diff --git a/.dockerignore b/.dockerignore
index 8802acb5..6668a7b5 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,10 +1,11 @@
-.git/
-.pytest_cache/
-.vscode/
-.venv/
-docs/
+.*
+**/__pycache__/
+*.egg-info/
+documentation/
 tests/
 build/
 dist/
 scripts/
-*.egg-info/
+src/interface/
+src/telemetry/
+!src/interface/web
diff --git a/.github/workflows/dockerize.yml b/.github/workflows/dockerize.yml
index 94c77c23..eae321aa 100644
--- a/.github/workflows/dockerize.yml
+++ b/.github/workflows/dockerize.yml
@@ -38,13 +38,23 @@ env:
 jobs:
   build:
     name: Publish Khoj Docker Images
-    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        image:
-          - 'local'
-          - 'cloud'
+        include:
+          - image: 'local'
+            platform: linux/amd64
+            runner: ubuntu-latest
+          - image: 'local'
+            platform: linux/arm64
+            runner: ubuntu-linux-arm64
+          - image: 'cloud'
+            platform: linux/amd64
+            runner: ubuntu-latest
+          - image: 'cloud'
+            platform: linux/arm64
+            runner: ubuntu-linux-arm64
+    runs-on: ${{ matrix.runner }}
     steps:
       - name: Checkout Code
         uses: actions/checkout@v3
@@ -52,9 +62,6 @@ jobs:
           # Get all history to correctly infer Khoj version using hatch
           fetch-depth: 0
 
-      - name: 🧹 Delete huge unnecessary tools folder
-        run: rm -rf /opt/hostedtoolcache
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -73,31 +80,68 @@ jobs:
         run: rm -rf /opt/hostedtoolcache
 
       - name: 📦 Build and Push Docker Image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         if: (matrix.image == 'local' && github.event_name == 'workflow_dispatch') && github.event.inputs.khoj == 'true' || (matrix.image == 'local' && github.event_name == 'push')
         with:
           context: .
           file: Dockerfile
-          platforms: linux/amd64, linux/arm64
           push: true
           tags: |
-            ghcr.io/${{ github.repository }}:${{ env.DOCKER_IMAGE_TAG }}
-            ${{ github.ref_type == 'tag' && format('ghcr.io/{0}:latest', github.repository) || '' }}
+            ghcr.io/${{ github.repository }}:${{ env.DOCKER_IMAGE_TAG }}-${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }}
           build-args: |
             VERSION=${{ steps.hatch.outputs.version }}
             PORT=42110
+          cache-from: type=gha,scope=${{ matrix.image }}-${{ matrix.platform }}
+          cache-to: type=gha,mode=max,scope=${{ matrix.image }}-${{ matrix.platform}}
+          labels: |
+            org.opencontainers.image.description=Khoj AI - Your second brain powered by LLMs and Neural Search
+            org.opencontainers.image.source=${{ github.server_url }}/${{ github.repository }}
 
       - name: 📦️⛅️ Build and Push Cloud Docker Image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         if: (matrix.image == 'cloud' && github.event_name == 'workflow_dispatch') && github.event.inputs.khoj-cloud == 'true' || (matrix.image == 'cloud' && github.event_name == 'push')
         with:
           context: .
           file: prod.Dockerfile
-          platforms: linux/amd64, linux/arm64
           push: true
           tags: |
-            ghcr.io/${{ github.repository }}-cloud:${{ env.DOCKER_IMAGE_TAG }}
-            ${{ github.ref_type == 'tag' && format('ghcr.io/{0}-cloud:latest', github.repository) || '' }}
+            ghcr.io/${{ github.repository }}-cloud:${{ env.DOCKER_IMAGE_TAG }}-${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }}
           build-args: |
             VERSION=${{ steps.hatch.outputs.version }}
             PORT=42110
+          cache-from: type=gha,scope=${{ matrix.image }}-${{ matrix.platform }}
+          cache-to: type=gha,mode=max,scope=${{ matrix.image }}-${{ matrix.platform}}
+          labels: |
+            org.opencontainers.image.description=Khoj AI Cloud - Your second brain powered by LLMs and Neural Search
+            org.opencontainers.image.source=${{ github.server_url }}/${{ github.repository }}
+
+  manifest:
+    needs: build
+    runs-on: ubuntu-latest
+    if: github.event_name != 'pull_request'
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.PAT }}
+
+      - name: Create and Push Local Manifest
+        if: github.event.inputs.khoj == 'true' || github.event_name == 'push'
+        run: |
+          docker buildx imagetools create \
+            -t ghcr.io/${{ github.repository }}:${{ env.DOCKER_IMAGE_TAG }} \
+            ghcr.io/${{ github.repository }}:${{ env.DOCKER_IMAGE_TAG }}-amd64 \
+            ghcr.io/${{ github.repository }}:${{ env.DOCKER_IMAGE_TAG }}-arm64
+
+      - name: Create and Push Cloud Manifest
+        if: github.event.inputs.khoj-cloud == 'true' || github.event_name == 'push'
+        run: |
+          docker buildx imagetools create \
+            -t ghcr.io/${{ github.repository }}-cloud:${{ env.DOCKER_IMAGE_TAG }} \
+            ghcr.io/${{ github.repository }}-cloud:${{ env.DOCKER_IMAGE_TAG }}-amd64 \
+            ghcr.io/${{ github.repository }}-cloud:${{ env.DOCKER_IMAGE_TAG }}-arm64
diff --git a/.github/workflows/run_evals.yml b/.github/workflows/run_evals.yml
index e77dcbfd..dc8c89b7 100644
--- a/.github/workflows/run_evals.yml
+++ b/.github/workflows/run_evals.yml
@@ -25,6 +25,8 @@ on:
         options:
           - frames
           - simpleqa
+          - gpqa
+          - math500
       sample_size:
         description: 'Number of samples to evaluate'
         required: false
@@ -74,12 +76,12 @@ jobs:
           DEBIAN_FRONTEND: noninteractive
         run: |
           # install postgres and other dependencies
-          apt update && apt install -y git python3-pip libegl1 sqlite3 libsqlite3-dev libsqlite3-0 ffmpeg libsm6 libxext6
-          apt install -y postgresql postgresql-client && apt install -y postgresql-server-dev-14
+          sudo apt update && sudo apt install -y git python3-pip libegl1 sqlite3 libsqlite3-dev libsqlite3-0 ffmpeg libsm6 libxext6
+          sudo apt install -y postgresql postgresql-client && sudo apt install -y postgresql-server-dev-14
           # upgrade pip
           python -m ensurepip --upgrade && python -m pip install --upgrade pip
           # install terrarium for code sandbox
-          git clone https://github.com/cohere-ai/cohere-terrarium.git && cd cohere-terrarium && npm install && mkdir pyodide_cache
+          git clone https://github.com/khoj-ai/terrarium.git && cd terrarium && npm install --legacy-peer-deps && mkdir pyodide_cache
 
       - name: ⬇️ Install Application
         run: |
@@ -89,14 +91,15 @@ jobs:
       - name: 📝 Run Eval
         env:
           KHOJ_MODE: ${{ matrix.khoj_mode }}
-          SAMPLE_SIZE: ${{ inputs.sample_size }}
+          SAMPLE_SIZE: ${{ github.event_name == 'workflow_dispatch' && inputs.sample_size || 200 }}
           BATCH_SIZE: "20"
           RANDOMIZE: "True"
           KHOJ_URL: "http://localhost:42110"
           KHOJ_LLM_SEED: "42"
           GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
-          SERPER_DEV_API_KEY: ${{ secrets.SERPER_DEV_API_KEY }}
-          OLOSTEP_API_KEY: ${{ secrets.OLOSTEP_API_KEY }}
+          SERPER_DEV_API_KEY: ${{ matrix.dataset != 'math500' && secrets.SERPER_DEV_API_KEY }}
+          OLOSTEP_API_KEY: ${{ matrix.dataset != 'math500' && secrets.OLOSTEP_API_KEY }}
+          HF_TOKEN: ${{ secrets.HF_TOKEN }}
           KHOJ_ADMIN_EMAIL: khoj
           KHOJ_ADMIN_PASSWORD: khoj
           POSTGRES_HOST: localhost
@@ -110,7 +113,7 @@ jobs:
           khoj --anonymous-mode --non-interactive &
 
           # Start code sandbox
-          npm run dev --prefix cohere-terrarium &
+          npm run dev --prefix terrarium &
 
           # Wait for server to be ready
           timeout=120
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2583f351..1f5dfc6f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -55,15 +55,13 @@ jobs:
         with:
           python-version: ${{ matrix.python_version }}
 
-      - name: Install Git
-        run: |
-          apt update && apt install -y git
-
       - name: ⏬️ Install Dependencies
         env:
           DEBIAN_FRONTEND: noninteractive
         run: |
-          apt update && apt install -y libegl1 sqlite3 libsqlite3-dev libsqlite3-0 ffmpeg libsm6 libxext6
+          apt update && apt install -y git libegl1 sqlite3 libsqlite3-dev libsqlite3-0 ffmpeg libsm6 libxext6
+          # required by llama-cpp-python prebuilt wheels
+          apt install -y musl-dev && ln -s /usr/lib/x86_64-linux-musl/libc.so /lib/libc.musl-x86_64.so.1
 
       - name: ⬇️ Install Postgres
         env:
@@ -78,6 +76,9 @@ jobs:
           python -m pip install --upgrade pip
 
       - name: ⬇️ Install Application
+        env:
+          PIP_EXTRA_INDEX_URL: "https://download.pytorch.org/whl/cpu https://abetlen.github.io/llama-cpp-python/whl/cpu"
+          CUDA_VISIBLE_DEVICES: ""
         run: sed -i 's/dynamic = \["version"\]/version = "0.0.0"/' pyproject.toml && pip install --upgrade .[dev]
 
       - name: 🧪 Test Application
diff --git a/.gitignore b/.gitignore
index 4041122a..09288aa7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,13 @@ src/interface/obsidian/main.js
 
 # obsidian
 data.json
+
+# Android
+src/interface/android/.gradle
+src/interface/android/app/build
+src/interface/android/build
+src/interface/android/*.aab
+src/interface/android/*.apk
+src/interface/android/*.apk.idsig
+src/interface/android/*.keystore
+src/interface/android/local.properties
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 444e182d..01cfc839 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -26,7 +26,7 @@ repos:
   rev: v1.0.0
   hooks:
     - id: mypy
-      stages: [push, manual]
+      stages: [pre-push, manual]
       pass_filenames: false
       args:
       - --config-file=pyproject.toml
diff --git a/Dockerfile b/Dockerfile
index 479fbadc..fab572cc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM ubuntu:jammy
+FROM ubuntu:jammy AS base
 LABEL homepage="https://khoj.dev"
 LABEL repository="https://github.com/khoj-ai/khoj"
 LABEL org.opencontainers.image.source="https://github.com/khoj-ai/khoj"
@@ -13,36 +13,51 @@ RUN apt update -y && apt -y install \
     # Required by RapidOCR
     libgl1 \
     libglx-mesa0 \
-    libglib2.0-0 && \
-    # Required by Next.js Web app
-    curl -sL https://deb.nodesource.com/setup_20.x | bash - && \
-    curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
-    echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
-    apt update -y && apt -y --no-install-recommends install nodejs yarn && \
+    libglib2.0-0 \
+    # Required by llama-cpp-python pre-built wheels. See #1628
+    musl-dev && \
+    ln -s /usr/lib/x86_64-linux-musl/libc.so /lib/libc.musl-x86_64.so.1 && \
+    # Clean up
     apt clean && rm -rf /var/lib/apt/lists/*
 
-# Install Application
+# Build Server
+FROM base AS server-deps
 WORKDIR /app
 COPY pyproject.toml .
 COPY README.md .
 ARG VERSION=0.0.0
+# use the pre-built llama-cpp-python, torch cpu wheel
+ENV PIP_EXTRA_INDEX_URL="https://download.pytorch.org/whl/cpu https://abetlen.github.io/llama-cpp-python/whl/cpu"
+# avoid downloading unused cuda specific python packages
+ENV CUDA_VISIBLE_DEVICES=""
 RUN sed -i "s/dynamic = \\[\"version\"\\]/version = \"$VERSION\"/" pyproject.toml && \
     pip install --no-cache-dir .
 
-# Copy Source Code
-COPY . .
-
-# Set the PYTHONPATH environment variable in order for it to find the Django app.
-ENV PYTHONPATH=/app/src:$PYTHONPATH
-
-# Go to the directory src/interface/web and export the built Next.js assets
+# Build Web App
+FROM node:20-alpine AS web-app
+# Set build optimization env vars
+ENV NODE_ENV=production
+ENV NEXT_TELEMETRY_DISABLED=1
 WORKDIR /app/src/interface/web
-RUN bash -c "yarn install --frozen-lockfile && yarn ciexport && yarn cache clean"
+# Install dependencies first (cache layer)
+COPY src/interface/web/package.json src/interface/web/yarn.lock ./
+RUN yarn install --frozen-lockfile
+# Copy source and build
+COPY src/interface/web/. ./
+RUN yarn build
+
+# Merge the Server and Web App into a Single Image
+FROM base
+ENV PYTHONPATH=/app/src
 WORKDIR /app
+COPY --from=server-deps /usr/local/lib/python3.10/dist-packages /usr/local/lib/python3.10/dist-packages
+COPY --from=web-app /app/src/interface/web/out ./src/khoj/interface/built
+COPY . .
+RUN cd src && python3 khoj/manage.py collectstatic --noinput
 
 # Run the Application
 # There are more arguments required for the application to run,
-# but these should be passed in through the docker-compose.yml file.
+# but those should be passed in through the docker-compose.yml file.
 ARG PORT
 EXPOSE ${PORT}
 ENTRYPOINT ["python3", "src/khoj/main.py"]
diff --git a/README.md b/README.md
index 07e23457..dbbe221c 100644
--- a/README.md
+++ b/README.md
@@ -29,10 +29,17 @@
 
 </div>
 
-<div align="left">
+***
+
+### 🎁 New
+* Start any message with `/research` to try out the experimental research mode with Khoj.
+* Anyone can now [create custom agents](https://blog.khoj.dev/posts/create-agents-on-khoj/) with tunable personality, tools and knowledge bases.
+* [Read](https://blog.khoj.dev/posts/evaluate-khoj-quality/) about Khoj's excellent performance on modern retrieval and reasoning benchmarks.
 
 ***
 
+## Overview
+
 [Khoj](https://khoj.dev) is a personal AI app to extend your capabilities. It smoothly scales up from an on-device personal AI to a cloud-scale enterprise AI.
 
 - Chat with any local or online LLM (e.g llama3, qwen, gemma, mistral, gpt, claude, gemini).
@@ -47,8 +54,6 @@
 
 ***
 
-</div>
-
 ## See it in action
 
 ![demo_chat](https://github.com/khoj-ai/khoj/blob/master/documentation/assets/img/quadratic_equation_khoj_web.gif?raw=true)
diff --git a/docker-compose.yml b/docker-compose.yml
index 652cf6a0..572e592e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,9 +22,9 @@ services:
     depends_on:
       database:
         condition: service_healthy
-    # Use the following line to use the latest version of khoj. Otherwise, it will build from source.
+    # Use the following line to use the latest version of khoj. Otherwise, it will build from source. Set this to ghcr.io/khoj-ai/khoj-cloud if you want to use the prod image.
     image: ghcr.io/khoj-ai/khoj:latest
-    # Uncomment the following line to build from source. This will take a few minutes. Comment the next two lines out if you want to use the offiicial image.
+    # Uncomment the following line to build from source. This will take a few minutes. Comment the next two lines out if you want to use the official image.
     # build:
       # context: .
     ports:
@@ -49,6 +49,8 @@ services:
       - KHOJ_DEBUG=False
       - KHOJ_ADMIN_EMAIL=username@example.com
       - KHOJ_ADMIN_PASSWORD=password
+      # Default URL of Terrarium, the Python sandbox used by Khoj to run code. Its container is specified above
+      - KHOJ_TERRARIUM_URL=http://host.docker.internal:8080
       # Uncomment line below to use with Ollama running on your local machine at localhost:11434.
       # Change URL to use with other OpenAI API compatible providers like VLLM, LMStudio etc.
       # - OPENAI_API_BASE=http://host.docker.internal:11434/v1/
@@ -64,7 +66,7 @@ services:
       # Ensure you set your provider specific API keys.
       # ---
       # Free, Slower API. Does both web search and webpage read. Get API key from https://jina.ai/
-      # - JINA_API_KEY=you_jina_api_key
+      # - JINA_API_KEY=your_jina_api_key
       # Paid, Fast API. Only does web search. Get API key from https://serper.dev/
       # - SERPER_DEV_API_KEY=your_serper_dev_api_key
       # Paid, Fast, Open API. Only does webpage read. Get API key from https://firecrawl.dev/
@@ -83,6 +85,7 @@ services:
       # Telemetry helps us prioritize feature development and understand how people are using Khoj
       # Read more at https://docs.khoj.dev/miscellaneous/telemetry
       # - KHOJ_TELEMETRY_DISABLE=True
+    # Comment out this line when you're using the official ghcr.io/khoj-ai/khoj-cloud prod image.
     command: --host="0.0.0.0" --port=42110 -vv --anonymous-mode --non-interactive
 
 
diff --git a/documentation/assets/img/chrome_pwa_alt.png b/documentation/assets/img/chrome_pwa_alt.png
new file mode 100644
index 00000000..018eb04a
Binary files /dev/null and b/documentation/assets/img/chrome_pwa_alt.png differ
diff --git a/documentation/assets/img/khoj_chat_on_desktop.png b/documentation/assets/img/khoj_chat_on_desktop.png
deleted file mode 100644
index e8c10718..00000000
Binary files a/documentation/assets/img/khoj_chat_on_desktop.png and /dev/null differ
diff --git a/documentation/assets/img/khoj_search_on_desktop.png b/documentation/assets/img/khoj_search_on_desktop.png
deleted file mode 100644
index 1dc3231d..00000000
Binary files a/documentation/assets/img/khoj_search_on_desktop.png and /dev/null differ
diff --git a/documentation/assets/img/mic_chat_icon.png b/documentation/assets/img/mic_chat_icon.png
deleted file mode 100644
index 0bf64de6..00000000
Binary files a/documentation/assets/img/mic_chat_icon.png and /dev/null differ
diff --git a/documentation/assets/img/pwa_install_desktop.png b/documentation/assets/img/pwa_install_desktop.png
new file mode 100644
index 00000000..633f1b85
Binary files /dev/null and b/documentation/assets/img/pwa_install_desktop.png differ
diff --git a/documentation/docs/advanced/admin.md b/documentation/docs/advanced/admin.md
index c1d641e1..a9727d2b 100644
--- a/documentation/docs/advanced/admin.md
+++ b/documentation/docs/advanced/admin.md
@@ -38,14 +38,13 @@ To add a server chat setting:
 - The `Advanced` field doesn't need to be set when self-hosting. When unset, the `Default` chat model is used for all users and the intermediate steps.
 
 
-### OpenAI Processor Conversation Configs
-These settings configure chat model providers to be accessed over API.
-The name of this setting is kind of a misnomer, we know, it'll hopefully be changed at some point.
-For each chat model provider you [add](http://localhost:42110/server/admin/database/openaiprocessorconversationconfig/add):
+### AI Model API
+These settings configure APIs to interact with AI models.
+For each AI Model API you [add](http://localhost:42110/server/admin/database/aimodelapi/add):
 - `Api key`: Set to your [OpenAI](https://platform.openai.com/api-keys), [Anthropic](https://console.anthropic.com/account/keys) or [Gemini](https://aistudio.google.com/app/apikey) API keys.
 - `Name`: Give the configuration any friendly name like `OpenAI`, `Gemini`, `Anthropic`.
 - `Api base url`: Set the API base URL. This is only relevant to set if you're using another OpenAI-compatible proxy server like [Ollama](/advanced/ollama) or [LMStudio](/advanced/lmstudio).
-  ![example configuration for openai processor](/img/example_openai_processor_config.png)
+  ![example configuration for ai model api](/img/example_openai_processor_config.png)
 
 ### Search Model Configs
 Search models are used to generate vector embeddings of your documents for natural language search and chat. You can choose any [embeddings models on HuggingFace](https://huggingface.co/models?pipeline_tag=sentence-similarity) to try, use for your to create vector embeddings of your documents for natural language search and chat.
diff --git a/documentation/docs/advanced/litellm.md b/documentation/docs/advanced/litellm.md
index 9dfaaf34..212ac047 100644
--- a/documentation/docs/advanced/litellm.md
+++ b/documentation/docs/advanced/litellm.md
@@ -21,7 +21,7 @@ Using LiteLLM with Khoj makes it possible to turn any LLM behind an API into you
    export MISTRAL_API_KEY=<MISTRAL_API_KEY>
    litellm --model mistral/mistral-tiny --drop_params
    ```
-3. Create a new [OpenAI Processor Conversation Config](http://localhost:42110/server/admin/database/openaiprocessorconversationconfig/add) on your Khoj admin panel
+3. Create a new [API Model API](http://localhost:42110/server/admin/database/aimodelapi/add) on your Khoj admin panel
    - Name: `proxy-name`
    - Api Key: `any string`
    - Api Base Url: **URL of your Openai Proxy API**
diff --git a/documentation/docs/advanced/ollama.mdx b/documentation/docs/advanced/ollama.mdx
index ef5295ef..78d77d26 100644
--- a/documentation/docs/advanced/ollama.mdx
+++ b/documentation/docs/advanced/ollama.mdx
@@ -60,7 +60,7 @@ Restart your Khoj server after first run or update to the settings below to ensu
       ```bash
       ollama pull llama3.1
       ```
-   3. Create a new [OpenAI Processor Conversation Config](http://localhost:42110/server/admin/database/openaiprocessorconversationconfig/add) on your Khoj admin panel
+   3. Create a new [AI Model API](http://localhost:42110/server/admin/database/aimodelapi/add) on your Khoj admin panel
       - Name: `ollama`
       - Api Key: `any string`
       - Api Base Url: `http://localhost:11434/v1/` (default for Ollama)
diff --git a/documentation/docs/advanced/use-openai-proxy.md b/documentation/docs/advanced/use-openai-proxy.md
index ec674767..6efaad1c 100644
--- a/documentation/docs/advanced/use-openai-proxy.md
+++ b/documentation/docs/advanced/use-openai-proxy.md
@@ -11,7 +11,7 @@ This is only helpful for self-hosted users. If you're using [Khoj Cloud](https:/
 Khoj natively supports local LLMs [available on HuggingFace in GGUF format](https://huggingface.co/models?library=gguf). Using an OpenAI API proxy with Khoj maybe useful for ease of setup, trying new models or using commercial LLMs via API.
 :::
 
-Khoj can use any OpenAI API compatible server including [Ollama](/advanced/ollama), [LMStudio](/advanced/lmstudio) and [LiteLLM](/advanced/litellm).
+Khoj can use any OpenAI API compatible server including local providers like [Ollama](/advanced/ollama), [LMStudio](/advanced/lmstudio) and [LiteLLM](/advanced/litellm) and commercial providers like [HuggingFace](https://huggingface.co/docs/api-inference/tasks/chat-completion#using-the-api), [OpenRouter](https://openrouter.ai/docs/quick-start) etc.
 Configuring this allows you to use non-standard, open or commercial, local or hosted LLM models for Khoj
 
 Combine them with Khoj can turn your favorite LLM into an AI agent. Allowing you to chat with your docs, find answers from the internet, build custom agents and run automations.
@@ -20,8 +20,8 @@ For specific integrations, see our [Ollama](/advanced/ollama), [LMStudio](/advan
 
 ## General Setup
 
-1. Start your preferred OpenAI API compatible app
-2. Create a new [OpenAI Processor Conversation Config](http://localhost:42110/server/admin/database/openaiprocessorconversationconfig/add) on your Khoj admin panel
+1. Start your preferred OpenAI API compatible app locally or get API keys from commercial AI model providers.
+3. Create a new [API Model API](http://localhost:42110/server/admin/database/aimodelapi/add) on your Khoj admin panel
    - Name: `any name`
    - Api Key: `any string`
    - Api Base Url: **URL of your Openai Proxy API**
diff --git a/documentation/docs/clients/desktop.md b/documentation/docs/clients/desktop.md
index 104c10fa..b8b7269d 100644
--- a/documentation/docs/clients/desktop.md
+++ b/documentation/docs/clients/desktop.md
@@ -4,22 +4,13 @@ sidebar_position: 1
 
 # Desktop
 
-> Query your Second Brain from your machine
+> Upload your knowledge base to Khoj and chat with your whole corpus
 
-Use the Desktop app to chat and search with Khoj.
-You can also share your files, folders with Khoj using the app.
+## Companion App
+
+Share your files, folders with Khoj using the app.
 Khoj will keep these files in sync to provide contextual responses when you search or chat.
 
-## Features
-- **Chat**
-  - **Faster answers**: Find answers quickly, from your private notes or the public internet
-  - **Assisted creativity**: Smoothly weave across retrieving answers and generating content
-  - **Iterative discovery**: Iteratively explore and re-discover your notes
-  - **Quick access**: Use [Khoj Mini](/features/khoj_mini) on the desktop to quickly pull up a mini chat module for quicker answers
-- **Search**
-  - **Natural**: Advanced natural language understanding using Transformer based ML Models
-  - **Incremental**: Incremental search for a fast, search-as-you-type experience
-
 ## Setup
 :::info[Self Hosting]
 If you are self-hosting the Khoj server, update the *Settings* page on the Khoj Desktop app to:
@@ -34,7 +25,20 @@ If you are self-hosting the Khoj server, update the *Settings* page on the Khoj
 4. [Optional] Add any files, folders you'd like Khoj to be aware of on the *Settings* page and Click *Save*.
    These files and folders will be automatically kept in sync for you
 
-## Interface
-| Chat | Search |
-|:----:|:------:|
-| ![](/img/khoj_chat_on_desktop.png) | ![](/img/khoj_search_on_desktop.png) |
+# Main App
+
+You can also install the Khoj application on your desktop as a progressive web app.
+
+1. Open the [Khoj Web App](https://app.khoj.dev) in Chrome.
+2. Click on the install button in the address bar to install the app. You must be logged into your Chrome browser for this to work.
+
+![progressive web app install icon](/img/pwa_install_desktop.png)
+
+Alternatively, you can also install using this route:
+
+1. Open the three-dot menu in the top right corner of the browser.
+2. Go to 'Cast, Save, and Share' option.
+3. Click on the "Open in Khoj" option.
+
+
+![progressive web app install route](/img/chrome_pwa_alt.png)
diff --git a/documentation/docs/clients/emacs.md b/documentation/docs/clients/emacs.md
index 73405b69..c047e282 100644
--- a/documentation/docs/clients/emacs.md
+++ b/documentation/docs/clients/emacs.md
@@ -114,7 +114,7 @@ This feature finds entries similar to the one you are currently on.
 2. Hit `C-c s f` (or `M-x khoj RET f`) to find similar entries
 
 ### Advanced Usage
-- Add [query filters](https://github.com/khoj-ai/khoj/#query-filters) during search to narrow down results further
+- Add [query filters](/miscellaneous/advanced#query-filters) during search to narrow down results further
   e.g. `What is the meaning of life? -"god" +"none" dt>"last week"`
 
 - Use `C-c C-o 2` to open the current result at cursor in its source org file
diff --git a/documentation/docs/get-started/setup.mdx b/documentation/docs/get-started/setup.mdx
index a7459376..a3081e96 100644
--- a/documentation/docs/get-started/setup.mdx
+++ b/documentation/docs/get-started/setup.mdx
@@ -302,11 +302,11 @@ Setup which chat model you'd want to use. Khoj supports local and online chat mo
 Using Ollama? See the [Ollama Integration](/advanced/ollama) section for more custom setup instructions.
 :::
 
-1. Create a new [OpenAI processor conversation config](http://localhost:42110/server/admin/database/openaiprocessorconversationconfig/add) in the server admin settings. This is kind of a misnomer, we know.
+1. Create a new [AI Model Api](http://localhost:42110/server/admin/database/aimodelapi/add) in the server admin settings.
    - Add your [OpenAI API key](https://platform.openai.com/api-keys)
    - Give the configuration a friendly name like `OpenAI`
    - (Optional) Set the API base URL. It is only relevant if you're using another OpenAI-compatible proxy server like [Ollama](/advanced/ollama) or [LMStudio](/advanced/lmstudio).<br />
-![example configuration for openai processor](/img/example_openai_processor_config.png)
+![example configuration for ai model api](/img/example_openai_processor_config.png)
 2. Create a new [chat model options](http://localhost:42110/server/admin/database/chatmodeloptions/add)
     - Set the `chat-model` field to an [OpenAI chat model](https://platform.openai.com/docs/models). Example: `gpt-4o`.
     - Make sure to set the `model-type` field to `OpenAI`.
@@ -315,22 +315,22 @@ Using Ollama? See the [Ollama Integration](/advanced/ollama) section for more cu
 ![example configuration for chat model options](/img/example_chatmodel_option.png)
   </TabItem>
   <TabItem value="anthropic" label="Anthropic">
-1. Create a new [OpenAI processor conversation config](http://localhost:42110/server/admin/database/openaiprocessorconversationconfig/add) in the server admin settings. This is kind of a misnomer, we know.
+1. Create a new [AI Model API](http://localhost:42110/server/admin/database/aimodelapi/add) in the server admin settings.
    - Add your [Anthropic API key](https://console.anthropic.com/account/keys)
    - Give the configuration a friendly name like `Anthropic`. Do not configure the API base url.
 2. Create a new [chat model options](http://localhost:42110/server/admin/database/chatmodeloptions/add)
     - Set the `chat-model` field to an [Anthropic chat model](https://docs.anthropic.com/en/docs/about-claude/models#model-names). Example: `claude-3-5-sonnet-20240620`.
     - Set the `model-type` field to `Anthropic`.
-    - Set the `Openai config` field to the OpenAI processor conversation config for Anthropic you created in step 1.
+    - Set the `ai model api` field to the Anthropic AI Model API you created in step 1.
   </TabItem>
   <TabItem value="gemini" label="Gemini">
-1. Create a new [OpenAI processor conversation config](http://localhost:42110/server/admin/database/openaiprocessorconversationconfig/add) in the server admin settings. This is kind of a misnomer, we know.
+1. Create a new [AI Model API](http://localhost:42110/server/admin/database/aimodelapi/add) in the server admin settings.
    - Add your [Gemini API key](https://aistudio.google.com/app/apikey)
    - Give the configuration a friendly name like `Gemini`. Do not configure the API base url.
 2. Create a new [chat model options](http://localhost:42110/server/admin/database/chatmodeloptions/add)
     - Set the `chat-model` field to a [Google Gemini chat model](https://cloud.google.com/vertex-ai/generative-ai/docs/learn/models#gemini-models). Example: `gemini-1.5-flash`.
     - Set the `model-type` field to `Gemini`.
-    - Set the `Openai config` field to the OpenAI processor conversation config for Gemini you created in step 1.
+    - Set the `ai model api` field to the Gemini AI Model API you created in step 1.
 
   </TabItem>
   <TabItem value="offline" label="Offline">
diff --git a/documentation/docusaurus.config.js b/documentation/docusaurus.config.js
index 6fcff6bc..13f4e906 100644
--- a/documentation/docusaurus.config.js
+++ b/documentation/docusaurus.config.js
@@ -37,6 +37,9 @@ const config = {
     locales: ['en'],
   },
 
+  // Add a widget for Chatwoot for live chat if users need help
+  clientModules: [require.resolve('./src/components/ChatwootWidget.js')],
+
   presets: [
     [
       'classic',
@@ -69,7 +72,6 @@ const config = {
       }),
     ],
   ],
-
   themeConfig:
     /** @type {import('@docusaurus/preset-classic').ThemeConfig} */
     ({
diff --git a/documentation/src/components/ChatwootWidget.js b/documentation/src/components/ChatwootWidget.js
new file mode 100644
index 00000000..bb90e1c5
--- /dev/null
+++ b/documentation/src/components/ChatwootWidget.js
@@ -0,0 +1,19 @@
+import ExecutionEnvironment from '@docusaurus/ExecutionEnvironment';
+
+// Only execute on client-side
+if (ExecutionEnvironment.canUseDOM) {
+  (function (d, t) {
+    var BASE_URL = "https://app.chatwoot.com";
+    var g = d.createElement(t), s = d.getElementsByTagName(t)[0];
+    g.src = BASE_URL + "/packs/js/sdk.js";
+    g.defer = true;
+    g.async = true;
+    s.parentNode.insertBefore(g, s);
+    g.onload = function () {
+      window.chatwootSDK.run({
+        websiteToken: 'cFxvnLSjfE2UF4UUiPCA5NsF',
+        baseUrl: BASE_URL
+      })
+    }
+  })(document, 'script');
+}
diff --git a/documentation/yarn.lock b/documentation/yarn.lock
index b00abca1..cf6450b9 100644
--- a/documentation/yarn.lock
+++ b/documentation/yarn.lock
@@ -48,15 +48,15 @@
   dependencies:
     "@algolia/cache-common" "4.24.0"
 
-"@algolia/client-abtesting@5.15.0":
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/@algolia/client-abtesting/-/client-abtesting-5.15.0.tgz#6414895e2246dc7b7facd97bd98c3abe13cabe59"
-  integrity sha512-FaEM40iuiv1mAipYyiptP4EyxkJ8qHfowCpEeusdHUC4C7spATJYArD2rX3AxkVeREkDIgYEOuXcwKUbDCr7Nw==
+"@algolia/client-abtesting@5.16.0":
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/@algolia/client-abtesting/-/client-abtesting-5.16.0.tgz#806d2da147c7bffab23ea2498e602a73432a8490"
+  integrity sha512-fqQ2Szc6zxqXyQF8Vr64QMVoqFHHDsR5gEr/Eki+q+lgERvGr3YXruiB7Xs8rDTXP6+NC3tM2sZjdaEXW/P+6Q==
   dependencies:
-    "@algolia/client-common" "5.15.0"
-    "@algolia/requester-browser-xhr" "5.15.0"
-    "@algolia/requester-fetch" "5.15.0"
-    "@algolia/requester-node-http" "5.15.0"
+    "@algolia/client-common" "5.16.0"
+    "@algolia/requester-browser-xhr" "5.16.0"
+    "@algolia/requester-fetch" "5.16.0"
+    "@algolia/requester-node-http" "5.16.0"
 
 "@algolia/client-account@4.24.0":
   version "4.24.0"
@@ -77,15 +77,15 @@
     "@algolia/requester-common" "4.24.0"
     "@algolia/transporter" "4.24.0"
 
-"@algolia/client-analytics@5.15.0":
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/@algolia/client-analytics/-/client-analytics-5.15.0.tgz#7ca1043cba7ac225d30e8bb52579504946b95f58"
-  integrity sha512-lho0gTFsQDIdCwyUKTtMuf9nCLwq9jOGlLGIeQGKDxXF7HbiAysFIu5QW/iQr1LzMgDyM9NH7K98KY+BiIFriQ==
+"@algolia/client-analytics@5.16.0":
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/@algolia/client-analytics/-/client-analytics-5.16.0.tgz#a923f43059b674239e6125f9a917cd25104e79dd"
+  integrity sha512-8HqIoGUwjc/XqjA+AjpRvtB40QzQ067qHuJujkR0k6WBLEM3OiB30FOfLZLabxnPIZgU55zmQ8exe+0WpgyKqA==
   dependencies:
-    "@algolia/client-common" "5.15.0"
-    "@algolia/requester-browser-xhr" "5.15.0"
-    "@algolia/requester-fetch" "5.15.0"
-    "@algolia/requester-node-http" "5.15.0"
+    "@algolia/client-common" "5.16.0"
+    "@algolia/requester-browser-xhr" "5.16.0"
+    "@algolia/requester-fetch" "5.16.0"
+    "@algolia/requester-node-http" "5.16.0"
 
 "@algolia/client-common@4.24.0":
   version "4.24.0"
@@ -95,20 +95,20 @@
     "@algolia/requester-common" "4.24.0"
     "@algolia/transporter" "4.24.0"
 
-"@algolia/client-common@5.15.0":
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/@algolia/client-common/-/client-common-5.15.0.tgz#cd47ae07a3afc7065438a2dab29f8434f848928e"
-  integrity sha512-IofrVh213VLsDkPoSKMeM9Dshrv28jhDlBDLRcVJQvlL8pzue7PEB1EZ4UoJFYS3NSn7JOcJ/V+olRQzXlJj1w==
+"@algolia/client-common@5.16.0":
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/@algolia/client-common/-/client-common-5.16.0.tgz#4e53548c6a83fa6c6d1856053347506c426aabae"
+  integrity sha512-4Bzvs5cdZ2MTMQvDlsmruZfyEk/NhSdsc+tA3vH9iMGIRzOj7Y9mwITpJM+hLFhbSE9Q0p0ojTF03RoDVclsZA==
 
-"@algolia/client-insights@5.15.0":
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/@algolia/client-insights/-/client-insights-5.15.0.tgz#f3bead0edd10e69365895da4a96044064b504f4d"
-  integrity sha512-bDDEQGfFidDi0UQUCbxXOCdphbVAgbVmxvaV75cypBTQkJ+ABx/Npw7LkFGw1FsoVrttlrrQbwjvUB6mLVKs/w==
+"@algolia/client-insights@5.16.0":
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/@algolia/client-insights/-/client-insights-5.16.0.tgz#69d9d9077a1977320ca325a7f8c9c31b0aaead31"
+  integrity sha512-vIiOK8+exA0AOlR9mRDUr148Rx3WNU73whaJtciYoqeHoy/utib+m3Lw1+6s0o7OuPb/wGRoJ1l5vQuVezVHgA==
   dependencies:
-    "@algolia/client-common" "5.15.0"
-    "@algolia/requester-browser-xhr" "5.15.0"
-    "@algolia/requester-fetch" "5.15.0"
-    "@algolia/requester-node-http" "5.15.0"
+    "@algolia/client-common" "5.16.0"
+    "@algolia/requester-browser-xhr" "5.16.0"
+    "@algolia/requester-fetch" "5.16.0"
+    "@algolia/requester-node-http" "5.16.0"
 
 "@algolia/client-personalization@4.24.0":
   version "4.24.0"
@@ -119,25 +119,25 @@
     "@algolia/requester-common" "4.24.0"
     "@algolia/transporter" "4.24.0"
 
-"@algolia/client-personalization@5.15.0":
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/@algolia/client-personalization/-/client-personalization-5.15.0.tgz#e962793ebf737a5ffa4867d2dfdfe17924be3833"
-  integrity sha512-LfaZqLUWxdYFq44QrasCDED5bSYOswpQjSiIL7Q5fYlefAAUO95PzBPKCfUhSwhb4rKxigHfDkd81AvEicIEoA==
+"@algolia/client-personalization@5.16.0":
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/@algolia/client-personalization/-/client-personalization-5.16.0.tgz#dab4d8e694cc0d76196e64e5c90059a78b511450"
+  integrity sha512-psAzXJgzqPMCID31wrWVRg19K+h5TsLKSv6YfzQhB5munnj4IAE2lxEet2hDkji7vPA0WWpXGAW5Tx0scyMvkA==
   dependencies:
-    "@algolia/client-common" "5.15.0"
-    "@algolia/requester-browser-xhr" "5.15.0"
-    "@algolia/requester-fetch" "5.15.0"
-    "@algolia/requester-node-http" "5.15.0"
+    "@algolia/client-common" "5.16.0"
+    "@algolia/requester-browser-xhr" "5.16.0"
+    "@algolia/requester-fetch" "5.16.0"
+    "@algolia/requester-node-http" "5.16.0"
 
-"@algolia/client-query-suggestions@5.15.0":
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/@algolia/client-query-suggestions/-/client-query-suggestions-5.15.0.tgz#d9a2d0d0660241bdae5fc36a6f1fcf339abbafeb"
-  integrity sha512-wu8GVluiZ5+il8WIRsGKu8VxMK9dAlr225h878GGtpTL6VBvwyJvAyLdZsfFIpY0iN++jiNb31q2C1PlPL+n/A==
+"@algolia/client-query-suggestions@5.16.0":
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/@algolia/client-query-suggestions/-/client-query-suggestions-5.16.0.tgz#d515b0f246c3872b54053bc57b4c0b3be416ece7"
+  integrity sha512-ygek1jdrAbw/tUIyHkK4YrH3uQoRmBbSUvZl8NBbz0S0GxjR6bhPbDZT8ny1INIMCA3KlYHPZAlCS+02RtvDyg==
   dependencies:
-    "@algolia/client-common" "5.15.0"
-    "@algolia/requester-browser-xhr" "5.15.0"
-    "@algolia/requester-fetch" "5.15.0"
-    "@algolia/requester-node-http" "5.15.0"
+    "@algolia/client-common" "5.16.0"
+    "@algolia/requester-browser-xhr" "5.16.0"
+    "@algolia/requester-fetch" "5.16.0"
+    "@algolia/requester-node-http" "5.16.0"
 
 "@algolia/client-search@4.24.0":
   version "4.24.0"
@@ -148,30 +148,30 @@
     "@algolia/requester-common" "4.24.0"
     "@algolia/transporter" "4.24.0"
 
-"@algolia/client-search@5.15.0":
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/@algolia/client-search/-/client-search-5.15.0.tgz#8645f5bc87a959b8008e021d8b31d55a47920b94"
-  integrity sha512-Z32gEMrRRpEta5UqVQA612sLdoqY3AovvUPClDfMxYrbdDAebmGDVPtSogUba1FZ4pP5dx20D3OV3reogLKsRA==
+"@algolia/client-search@5.16.0":
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/@algolia/client-search/-/client-search-5.16.0.tgz#f9a4d3754b3f0d3ec2ea6af76268edbc9cf39de2"
+  integrity sha512-mVnkDZjpbiqdXRz0NrQlx6+QsnKYENuruYyjTJNcG3qAe015tvGAHcvvzRT78ZxETS7WjruWSlXBcL5llycNsQ==
   dependencies:
-    "@algolia/client-common" "5.15.0"
-    "@algolia/requester-browser-xhr" "5.15.0"
-    "@algolia/requester-fetch" "5.15.0"
-    "@algolia/requester-node-http" "5.15.0"
+    "@algolia/client-common" "5.16.0"
+    "@algolia/requester-browser-xhr" "5.16.0"
+    "@algolia/requester-fetch" "5.16.0"
+    "@algolia/requester-node-http" "5.16.0"
 
 "@algolia/events@^4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@algolia/events/-/events-4.0.1.tgz#fd39e7477e7bc703d7f893b556f676c032af3950"
   integrity sha512-FQzvOCgoFXAbf5Y6mYozw2aj5KCJoA3m4heImceldzPSMbdyS4atVjJzXKMsfX3wnZTFYwkkt8/z8UesLHlSBQ==
 
-"@algolia/ingestion@1.15.0":
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/@algolia/ingestion/-/ingestion-1.15.0.tgz#a3f3ec2139042f8597c2a975430a6f77cd764db3"
-  integrity sha512-MkqkAxBQxtQ5if/EX2IPqFA7LothghVyvPoRNA/meS2AW2qkHwcxjuiBxv4H6mnAVEPfJlhu9rkdVz9LgCBgJg==
+"@algolia/ingestion@1.16.0":
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/@algolia/ingestion/-/ingestion-1.16.0.tgz#f68a803bf6949a585ccf61021206310930950452"
+  integrity sha512-nmLcQYeG1YYRDAv2U+ebBD23mBSfkmhSwdDx2DBzqupStNrYWqYHsNgATLTMtMUTfgD0nSgBl5c+03yXg5WpiQ==
   dependencies:
-    "@algolia/client-common" "5.15.0"
-    "@algolia/requester-browser-xhr" "5.15.0"
-    "@algolia/requester-fetch" "5.15.0"
-    "@algolia/requester-node-http" "5.15.0"
+    "@algolia/client-common" "5.16.0"
+    "@algolia/requester-browser-xhr" "5.16.0"
+    "@algolia/requester-fetch" "5.16.0"
+    "@algolia/requester-node-http" "5.16.0"
 
 "@algolia/logger-common@4.24.0":
   version "4.24.0"
@@ -185,15 +185,15 @@
   dependencies:
     "@algolia/logger-common" "4.24.0"
 
-"@algolia/monitoring@1.15.0":
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/@algolia/monitoring/-/monitoring-1.15.0.tgz#1eb58722ec9ea6e5de3621150f97a43571bd312e"
-  integrity sha512-QPrFnnGLMMdRa8t/4bs7XilPYnoUXDY8PMQJ1sf9ZFwhUysYYhQNX34/enoO0LBjpoOY6rLpha39YQEFbzgKyQ==
+"@algolia/monitoring@1.16.0":
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/@algolia/monitoring/-/monitoring-1.16.0.tgz#f6e838df45f06e951ec7ac40f697b8bc5f3607e0"
+  integrity sha512-tiDkoQOO/d4o8W6dEnpCIMCWp6mwdjqZ+Q51QiCKvz1vcYU/YEx4lleY9oadjAMoOVWZHL6ItEF1LbQHvVNogQ==
   dependencies:
-    "@algolia/client-common" "5.15.0"
-    "@algolia/requester-browser-xhr" "5.15.0"
-    "@algolia/requester-fetch" "5.15.0"
-    "@algolia/requester-node-http" "5.15.0"
+    "@algolia/client-common" "5.16.0"
+    "@algolia/requester-browser-xhr" "5.16.0"
+    "@algolia/requester-fetch" "5.16.0"
+    "@algolia/requester-node-http" "5.16.0"
 
 "@algolia/recommend@4.24.0":
   version "4.24.0"
@@ -212,15 +212,15 @@
     "@algolia/requester-node-http" "4.24.0"
     "@algolia/transporter" "4.24.0"
 
-"@algolia/recommend@5.15.0":
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/@algolia/recommend/-/recommend-5.15.0.tgz#8f3359ee7e855849ac3872f67c0672f6835c8f79"
-  integrity sha512-5eupMwSqMLDObgSMF0XG958zR6GJP3f7jHDQ3/WlzCM9/YIJiWIUoJFGsko9GYsA5xbLDHE/PhWtq4chcCdaGQ==
+"@algolia/recommend@5.16.0":
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/@algolia/recommend/-/recommend-5.16.0.tgz#df9eac25697b3208bd77b72ec5a9e90bcef72a04"
+  integrity sha512-hehiMLsDnXnnZGXXKdeXUsvP3PwqAKL/rT4XutkYXsqQ1Jnv4EFrMOY8morUT8nlPv7d1bHPF+bTiNaKvkbBbA==
   dependencies:
-    "@algolia/client-common" "5.15.0"
-    "@algolia/requester-browser-xhr" "5.15.0"
-    "@algolia/requester-fetch" "5.15.0"
-    "@algolia/requester-node-http" "5.15.0"
+    "@algolia/client-common" "5.16.0"
+    "@algolia/requester-browser-xhr" "5.16.0"
+    "@algolia/requester-fetch" "5.16.0"
+    "@algolia/requester-node-http" "5.16.0"
 
 "@algolia/requester-browser-xhr@4.24.0":
   version "4.24.0"
@@ -229,24 +229,24 @@
   dependencies:
     "@algolia/requester-common" "4.24.0"
 
-"@algolia/requester-browser-xhr@5.15.0":
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/@algolia/requester-browser-xhr/-/requester-browser-xhr-5.15.0.tgz#5ffdccdf5cd7814ed3486bed418edb6db25c32a2"
-  integrity sha512-Po/GNib6QKruC3XE+WKP1HwVSfCDaZcXu48kD+gwmtDlqHWKc7Bq9lrS0sNZ456rfCKhXksOmMfUs4wRM/Y96w==
+"@algolia/requester-browser-xhr@5.16.0":
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/@algolia/requester-browser-xhr/-/requester-browser-xhr-5.16.0.tgz#ca9da2695844e698add53cf759b80a6a397f0af2"
+  integrity sha512-s/ty3lN0Bk9EC6VId/JO+AMOy6s0Hb3IpXUIa4iKKrH7p3n+lTEtwltVjFVW0fq9JfvQdECoaM951K23G/nRtQ==
   dependencies:
-    "@algolia/client-common" "5.15.0"
+    "@algolia/client-common" "5.16.0"
 
 "@algolia/requester-common@4.24.0":
   version "4.24.0"
   resolved "https://registry.yarnpkg.com/@algolia/requester-common/-/requester-common-4.24.0.tgz#1c60c198031f48fcdb9e34c4057a3ea987b9a436"
   integrity sha512-k3CXJ2OVnvgE3HMwcojpvY6d9kgKMPRxs/kVohrwF5WMr2fnqojnycZkxPoEg+bXm8fi5BBfFmOqgYztRtHsQA==
 
-"@algolia/requester-fetch@5.15.0":
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/@algolia/requester-fetch/-/requester-fetch-5.15.0.tgz#2ce94d4855090fac192b208d95eeea22e1ca4489"
-  integrity sha512-rOZ+c0P7ajmccAvpeeNrUmEKoliYFL8aOR5qGW5pFq3oj3Iept7Y5mEtEsOBYsRt6qLnaXn4zUKf+N8nvJpcIw==
+"@algolia/requester-fetch@5.16.0":
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/@algolia/requester-fetch/-/requester-fetch-5.16.0.tgz#8e8799c7c8efd07be4ca4fa4d12cee235eaad714"
+  integrity sha512-E8euSKDkljYpv5QHOZQrBCMZ4W98PKHRp5Cx8JxMYyyPWQ0xkD9b1c5yvOtJJ1lufqDvcuxvrF4eRBwW+BP3QA==
   dependencies:
-    "@algolia/client-common" "5.15.0"
+    "@algolia/client-common" "5.16.0"
 
 "@algolia/requester-node-http@4.24.0":
   version "4.24.0"
@@ -255,12 +255,12 @@
   dependencies:
     "@algolia/requester-common" "4.24.0"
 
-"@algolia/requester-node-http@5.15.0":
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/@algolia/requester-node-http/-/requester-node-http-5.15.0.tgz#e2020afcdaea56dc204bc6c82daab41478b32d87"
-  integrity sha512-b1jTpbFf9LnQHEJP5ddDJKE2sAlhYd7EVSOWgzo/27n/SfCoHfqD0VWntnWYD83PnOKvfe8auZ2+xCb0TXotrQ==
+"@algolia/requester-node-http@5.16.0":
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/@algolia/requester-node-http/-/requester-node-http-5.16.0.tgz#fe883a6f92da5afbb3de778f6c0e43c6c7f9e133"
+  integrity sha512-gzLIQlgvvXzGExBC8xFVtsiDbenGgANQ+p/lcPO5ERs1ZNGXIqLnyqwP8amZl6YwXJEt4PPXL/p4IytBWs0jUw==
   dependencies:
-    "@algolia/client-common" "5.15.0"
+    "@algolia/client-common" "5.16.0"
 
 "@algolia/transporter@4.24.0":
   version "4.24.0"
@@ -279,7 +279,7 @@
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.24"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.25.9", "@babel/code-frame@^7.26.0", "@babel/code-frame@^7.8.3":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.25.9", "@babel/code-frame@^7.26.0", "@babel/code-frame@^7.26.2", "@babel/code-frame@^7.8.3":
   version "7.26.2"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85"
   integrity sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==
@@ -289,9 +289,9 @@
     picocolors "^1.0.0"
 
 "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.25.9", "@babel/compat-data@^7.26.0":
-  version "7.26.2"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.26.2.tgz#278b6b13664557de95b8f35b90d96785850bb56e"
-  integrity sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==
+  version "7.26.3"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.26.3.tgz#99488264a56b2aded63983abd6a417f03b92ed02"
+  integrity sha512-nHIxvKPniQXpmQLb0vhY3VaFb3S0YrTAwpOWJZh1wn3oJPjJk9Asva204PsBdmAE8vpzfHudT8DB0scYvy9q0g==
 
 "@babel/core@^7.21.3", "@babel/core@^7.25.9":
   version "7.26.0"
@@ -314,13 +314,13 @@
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/generator@^7.25.9", "@babel/generator@^7.26.0":
-  version "7.26.2"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.26.2.tgz#87b75813bec87916210e5e01939a4c823d6bb74f"
-  integrity sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==
+"@babel/generator@^7.25.9", "@babel/generator@^7.26.0", "@babel/generator@^7.26.3":
+  version "7.26.3"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.26.3.tgz#ab8d4360544a425c90c248df7059881f4b2ce019"
+  integrity sha512-6FF/urZvD0sTeO7k6/B15pMLC4CHUv1426lzr3N01aHJTl046uCAh9LXW/fzeXXjPNCJ6iABW5XaWOsIZB93aQ==
   dependencies:
-    "@babel/parser" "^7.26.2"
-    "@babel/types" "^7.26.0"
+    "@babel/parser" "^7.26.3"
+    "@babel/types" "^7.26.3"
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.25"
     jsesc "^3.0.2"
@@ -332,14 +332,6 @@
   dependencies:
     "@babel/types" "^7.25.9"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.25.9.tgz#f41752fe772a578e67286e6779a68a5a92de1ee9"
-  integrity sha512-C47lC7LIDCnz0h4vai/tpNOI95tCd5ZT3iBt/DBH5lXKHZsyNQv18yf1wIIg2ntiQNgmAvA+DgZ82iW8Qdym8g==
-  dependencies:
-    "@babel/traverse" "^7.25.9"
-    "@babel/types" "^7.25.9"
-
 "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.25.9":
   version "7.25.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz#55af025ce365be3cdc0c1c1e56c6af617ce88875"
@@ -365,12 +357,12 @@
     semver "^6.3.1"
 
 "@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.9.tgz#3e8999db94728ad2b2458d7a470e7770b7764e26"
-  integrity sha512-ORPNZ3h6ZRkOyAa/SaHU+XsLZr0UQzRwuDQ0cczIA17nAzZ+85G5cVkOJIj7QavLZGSe8QXUmNFxSZzjcZF9bw==
+  version "7.26.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.26.3.tgz#5169756ecbe1d95f7866b90bb555b022595302a0"
+  integrity sha512-G7ZRb40uUgdKOQqPLjfD12ZmGA54PzqDFUv2BKImnC9QIfGhIHKvVML0oN8IUiDq4iRqpq74ABpvOaerfWdong==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.25.9"
-    regexpu-core "^6.1.1"
+    regexpu-core "^6.2.0"
     semver "^6.3.1"
 
 "@babel/helper-define-polyfill-provider@^0.6.2", "@babel/helper-define-polyfill-provider@^0.6.3":
@@ -439,14 +431,6 @@
     "@babel/helper-optimise-call-expression" "^7.25.9"
     "@babel/traverse" "^7.25.9"
 
-"@babel/helper-simple-access@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.25.9.tgz#6d51783299884a2c74618d6ef0f86820ec2e7739"
-  integrity sha512-c6WHXuiaRsJTyHYLJV75t9IqsmTbItYfdj99PnzYGQZkYKvan5/2jKJ7gu31J3/BJ/A18grImSPModuyG/Eo0Q==
-  dependencies:
-    "@babel/traverse" "^7.25.9"
-    "@babel/types" "^7.25.9"
-
 "@babel/helper-skip-transparent-expression-wrappers@^7.25.9":
   version "7.25.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz#0b2e1b62d560d6b1954893fd2b705dc17c91f0c9"
@@ -487,12 +471,12 @@
     "@babel/template" "^7.25.9"
     "@babel/types" "^7.26.0"
 
-"@babel/parser@^7.25.9", "@babel/parser@^7.26.0", "@babel/parser@^7.26.2":
-  version "7.26.2"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.2.tgz#fd7b6f487cfea09889557ef5d4eeb9ff9a5abd11"
-  integrity sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==
+"@babel/parser@^7.25.9", "@babel/parser@^7.26.0", "@babel/parser@^7.26.3":
+  version "7.26.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.3.tgz#8c51c5db6ddf08134af1ddbacf16aaab48bac234"
+  integrity sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==
   dependencies:
-    "@babel/types" "^7.26.0"
+    "@babel/types" "^7.26.3"
 
 "@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.25.9":
   version "7.25.9"
@@ -694,11 +678,10 @@
     "@babel/helper-plugin-utils" "^7.25.9"
 
 "@babel/plugin-transform-exponentiation-operator@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.25.9.tgz#ece47b70d236c1d99c263a1e22b62dc20a4c8b0f"
-  integrity sha512-KRhdhlVk2nObA5AYa7QMgTMTVJdfHprfpAk4DjZVtllqRg9qarilstTKEhpVjyt+Npi8ThRyiV8176Am3CodPA==
+  version "7.26.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.26.3.tgz#e29f01b6de302c7c2c794277a48f04a9ca7f03bc"
+  integrity sha512-7CAHcQ58z2chuXPWblnn1K6rLDnDWieghSOEmqQsrBenH0P9InCUtOJYD89pvngljmZlJcz3fcmgYsXFNGa1ZQ==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.25.9"
     "@babel/helper-plugin-utils" "^7.25.9"
 
 "@babel/plugin-transform-export-namespace-from@^7.25.9":
@@ -762,13 +745,12 @@
     "@babel/helper-plugin-utils" "^7.25.9"
 
 "@babel/plugin-transform-modules-commonjs@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.9.tgz#d165c8c569a080baf5467bda88df6425fc060686"
-  integrity sha512-dwh2Ol1jWwL2MgkCzUSOvfmKElqQcuswAZypBSUsScMXvgdT8Ekq5YA6TtqpTVWH+4903NmboMuH1o9i8Rxlyg==
+  version "7.26.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.26.3.tgz#8f011d44b20d02c3de44d8850d971d8497f981fb"
+  integrity sha512-MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.25.9"
+    "@babel/helper-module-transforms" "^7.26.0"
     "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/helper-simple-access" "^7.25.9"
 
 "@babel/plugin-transform-modules-systemjs@^7.25.9":
   version "7.25.9"
@@ -992,9 +974,9 @@
     "@babel/helper-plugin-utils" "^7.25.9"
 
 "@babel/plugin-transform-typescript@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.25.9.tgz#69267905c2b33c2ac6d8fe765e9dc2ddc9df3849"
-  integrity sha512-7PbZQZP50tzv2KGGnhh82GSyMB01yKY9scIjf1a+GfZCtInOWqUH5+1EBU4t9fyR5Oykkkc9vFTs4OHrhHXljQ==
+  version "7.26.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.26.3.tgz#3d6add9c78735623317387ee26d5ada540eee3fd"
+  integrity sha512-6+5hpdr6mETwSKjmJUdYw0EIkATiQhnELWlE3kJFBwSg/BGIVwVaVbX+gOXBCdc7Ln1RXZxyWGecIXhUfnl7oA==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.25.9"
     "@babel/helper-create-class-features-plugin" "^7.25.9"
@@ -1118,9 +1100,9 @@
     esutils "^2.0.2"
 
 "@babel/preset-react@^7.18.6", "@babel/preset-react@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.25.9.tgz#5f473035dc2094bcfdbc7392d0766bd42dce173e"
-  integrity sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==
+  version "7.26.3"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.26.3.tgz#7c5e028d623b4683c1f83a0bd4713b9100560caa"
+  integrity sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.25.9"
     "@babel/helper-validator-option" "^7.25.9"
@@ -1165,22 +1147,22 @@
     "@babel/types" "^7.25.9"
 
 "@babel/traverse@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.9.tgz#a50f8fe49e7f69f53de5bea7e413cd35c5e13c84"
-  integrity sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==
+  version "7.26.4"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.26.4.tgz#ac3a2a84b908dde6d463c3bfa2c5fdc1653574bd"
+  integrity sha512-fH+b7Y4p3yqvApJALCPJcwb0/XaOSgtK4pzV6WVjPR5GLFQBRI7pfoX2V2iM48NXvX07NUxxm1Vw98YjqTcU5w==
   dependencies:
-    "@babel/code-frame" "^7.25.9"
-    "@babel/generator" "^7.25.9"
-    "@babel/parser" "^7.25.9"
+    "@babel/code-frame" "^7.26.2"
+    "@babel/generator" "^7.26.3"
+    "@babel/parser" "^7.26.3"
     "@babel/template" "^7.25.9"
-    "@babel/types" "^7.25.9"
+    "@babel/types" "^7.26.3"
     debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@^7.21.3", "@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.4.4":
-  version "7.26.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.0.tgz#deabd08d6b753bc8e0f198f8709fb575e31774ff"
-  integrity sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==
+"@babel/types@^7.21.3", "@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.26.3", "@babel/types@^7.4.4":
+  version "7.26.3"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.3.tgz#37e79830f04c2b5687acc77db97fbc75fb81f3c0"
+  integrity sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==
   dependencies:
     "@babel/helper-string-parser" "^7.25.9"
     "@babel/helper-validator-identifier" "^7.25.9"
@@ -1532,10 +1514,10 @@
     "@docsearch/css" "3.8.0"
     algoliasearch "^5.12.0"
 
-"@docusaurus/babel@3.6.2":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@docusaurus/babel/-/babel-3.6.2.tgz#c63dd2d9d7861189fe51950b3b6550477057bcee"
-  integrity sha512-v8N8TWGXDsb5sxQC3Rcqb1CZr0LlU1OgqqVBUchN6cpIUr7EJuVJs5eHcIu5Ag8mwO/hWN3f7FE9uaHTMapAbg==
+"@docusaurus/babel@3.6.3":
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/@docusaurus/babel/-/babel-3.6.3.tgz#016714fe7a8807d0fc2f7180eace5e82bebbb8a6"
+  integrity sha512-7dW9Hat9EHYCVicFXYA4hjxBY38+hPuCURL8oRF9fySRm7vzNWuEOghA1TXcykuXZp0HLG2td4RhDxCvGG7tNw==
   dependencies:
     "@babel/core" "^7.25.9"
     "@babel/generator" "^7.25.9"
@@ -1547,23 +1529,23 @@
     "@babel/runtime" "^7.25.9"
     "@babel/runtime-corejs3" "^7.25.9"
     "@babel/traverse" "^7.25.9"
-    "@docusaurus/logger" "3.6.2"
-    "@docusaurus/utils" "3.6.2"
+    "@docusaurus/logger" "3.6.3"
+    "@docusaurus/utils" "3.6.3"
     babel-plugin-dynamic-import-node "^2.3.3"
     fs-extra "^11.1.1"
     tslib "^2.6.0"
 
-"@docusaurus/bundler@3.6.2":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@docusaurus/bundler/-/bundler-3.6.2.tgz#5bdd46862b40f1eea93f14714b858d07c2dd8c2f"
-  integrity sha512-YkEifEVs4lV931SrHBB4n6WqRowMw+aM/QPH3z8aU+5t1dWa+1p2OPqARS+tSbh3la9ns+L1zIfSbd8RHi2/PQ==
+"@docusaurus/bundler@3.6.3":
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/@docusaurus/bundler/-/bundler-3.6.3.tgz#f09c2e29613f988b874a4be2247708e121b7fc5c"
+  integrity sha512-47JLuc8D4wA+6VOvmMd5fUC9rFppBQpQOnxDYiVXffm/DeV/wmm3sbpNd5Y+O+G2+nevLTRnvCm/qyancv0Y3A==
   dependencies:
     "@babel/core" "^7.25.9"
-    "@docusaurus/babel" "3.6.2"
-    "@docusaurus/cssnano-preset" "3.6.2"
-    "@docusaurus/logger" "3.6.2"
-    "@docusaurus/types" "3.6.2"
-    "@docusaurus/utils" "3.6.2"
+    "@docusaurus/babel" "3.6.3"
+    "@docusaurus/cssnano-preset" "3.6.3"
+    "@docusaurus/logger" "3.6.3"
+    "@docusaurus/types" "3.6.3"
+    "@docusaurus/utils" "3.6.3"
     babel-loader "^9.2.1"
     clean-css "^5.3.2"
     copy-webpack-plugin "^11.0.0"
@@ -1584,18 +1566,18 @@
     webpack "^5.95.0"
     webpackbar "^6.0.1"
 
-"@docusaurus/core@3.6.2", "@docusaurus/core@^3.2.1":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@docusaurus/core/-/core-3.6.2.tgz#78628790f255555bb4c81e5952d16ea1412c4548"
-  integrity sha512-irMts/mGLZv8dWcy0WUtbY/U6b5qIfHgQd1/kXMyAxUJo99fL0wFSqhMI+tcxjk0HYy427MXerLMqFJj+Arg1w==
+"@docusaurus/core@3.6.3", "@docusaurus/core@^3.2.1":
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/@docusaurus/core/-/core-3.6.3.tgz#6bf968ee26a36d71387bab293f27ccffc0e428b6"
+  integrity sha512-xL7FRY9Jr5DWqB6pEnqgKqcMPJOX5V0pgWXi5lCiih11sUBmcFKM7c3+GyxcVeeWFxyYSDP3grLTWqJoP4P9Vw==
   dependencies:
-    "@docusaurus/babel" "3.6.2"
-    "@docusaurus/bundler" "3.6.2"
-    "@docusaurus/logger" "3.6.2"
-    "@docusaurus/mdx-loader" "3.6.2"
-    "@docusaurus/utils" "3.6.2"
-    "@docusaurus/utils-common" "3.6.2"
-    "@docusaurus/utils-validation" "3.6.2"
+    "@docusaurus/babel" "3.6.3"
+    "@docusaurus/bundler" "3.6.3"
+    "@docusaurus/logger" "3.6.3"
+    "@docusaurus/mdx-loader" "3.6.3"
+    "@docusaurus/utils" "3.6.3"
+    "@docusaurus/utils-common" "3.6.3"
+    "@docusaurus/utils-validation" "3.6.3"
     boxen "^6.2.1"
     chalk "^4.1.2"
     chokidar "^3.5.3"
@@ -1633,32 +1615,32 @@
     webpack-dev-server "^4.15.2"
     webpack-merge "^6.0.1"
 
-"@docusaurus/cssnano-preset@3.6.2":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@docusaurus/cssnano-preset/-/cssnano-preset-3.6.2.tgz#007e7150b099ea2e9e874dd48a809614c628a335"
-  integrity sha512-mBkVa4QMHRwCFCVLYdBlOZuAT1iVVsS7GGSgliSVAeTOagP/AbtlBsCVrBs+keEuDuRF1w/6QEcqDoZe9fa5pw==
+"@docusaurus/cssnano-preset@3.6.3":
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/@docusaurus/cssnano-preset/-/cssnano-preset-3.6.3.tgz#ea19b307183ec20dea4927efc4ddf249150b8c6a"
+  integrity sha512-qP7SXrwZ+23GFJdPN4aIHQrZW+oH/7tzwEuc/RNL0+BdZdmIjYQqUxdXsjE4lFxLNZjj0eUrSNYIS6xwfij+5Q==
   dependencies:
     cssnano-preset-advanced "^6.1.2"
     postcss "^8.4.38"
     postcss-sort-media-queries "^5.2.0"
     tslib "^2.6.0"
 
-"@docusaurus/logger@3.6.2":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@docusaurus/logger/-/logger-3.6.2.tgz#4f73f82b33e1d432f3940fc208b3c0646ca5549c"
-  integrity sha512-1p4IQhhgLyIfsey4UAdAIW69aUE1Ei6O91Nsw30ryZeDWSG5dh4o3zaRGOLxfAX69Ac/yDm6YCwJOafUxL6Vxg==
+"@docusaurus/logger@3.6.3":
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/@docusaurus/logger/-/logger-3.6.3.tgz#c6e514c9429487ef38be2f2129b2b842740d92fd"
+  integrity sha512-xSubJixcNyMV9wMV4q0s47CBz3Rlc5jbcCCuij8pfQP8qn/DIpt0ks8W6hQWzHAedg/J/EwxxUOUrnEoKzJo8g==
   dependencies:
     chalk "^4.1.2"
     tslib "^2.6.0"
 
-"@docusaurus/mdx-loader@3.6.2":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@docusaurus/mdx-loader/-/mdx-loader-3.6.2.tgz#d240974b0e754d5a5d8eb3f9d0a00a2055fabc68"
-  integrity sha512-7fbRmNgF3CR96Ja82Ya0/Cdu1OL9UJ/22llNMY8lr5gAbw718Y5ryXMVRIYn0JNLTiSxzgtvW4DIsUWEB8NMpw==
+"@docusaurus/mdx-loader@3.6.3":
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/@docusaurus/mdx-loader/-/mdx-loader-3.6.3.tgz#127babc7cdb26d37c723bc3ae518bda17ce40160"
+  integrity sha512-3iJdiDz9540ppBseeI93tWTDtUGVkxzh59nMq4ignylxMuXBLK8dFqVeaEor23v1vx6TrGKZ2FuLaTB+U7C0QQ==
   dependencies:
-    "@docusaurus/logger" "3.6.2"
-    "@docusaurus/utils" "3.6.2"
-    "@docusaurus/utils-validation" "3.6.2"
+    "@docusaurus/logger" "3.6.3"
+    "@docusaurus/utils" "3.6.3"
+    "@docusaurus/utils-validation" "3.6.3"
     "@mdx-js/mdx" "^3.0.0"
     "@slorber/remark-comment" "^1.0.0"
     escape-html "^1.0.3"
@@ -1681,12 +1663,12 @@
     vfile "^6.0.1"
     webpack "^5.88.1"
 
-"@docusaurus/module-type-aliases@3.6.2", "@docusaurus/module-type-aliases@^3.2.1":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@docusaurus/module-type-aliases/-/module-type-aliases-3.6.2.tgz#7432618696668acc9a7cfb47de66c6987cd57680"
-  integrity sha512-NrJkL2rLTCjHtWOqUvWzwqvJrsKLj0gVJeV6q5yeKdKKgItietcTf2fTRkM9LHKSUN8CBDXxwHABeQvTahvmXQ==
+"@docusaurus/module-type-aliases@3.6.3", "@docusaurus/module-type-aliases@^3.2.1":
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/@docusaurus/module-type-aliases/-/module-type-aliases-3.6.3.tgz#1f7030b1cf1f658cf664d41b6eadba93bbe51d87"
+  integrity sha512-MjaXX9PN/k5ugNvfRZdWyKWq4FsrhN4LEXaj0pEmMebJuBNlFeGyKQUa9DRhJHpadNaiMLrbo9m3U7Ig5YlsZg==
   dependencies:
-    "@docusaurus/types" "3.6.2"
+    "@docusaurus/types" "3.6.3"
     "@types/history" "^4.7.11"
     "@types/react" "*"
     "@types/react-router-config" "*"
@@ -1694,19 +1676,19 @@
     react-helmet-async "*"
     react-loadable "npm:@docusaurus/react-loadable@6.0.0"
 
-"@docusaurus/plugin-content-blog@3.6.2":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-blog/-/plugin-content-blog-3.6.2.tgz#b197dd920e380bf1394995215ba7fee8019baa82"
-  integrity sha512-6bJxr6Or4NslEVH3BJuPH30kUWiqUjDRdGPhvxpHmt9W/RY2/6u72WICG3bW3dLFxJ/2uDLBU92lHnatpvo7Ew==
+"@docusaurus/plugin-content-blog@3.6.3":
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-blog/-/plugin-content-blog-3.6.3.tgz#d6a597e4bfdeb3f1f6ce06d2ac86207296988cc9"
+  integrity sha512-k0ogWwwJU3pFRFfvW1kRVHxzf2DutLGaaLjAnHVEU6ju+aRP0Z5ap/13DHyPOfHeE4WKpn/M0TqjdwZAcY3kAw==
   dependencies:
-    "@docusaurus/core" "3.6.2"
-    "@docusaurus/logger" "3.6.2"
-    "@docusaurus/mdx-loader" "3.6.2"
-    "@docusaurus/theme-common" "3.6.2"
-    "@docusaurus/types" "3.6.2"
-    "@docusaurus/utils" "3.6.2"
-    "@docusaurus/utils-common" "3.6.2"
-    "@docusaurus/utils-validation" "3.6.2"
+    "@docusaurus/core" "3.6.3"
+    "@docusaurus/logger" "3.6.3"
+    "@docusaurus/mdx-loader" "3.6.3"
+    "@docusaurus/theme-common" "3.6.3"
+    "@docusaurus/types" "3.6.3"
+    "@docusaurus/utils" "3.6.3"
+    "@docusaurus/utils-common" "3.6.3"
+    "@docusaurus/utils-validation" "3.6.3"
     cheerio "1.0.0-rc.12"
     feed "^4.2.2"
     fs-extra "^11.1.1"
@@ -1718,20 +1700,20 @@
     utility-types "^3.10.0"
     webpack "^5.88.1"
 
-"@docusaurus/plugin-content-docs@3.6.2":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-docs/-/plugin-content-docs-3.6.2.tgz#3a8b4b162a2688e5855c04ed6c4ec0b6951619a0"
-  integrity sha512-e6WW1g10RIXXLN/rrtqTi/FyJ1Hj3X9Mmgz4V11/0pDCxIGGI8m4ocbAglUlLtgvbLD5viNLefl/NwbOW3JXiQ==
+"@docusaurus/plugin-content-docs@3.6.3":
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-docs/-/plugin-content-docs-3.6.3.tgz#aae044d2af6996d1a6de8d815aca8a83b485e0a5"
+  integrity sha512-r2wS8y/fsaDcxkm20W5bbYJFPzdWdEaTWVYjNxlHlcmX086eqQR1Fomlg9BHTJ0dLXPzAlbC8EN4XqMr3QzNCQ==
   dependencies:
-    "@docusaurus/core" "3.6.2"
-    "@docusaurus/logger" "3.6.2"
-    "@docusaurus/mdx-loader" "3.6.2"
-    "@docusaurus/module-type-aliases" "3.6.2"
-    "@docusaurus/theme-common" "3.6.2"
-    "@docusaurus/types" "3.6.2"
-    "@docusaurus/utils" "3.6.2"
-    "@docusaurus/utils-common" "3.6.2"
-    "@docusaurus/utils-validation" "3.6.2"
+    "@docusaurus/core" "3.6.3"
+    "@docusaurus/logger" "3.6.3"
+    "@docusaurus/mdx-loader" "3.6.3"
+    "@docusaurus/module-type-aliases" "3.6.3"
+    "@docusaurus/theme-common" "3.6.3"
+    "@docusaurus/types" "3.6.3"
+    "@docusaurus/utils" "3.6.3"
+    "@docusaurus/utils-common" "3.6.3"
+    "@docusaurus/utils-validation" "3.6.3"
     "@types/react-router-config" "^5.0.7"
     combine-promises "^1.1.0"
     fs-extra "^11.1.1"
@@ -1741,115 +1723,115 @@
     utility-types "^3.10.0"
     webpack "^5.88.1"
 
-"@docusaurus/plugin-content-pages@3.6.2":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-pages/-/plugin-content-pages-3.6.2.tgz#49b1a033d41841f7a8bcbbe67511609b402cc80f"
-  integrity sha512-fo4NyGkw10lYHyHaTxE6TZLYnxNtCfRHeZkNK1N9pBYqe7TT2dBUNAEeVW2U3ed9m6YuB7JKSQsa++GGmcP+6g==
+"@docusaurus/plugin-content-pages@3.6.3":
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-pages/-/plugin-content-pages-3.6.3.tgz#0a5a43d1677ee519f63a54634653c54ddf41f475"
+  integrity sha512-eHrmTgjgLZsuqfsYr5X2xEwyIcck0wseSofWrjTwT9FLOWp+KDmMAuVK+wRo7sFImWXZk3oV/xX/g9aZrhD7OA==
   dependencies:
-    "@docusaurus/core" "3.6.2"
-    "@docusaurus/mdx-loader" "3.6.2"
-    "@docusaurus/types" "3.6.2"
-    "@docusaurus/utils" "3.6.2"
-    "@docusaurus/utils-validation" "3.6.2"
+    "@docusaurus/core" "3.6.3"
+    "@docusaurus/mdx-loader" "3.6.3"
+    "@docusaurus/types" "3.6.3"
+    "@docusaurus/utils" "3.6.3"
+    "@docusaurus/utils-validation" "3.6.3"
     fs-extra "^11.1.1"
     tslib "^2.6.0"
     webpack "^5.88.1"
 
-"@docusaurus/plugin-debug@3.6.2":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-debug/-/plugin-debug-3.6.2.tgz#6983f64954fe69a51b65b2d9431bdf0b5ccf1884"
-  integrity sha512-T/eS3VvHElpeV5S8uwp7Si4ujEynmgFtJLvA2CSa5pzQuOF1EEghF9nekAIj0cWtDHsqNUDZNr8hK1brivFXSg==
+"@docusaurus/plugin-debug@3.6.3":
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-debug/-/plugin-debug-3.6.3.tgz#4e62ddfbae4d597b073f8e3c632cc12d012339e3"
+  integrity sha512-zB9GXfIZNPRfzKnNjU6xGVrqn9bPXuGhpjgsuc/YtcTDjnjhasg38NdYd5LEqXex5G/zIorQgWB3n6x/Ut62vQ==
   dependencies:
-    "@docusaurus/core" "3.6.2"
-    "@docusaurus/types" "3.6.2"
-    "@docusaurus/utils" "3.6.2"
+    "@docusaurus/core" "3.6.3"
+    "@docusaurus/types" "3.6.3"
+    "@docusaurus/utils" "3.6.3"
     fs-extra "^11.1.1"
     react-json-view-lite "^1.2.0"
     tslib "^2.6.0"
 
-"@docusaurus/plugin-google-analytics@3.6.2":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-3.6.2.tgz#4266b4b2273998e87fa733d932d5b464c2a10b21"
-  integrity sha512-B7ihrr3wz8e4XqW+dIAtq844u3Z83u5CeiL1xrCqzFH+vDCjUZHTamS3zKXNcgi6YVVe6hUQXPG15ltaqQaVPQ==
+"@docusaurus/plugin-google-analytics@3.6.3":
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-3.6.3.tgz#63648d469b1e3c50fad8878e7a7db9856e503d5f"
+  integrity sha512-rCDNy1QW8Dag7nZq67pcum0bpFLrwvxJhYuVprhFh8BMBDxV0bY+bAkGHbSf68P3Bk9C3hNOAXX1srGLIDvcTA==
   dependencies:
-    "@docusaurus/core" "3.6.2"
-    "@docusaurus/types" "3.6.2"
-    "@docusaurus/utils-validation" "3.6.2"
+    "@docusaurus/core" "3.6.3"
+    "@docusaurus/types" "3.6.3"
+    "@docusaurus/utils-validation" "3.6.3"
     tslib "^2.6.0"
 
-"@docusaurus/plugin-google-gtag@3.6.2":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-3.6.2.tgz#23f70f7a05e61cfb9d9d7ee18dbff3ef2b129f2c"
-  integrity sha512-V8ijI6qddAAkJ0vd8sjZ7S/apRTLJn9dAwvj/rSMd93witGdKINemL+9TyfLkhcXKTxyqRT8zKdu8ewjPXqKHg==
+"@docusaurus/plugin-google-gtag@3.6.3":
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-3.6.3.tgz#8a1388b4123904be17e661ea7aa71d798d0c046e"
+  integrity sha512-+OyDvhM6rqVkQOmLVkQWVJAizEEfkPzVWtIHXlWPOCFGK9X4/AWeBSrU0WG4iMg9Z4zD4YDRrU+lvI4s6DSC+w==
   dependencies:
-    "@docusaurus/core" "3.6.2"
-    "@docusaurus/types" "3.6.2"
-    "@docusaurus/utils-validation" "3.6.2"
+    "@docusaurus/core" "3.6.3"
+    "@docusaurus/types" "3.6.3"
+    "@docusaurus/utils-validation" "3.6.3"
     "@types/gtag.js" "^0.0.12"
     tslib "^2.6.0"
 
-"@docusaurus/plugin-google-tag-manager@3.6.2":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-tag-manager/-/plugin-google-tag-manager-3.6.2.tgz#36ab95fcd5c1bf96fd18c0cf9b208bb428b81242"
-  integrity sha512-fnWQ5FdN9f8c8VTgjaQ98208Y+d/JjHhD506rWIIL9rt1cJOf29XElxvOeKpMJadfkgY5KLZSAiHkGt+4qgN4g==
+"@docusaurus/plugin-google-tag-manager@3.6.3":
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-tag-manager/-/plugin-google-tag-manager-3.6.3.tgz#38cbe416803f29782807cebf3ebf240cb47c3c74"
+  integrity sha512-1M6UPB13gWUtN2UHX083/beTn85PlRI9ABItTl/JL1FJ5dJTWWFXXsHf9WW/6hrVwthwTeV/AGbGKvLKV+IlCA==
   dependencies:
-    "@docusaurus/core" "3.6.2"
-    "@docusaurus/types" "3.6.2"
-    "@docusaurus/utils-validation" "3.6.2"
+    "@docusaurus/core" "3.6.3"
+    "@docusaurus/types" "3.6.3"
+    "@docusaurus/utils-validation" "3.6.3"
     tslib "^2.6.0"
 
-"@docusaurus/plugin-sitemap@3.6.2", "@docusaurus/plugin-sitemap@^3.2.1":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-sitemap/-/plugin-sitemap-3.6.2.tgz#c8ff7cf82bd5d943a13bb8d0ae690080a025029e"
-  integrity sha512-qcAQAP1Ot0dZpeRoJ0L/Zck5FVDkll2IleVZQLzxeRVDZIw1P9/TK7/Aw1w2pmH7dmw/Cwk/cLSVRvLAmp9k7A==
+"@docusaurus/plugin-sitemap@3.6.3", "@docusaurus/plugin-sitemap@^3.2.1":
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-sitemap/-/plugin-sitemap-3.6.3.tgz#0458e6f7476ab6fd1466e01b153a3211d3223c53"
+  integrity sha512-94qOO4M9Fwv9KfVQJsgbe91k+fPJ4byf1L3Ez8TUa6TAFPo/BrLwQ80zclHkENlL1824TuxkcMKv33u6eydQCg==
   dependencies:
-    "@docusaurus/core" "3.6.2"
-    "@docusaurus/logger" "3.6.2"
-    "@docusaurus/types" "3.6.2"
-    "@docusaurus/utils" "3.6.2"
-    "@docusaurus/utils-common" "3.6.2"
-    "@docusaurus/utils-validation" "3.6.2"
+    "@docusaurus/core" "3.6.3"
+    "@docusaurus/logger" "3.6.3"
+    "@docusaurus/types" "3.6.3"
+    "@docusaurus/utils" "3.6.3"
+    "@docusaurus/utils-common" "3.6.3"
+    "@docusaurus/utils-validation" "3.6.3"
     fs-extra "^11.1.1"
     sitemap "^7.1.1"
     tslib "^2.6.0"
 
 "@docusaurus/preset-classic@^3.2.1":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@docusaurus/preset-classic/-/preset-classic-3.6.2.tgz#5ec801fa317123ba8458af3105eca8eac78a49bc"
-  integrity sha512-r2n5eHdhiNSrJGsrrYcw+WsyStmXxe0ZG3RdA9LVyK5+jBHM8blrUWJEDugnzCNbyhUzhdtcmgCC9fhdAvKuQw==
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/@docusaurus/preset-classic/-/preset-classic-3.6.3.tgz#072298b5b6d0de7d0346b1e9b550a30ef2add56d"
+  integrity sha512-VHSYWROT3flvNNI1SrnMOtW1EsjeHNK9dhU6s9eY5hryZe79lUqnZJyze/ymDe2LXAqzyj6y5oYvyBoZZk6ErA==
   dependencies:
-    "@docusaurus/core" "3.6.2"
-    "@docusaurus/plugin-content-blog" "3.6.2"
-    "@docusaurus/plugin-content-docs" "3.6.2"
-    "@docusaurus/plugin-content-pages" "3.6.2"
-    "@docusaurus/plugin-debug" "3.6.2"
-    "@docusaurus/plugin-google-analytics" "3.6.2"
-    "@docusaurus/plugin-google-gtag" "3.6.2"
-    "@docusaurus/plugin-google-tag-manager" "3.6.2"
-    "@docusaurus/plugin-sitemap" "3.6.2"
-    "@docusaurus/theme-classic" "3.6.2"
-    "@docusaurus/theme-common" "3.6.2"
-    "@docusaurus/theme-search-algolia" "3.6.2"
-    "@docusaurus/types" "3.6.2"
+    "@docusaurus/core" "3.6.3"
+    "@docusaurus/plugin-content-blog" "3.6.3"
+    "@docusaurus/plugin-content-docs" "3.6.3"
+    "@docusaurus/plugin-content-pages" "3.6.3"
+    "@docusaurus/plugin-debug" "3.6.3"
+    "@docusaurus/plugin-google-analytics" "3.6.3"
+    "@docusaurus/plugin-google-gtag" "3.6.3"
+    "@docusaurus/plugin-google-tag-manager" "3.6.3"
+    "@docusaurus/plugin-sitemap" "3.6.3"
+    "@docusaurus/theme-classic" "3.6.3"
+    "@docusaurus/theme-common" "3.6.3"
+    "@docusaurus/theme-search-algolia" "3.6.3"
+    "@docusaurus/types" "3.6.3"
 
-"@docusaurus/theme-classic@3.6.2":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@docusaurus/theme-classic/-/theme-classic-3.6.2.tgz#4c2770d3609176dd2462dfb0cb4d0b3d3010404b"
-  integrity sha512-bCdOPqPNezhLx+hgNVO2Cf+8/1AHa9uHDOqTx/CKAx2I0J/jV9G+6JiMtpSRKGNfBoLT1O+56/7+WtkOf54xTw==
+"@docusaurus/theme-classic@3.6.3":
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/@docusaurus/theme-classic/-/theme-classic-3.6.3.tgz#00599a9de5fd5c122fd1b8c59d3b755878f2a72c"
+  integrity sha512-1RRLK1tSArI2c00qugWYO3jRocjOZwGF1mBzPPylDVRwWCS/rnWWR91ChdbbaxIupRJ+hX8ZBYrwr5bbU0oztQ==
   dependencies:
-    "@docusaurus/core" "3.6.2"
-    "@docusaurus/logger" "3.6.2"
-    "@docusaurus/mdx-loader" "3.6.2"
-    "@docusaurus/module-type-aliases" "3.6.2"
-    "@docusaurus/plugin-content-blog" "3.6.2"
-    "@docusaurus/plugin-content-docs" "3.6.2"
-    "@docusaurus/plugin-content-pages" "3.6.2"
-    "@docusaurus/theme-common" "3.6.2"
-    "@docusaurus/theme-translations" "3.6.2"
-    "@docusaurus/types" "3.6.2"
-    "@docusaurus/utils" "3.6.2"
-    "@docusaurus/utils-common" "3.6.2"
-    "@docusaurus/utils-validation" "3.6.2"
+    "@docusaurus/core" "3.6.3"
+    "@docusaurus/logger" "3.6.3"
+    "@docusaurus/mdx-loader" "3.6.3"
+    "@docusaurus/module-type-aliases" "3.6.3"
+    "@docusaurus/plugin-content-blog" "3.6.3"
+    "@docusaurus/plugin-content-docs" "3.6.3"
+    "@docusaurus/plugin-content-pages" "3.6.3"
+    "@docusaurus/theme-common" "3.6.3"
+    "@docusaurus/theme-translations" "3.6.3"
+    "@docusaurus/types" "3.6.3"
+    "@docusaurus/utils" "3.6.3"
+    "@docusaurus/utils-common" "3.6.3"
+    "@docusaurus/utils-validation" "3.6.3"
     "@mdx-js/react" "^3.0.0"
     clsx "^2.0.0"
     copy-text-to-clipboard "^3.2.0"
@@ -1864,15 +1846,15 @@
     tslib "^2.6.0"
     utility-types "^3.10.0"
 
-"@docusaurus/theme-common@3.6.2":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@docusaurus/theme-common/-/theme-common-3.6.2.tgz#a520d9053b6ea0fa913d42898d35f73ed5ca3b9b"
-  integrity sha512-lfgsL064KEHpCkgGUc0OYoUPCpYfzggp6Hof8sz59UuKiLvb/Z7raewE9/NfocrJ2HZI17rLgMX3SQlRDh/5gg==
+"@docusaurus/theme-common@3.6.3":
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/@docusaurus/theme-common/-/theme-common-3.6.3.tgz#a8a6ebd2b0fd7a5cca4d0c6a2f9ccff905fa7438"
+  integrity sha512-b8ZkhczXHDxWWyvz+YJy4t/PlPbEogTTbgnHoflYnH7rmRtyoodTsu8WVM12la5LmlMJBclBXFl29OH8kPE7gg==
   dependencies:
-    "@docusaurus/mdx-loader" "3.6.2"
-    "@docusaurus/module-type-aliases" "3.6.2"
-    "@docusaurus/utils" "3.6.2"
-    "@docusaurus/utils-common" "3.6.2"
+    "@docusaurus/mdx-loader" "3.6.3"
+    "@docusaurus/module-type-aliases" "3.6.3"
+    "@docusaurus/utils" "3.6.3"
+    "@docusaurus/utils-common" "3.6.3"
     "@types/history" "^4.7.11"
     "@types/react" "*"
     "@types/react-router-config" "*"
@@ -1882,19 +1864,19 @@
     tslib "^2.6.0"
     utility-types "^3.10.0"
 
-"@docusaurus/theme-search-algolia@3.6.2":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@docusaurus/theme-search-algolia/-/theme-search-algolia-3.6.2.tgz#b03b7d35a385004d089d000be764abdfb3fa5721"
-  integrity sha512-SFLS+Rq8Cg2yepnHucA9sRpIR97yHvZWlCgMzBLunV3KHbB6hD2h5HPhFV39wYHYCjJUAOH1lX9poJ1qKYuSvg==
+"@docusaurus/theme-search-algolia@3.6.3":
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/@docusaurus/theme-search-algolia/-/theme-search-algolia-3.6.3.tgz#1a3331a489f392f5b032c4efc5f431e57eddf7ce"
+  integrity sha512-rt+MGCCpYgPyWCGXtbxlwFbTSobu15jWBTPI2LHsHNa5B0zSmOISX6FWYAPt5X1rNDOqMGM0FATnh7TBHRohVA==
   dependencies:
     "@docsearch/react" "^3.5.2"
-    "@docusaurus/core" "3.6.2"
-    "@docusaurus/logger" "3.6.2"
-    "@docusaurus/plugin-content-docs" "3.6.2"
-    "@docusaurus/theme-common" "3.6.2"
-    "@docusaurus/theme-translations" "3.6.2"
-    "@docusaurus/utils" "3.6.2"
-    "@docusaurus/utils-validation" "3.6.2"
+    "@docusaurus/core" "3.6.3"
+    "@docusaurus/logger" "3.6.3"
+    "@docusaurus/plugin-content-docs" "3.6.3"
+    "@docusaurus/theme-common" "3.6.3"
+    "@docusaurus/theme-translations" "3.6.3"
+    "@docusaurus/utils" "3.6.3"
+    "@docusaurus/utils-validation" "3.6.3"
     algoliasearch "^4.18.0"
     algoliasearch-helper "^3.13.3"
     clsx "^2.0.0"
@@ -1904,18 +1886,18 @@
     tslib "^2.6.0"
     utility-types "^3.10.0"
 
-"@docusaurus/theme-translations@3.6.2":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@docusaurus/theme-translations/-/theme-translations-3.6.2.tgz#ff6d2588aa9bf9fb1e07465def067529d5668665"
-  integrity sha512-LIWrYoDUsOTKmb0c7IQzawiPUTAaczBs5IOx6srxOWoTHVUMLzJCkl5Y6whfuRrnul8G05qv2vk238bN5Ko62g==
+"@docusaurus/theme-translations@3.6.3":
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/@docusaurus/theme-translations/-/theme-translations-3.6.3.tgz#6e473835ea016ce4acd7d2997f411811db8c4f6b"
+  integrity sha512-Gb0regclToVlngSIIwUCtBMQBq48qVUaN1XQNKW4XwlsgUyk0vP01LULdqbem7czSwIeBAFXFoORJ0RPX7ht/w==
   dependencies:
     fs-extra "^11.1.1"
     tslib "^2.6.0"
 
-"@docusaurus/types@3.6.2", "@docusaurus/types@^3.2.1":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@docusaurus/types/-/types-3.6.2.tgz#bd69c4c99b535b67f01276dc186622e0b1fc1305"
-  integrity sha512-117Wsk6xXrWEAsCYCXS3TGJv5tkdIZDcd7T/V0UJvKYmY0gyVPPcEQChy8yTdjbIkbB2q4fa7Jpox72Qv86mqQ==
+"@docusaurus/types@3.6.3", "@docusaurus/types@^3.2.1":
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/@docusaurus/types/-/types-3.6.3.tgz#e87592e31616da1b8dc473e4c8205c61885a1518"
+  integrity sha512-xD9oTGDrouWzefkhe9ogB2fDV96/82cRpNGx2HIvI5L87JHNhQVIWimQ/3JIiiX/TEd5S9s+VO6FFguwKNRVow==
   dependencies:
     "@mdx-js/mdx" "^3.0.0"
     "@types/history" "^4.7.11"
@@ -1927,36 +1909,36 @@
     webpack "^5.95.0"
     webpack-merge "^5.9.0"
 
-"@docusaurus/utils-common@3.6.2":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@docusaurus/utils-common/-/utils-common-3.6.2.tgz#3367572d72090b7f17e721af7f020f8e39931662"
-  integrity sha512-dr5wK+OyU2QAWxG7S5siD2bPgS7+ZeqWHfgLNHZ5yalaZf8TbeNNLqydfngukAY56BGZN0NbMkX6jGIr7ZF0sA==
+"@docusaurus/utils-common@3.6.3":
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/@docusaurus/utils-common/-/utils-common-3.6.3.tgz#57f840bd6f0928cf10060198cb421f1b9212c8f5"
+  integrity sha512-v4nKDaANLgT3pMBewHYEMAl/ufY0LkXao1QkFWzI5huWFOmNQ2UFzv2BiKeHX5Ownis0/w6cAyoxPhVdDonlSQ==
   dependencies:
-    "@docusaurus/types" "3.6.2"
+    "@docusaurus/types" "3.6.3"
     tslib "^2.6.0"
 
-"@docusaurus/utils-validation@3.6.2":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@docusaurus/utils-validation/-/utils-validation-3.6.2.tgz#62b97a0d72694c85fa63928c494dd238a84c991f"
-  integrity sha512-Y3EwblDz72KOcobb5t2zlhHSmrfE8EaHusPJ96Kx2JYtNXL2omqCoOb6FpaXWhES75wvjUpkFLYfiNqAqEov8g==
+"@docusaurus/utils-validation@3.6.3":
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/@docusaurus/utils-validation/-/utils-validation-3.6.3.tgz#3eca7125235eb90983ff660b97a71f331e331f57"
+  integrity sha512-bhEGGiN5BE38h21vjqD70Gxg++j+PfYVddDUE5UFvLDup68QOcpD33CLr+2knPorlxRbEaNfz6HQDUMQ3HuqKw==
   dependencies:
-    "@docusaurus/logger" "3.6.2"
-    "@docusaurus/utils" "3.6.2"
-    "@docusaurus/utils-common" "3.6.2"
+    "@docusaurus/logger" "3.6.3"
+    "@docusaurus/utils" "3.6.3"
+    "@docusaurus/utils-common" "3.6.3"
     fs-extra "^11.2.0"
     joi "^17.9.2"
     js-yaml "^4.1.0"
     lodash "^4.17.21"
     tslib "^2.6.0"
 
-"@docusaurus/utils@3.6.2":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@docusaurus/utils/-/utils-3.6.2.tgz#727299c2051eee04c1b431bc6ccd55fd4e5a0d52"
-  integrity sha512-oxnpUcFZGE3uPCDoXr8GJriB3VWM9sFjPedFidX3Fsz87l1NZNc1wtbKPfQ7GYFDMYo2IGlAv5+47Me9RkM6lg==
+"@docusaurus/utils@3.6.3":
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/@docusaurus/utils/-/utils-3.6.3.tgz#8dcb1969e4011a84dfb0a031da806dadddebf0ea"
+  integrity sha512-0R/FR3bKVl4yl8QwbL4TYFfR+OXBRpVUaTJdENapBGR3YMwfM6/JnhGilWQO8AOwPJGtGoDK7ib8+8UF9f3OZQ==
   dependencies:
-    "@docusaurus/logger" "3.6.2"
-    "@docusaurus/types" "3.6.2"
-    "@docusaurus/utils-common" "3.6.2"
+    "@docusaurus/logger" "3.6.3"
+    "@docusaurus/types" "3.6.3"
+    "@docusaurus/utils-common" "3.6.3"
     "@svgr/webpack" "^8.1.0"
     escape-string-regexp "^4.0.0"
     file-loader "^6.2.0"
@@ -2368,9 +2350,9 @@
   integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==
 
 "@types/express-serve-static-core@*", "@types/express-serve-static-core@^5.0.0":
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-5.0.1.tgz#3c9997ae9d00bc236e45c6374e84f2596458d9db"
-  integrity sha512-CRICJIl0N5cXDONAdlTv5ShATZ4HEwk6kDDIW2/w9qOWKg+NU/5F8wYRWCrONad0/UKkloNSmmyN/wX4rtpbVA==
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-5.0.2.tgz#812d2871e5eea17fb0bd5214dda7a7b748c0e12a"
+  integrity sha512-vluaspfvWEtE4vcSDlKRNer52DvOGrB2xv6diXy6UKyKW0lqZiWHGNApSyxOv+8DE5Z27IzVvE7hNkxg7EXIcg==
   dependencies:
     "@types/node" "*"
     "@types/qs" "*"
@@ -2500,11 +2482,11 @@
     "@types/node" "*"
 
 "@types/node@*":
-  version "22.9.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.9.1.tgz#bdf91c36e0e7ecfb7257b2d75bf1b206b308ca71"
-  integrity sha512-p8Yy/8sw1caA8CdRIQBG5tiLHmxtQKObCijiAa9Ez+d4+PRffM4054xbju0msf+cvhJpnFEeNjxmVT/0ipktrg==
+  version "22.10.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.10.1.tgz#41ffeee127b8975a05f8c4f83fb89bcb2987d766"
+  integrity sha512-qKgsUwfHZV2WCWLAnVP1JqnpE6Im6h3Y0+fYgMTasNQ7V++CBX5OT1as0g0f+OyubbFqhf6XVNIsmN4IIhEgGQ==
   dependencies:
-    undici-types "~6.19.8"
+    undici-types "~6.20.0"
 
 "@types/node@^17.0.5":
   version "17.0.45"
@@ -2521,11 +2503,6 @@
   resolved "https://registry.yarnpkg.com/@types/prismjs/-/prismjs-1.26.5.tgz#72499abbb4c4ec9982446509d2f14fb8483869d6"
   integrity sha512-AUZTa7hQ2KY5L7AmtSiqxlhWxb4ina0yd8hNbl4TWuqnv/pFP0nDMb3YrfSBf4hJVGLh2YEIBfKaBW/9UEl6IQ==
 
-"@types/prop-types@*":
-  version "15.7.13"
-  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.13.tgz#2af91918ee12d9d32914feb13f5326658461b451"
-  integrity sha512-hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA==
-
 "@types/qs@*":
   version "6.9.17"
   resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.17.tgz#fc560f60946d0aeff2f914eb41679659d3310e1a"
@@ -2563,11 +2540,10 @@
     "@types/react" "*"
 
 "@types/react@*":
-  version "18.3.12"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.12.tgz#99419f182ccd69151813b7ee24b792fe08774f60"
-  integrity sha512-D2wOSq/d6Agt28q7rSI3jhU7G6aiuzljDGZ2hTZHIkrTLUI+AF3WMeKkEZ9nN2fkBAlcktT6vcZjDFiIhMYEQw==
+  version "19.0.1"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-19.0.1.tgz#a000d5b78f473732a08cecbead0f3751e550b3df"
+  integrity sha512-YW6614BDhqbpR5KtUYzTA+zlA7nayzJRA9ljz9CQoxthR0sDisYZLuvSMsil36t4EH/uAt8T52Xb4sVw17G+SQ==
   dependencies:
-    "@types/prop-types" "*"
     csstype "^3.0.2"
 
 "@types/retry@0.12.0":
@@ -2643,11 +2619,11 @@
     "@types/yargs-parser" "*"
 
 "@ungap/structured-clone@^1.0.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
-  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.1.tgz#28fa185f67daaf7b7a1a8c1d445132c5d979f8bd"
+  integrity sha512-fEzPV3hSkSMltkw152tJKNARhOupqbH96MZWyRjNaYZOMIzbrTeQDG+MTc6Mr2pgzFQzFxAfmhGDNP5QK++2ZA==
 
-"@webassemblyjs/ast@1.14.1", "@webassemblyjs/ast@^1.12.1":
+"@webassemblyjs/ast@1.14.1", "@webassemblyjs/ast@^1.14.1":
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.14.1.tgz#a9f6a07f2b03c95c8d38c4536a1fdfb521ff55b6"
   integrity sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==
@@ -2713,7 +2689,7 @@
   resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.13.2.tgz#917a20e93f71ad5602966c2d685ae0c6c21f60f1"
   integrity sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==
 
-"@webassemblyjs/wasm-edit@^1.12.1":
+"@webassemblyjs/wasm-edit@^1.14.1":
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz#ac6689f502219b59198ddec42dcd496b1004d597"
   integrity sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==
@@ -2748,7 +2724,7 @@
     "@webassemblyjs/wasm-gen" "1.14.1"
     "@webassemblyjs/wasm-parser" "1.14.1"
 
-"@webassemblyjs/wasm-parser@1.14.1", "@webassemblyjs/wasm-parser@^1.12.1":
+"@webassemblyjs/wasm-parser@1.14.1", "@webassemblyjs/wasm-parser@^1.14.1":
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz#b3e13f1893605ca78b52c68e54cf6a865f90b9fb"
   integrity sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==
@@ -2856,9 +2832,9 @@ ajv@^8.0.0, ajv@^8.9.0:
     require-from-string "^2.0.2"
 
 algoliasearch-helper@^3.13.3:
-  version "3.22.5"
-  resolved "https://registry.yarnpkg.com/algoliasearch-helper/-/algoliasearch-helper-3.22.5.tgz#2fcc26814e10a121a2c2526a1b05c754061c56c0"
-  integrity sha512-lWvhdnc+aKOKx8jyA3bsdEgHzm/sglC4cYdMG4xSQyRiPLJVJtH/IVYZG3Hp6PkTEhQqhyVYkeP9z2IlcHJsWw==
+  version "3.22.6"
+  resolved "https://registry.yarnpkg.com/algoliasearch-helper/-/algoliasearch-helper-3.22.6.tgz#6a31c67d277a32f3f7ae1b8a6e57ca73f1e1a0b0"
+  integrity sha512-F2gSb43QHyvZmvH/2hxIjbk/uFdO2MguQYTFP7J+RowMW1csjIODMobEnpLI8nbLQuzZnGZdIxl5Bpy1k9+CFQ==
   dependencies:
     "@algolia/events" "^4.0.1"
 
@@ -2884,23 +2860,23 @@ algoliasearch@^4.18.0:
     "@algolia/transporter" "4.24.0"
 
 algoliasearch@^5.12.0:
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-5.15.0.tgz#09cef5a2555c4554b37a99f0488ea6ab2347e625"
-  integrity sha512-Yf3Swz1s63hjvBVZ/9f2P1Uu48GjmjCN+Esxb6MAONMGtZB1fRX8/S1AhUTtsuTlcGovbYLxpHgc7wEzstDZBw==
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-5.16.0.tgz#5a1768ae6846c93a8314ecdf1521dd11ce6c80b0"
+  integrity sha512-0zWz0LGfB0MLrhcnyGDpvVWPSsZnECNU6V/GPtNkHHSgaUj/7i+j36bZm6HClCvo8GvuxbN+ccbFREWUouHlfg==
   dependencies:
-    "@algolia/client-abtesting" "5.15.0"
-    "@algolia/client-analytics" "5.15.0"
-    "@algolia/client-common" "5.15.0"
-    "@algolia/client-insights" "5.15.0"
-    "@algolia/client-personalization" "5.15.0"
-    "@algolia/client-query-suggestions" "5.15.0"
-    "@algolia/client-search" "5.15.0"
-    "@algolia/ingestion" "1.15.0"
-    "@algolia/monitoring" "1.15.0"
-    "@algolia/recommend" "5.15.0"
-    "@algolia/requester-browser-xhr" "5.15.0"
-    "@algolia/requester-fetch" "5.15.0"
-    "@algolia/requester-node-http" "5.15.0"
+    "@algolia/client-abtesting" "5.16.0"
+    "@algolia/client-analytics" "5.16.0"
+    "@algolia/client-common" "5.16.0"
+    "@algolia/client-insights" "5.16.0"
+    "@algolia/client-personalization" "5.16.0"
+    "@algolia/client-query-suggestions" "5.16.0"
+    "@algolia/client-search" "5.16.0"
+    "@algolia/ingestion" "1.16.0"
+    "@algolia/monitoring" "1.16.0"
+    "@algolia/recommend" "5.16.0"
+    "@algolia/requester-browser-xhr" "5.16.0"
+    "@algolia/requester-fetch" "5.16.0"
+    "@algolia/requester-node-http" "5.16.0"
 
 ansi-align@^3.0.1:
   version "3.0.1"
@@ -3181,16 +3157,23 @@ cacheable-request@^10.2.8:
     normalize-url "^8.0.0"
     responselike "^3.0.0"
 
-call-bind@^1.0.5, call-bind@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9"
-  integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==
+call-bind-apply-helpers@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz#32e5892e6361b29b0b545ba6f7763378daca2840"
+  integrity sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==
   dependencies:
-    es-define-property "^1.0.0"
     es-errors "^1.3.0"
     function-bind "^1.1.2"
+
+call-bind@^1.0.5, call-bind@^1.0.7:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.8.tgz#0736a9660f537e3388826f440d5ec45f744eaa4c"
+  integrity sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==
+  dependencies:
+    call-bind-apply-helpers "^1.0.0"
+    es-define-property "^1.0.0"
     get-intrinsic "^1.2.4"
-    set-function-length "^1.2.1"
+    set-function-length "^1.2.2"
 
 callsites@^3.0.0:
   version "3.1.0"
@@ -3226,9 +3209,9 @@ caniuse-api@^3.0.0:
     lodash.uniq "^4.5.0"
 
 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001646, caniuse-lite@^1.0.30001669:
-  version "1.0.30001680"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001680.tgz#5380ede637a33b9f9f1fc6045ea99bd142f3da5e"
-  integrity sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA==
+  version "1.0.30001687"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001687.tgz#d0ac634d043648498eedf7a3932836beba90ebae"
+  integrity sha512-0S/FDhf4ZiqrTUiQ39dKeUjYRjkv7lOZU1Dgif2rIqrTzX/1wV2hfKu9TOm1IHkdSijfLswxTFzl/cvir+SLSQ==
 
 ccount@^2.0.0:
   version "2.0.1"
@@ -3688,9 +3671,9 @@ css-what@^6.0.1, css-what@^6.1.0:
   integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
 
 cssdb@^8.2.1:
-  version "8.2.1"
-  resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-8.2.1.tgz#62a5d9a41e2c86f1d7c35981098fc5ce47c5766c"
-  integrity sha512-KwEPys7lNsC8OjASI8RrmwOYYDcm0JOW9zQhcV83ejYcQkirTEyeAGui8aO2F5PiS6SLpxuTzl6qlMElIdsgIg==
+  version "8.2.3"
+  resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-8.2.3.tgz#7e6980bb5a785a9b4eb2a21bd38d50624b56cb46"
+  integrity sha512-9BDG5XmJrJQQnJ51VFxXCAtpZ5ebDlAREmO8sxMOVU0aSxN/gocbctjIG5LMh3WBUq+xTlb/jw2LoljBEqraTA==
 
 cssesc@^3.0.0:
   version "3.0.0"
@@ -3784,9 +3767,9 @@ debug@2.6.9, debug@^2.6.0:
     ms "2.0.0"
 
 debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1:
-  version "4.3.7"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
-  integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a"
+  integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==
   dependencies:
     ms "^2.1.3"
 
@@ -4002,6 +3985,15 @@ dot-prop@^6.0.1:
   dependencies:
     is-obj "^2.0.0"
 
+dunder-proto@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.0.tgz#c2fce098b3c8f8899554905f4377b6d85dabaa80"
+  integrity sha512-9+Sj30DIu+4KvHqMfLUGLFYL2PkURSYMVXJyXe92nFRvlYq5hBjLEhblKB+vkd/WVlUYMWigiY07T91Fkk0+4A==
+  dependencies:
+    call-bind-apply-helpers "^1.0.0"
+    es-errors "^1.3.0"
+    gopd "^1.2.0"
+
 duplexer@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
@@ -4018,9 +4010,9 @@ ee-first@1.1.1:
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
 electron-to-chromium@^1.5.41:
-  version "1.5.63"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.63.tgz#69444d592fbbe628d129866c2355691ea93eda3e"
-  integrity sha512-ddeXKuY9BHo/mw145axlyWjlJ1UBt4WK3AlvkT7W2AbqfRQoacVoRUCF6wL3uIx/8wT9oLKXzI+rFqHHscByaA==
+  version "1.5.72"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.72.tgz#a732805986d3a5b5fedd438ddf4616c7d78ac2df"
+  integrity sha512-ZpSAUOZ2Izby7qnZluSrAlGgGQzucmFbN0n64dYzocYxnxV5ufurpj3VgEe4cUp7ir9LmeLxNYo8bVnlM8bQHw==
 
 emoji-regex@^8.0.0:
   version "8.0.0"
@@ -4082,12 +4074,10 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-define-property@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845"
-  integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==
-  dependencies:
-    get-intrinsic "^1.2.4"
+es-define-property@^1.0.0, es-define-property@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa"
+  integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==
 
 es-errors@^1.3.0:
   version "1.3.0"
@@ -4289,9 +4279,9 @@ execa@^5.0.0:
     strip-final-newline "^2.0.0"
 
 express@^4.17.3:
-  version "4.21.1"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.21.1.tgz#9dae5dda832f16b4eec941a4e44aa89ec481b281"
-  integrity sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.21.2.tgz#cf250e48362174ead6cea4a566abef0162c1ec32"
+  integrity sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==
   dependencies:
     accepts "~1.3.8"
     array-flatten "1.1.1"
@@ -4312,7 +4302,7 @@ express@^4.17.3:
     methods "~1.1.2"
     on-finished "2.4.1"
     parseurl "~1.3.3"
-    path-to-regexp "0.1.10"
+    path-to-regexp "0.1.12"
     proxy-addr "~2.0.7"
     qs "6.13.0"
     range-parser "~1.2.1"
@@ -4560,16 +4550,19 @@ gensync@^1.0.0-beta.2:
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
-get-intrinsic@^1.1.3, get-intrinsic@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd"
-  integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==
+get-intrinsic@^1.2.4:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.5.tgz#dfe7dd1b30761b464fe51bf4bb00ac7c37b681e7"
+  integrity sha512-Y4+pKa7XeRUPWFNvOOYHkRYrfzW07oraURSvjDmRVOJ748OrVmeXtpE4+GCEHncjCjkTxPNRt8kEbxDhsn6VTg==
   dependencies:
+    call-bind-apply-helpers "^1.0.0"
+    dunder-proto "^1.0.0"
+    es-define-property "^1.0.1"
     es-errors "^1.3.0"
     function-bind "^1.1.2"
-    has-proto "^1.0.1"
-    has-symbols "^1.0.3"
-    hasown "^2.0.0"
+    gopd "^1.2.0"
+    has-symbols "^1.1.0"
+    hasown "^2.0.2"
 
 get-own-enumerable-property-symbols@^3.0.0:
   version "3.0.2"
@@ -4668,12 +4661,10 @@ globby@^13.1.1:
     merge2 "^1.4.1"
     slash "^4.0.0"
 
-gopd@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
-  integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
-  dependencies:
-    get-intrinsic "^1.1.3"
+gopd@^1.0.1, gopd@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1"
+  integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==
 
 got@^12.1.0:
   version "12.6.1"
@@ -4736,22 +4727,17 @@ has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.2:
   dependencies:
     es-define-property "^1.0.0"
 
-has-proto@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd"
-  integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==
-
-has-symbols@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
-  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
+has-symbols@^1.0.3, has-symbols@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338"
+  integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==
 
 has-yarn@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-3.0.0.tgz#c3c21e559730d1d3b57e28af1f30d06fac38147d"
   integrity sha512-IrsVwUHhEULx3R8f/aA8AHuEzAorplsab/v8HBzEiIukwq5i/EC+xmOW+HfP1OaDP+2JkgT1yILHN2O3UFIbcA==
 
-hasown@^2.0.0, hasown@^2.0.2:
+hasown@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
   integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
@@ -5496,9 +5482,9 @@ leven@^3.1.0:
   integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
 
 lilconfig@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-3.1.2.tgz#e4a7c3cb549e3a606c8dcc32e5ae1005e62c05cb"
-  integrity sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-3.1.3.tgz#a1bcfd6257f9585bf5ae14ceeebb7b559025e4c4"
+  integrity sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==
 
 lines-and-columns@^1.1.6:
   version "1.2.4"
@@ -6397,9 +6383,9 @@ multicast-dns@^7.2.5:
     thunky "^1.0.2"
 
 nanoid@^3.3.7:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
-  integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
+  version "3.3.8"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
+  integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==
 
 negotiator@0.6.3:
   version "0.6.3"
@@ -6425,9 +6411,9 @@ no-case@^3.0.4:
     tslib "^2.0.3"
 
 node-emoji@^2.1.0:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-2.1.3.tgz#93cfabb5cc7c3653aa52f29d6ffb7927d8047c06"
-  integrity sha512-E2WEOVsgs7O16zsURJ/eH8BqhF029wGpEOnv7Urwdo2wmQanOACwJQh0devF9D9RhoZru0+9JXIS0dBXIAz+lA==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-2.2.0.tgz#1d000e3c76e462577895be1b436f4aa2d6760eb0"
+  integrity sha512-Z3lTE9pLaJF47NyMhd4ww1yFTAP8YhYI8SleJiHzM46Fgpm5cnNzSl9XfzFNqbaz+VlJrIj3fXQ4DeN1Rjm6cw==
   dependencies:
     "@sindresorhus/is" "^4.6.0"
     char-regex "^1.0.2"
@@ -6440,9 +6426,9 @@ node-forge@^1:
   integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
 
 node-releases@^2.0.18:
-  version "2.0.18"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f"
-  integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==
+  version "2.0.19"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.19.tgz#9e445a52950951ec4d177d843af370b411caf314"
+  integrity sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==
 
 normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
@@ -6740,10 +6726,10 @@ path-parse@^1.0.7:
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
-path-to-regexp@0.1.10:
-  version "0.1.10"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.10.tgz#67e9108c5c0551b9e5326064387de4763c4d5f8b"
-  integrity sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==
+path-to-regexp@0.1.12:
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.12.tgz#d5e1a12e478a976d432ef3c58d534b9923164bb7"
+  integrity sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==
 
 path-to-regexp@3.3.0:
   version "3.3.0"
@@ -7727,22 +7713,22 @@ regenerator-transform@^0.15.2:
   dependencies:
     "@babel/runtime" "^7.8.4"
 
-regexpu-core@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-6.1.1.tgz#b469b245594cb2d088ceebc6369dceb8c00becac"
-  integrity sha512-k67Nb9jvwJcJmVpw0jPttR1/zVfnKf8Km0IPatrU/zJ5XeG3+Slx0xLXs9HByJSzXzrlz5EDvN6yLNMDc2qdnw==
+regexpu-core@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-6.2.0.tgz#0e5190d79e542bf294955dccabae04d3c7d53826"
+  integrity sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==
   dependencies:
     regenerate "^1.4.2"
     regenerate-unicode-properties "^10.2.0"
     regjsgen "^0.8.0"
-    regjsparser "^0.11.0"
+    regjsparser "^0.12.0"
     unicode-match-property-ecmascript "^2.0.0"
     unicode-match-property-value-ecmascript "^2.1.0"
 
 registry-auth-token@^5.0.1:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-5.0.2.tgz#8b026cc507c8552ebbe06724136267e63302f756"
-  integrity sha512-o/3ikDxtXaA59BmZuZrJZDJv8NMDGSj+6j6XaeBmHw8eY1i1qd9+6H+LjVvQXx3HN6aRCGa1cUdJ9RaJZUugnQ==
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-5.0.3.tgz#417d758c8164569de8cf5cabff16cc937902dcc6"
+  integrity sha512-1bpc9IyC+e+CNFRaWyn77tk4xGG4PPUyfakSmA6F6cvUDjrm58dfyJ3II+9yb10EDkHoy1LaPSmHaWLOH3m6HA==
   dependencies:
     "@pnpm/npm-conf" "^2.1.0"
 
@@ -7758,10 +7744,10 @@ regjsgen@^0.8.0:
   resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.8.0.tgz#df23ff26e0c5b300a6470cad160a9d090c3a37ab"
   integrity sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==
 
-regjsparser@^0.11.0:
-  version "0.11.2"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.11.2.tgz#7404ad42be00226d72bcf1f003f1f441861913d8"
-  integrity sha512-3OGZZ4HoLJkkAZx/48mTXJNlmqTGOzc0o9OWQPuWpkOlXXPbyN6OafCcoXUnBqE2D3f/T5L+pWc1kdEmnfnRsA==
+regjsparser@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.12.0.tgz#0e846df6c6530586429377de56e0475583b088dc"
+  integrity sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==
   dependencies:
     jsesc "~3.0.2"
 
@@ -8125,7 +8111,7 @@ serve-static@1.16.2:
     parseurl "~1.3.3"
     send "0.19.0"
 
-set-function-length@^1.2.1:
+set-function-length@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"
   integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==
@@ -8172,9 +8158,9 @@ shebang-regex@^3.0.0:
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
 shell-quote@^1.7.3, shell-quote@^1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680"
-  integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.2.tgz#d2d83e057959d53ec261311e9e9b8f51dcb2934a"
+  integrity sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==
 
 shelljs@^0.8.5:
   version "0.8.5"
@@ -8503,9 +8489,9 @@ terser-webpack-plugin@^5.3.10, terser-webpack-plugin@^5.3.9:
     terser "^5.26.0"
 
 terser@^5.10.0, terser@^5.15.1, terser@^5.26.0:
-  version "5.36.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.36.0.tgz#8b0dbed459ac40ff7b4c9fd5a3a2029de105180e"
-  integrity sha512-IYV9eNMuFAV4THUspIRXkLakHnV6XO7FEdtKjf/mDyrnqUg9LnlOn6/RwRvM9SZjR4GUq8Nk8zj67FzVARr74w==
+  version "5.37.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.37.0.tgz#38aa66d1cfc43d0638fab54e43ff8a4f72a21ba3"
+  integrity sha512-B8wRRkmre4ERucLM/uXx4MOV5cbnOlVAqUst+1+iLKPI0dOgFO28f84ptoQt9HEI537PMzfYa/d+GEPKTRXmYA==
   dependencies:
     "@jridgewell/source-map" "^0.3.3"
     acorn "^8.8.2"
@@ -8594,10 +8580,10 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-undici-types@~6.19.8:
-  version "6.19.8"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
-  integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
+undici-types@~6.20.0:
+  version "6.20.0"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.20.0.tgz#8171bf22c1f588d1554d55bf204bc624af388433"
+  integrity sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==
 
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.1"
@@ -8914,15 +8900,15 @@ webpack-sources@^3.2.3:
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
 webpack@^5.88.1, webpack@^5.95.0:
-  version "5.96.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.96.1.tgz#3676d1626d8312b6b10d0c18cc049fba7ac01f0c"
-  integrity sha512-l2LlBSvVZGhL4ZrPwyr8+37AunkcYj5qh8o6u2/2rzoPc8gxFJkLj1WxNgooi9pnoc06jh0BjuXnamM4qlujZA==
+  version "5.97.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.97.1.tgz#972a8320a438b56ff0f1d94ade9e82eac155fa58"
+  integrity sha512-EksG6gFY3L1eFMROS/7Wzgrii5mBAFe4rIr3r2BTfo7bcc+DWwFZ4OJ/miOuHJO/A85HwyI4eQ0F6IKXesO7Fg==
   dependencies:
     "@types/eslint-scope" "^3.7.7"
     "@types/estree" "^1.0.6"
-    "@webassemblyjs/ast" "^1.12.1"
-    "@webassemblyjs/wasm-edit" "^1.12.1"
-    "@webassemblyjs/wasm-parser" "^1.12.1"
+    "@webassemblyjs/ast" "^1.14.1"
+    "@webassemblyjs/wasm-edit" "^1.14.1"
+    "@webassemblyjs/wasm-parser" "^1.14.1"
     acorn "^8.14.0"
     browserslist "^4.24.0"
     chrome-trace-event "^1.0.2"
diff --git a/manifest.json b/manifest.json
index fbe0a70d..5c7d60aa 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "khoj",
 	"name": "Khoj",
-	"version": "1.30.1",
+	"version": "1.31.0",
 	"minAppVersion": "0.15.0",
 	"description": "Your Second Brain",
 	"author": "Khoj Inc.",
diff --git a/prod.Dockerfile b/prod.Dockerfile
index d955f155..015a5a3e 100644
--- a/prod.Dockerfile
+++ b/prod.Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM ubuntu:jammy
+FROM ubuntu:jammy AS base
 LABEL homepage="https://khoj.dev"
 LABEL repository="https://github.com/khoj-ai/khoj"
 LABEL org.opencontainers.image.source="https://github.com/khoj-ai/khoj"
@@ -13,36 +13,52 @@ RUN apt update -y && apt -y install \
     libsm6 \
     libxext6 \
     swig \
-    curl && \
-    # Required by Next.js Web app
-    curl -sL https://deb.nodesource.com/setup_20.x | bash - && \
-    curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
-    echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
-    apt update -y && apt -y --no-install-recommends install nodejs yarn && \
+    curl \
+    # Required by llama-cpp-python pre-built wheels. See #1628
+    musl-dev && \
+    ln -s /usr/lib/x86_64-linux-musl/libc.so /lib/libc.musl-x86_64.so.1 && \
+    # Clean up
     apt clean && rm -rf /var/lib/apt/lists/*
 
-# Install Application
+# Build Server
+FROM base AS server-deps
 WORKDIR /app
 COPY pyproject.toml .
 COPY README.md .
 ARG VERSION=0.0.0
+# use the pre-built llama-cpp-python, torch cpu wheel
+ENV PIP_EXTRA_INDEX_URL="https://download.pytorch.org/whl/cpu https://abetlen.github.io/llama-cpp-python/whl/cpu"
+# avoid downloading unused cuda specific python packages
+ENV CUDA_VISIBLE_DEVICES=""
 RUN sed -i "s/dynamic = \\[\"version\"\\]/version = \"$VERSION\"/" pyproject.toml && \
     pip install --no-cache-dir -e .[prod]
 
-# Copy Source Code
-COPY . .
-
-# Set the PYTHONPATH environment variable in order for it to find the Django app.
-ENV PYTHONPATH=/app/src:$PYTHONPATH
-
-# Go to the directory src/interface/web and export the built Next.js assets
+# Build Web App
+FROM node:20-alpine AS web-app
+# Set build optimization env vars
+ENV NODE_ENV=production
+ENV NEXT_TELEMETRY_DISABLED=1
 WORKDIR /app/src/interface/web
-RUN bash -c "yarn install --frozen-lockfile --verbose && yarn ciexport && yarn cache clean"
+# Install dependencies first (cache layer)
+COPY src/interface/web/package.json src/interface/web/yarn.lock ./
+RUN yarn install --frozen-lockfile
+# Copy source and build
+COPY src/interface/web/. ./
+RUN yarn build
+
+# Merge the Server and Web App into a Single Image
+FROM base
+ENV PYTHONPATH=/app/src:$PYTHONPATH
 WORKDIR /app
+COPY --from=server-deps /usr/local/lib/python3.10/dist-packages /usr/local/lib/python3.10/dist-packages
+COPY --from=server-deps /usr/local/bin /usr/local/bin
+COPY --from=web-app /app/src/interface/web/out ./src/khoj/interface/built
+COPY . .
+RUN cd src && python3 khoj/manage.py collectstatic --noinput
 
 # Run the Application
 # There are more arguments required for the application to run,
-# but these should be passed in through the docker-compose.yml file.
+# but those should be passed in through the docker-compose.yml file.
 ARG PORT
 EXPOSE ${PORT}
 ENTRYPOINT ["gunicorn", "-c", "gunicorn-config.py", "src.khoj.main:app"]
diff --git a/pyproject.toml b/pyproject.toml
index f02b5559..fbe4135e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -63,7 +63,8 @@ dependencies = [
     "tenacity == 8.3.0",
     "anyio == 3.7.1",
     "pymupdf == 1.24.11",
-    "django == 5.0.9",
+    "django == 5.0.10",
+    "django-unfold == 0.42.0",
     "authlib == 1.2.1",
     "llama-cpp-python == 0.2.88",
     "itsdangerous == 2.1.2",
@@ -88,6 +89,7 @@ dependencies = [
     "anthropic == 0.26.1",
     "docx2txt == 0.8",
     "google-generativeai == 0.8.3",
+    "pyjson5 == 1.6.7",
 ]
 dynamic = ["version"]
 
diff --git a/src/interface/android/app/build.gradle b/src/interface/android/app/build.gradle
new file mode 100644
index 00000000..bfa06911
--- /dev/null
+++ b/src/interface/android/app/build.gradle
@@ -0,0 +1,211 @@
+/*
+ * Copyright 2019 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import groovy.xml.MarkupBuilder
+
+plugins {
+    id 'com.android.application'
+}
+
+def twaManifest = [
+    applicationId: 'dev.khoj.app',
+    hostName: 'app.khoj.dev', // The domain being opened in the TWA.
+    launchUrl: '/', // The start path for the TWA. Must be relative to the domain.
+    name: 'Khoj AI', // The application name.
+    launcherName: 'Khoj', // The name shown on the Android Launcher.
+    themeColor: '#FFFFFF', // The color used for the status bar.
+    themeColorDark: '#000000', // The color used for the dark status bar.
+    navigationColor: '#000000', // The color used for the navigation bar.
+    navigationColorDark: '#000000', // The color used for the dark navbar.
+    navigationDividerColor: '#000000', // The navbar divider color.
+    navigationDividerColorDark: '#000000', // The dark navbar divider color.
+    backgroundColor: '#FFFFFF', // The color used for the splash screen background.
+    enableNotifications: true, // Set to true to enable notification delegation.
+    // Every shortcut must include the following fields:
+    // - name: String that will show up in the shortcut.
+    // - short_name: Shorter string used if |name| is too long.
+    // - url: Absolute path of the URL to launch the app with (e.g '/create').
+    // - icon: Name of the resource in the drawable folder to use as an icon.
+    shortcuts: [],
+    // The duration of fade out animation in milliseconds to be played when removing splash screen.
+    splashScreenFadeOutDuration: 300,
+    generatorApp: 'bubblewrap-cli', // Application that generated the Android Project
+    // The fallback strategy for when Trusted Web Activity is not available. Possible values are
+    // 'customtabs' and 'webview'.
+    fallbackType: 'customtabs',
+    enableSiteSettingsShortcut: 'true',
+    orientation: 'natural',
+]
+
+android {
+    compileSdkVersion 35
+    namespace "dev.khoj.app"
+    defaultConfig {
+        applicationId "dev.khoj.app"
+        minSdkVersion 19
+        targetSdkVersion 35
+        versionCode 4
+        versionName "4"
+
+        // The name for the application
+        resValue "string", "appName", twaManifest.name
+
+        // The name for the application on the Android Launcher
+        resValue "string", "launcherName", twaManifest.launcherName
+
+        // The URL that will be used when launching the TWA from the Android Launcher
+        def launchUrl = "https://" + twaManifest.hostName + twaManifest.launchUrl
+        resValue "string", "launchUrl", launchUrl
+
+
+            // The URL the Web Manifest for the Progressive Web App that the TWA points to. This
+            // is used by Chrome OS and Meta Quest to open the Web version of the PWA instead of
+            // the TWA, as it will probably give a better user experience for non-mobile devices.
+            resValue "string", "webManifestUrl", 'https://app.khoj.dev/static/khoj.webmanifest'
+
+
+
+            // This is used by Meta Quest.
+            resValue "string", "fullScopeUrl", 'https://app.khoj.dev/'
+
+
+
+
+        // The hostname is used when building the intent-filter, so the TWA is able to
+        // handle Intents to open host url of the application.
+        resValue "string", "hostName", twaManifest.hostName
+
+        // This attribute sets the status bar color for the TWA. It can be either set here or in
+        // `res/values/colors.xml`. Setting in both places is an error and the app will not
+        // compile. If not set, the status bar color defaults to #FFFFFF - white.
+        resValue "color", "colorPrimary", twaManifest.themeColor
+
+        // This attribute sets the dark status bar color for the TWA. It can be either set here or in
+        // `res/values/colors.xml`. Setting in both places is an error and the app will not
+        // compile. If not set, the status bar color defaults to #000000 - white.
+        resValue "color", "colorPrimaryDark", twaManifest.themeColorDark
+
+        // This attribute sets the navigation bar color for the TWA. It can be either set here or
+        // in `res/values/colors.xml`. Setting in both places is an error and the app will not
+        // compile. If not set, the navigation bar color defaults to #FFFFFF - white.
+        resValue "color", "navigationColor", twaManifest.navigationColor
+
+        // This attribute sets the dark navigation bar color for the TWA. It can be either set here
+        // or in `res/values/colors.xml`. Setting in both places is an error and the app will not
+        // compile. If not set, the navigation bar color defaults to #000000 - black.
+        resValue "color", "navigationColorDark", twaManifest.navigationColorDark
+
+        // This attribute sets the navbar divider color for the TWA. It can be either
+        // set here or in `res/values/colors.xml`. Setting in both places is an error and the app
+        // will not compile. If not set, the divider color defaults to #00000000 - transparent.
+        resValue "color", "navigationDividerColor", twaManifest.navigationDividerColor
+
+        // This attribute sets the dark navbar divider color for the TWA. It can be either
+        // set here or in `res/values/colors.xml`. Setting in both places is an error and the
+        //app will not compile. If not set, the divider color defaults to #000000 - black.
+        resValue "color", "navigationDividerColorDark", twaManifest.navigationDividerColorDark
+
+        // Sets the color for the background used for the splash screen when launching the
+        // Trusted Web Activity.
+        resValue "color", "backgroundColor", twaManifest.backgroundColor
+
+        // Defines a provider authority for the Splash Screen
+        resValue "string", "providerAuthority", twaManifest.applicationId + '.fileprovider'
+
+        // The enableNotification resource is used to enable or disable the
+        // TrustedWebActivityService, by changing the android:enabled and android:exported
+        // attributes
+        resValue "bool", "enableNotification", twaManifest.enableNotifications.toString()
+
+        twaManifest.shortcuts.eachWithIndex { shortcut, index ->
+            resValue "string", "shortcut_name_$index", "$shortcut.name"
+            resValue "string", "shortcut_short_name_$index", "$shortcut.short_name"
+        }
+
+        // The splashScreenFadeOutDuration resource is used to set the duration of fade out animation in milliseconds
+        // to be played when removing splash screen. The default is 0 (no animation).
+        resValue "integer", "splashScreenFadeOutDuration", twaManifest.splashScreenFadeOutDuration.toString()
+
+        resValue "string", "generatorApp", twaManifest.generatorApp
+
+        resValue "string", "fallbackType", twaManifest.fallbackType
+
+        resValue "bool", "enableSiteSettingsShortcut", twaManifest.enableSiteSettingsShortcut
+        resValue "string", "orientation", twaManifest.orientation
+    }
+    buildTypes {
+        release {
+            minifyEnabled true
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    lintOptions {
+        checkReleaseBuilds false
+    }
+}
+
+task generateShorcutsFile {
+    assert twaManifest.shortcuts.size() < 5, "You can have at most 4 shortcuts."
+    twaManifest.shortcuts.eachWithIndex { s, i ->
+        assert s.name != null, 'Missing `name` in shortcut #' + i
+        assert s.short_name != null, 'Missing `short_name` in shortcut #' + i
+        assert s.url != null, 'Missing `icon` in shortcut #' + i
+        assert s.icon != null, 'Missing `url` in shortcut #' + i
+    }
+
+    def shortcutsFile = new File("$projectDir/src/main/res/xml", "shortcuts.xml")
+
+    def xmlWriter = new StringWriter()
+    def xmlMarkup = new MarkupBuilder(new IndentPrinter(xmlWriter, "    ", true))
+
+    xmlMarkup
+        .'shortcuts'('xmlns:android': 'http://schemas.android.com/apk/res/android') {
+            twaManifest.shortcuts.eachWithIndex { s, i ->
+                'shortcut'(
+                        'android:shortcutId': 'shortcut' + i,
+                        'android:enabled': 'true',
+                        'android:icon': '@drawable/' + s.icon,
+                        'android:shortcutShortLabel': '@string/shortcut_short_name_' + i,
+                        'android:shortcutLongLabel': '@string/shortcut_name_' + i) {
+                    'intent'(
+                            'android:action': 'android.intent.action.MAIN',
+                            'android:targetPackage': twaManifest.applicationId,
+                            'android:targetClass': twaManifest.applicationId + '.LauncherActivity',
+                            'android:data': s.url)
+                    'categories'('android:name': 'android.intent.category.LAUNCHER')
+                }
+            }
+        }
+    shortcutsFile.text = xmlWriter.toString() + '\n'
+}
+
+preBuild.dependsOn(generateShorcutsFile)
+
+repositories {
+
+}
+
+dependencies {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+
+        implementation 'com.google.androidbrowserhelper:locationdelegation:1.1.1'
+
+        implementation 'com.google.androidbrowserhelper:androidbrowserhelper:2.5.0'
+
+}
diff --git a/src/interface/android/app/src/main/AndroidManifest.xml b/src/interface/android/app/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..39fee27d
--- /dev/null
+++ b/src/interface/android/app/src/main/AndroidManifest.xml
@@ -0,0 +1,188 @@
+<!--
+    Copyright 2019 Google Inc. All Rights Reserved.
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- The "package" attribute is rewritten by the Gradle build with the value of applicationId.
+     It is still required here, as it is used to derive paths, for instance when referring
+     to an Activity by ".MyActivity" instead of the full name. If more Activities are added to the
+     application, the package attribute will need to reflect the correct path in order to use
+     the abbreviated format. -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="dev.khoj.app">
+
+
+        <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+
+
+
+
+
+
+
+
+    <application
+        android:name="Application"
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/appName"
+
+        android:manageSpaceActivity="com.google.androidbrowserhelper.trusted.ManageDataLauncherActivity"
+
+        android:supportsRtl="true"
+        android:theme="@android:style/Theme.Translucent.NoTitleBar">
+
+        <meta-data
+            android:name="asset_statements"
+            android:resource="@string/assetStatements" />
+
+
+            <meta-data
+                android:name="web_manifest_url"
+                android:value="@string/webManifestUrl" />
+
+
+        <meta-data
+            android:name="twa_generator"
+            android:value="@string/generatorApp" />
+
+
+
+
+
+
+            <activity android:name="com.google.androidbrowserhelper.trusted.ManageDataLauncherActivity">
+            <meta-data
+                android:name="android.support.customtabs.trusted.MANAGE_SPACE_URL"
+                android:value="@string/launchUrl" />
+            </activity>
+
+
+        <activity android:name="LauncherActivity"
+            android:alwaysRetainTaskState="true"
+            android:label="@string/launcherName"
+            android:exported="true">
+            <meta-data android:name="android.support.customtabs.trusted.DEFAULT_URL"
+                android:value="@string/launchUrl" />
+
+            <meta-data
+                android:name="android.support.customtabs.trusted.STATUS_BAR_COLOR"
+                android:resource="@color/colorPrimary" />
+
+            <meta-data
+                android:name="android.support.customtabs.trusted.STATUS_BAR_COLOR_DARK"
+                android:resource="@color/colorPrimaryDark" />
+
+            <meta-data
+                android:name="android.support.customtabs.trusted.NAVIGATION_BAR_COLOR"
+                android:resource="@color/navigationColor" />
+
+            <meta-data
+                android:name="android.support.customtabs.trusted.NAVIGATION_BAR_COLOR_DARK"
+                android:resource="@color/navigationColorDark" />
+
+            <meta-data
+                android:name="androix.browser.trusted.NAVIGATION_BAR_DIVIDER_COLOR"
+                android:resource="@color/navigationDividerColor" />
+
+            <meta-data
+                android:name="androix.browser.trusted.NAVIGATION_BAR_DIVIDER_COLOR_DARK"
+                android:resource="@color/navigationDividerColorDark" />
+
+            <meta-data android:name="android.support.customtabs.trusted.SPLASH_IMAGE_DRAWABLE"
+                android:resource="@drawable/splash"/>
+
+            <meta-data android:name="android.support.customtabs.trusted.SPLASH_SCREEN_BACKGROUND_COLOR"
+                android:resource="@color/backgroundColor"/>
+
+            <meta-data android:name="android.support.customtabs.trusted.SPLASH_SCREEN_FADE_OUT_DURATION"
+                android:value="@integer/splashScreenFadeOutDuration"/>
+
+            <meta-data android:name="android.support.customtabs.trusted.FILE_PROVIDER_AUTHORITY"
+                android:value="@string/providerAuthority"/>
+
+            <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts" />
+
+            <meta-data android:name="android.support.customtabs.trusted.FALLBACK_STRATEGY"
+                android:value="@string/fallbackType" />
+
+
+
+
+
+            <meta-data android:name="android.support.customtabs.trusted.SCREEN_ORIENTATION"
+                android:value="@string/orientation"/>
+
+
+
+
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE"/>
+                <data android:scheme="https"
+                    android:host="@string/hostName"/>
+            </intent-filter>
+
+
+        </activity>
+
+        <activity android:name="com.google.androidbrowserhelper.trusted.FocusActivity" />
+
+        <activity android:name="com.google.androidbrowserhelper.trusted.WebViewFallbackActivity"
+            android:configChanges="orientation|screenSize" />
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="@string/providerAuthority"
+            android:grantUriPermissions="true"
+            android:exported="false">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/filepaths" />
+        </provider>
+
+        <service
+            android:name=".DelegationService"
+            android:enabled="@bool/enableNotification"
+            android:exported="@bool/enableNotification">
+
+
+                <meta-data
+                    android:name="android.support.customtabs.trusted.SMALL_ICON"
+                    android:resource="@drawable/ic_notification_icon" />
+
+
+            <intent-filter>
+                <action android:name="android.support.customtabs.trusted.TRUSTED_WEB_ACTIVITY_SERVICE"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </service>
+
+
+            <activity android:name="com.google.androidbrowserhelper.trusted.NotificationPermissionRequestActivity" />
+
+
+
+            <activity android:name=
+        "com.google.androidbrowserhelper.locationdelegation.PermissionRequestActivity"/>
+
+    </application>
+</manifest>
diff --git a/src/interface/android/app/src/main/java/dev/khoj/app/Application.java b/src/interface/android/app/src/main/java/dev/khoj/app/Application.java
new file mode 100644
index 00000000..a1d3040f
--- /dev/null
+++ b/src/interface/android/app/src/main/java/dev/khoj/app/Application.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2020 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package dev.khoj.app;
+
+
+
+public class Application extends android.app.Application {
+
+
+
+  @Override
+  public void onCreate() {
+      super.onCreate();
+
+  }
+}
diff --git a/src/interface/android/app/src/main/java/dev/khoj/app/DelegationService.java b/src/interface/android/app/src/main/java/dev/khoj/app/DelegationService.java
new file mode 100644
index 00000000..d8d6bd10
--- /dev/null
+++ b/src/interface/android/app/src/main/java/dev/khoj/app/DelegationService.java
@@ -0,0 +1,17 @@
+package dev.khoj.app;
+
+
+import com.google.androidbrowserhelper.locationdelegation.LocationDelegationExtraCommandHandler;
+
+
+public class DelegationService extends
+        com.google.androidbrowserhelper.trusted.DelegationService {
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+
+            registerExtraCommandHandler(new LocationDelegationExtraCommandHandler());
+
+    }
+}
diff --git a/src/interface/android/app/src/main/java/dev/khoj/app/LauncherActivity.java b/src/interface/android/app/src/main/java/dev/khoj/app/LauncherActivity.java
new file mode 100644
index 00000000..a56c4232
--- /dev/null
+++ b/src/interface/android/app/src/main/java/dev/khoj/app/LauncherActivity.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2020 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package dev.khoj.app;
+
+import android.content.pm.ActivityInfo;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+
+
+
+public class LauncherActivity
+        extends com.google.androidbrowserhelper.trusted.LauncherActivity {
+
+
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // Setting an orientation crashes the app due to the transparent background on Android 8.0
+        // Oreo and below. We only set the orientation on Oreo and above. This only affects the
+        // splash screen and Chrome will still respect the orientation.
+        // See https://github.com/GoogleChromeLabs/bubblewrap/issues/496 for details.
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.O) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
+        } else {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
+        }
+    }
+
+    @Override
+    protected Uri getLaunchingUrl() {
+        // Get the original launch Url.
+        Uri uri = super.getLaunchingUrl();
+
+
+
+        return uri;
+    }
+}
diff --git a/src/interface/android/app/src/main/res/drawable-anydpi/shortcut_legacy_background.xml b/src/interface/android/app/src/main/res/drawable-anydpi/shortcut_legacy_background.xml
new file mode 100644
index 00000000..d53c148a
--- /dev/null
+++ b/src/interface/android/app/src/main/res/drawable-anydpi/shortcut_legacy_background.xml
@@ -0,0 +1,25 @@
+<!--
+    Copyright 2020 Google Inc. All Rights Reserved.
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:inset="2dp">
+    <aapt:attr name="android:drawable">
+        <shape android:shape="oval">
+            <solid android:color="@color/shortcut_background" />
+            <size android:width="44dp" android:height="44dp" />
+        </shape>
+    </aapt:attr>
+</inset>
diff --git a/src/interface/android/app/src/main/res/drawable-hdpi/ic_notification_icon.png b/src/interface/android/app/src/main/res/drawable-hdpi/ic_notification_icon.png
new file mode 100644
index 00000000..db196a12
Binary files /dev/null and b/src/interface/android/app/src/main/res/drawable-hdpi/ic_notification_icon.png differ
diff --git a/src/interface/android/app/src/main/res/drawable-hdpi/splash.png b/src/interface/android/app/src/main/res/drawable-hdpi/splash.png
new file mode 100644
index 00000000..9d2384e2
Binary files /dev/null and b/src/interface/android/app/src/main/res/drawable-hdpi/splash.png differ
diff --git a/src/interface/android/app/src/main/res/drawable-mdpi/ic_notification_icon.png b/src/interface/android/app/src/main/res/drawable-mdpi/ic_notification_icon.png
new file mode 100644
index 00000000..1d97f7c1
Binary files /dev/null and b/src/interface/android/app/src/main/res/drawable-mdpi/ic_notification_icon.png differ
diff --git a/src/interface/android/app/src/main/res/drawable-mdpi/splash.png b/src/interface/android/app/src/main/res/drawable-mdpi/splash.png
new file mode 100644
index 00000000..77088425
Binary files /dev/null and b/src/interface/android/app/src/main/res/drawable-mdpi/splash.png differ
diff --git a/src/interface/android/app/src/main/res/drawable-xhdpi/ic_notification_icon.png b/src/interface/android/app/src/main/res/drawable-xhdpi/ic_notification_icon.png
new file mode 100644
index 00000000..9625ad91
Binary files /dev/null and b/src/interface/android/app/src/main/res/drawable-xhdpi/ic_notification_icon.png differ
diff --git a/src/interface/android/app/src/main/res/drawable-xhdpi/splash.png b/src/interface/android/app/src/main/res/drawable-xhdpi/splash.png
new file mode 100644
index 00000000..1d4f64fe
Binary files /dev/null and b/src/interface/android/app/src/main/res/drawable-xhdpi/splash.png differ
diff --git a/src/interface/android/app/src/main/res/drawable-xxhdpi/ic_notification_icon.png b/src/interface/android/app/src/main/res/drawable-xxhdpi/ic_notification_icon.png
new file mode 100644
index 00000000..355b7586
Binary files /dev/null and b/src/interface/android/app/src/main/res/drawable-xxhdpi/ic_notification_icon.png differ
diff --git a/src/interface/android/app/src/main/res/drawable-xxhdpi/splash.png b/src/interface/android/app/src/main/res/drawable-xxhdpi/splash.png
new file mode 100644
index 00000000..43423514
Binary files /dev/null and b/src/interface/android/app/src/main/res/drawable-xxhdpi/splash.png differ
diff --git a/src/interface/android/app/src/main/res/drawable-xxxhdpi/ic_notification_icon.png b/src/interface/android/app/src/main/res/drawable-xxxhdpi/ic_notification_icon.png
new file mode 100644
index 00000000..9ed4d5e6
Binary files /dev/null and b/src/interface/android/app/src/main/res/drawable-xxxhdpi/ic_notification_icon.png differ
diff --git a/src/interface/android/app/src/main/res/drawable-xxxhdpi/splash.png b/src/interface/android/app/src/main/res/drawable-xxxhdpi/splash.png
new file mode 100644
index 00000000..cec7e27d
Binary files /dev/null and b/src/interface/android/app/src/main/res/drawable-xxxhdpi/splash.png differ
diff --git a/src/interface/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/src/interface/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..b97b2df5
Binary files /dev/null and b/src/interface/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/interface/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/src/interface/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..0a454eb1
Binary files /dev/null and b/src/interface/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/interface/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/src/interface/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..47c45373
Binary files /dev/null and b/src/interface/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/interface/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/src/interface/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..643b56f7
Binary files /dev/null and b/src/interface/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/interface/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/src/interface/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..3a456d9f
Binary files /dev/null and b/src/interface/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/interface/android/app/src/main/res/raw/web_app_manifest.json b/src/interface/android/app/src/main/res/raw/web_app_manifest.json
new file mode 100644
index 00000000..cff9d4ef
--- /dev/null
+++ b/src/interface/android/app/src/main/res/raw/web_app_manifest.json
@@ -0,0 +1 @@
+{"name":"Khoj","short_name":"Khoj","display":"standalone","start_url":"/","description":"The open, personal AI for your digital brain. You can ask Khoj to draft a message, paint your imagination, find information on the internet and even answer questions from your documents.","theme_color":"#ffffff","background_color":"#ffffff","icons":[{"src":"/static/assets/icons/khoj_lantern_128x128.png","sizes":"128x128","type":"image/png"},{"src":"/static/assets/icons/khoj_lantern_256x256.png","sizes":"256x256","type":"image/png"}],"screenshots":[{"src":"/static/assets/samples/phone-remember-plan-sample.png","sizes":"419x900","type":"image/png","form_factor":"narrow","label":"Remember and Plan"},{"src":"/static/assets/samples/phone-browse-draw-sample.png","sizes":"419x900","type":"image/png","form_factor":"narrow","label":"Browse and Draw"},{"src":"/static/assets/samples/desktop-remember-plan-sample.png","sizes":"1260x742","type":"image/png","form_factor":"wide","label":"Remember and Plan"},{"src":"/static/assets/samples/desktop-browse-draw-sample.png","sizes":"1260x742","type":"image/png","form_factor":"wide","label":"Browse and Draw"}]}
diff --git a/src/interface/android/app/src/main/res/values/colors.xml b/src/interface/android/app/src/main/res/values/colors.xml
new file mode 100644
index 00000000..e66222d0
--- /dev/null
+++ b/src/interface/android/app/src/main/res/values/colors.xml
@@ -0,0 +1,18 @@
+<!--
+    Copyright 2020 Google Inc. All Rights Reserved.
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <color name="shortcut_background">#F5F5F5</color>
+</resources>
diff --git a/src/interface/android/app/src/main/res/values/strings.xml b/src/interface/android/app/src/main/res/values/strings.xml
new file mode 100644
index 00000000..d5d34f8b
--- /dev/null
+++ b/src/interface/android/app/src/main/res/values/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2021 Google Inc. All Rights Reserved.
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+
+
+  <!--
+    This variable below expresses the relationship between the app and the site,
+    as documented in the TWA documentation at
+    https://developers.google.com/web/updates/2017/10/using-twa#set_up_digital_asset_links_in_an_android_app
+    and is injected into the AndroidManifest.xml
+  -->
+  <string name="assetStatements">
+    [{
+        \"relation\": [\"delegate_permission/common.handle_all_urls\"],
+        \"target\": {
+            \"namespace\": \"web\",
+            \"site\": \"https://app.khoj.dev\"
+        }
+    }]
+
+  </string>
+</resources>
diff --git a/src/interface/android/app/src/main/res/xml/filepaths.xml b/src/interface/android/app/src/main/res/xml/filepaths.xml
new file mode 100644
index 00000000..a5434852
--- /dev/null
+++ b/src/interface/android/app/src/main/res/xml/filepaths.xml
@@ -0,0 +1,18 @@
+<!--
+    Copyright 2019 Google Inc. All Rights Reserved.
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<paths>
+    <files-path path="twa_splash/" name="twa_splash" />
+</paths>
diff --git a/src/interface/android/app/src/main/res/xml/shortcuts.xml b/src/interface/android/app/src/main/res/xml/shortcuts.xml
new file mode 100644
index 00000000..5effdb1d
--- /dev/null
+++ b/src/interface/android/app/src/main/res/xml/shortcuts.xml
@@ -0,0 +1 @@
+<shortcuts xmlns:android='http://schemas.android.com/apk/res/android' />
diff --git a/src/interface/android/build.gradle b/src/interface/android/build.gradle
new file mode 100644
index 00000000..fe8944ba
--- /dev/null
+++ b/src/interface/android/build.gradle
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2019 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:8.7.2'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+tasks.register('clean', Delete) {
+    delete rootProject.buildDir
+}
diff --git a/src/interface/android/gradle.properties b/src/interface/android/gradle.properties
new file mode 100644
index 00000000..784a1d43
--- /dev/null
+++ b/src/interface/android/gradle.properties
@@ -0,0 +1,14 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+android.useAndroidX=true
diff --git a/src/interface/android/gradle/wrapper/gradle-wrapper.jar b/src/interface/android/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..5c2d1cf0
Binary files /dev/null and b/src/interface/android/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/src/interface/android/gradle/wrapper/gradle-wrapper.properties b/src/interface/android/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..b30c9914
--- /dev/null
+++ b/src/interface/android/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
diff --git a/src/interface/android/gradlew b/src/interface/android/gradlew
new file mode 100755
index 00000000..b740cf13
--- /dev/null
+++ b/src/interface/android/gradlew
@@ -0,0 +1,249 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/src/interface/android/gradlew.bat b/src/interface/android/gradlew.bat
new file mode 100644
index 00000000..7101f8e4
--- /dev/null
+++ b/src/interface/android/gradlew.bat
@@ -0,0 +1,92 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/src/interface/android/manifest-checksum.txt b/src/interface/android/manifest-checksum.txt
new file mode 100644
index 00000000..d3280ee8
--- /dev/null
+++ b/src/interface/android/manifest-checksum.txt
@@ -0,0 +1 @@
+6ee1711cf4f745dafc80c1cc13c3025342a0f5da
diff --git a/src/interface/android/settings.gradle b/src/interface/android/settings.gradle
new file mode 100644
index 00000000..e7b4def4
--- /dev/null
+++ b/src/interface/android/settings.gradle
@@ -0,0 +1 @@
+include ':app'
diff --git a/src/interface/android/store_icon.png b/src/interface/android/store_icon.png
new file mode 100644
index 00000000..93b5729d
Binary files /dev/null and b/src/interface/android/store_icon.png differ
diff --git a/src/interface/android/twa-manifest.json b/src/interface/android/twa-manifest.json
new file mode 100644
index 00000000..9b462834
--- /dev/null
+++ b/src/interface/android/twa-manifest.json
@@ -0,0 +1,55 @@
+{
+  "packageId": "dev.khoj.app",
+  "host": "app.khoj.dev",
+  "name": "Khoj AI",
+  "launcherName": "Khoj",
+  "display": "standalone",
+  "themeColor": "#FFFFFF",
+  "themeColorDark": "#000000",
+  "navigationColor": "#000000",
+  "navigationColorDark": "#000000",
+  "navigationDividerColor": "#000000",
+  "navigationDividerColorDark": "#000000",
+  "backgroundColor": "#FFFFFF",
+  "enableNotifications": true,
+  "startUrl": "/",
+  "iconUrl": "https://assets.khoj.dev/khoj_lantern_1200x1200.png",
+  "splashScreenFadeOutDuration": 300,
+  "signingKey": {
+    "path": "android.keystore",
+    "alias": "android"
+  },
+  "appVersionName": "4",
+  "appVersionCode": 4,
+  "shortcuts": [],
+  "generatorApp": "bubblewrap-cli",
+  "webManifestUrl": "https://app.khoj.dev/static/khoj.webmanifest",
+  "fallbackType": "customtabs",
+  "features": {
+    "locationDelegation": {
+      "enabled": true
+    }
+  },
+  "alphaDependencies": {
+    "enabled": false
+  },
+  "enableSiteSettingsShortcut": true,
+  "isChromeOSOnly": false,
+  "isMetaQuest": false,
+  "fullScopeUrl": "https://app.khoj.dev/",
+  "minSdkVersion": 19,
+  "orientation": "natural",
+  "fingerprints": [
+    {
+      "name": "signing",
+      "value": "CC:98:4A:0A:F1:CC:84:26:AC:02:86:49:AA:69:64:B9:5E:63:A3:EF:18:56:EA:CA:13:C1:3A:15:CA:49:77:46"
+    },
+    {
+      "name": "upload",
+      "value": "D4:5A:6F:6C:18:28:D2:1C:78:27:92:C6:AC:DB:4C:12:C4:52:A1:88:9B:A1:F5:67:D1:22:FE:A0:0F:B1:AE:92"
+    }
+  ],
+  "additionalTrustedOrigins": [],
+  "retainedBundles": [],
+  "appVersion": "4"
+}
diff --git a/src/interface/desktop/assets/icons/chat.svg b/src/interface/desktop/assets/icons/chat.svg
deleted file mode 100644
index a5cbf3af..00000000
--- a/src/interface/desktop/assets/icons/chat.svg
+++ /dev/null
@@ -1,24 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg"
-   width="800px"
-   height="800px"
-   viewBox="0 0 24 24"
-   fill="none"
-   version="1.1">
-  <path
-     d="m 14.024348,9.8497703 0.04627,1.9750167"
-     stroke="#1c274c"
-     stroke-width="1.77073"
-     stroke-linecap="round" />
-  <path
-     d="m 9.6453624,9.7953624 0.046275,1.9750166"
-     stroke="#1c274c"
-     stroke-width="1.77072"
-     stroke-linecap="round" />
-  <path
-     d="m 11.90538,2.3619994 c -5.4939109,0 -9.6890976,4.0608185 -9.6890976,9.8578926 0,1.477202 0.2658016,2.542848 0.6989332,3.331408 0.433559,0.789293 1.0740097,1.372483 1.9230615,1.798517 1.7362861,0.87132 4.1946007,1.018626 7.0671029,1.018626 0.317997,0 0.593711,0.167879 0.784844,0.458501 0.166463,0.253124 0.238617,0.552748 0.275566,0.787233 0.07263,0.460801 0.05871,1.030165 0.04785,1.474824 v 4.8e-5 l -2.26e-4,0.0091 c -0.0085,0.348246 -0.01538,0.634247 -0.0085,0.861186 0.105589,-0.07971 0.227925,-0.185287 0.36735,-0.31735 0.348613,-0.330307 0.743513,-0.767362 1.176607,-1.246635 l 0.07837,-0.08673 c 0.452675,-0.500762 0.941688,-1.037938 1.41216,-1.473209 0.453774,-0.419787 0.969948,-0.822472 1.476003,-0.953853 1.323661,-0.343655 2.330132,-0.904027 3.005749,-1.76381 0.658957,-0.838568 1.073167,-2.051868 1.073167,-3.898667 0,-5.7970748 -4.195186,-9.8578946 -9.689097,-9.8578946 z M 0.92440678,12.219892 c 0,-7.0067939 5.05909412,-11.47090892 10.98097322,-11.47090892 5.921878,0 10.980972,4.46411502 10.980972,11.47090892 0,2.172259 -0.497596,3.825405 -1.442862,5.028357 -0.928601,1.181693 -2.218843,1.837914 -3.664937,2.213334 -0.211641,0.05502 -0.53529,0.268579 -0.969874,0.670658 -0.417861,0.386604 -0.865628,0.876836 -1.324566,1.384504 l -0.09131,0.101202 c -0.419252,0.464136 -0.849637,0.94059 -1.239338,1.309807 -0.210187,0.199169 -0.425281,0.383422 -0.635348,0.523424 -0.200911,0.133819 -0.449635,0.263369 -0.716376,0.281474 -0.327812,0.02226 -0.61539,-0.149209 -0.804998,-0.457293 -0.157614,-0.255993 -0.217622,-0.557143 -0.246564,-0.778198 -0.0542,-0.414027 -0.04101,-0.933065 -0.03027,-1.355183 l 0.0024,-0.0922 c 0.01099,-0.463865 0.01489,-0.820507 -0.01611,-1.06842 C 8.9434608,19.975238 6.3139711,19.828758 4.356743,18.84659 3.3355029,18.334136 2.4624526,17.578678 1.8500164,16.463713 1.2372016,15.348029 0.92459928,13.943803 0.92459928,12.219967 Z"
-     clip-rule="evenodd"
-     stroke-width="0.360886"
-     fill="#1c274c"
-     fill-rule="evenodd"
-     fill-opacity="1" />
-</svg>
diff --git a/src/interface/desktop/assets/icons/circular-add.svg b/src/interface/desktop/assets/icons/circular-add.svg
deleted file mode 100644
index 9e6ac67b..00000000
--- a/src/interface/desktop/assets/icons/circular-add.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M15 12L12 12M12 12L9 12M12 12L12 9M12 12L12 15" stroke="#1C274C" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M7 3.33782C8.47087 2.48697 10.1786 2 12 2C17.5228 2 22 6.47715 22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 10.1786 2.48697 8.47087 3.33782 7" stroke="#1C274C" stroke-width="1.5" stroke-linecap="round"/>
-</svg>
diff --git a/src/interface/desktop/assets/icons/clock.svg b/src/interface/desktop/assets/icons/clock.svg
new file mode 100644
index 00000000..e9ac78df
--- /dev/null
+++ b/src/interface/desktop/assets/icons/clock.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><rect width="256" height="256" fill="none"/><polyline points="128 80 128 128 168 152" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><polyline points="184 104 224 104 224 64" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><path d="M188.4,192a88,88,0,1,1,1.83-126.23C202,77.69,211.72,88.93,224,104" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/></svg>
diff --git a/src/interface/desktop/assets/icons/confirm-icon.svg b/src/interface/desktop/assets/icons/confirm-icon.svg
deleted file mode 100644
index 98d30500..00000000
--- a/src/interface/desktop/assets/icons/confirm-icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 122.88 122.88"><defs><style>.cls-1{fill:#00a912;}.cls-1,.cls-2{fill-rule:evenodd;}.cls-2{fill:#fff;}</style></defs><title>confirm</title><path class="cls-1" d="M61.44,0A61.44,61.44,0,1,1,0,61.44,61.44,61.44,0,0,1,61.44,0Z"/><path class="cls-2" d="M42.37,51.68,53.26,62,79,35.87c2.13-2.16,3.47-3.9,6.1-1.19l8.53,8.74c2.8,2.77,2.66,4.4,0,7L58.14,85.34c-5.58,5.46-4.61,5.79-10.26.19L28,65.77c-1.18-1.28-1.05-2.57.24-3.84l9.9-10.27c1.5-1.58,2.7-1.44,4.22,0Z"/></svg>
diff --git a/src/interface/desktop/assets/icons/file-not-synced.svg b/src/interface/desktop/assets/icons/file-not-synced.svg
index 227d51d3..62d1425c 100644
--- a/src/interface/desktop/assets/icons/file-not-synced.svg
+++ b/src/interface/desktop/assets/icons/file-not-synced.svg
@@ -1,9 +1 @@
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Transformed by: SVG Repo Mixer Tools -->
-<svg width="800px" height="800px" viewBox="-2.4 -2.4 28.80 28.80" fill="none" xmlns="http://www.w3.org/2000/svg">
-
<g id="SVGRepo_bgCarrier" stroke-width="0">
-
<rect x="-2.4" y="-2.4" width="28.80" height="28.80" rx="14.4" fill="#ffad9f" strokewidth="0"/>
-
</g>
-
<g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"/>
-
<g id="SVGRepo_iconCarrier"> <path d="M22 12.3529C22 15.0599 20.0726 17.3221 17.5 17.8722M6.28571 18C3.91878 18 2 16.1038 2 13.7647C2 11.4256 3.91878 9.52941 6.28571 9.52941C6.56983 9.52941 6.8475 9.55673 7.11616 9.60887M14.381 7.02721C14.9767 6.81911 15.6178 6.70588 16.2857 6.70588C16.9404 6.70588 17.5693 6.81468 18.1551 7.01498M7.11616 9.60887C6.88706 8.9978 6.7619 8.33687 6.7619 7.64706C6.7619 4.52827 9.32028 2 12.4762 2C15.4159 2 17.8371 4.19371 18.1551 7.01498M7.11616 9.60887C7.68059 9.71839 8.20528 9.9374 8.66667 10.2426M18.1551 7.01498C18.8381 7.24853 19.4623 7.60648 20 8.06141" stroke="#d42400" stroke-width="1.5" stroke-linecap="round"/> <path d="M8.5 17C8.5 15.5858 8.5 14.8787 8.93934 14.4393C9.37868 14 10.0858 14 11.5 14H12.5C13.9142 14 14.6213 14 15.0607 14.4393C15.5 14.8787 15.5 15.5858 15.5 17V19C15.5 20.4142 15.5 21.1213 15.0607 21.5607C14.6213 22 13.9142 22 12.5 22H11.5C10.0858 22 9.37868 22 8.93934 21.5607C8.5 21.1213 8.5 20.4142 8.5 19V17Z" stroke="#d42400" stroke-width="1.5"/> <path d="M11 18H13" stroke="#d42400" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/> </g>
-
</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><rect width="256" height="256" fill="none"/><line x1="48" y1="40" x2="208" y2="216" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><path d="M193.89,200.49A79.66,79.66,0,0,1,160,208H72A56,56,0,1,1,85.92,97.74" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><path d="M112.63,63.52A80,80,0,0,1,219.68,181.28" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><path d="M80,128A79.68,79.68,0,0,1,91.07,87.37" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/></svg>
diff --git a/src/interface/desktop/assets/icons/file-synced.svg b/src/interface/desktop/assets/icons/file-synced.svg
index c584a86d..c19d8446 100644
--- a/src/interface/desktop/assets/icons/file-synced.svg
+++ b/src/interface/desktop/assets/icons/file-synced.svg
@@ -1,9 +1 @@
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Transformed by: SVG Repo Mixer Tools -->
-<svg width="800px" height="800px" viewBox="-2.4 -2.4 28.80 28.80" fill="none" xmlns="http://www.w3.org/2000/svg" stroke="#16ba00">
-
<g id="SVGRepo_bgCarrier" stroke-width="0">
-
<rect x="-2.4" y="-2.4" width="28.80" height="28.80" rx="14.4" fill="#7aff00" strokewidth="0"/>
-
</g>
-
<g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"/>
-
<g id="SVGRepo_iconCarrier"> <path d="M22 13.3529C22 16.0599 20.0726 18.3221 17.5 18.8722M6.28571 19C3.91878 19 2 17.1038 2 14.7647C2 12.4256 3.91878 10.5294 6.28571 10.5294C6.56983 10.5294 6.8475 10.5567 7.11616 10.6089M14.381 8.02721C14.9767 7.81911 15.6178 7.70588 16.2857 7.70588C16.9404 7.70588 17.5693 7.81468 18.1551 8.01498M7.11616 10.6089C6.88706 9.9978 6.7619 9.33687 6.7619 8.64706C6.7619 5.52827 9.32028 3 12.4762 3C15.4159 3 17.8371 5.19371 18.1551 8.01498M7.11616 10.6089C7.68059 10.7184 8.20528 10.9374 8.66667 11.2426M18.1551 8.01498C18.8381 8.24853 19.4623 8.60648 20 9.06141" stroke="#16ba00" stroke-width="1.5" stroke-linecap="round"/> <path d="M10 19.8L11.1429 21L14 18" stroke="#16ba00" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/> </g>
-
</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><rect width="256" height="256" fill="none"/><path d="M80,128a80,80,0,1,1,80,80H72A56,56,0,1,1,85.92,97.74" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><polyline points="120 136 144 160 192 112" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/></svg>
diff --git a/src/interface/desktop/assets/icons/folder.svg b/src/interface/desktop/assets/icons/folder.svg
deleted file mode 100644
index c7003a64..00000000
--- a/src/interface/desktop/assets/icons/folder.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-	 viewBox="0 0 512 512" xml:space="preserve">
-<path id="SVGCleanerId_0" style="fill:#FFC36E;" d="M183.295,123.586H55.05c-6.687,0-12.801-3.778-15.791-9.76l-12.776-25.55
-	l12.776-25.55c2.99-5.982,9.103-9.76,15.791-9.76h128.246c6.687,0,12.801,3.778,15.791,9.76l12.775,25.55l-12.776,25.55
-	C196.096,119.808,189.983,123.586,183.295,123.586z"/>
-<g>
-	<path id="SVGCleanerId_0_1_" style="fill:#FFC36E;" d="M183.295,123.586H55.05c-6.687,0-12.801-3.778-15.791-9.76l-12.776-25.55
-		l12.776-25.55c2.99-5.982,9.103-9.76,15.791-9.76h128.246c6.687,0,12.801,3.778,15.791,9.76l12.775,25.55l-12.776,25.55
-		C196.096,119.808,189.983,123.586,183.295,123.586z"/>
-</g>
-<path style="fill:#EFF2FA;" d="M485.517,70.621H26.483c-4.875,0-8.828,3.953-8.828,8.828v44.138h476.69V79.448
-	C494.345,74.573,490.392,70.621,485.517,70.621z"/>
-<rect x="17.655" y="105.931" style="fill:#E1E6F2;" width="476.69" height="17.655"/>
-<path style="fill:#FFD782;" d="M494.345,88.276H217.318c-3.343,0-6.4,1.889-7.895,4.879l-10.336,20.671
-	c-2.99,5.982-9.105,9.76-15.791,9.76H55.05c-6.687,0-12.801-3.778-15.791-9.76L28.922,93.155c-1.495-2.99-4.552-4.879-7.895-4.879
-	h-3.372C7.904,88.276,0,96.18,0,105.931v335.448c0,9.751,7.904,17.655,17.655,17.655h476.69c9.751,0,17.655-7.904,17.655-17.655
-	V105.931C512,96.18,504.096,88.276,494.345,88.276z"/>
-<path style="fill:#FFC36E;" d="M485.517,441.379H26.483c-4.875,0-8.828-3.953-8.828-8.828l0,0c0-4.875,3.953-8.828,8.828-8.828
-	h459.034c4.875,0,8.828,3.953,8.828,8.828l0,0C494.345,437.427,490.392,441.379,485.517,441.379z"/>
-<path style="fill:#EFF2FA;" d="M326.621,220.69h132.414c4.875,0,8.828-3.953,8.828-8.828v-70.621c0-4.875-3.953-8.828-8.828-8.828
-	H326.621c-4.875,0-8.828,3.953-8.828,8.828v70.621C317.793,216.737,321.746,220.69,326.621,220.69z"/>
-<path style="fill:#C7CFE2;" d="M441.379,167.724h-97.103c-4.875,0-8.828-3.953-8.828-8.828l0,0c0-4.875,3.953-8.828,8.828-8.828
-	h97.103c4.875,0,8.828,3.953,8.828,8.828l0,0C450.207,163.772,446.254,167.724,441.379,167.724z"/>
-<path style="fill:#D7DEED;" d="M441.379,203.034h-97.103c-4.875,0-8.828-3.953-8.828-8.828l0,0c0-4.875,3.953-8.828,8.828-8.828
-	h97.103c4.875,0,8.828,3.953,8.828,8.828l0,0C450.207,199.082,446.254,203.034,441.379,203.034z"/>
-</svg>
diff --git a/src/interface/desktop/assets/icons/key.svg b/src/interface/desktop/assets/icons/key.svg
deleted file mode 100644
index 437688fb..00000000
--- a/src/interface/desktop/assets/icons/key.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M22 8.29344C22 11.7692 19.1708 14.5869 15.6807 14.5869C15.0439 14.5869 13.5939 14.4405 12.8885 13.8551L12.0067 14.7333C11.4883 15.2496 11.6283 15.4016 11.8589 15.652C11.9551 15.7565 12.0672 15.8781 12.1537 16.0505C12.1537 16.0505 12.8885 17.075 12.1537 18.0995C11.7128 18.6849 10.4783 19.5045 9.06754 18.0995L8.77362 18.3922C8.77362 18.3922 9.65538 19.4167 8.92058 20.4412C8.4797 21.0267 7.30403 21.6121 6.27531 20.5876L5.2466 21.6121C4.54119 22.3146 3.67905 21.9048 3.33616 21.6121L2.45441 20.7339C1.63143 19.9143 2.1115 19.0264 2.45441 18.6849L10.0963 11.0743C10.0963 11.0743 9.3615 9.90338 9.3615 8.29344C9.3615 4.81767 12.1907 2 15.6807 2C19.1708 2 22 4.81767 22 8.29344ZM15.681 10.4889C16.8984 10.4889 17.8853 9.50601 17.8853 8.29353C17.8853 7.08105 16.8984 6.09814 15.681 6.09814C14.4635 6.09814 13.4766 7.08105 13.4766 8.29353C13.4766 9.50601 14.4635 10.4889 15.681 10.4889Z" fill="#1C274C"/>
-</svg>
diff --git a/src/interface/desktop/assets/icons/khoj-logo-sideways-200.png b/src/interface/desktop/assets/icons/khoj-logo-sideways-200.png
deleted file mode 100644
index 52ccdfa4..00000000
Binary files a/src/interface/desktop/assets/icons/khoj-logo-sideways-200.png and /dev/null differ
diff --git a/src/interface/desktop/assets/icons/khoj-logo-sideways-500.png b/src/interface/desktop/assets/icons/khoj-logo-sideways-500.png
deleted file mode 100644
index 765d6e33..00000000
Binary files a/src/interface/desktop/assets/icons/khoj-logo-sideways-500.png and /dev/null differ
diff --git a/src/interface/desktop/assets/icons/khoj_logo.png b/src/interface/desktop/assets/icons/khoj_logo.png
new file mode 100644
index 00000000..a3301e62
Binary files /dev/null and b/src/interface/desktop/assets/icons/khoj_logo.png differ
diff --git a/src/interface/desktop/assets/icons/link.svg b/src/interface/desktop/assets/icons/link.svg
deleted file mode 100644
index 43852d95..00000000
--- a/src/interface/desktop/assets/icons/link.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.16488 17.6505C8.92513 17.8743 8.73958 18.0241 8.54996 18.1336C7.62175 18.6695 6.47816 18.6695 5.54996 18.1336C5.20791 17.9361 4.87912 17.6073 4.22153 16.9498C3.56394 16.2922 3.23514 15.9634 3.03767 15.6213C2.50177 14.6931 2.50177 13.5495 3.03767 12.6213C3.23514 12.2793 3.56394 11.9505 4.22153 11.2929L7.04996 8.46448C7.70755 7.80689 8.03634 7.47809 8.37838 7.28062C9.30659 6.74472 10.4502 6.74472 11.3784 7.28061C11.7204 7.47809 12.0492 7.80689 12.7068 8.46448C13.3644 9.12207 13.6932 9.45086 13.8907 9.7929C14.4266 10.7211 14.4266 11.8647 13.8907 12.7929C13.7812 12.9825 13.6314 13.1681 13.4075 13.4078M10.5919 10.5922C10.368 10.8319 10.2182 11.0175 10.1087 11.2071C9.57284 12.1353 9.57284 13.2789 10.1087 14.2071C10.3062 14.5492 10.635 14.878 11.2926 15.5355C11.9502 16.1931 12.279 16.5219 12.621 16.7194C13.5492 17.2553 14.6928 17.2553 15.621 16.7194C15.9631 16.5219 16.2919 16.1931 16.9495 15.5355L19.7779 12.7071C20.4355 12.0495 20.7643 11.7207 20.9617 11.3787C21.4976 10.4505 21.4976 9.30689 20.9617 8.37869C20.7643 8.03665 20.4355 7.70785 19.7779 7.05026C19.1203 6.39267 18.7915 6.06388 18.4495 5.8664C17.5212 5.3305 16.3777 5.3305 15.4495 5.8664C15.2598 5.97588 15.0743 6.12571 14.8345 6.34955" stroke="#000000" stroke-width="2" stroke-linecap="round"/>
-</svg>
diff --git a/src/interface/desktop/assets/icons/microphone-solid.svg b/src/interface/desktop/assets/icons/microphone-solid.svg
deleted file mode 100644
index 3fc4b91d..00000000
--- a/src/interface/desktop/assets/icons/microphone-solid.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M192 0C139 0 96 43 96 96V256c0 53 43 96 96 96s96-43 96-96V96c0-53-43-96-96-96zM64 216c0-13.3-10.7-24-24-24s-24 10.7-24 24v40c0 89.1 66.2 162.7 152 174.4V464H120c-13.3 0-24 10.7-24 24s10.7 24 24 24h72 72c13.3 0 24-10.7 24-24s-10.7-24-24-24H216V430.4c85.8-11.7 152-85.3 152-174.4V216c0-13.3-10.7-24-24-24s-24 10.7-24 24v40c0 70.7-57.3 128-128 128s-128-57.3-128-128V216z"/></svg>
diff --git a/src/interface/desktop/assets/icons/open-link.svg b/src/interface/desktop/assets/icons/open-link.svg
new file mode 100644
index 00000000..abaa88ad
--- /dev/null
+++ b/src/interface/desktop/assets/icons/open-link.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><rect width="256" height="256" fill="none"/><polyline points="216 104 215.99 40.01 152 40" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><line x1="136" y1="120" x2="216" y2="40" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><path d="M184,136v72a8,8,0,0,1-8,8H48a8,8,0,0,1-8-8V80a8,8,0,0,1,8-8h72" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/></svg>
diff --git a/src/interface/desktop/assets/icons/plaintext.svg b/src/interface/desktop/assets/icons/plaintext.svg
deleted file mode 100644
index 92233c24..00000000
--- a/src/interface/desktop/assets/icons/plaintext.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 100 100" width="100px" height="100px"><path fill="#fefdef" d="M29.614,12.307h-1.268c-4.803,0-8.732,3.93-8.732,8.732v61.535c0,4.803,3.93,8.732,8.732,8.732h43.535c4.803,0,8.732-3.93,8.732-8.732v-50.02C72.74,24.68,68.241,20.182,60.367,12.307H41.614"/><path fill="#1f212b" d="M71.882,92.307H28.347c-5.367,0-9.732-4.366-9.732-9.732V21.04c0-5.367,4.366-9.732,9.732-9.732h1.268c0.552,0,1,0.448,1,1s-0.448,1-1,1h-1.268c-4.264,0-7.732,3.469-7.732,7.732v61.535c0,4.264,3.469,7.732,7.732,7.732h43.535c4.264,0,7.732-3.469,7.732-7.732V32.969L59.953,13.307H41.614c-0.552,0-1-0.448-1-1s0.448-1,1-1h18.752c0.265,0,0.52,0.105,0.707,0.293l20.248,20.248c0.188,0.188,0.293,0.442,0.293,0.707v50.02C81.614,87.941,77.248,92.307,71.882,92.307z"/><path fill="#fef6aa" d="M60.114,12.807v10.986c0,4.958,4.057,9.014,9.014,9.014h11.986"/><path fill="#1f212b" d="M81.114 33.307H69.129c-5.247 0-9.515-4.268-9.515-9.515V12.807c0-.276.224-.5.5-.5s.5.224.5.5v10.985c0 4.695 3.82 8.515 8.515 8.515h11.985c.276 0 .5.224.5.5S81.391 33.307 81.114 33.307zM75.114 51.307c-.276 0-.5-.224-.5-.5v-3c0-.276.224-.5.5-.5s.5.224.5.5v3C75.614 51.083 75.391 51.307 75.114 51.307zM75.114 59.307c-.276 0-.5-.224-.5-.5v-6c0-.276.224-.5.5-.5s.5.224.5.5v6C75.614 59.083 75.391 59.307 75.114 59.307zM67.956 86.307H32.272c-4.223 0-7.658-3.45-7.658-7.689V25.955c0-2.549 1.264-4.931 3.382-6.371.228-.156.54-.095.695.132.155.229.096.54-.132.695-1.844 1.254-2.944 3.326-2.944 5.544v52.663c0 3.688 2.987 6.689 6.658 6.689h35.685c3.671 0 6.658-3.001 6.658-6.689V60.807c0-.276.224-.5.5-.5s.5.224.5.5v17.811C75.614 82.857 72.179 86.307 67.956 86.307z"/><path fill="#1f212b" d="M39.802 14.307l-.117 11.834c0 2.21-2.085 3.666-4.036 3.666-1.951 0-4.217-1.439-4.217-3.649l.037-12.58c0-1.307 1.607-2.451 2.801-2.451 1.194 0 2.345 1.149 2.345 2.456l.021 10.829c0 0-.083.667-1.005.645-.507-.012-1.145-.356-1.016-.906v-9.843h-.813l-.021 9.708c0 1.38.54 1.948 1.875 1.948s1.959-.714 1.959-2.094V13.665c0-2.271-1.36-3.5-3.436-3.5s-3.564 1.261-3.564 3.532l.032 12.11c0 3.04 2.123 4.906 4.968 4.906 2.845 0 5-1.71 5-4.75V14.307H39.802zM53.114 52.307h-23c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h23c.276 0 .5.224.5.5S53.391 52.307 53.114 52.307zM44.114 59.307h-14c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h14c.276 0 .5.224.5.5S44.391 59.307 44.114 59.307zM70.114 59.307h-24c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h24c.276 0 .5.224.5.5S70.391 59.307 70.114 59.307zM61.114 66.307h-11c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h11c.276 0 .5.224.5.5S61.391 66.307 61.114 66.307zM71.114 66.307h-8c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h8c.276 0 .5.224.5.5S71.391 66.307 71.114 66.307zM48.114 66.307h-18c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h18c.276 0 .5.224.5.5S48.391 66.307 48.114 66.307zM70.114 73.307h-13c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h13c.276 0 .5.224.5.5S70.391 73.307 70.114 73.307zM54.114 73.307h-24c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h24c.276 0 .5.224.5.5S54.391 73.307 54.114 73.307z"/></svg>
diff --git a/src/interface/desktop/assets/icons/question-mark-icon.svg b/src/interface/desktop/assets/icons/question-mark-icon.svg
deleted file mode 100644
index fde2e972..00000000
--- a/src/interface/desktop/assets/icons/question-mark-icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" image-rendering="optimizeQuality" fill-rule="evenodd" clip-rule="evenodd" viewBox="0 0 512 512"><path fill-rule="nonzero" d="M256 0c70.69 0 134.7 28.66 181.02 74.98C483.34 121.31 512 185.31 512 256c0 70.69-28.66 134.7-74.98 181.02C390.7 483.34 326.69 512 256 512c-70.69 0-134.69-28.66-181.02-74.98C28.66 390.7 0 326.69 0 256c0-70.69 28.66-134.69 74.98-181.02C121.31 28.66 185.31 0 256 0zm-21.49 301.51v-2.03c.16-13.46 1.48-24.12 4.07-32.05 2.54-7.92 6.19-14.37 10.97-19.25 4.77-4.92 10.51-9.39 17.22-13.46 4.31-2.74 8.22-5.78 11.68-9.18 3.45-3.36 6.19-7.27 8.23-11.69 2.02-4.37 3.04-9.24 3.04-14.62 0-6.4-1.52-11.94-4.57-16.66-3-4.68-7.06-8.28-12.04-10.87-5.03-2.54-10.61-3.81-16.76-3.81-5.53 0-10.81 1.11-15.89 3.45-5.03 2.29-9.25 5.89-12.55 10.77-3.3 4.87-5.23 11.12-5.74 18.74h-32.91c.51-12.95 3.81-23.92 9.85-32.91 6.1-8.99 14.13-15.8 24.08-20.42 10.01-4.62 21.08-6.9 33.16-6.9 13.31 0 24.89 2.43 34.84 7.41 9.96 4.93 17.73 11.83 23.27 20.67 5.48 8.84 8.28 19.1 8.28 30.88 0 8.08-1.27 15.34-3.81 21.79-2.54 6.45-6.1 12.24-10.77 17.27-4.68 5.08-10.21 9.54-16.71 13.41-6.15 3.86-11.12 7.82-14.88 11.93-3.81 4.11-6.56 8.99-8.28 14.58-1.73 5.63-2.69 12.59-2.84 20.92v2.03h-30.94zm16.36 65.82c-5.94-.04-11.02-2.13-15.29-6.35-4.26-4.21-6.35-9.34-6.35-15.33 0-5.89 2.09-10.97 6.35-15.19 4.27-4.21 9.35-6.35 15.29-6.35 5.84 0 10.92 2.14 15.18 6.35 4.32 4.22 6.45 9.3 6.45 15.19 0 3.96-1.01 7.62-2.99 10.87-1.98 3.3-4.57 5.94-7.82 7.87-3.25 1.93-6.86 2.9-10.82 2.94zM417.71 94.29C376.33 52.92 319.15 27.32 256 27.32c-63.15 0-120.32 25.6-161.71 66.97C52.92 135.68 27.32 192.85 27.32 256c0 63.15 25.6 120.33 66.97 161.71 41.39 41.37 98.56 66.97 161.71 66.97 63.15 0 120.33-25.6 161.71-66.97 41.37-41.38 66.97-98.56 66.97-161.71 0-63.15-25.6-120.32-66.97-161.71z"/></svg>
diff --git a/src/interface/desktop/assets/icons/search.svg b/src/interface/desktop/assets/icons/search.svg
deleted file mode 100644
index f0e463f2..00000000
--- a/src/interface/desktop/assets/icons/search.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg"
-   width="800px"
-   height="800px"
-   viewBox="0 0 24 24"
-   fill="none"
-   version="1.1">
-  <path
-     d="m 18.562765,17.147843 c 1.380497,-1.679442 2.307667,-4.013099 2.307667,-6.330999 C 20.870432,5.3951476 16.353958,1 10.782674,1 5.2113555,1 0.69491525,5.3951476 0.69491525,10.816844 c 0,5.421663 4.51644025,9.816844 10.08775875,9.816844 2.381867,0 4.570922,-0.803307 6.296712,-2.14673 0.508475,-0.508475 4.514633,4.192839 4.514633,4.192839 1.036377,1.008544 2.113087,-0.02559 1.07671,-1.034139 z m -7.780091,1.925408 c -4.3394583,0 -8.6708434,-4.033489 -8.6708434,-8.256407 0,-4.2229187 4.3313851,-8.2564401 8.6708434,-8.2564401 4.339458,0 8.670809,4.2369112 8.670809,8.4598301 0,4.222918 -4.331351,8.053017 -8.670809,8.053017 z"
-     fill="#1c274c"
-     fill-rule="evenodd"
-     clip-rule="evenodd"
-     fill-opacity="1"
-     stroke-width="1.10519"
-     stroke-dasharray="none" />
-  <path
-     d="m 13.337351,9.3402647 0.05184,2.1532893"
-     stroke="#1c274c"
-     stroke-width="1.95702"
-     stroke-linecap="round" />
-  <path
-     d="M 8.431347,9.2809457 8.483191,11.434235"
-     stroke="#1c274c"
-     stroke-width="1.95701"
-     stroke-linecap="round" />
-</svg>
diff --git a/src/interface/desktop/assets/icons/stop-solid.svg b/src/interface/desktop/assets/icons/stop-solid.svg
deleted file mode 100644
index a9aaba28..00000000
--- a/src/interface/desktop/assets/icons/stop-solid.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   viewBox="0 0 384 512"
-   version="1.1"
-   id="svg1"
-   sodipodi:docname="stop-solid.svg"
-   inkscape:version="1.3 (0e150ed, 2023-07-21)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs1" />
-  <sodipodi:namedview
-     id="namedview1"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:zoom="0.4609375"
-     inkscape:cx="192"
-     inkscape:cy="256"
-     inkscape:window-width="1312"
-     inkscape:window-height="449"
-     inkscape:window-x="0"
-     inkscape:window-y="88"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg1" />
-  <!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. -->
-  <path
-     d="M0 128C0 92.7 28.7 64 64 64H320c35.3 0 64 28.7 64 64V384c0 35.3-28.7 64-64 64H64c-35.3 0-64-28.7-64-64V128z"
-     id="path1"
-     style="fill:#aa0000" />
-</svg>
diff --git a/src/interface/desktop/assets/icons/trash-solid.svg b/src/interface/desktop/assets/icons/trash-solid.svg
index 768d80f8..3b67fe45 100644
--- a/src/interface/desktop/assets/icons/trash-solid.svg
+++ b/src/interface/desktop/assets/icons/trash-solid.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M135.2 17.7L128 32H32C14.3 32 0 46.3 0 64S14.3 96 32 96H416c17.7 0 32-14.3 32-32s-14.3-32-32-32H320l-7.2-14.3C307.4 6.8 296.3 0 284.2 0H163.8c-12.1 0-23.2 6.8-28.6 17.7zM416 128H32L53.2 467c1.6 25.3 22.6 45 47.9 45H346.9c25.3 0 46.3-19.7 47.9-45L416 128z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><rect width="256" height="256" fill="none"/><line x1="216" y1="56" x2="40" y2="56" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><line x1="88" y1="24" x2="168" y2="24" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><path d="M200,56V208a8,8,0,0,1-8,8H64a8,8,0,0,1-8-8V56" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/></svg>
diff --git a/src/interface/desktop/assets/icons/upload.svg b/src/interface/desktop/assets/icons/upload.svg
new file mode 100644
index 00000000..2fe72e20
--- /dev/null
+++ b/src/interface/desktop/assets/icons/upload.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><rect width="256" height="256" fill="none"/><path d="M176,128h48a8,8,0,0,1,8,8v64a8,8,0,0,1-8,8H32a8,8,0,0,1-8-8V136a8,8,0,0,1,8-8H80" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><line x1="128" y1="128" x2="128" y2="24" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><polyline points="80 72 128 24 176 72" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><circle cx="188" cy="168" r="12"/></svg>
diff --git a/src/interface/desktop/assets/khoj.css b/src/interface/desktop/assets/khoj.css
index 1f1594d5..9781902f 100644
--- a/src/interface/desktop/assets/khoj.css
+++ b/src/interface/desktop/assets/khoj.css
@@ -8,13 +8,12 @@
     --primary-hover: #fee285;
     --primary-focus: rgba(255, 179, 0, 0.125);
     --primary-inverse: rgba(0, 0, 0, 0.75);
-    --background-color: #f5f4f3;
+    --background-color: #fff;
     --main-text-color: #475569;
     --summer-sun: #fcc50b;
     --water: #44b9da;
     --leaf: #7b990a;
     --flower: #d1684e;
-    --font-family: "Noto Sans", "Noto Sans Arabic", sans-serif !important;
 }
 
 /* Amber Dark scheme (Auto) */
@@ -25,13 +24,12 @@
         --primary-hover: #fee285;
         --primary-focus: rgba(255, 179, 0, 0.25);
         --primary-inverse: rgba(0, 0, 0, 0.75);
-        --background-color: #f5f4f3;
+        --background-color: #fff;
         --main-text-color: #475569;
         --summer-sun: #fcc50b;
         --water: #44b9da;
         --leaf: #7b990a;
         --flower: #d1684e;
-        --font-family: "Noto Sans", "Noto Sans Arabic", sans-serif !important;
     }
 }
 /* Amber Dark scheme (Forced) */
@@ -41,13 +39,12 @@
     --primary-hover: #fcc50b;
     --primary-focus: rgba(255, 179, 0, 0.25);
     --primary-inverse: rgba(0, 0, 0, 0.75);
-    --background-color: #f5f4f3;
+    --background-color: #fff;
     --main-text-color: #475569;
     --summer-sun: #fcc50b;
     --water: #44b9da;
     --leaf: #7b990a;
     --flower: #d1684e;
-    --font-family: "Noto Sans", "Noto Sans Arabic", sans-serif !important;
 }
 /* Amber (Common styles) */
 :root {
@@ -90,36 +87,46 @@ nav.khoj-nav {
     grid-gap: 32px;
     justify-self: right;
     align-items: center;
-  }
+}
 
-  .khoj-status-box {
+.khoj-status-box {
     display: flex;
     align-items: center;
-    justify-content: center;
-    min-width: 52px;
-    gap: 4px;
-    -webkit-app-region: no-drag;
+    padding: 8px 12px;
+    border-radius: 16px;
+    font-size: 14px;
+    font-weight: 500;
+    background-color: #f5f5f5; /* Neutral background */
+    color: #333; /* Neutral text color */
+    box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1); /* Subtle shadow */
+    transition: background-color 0.3s ease, color 0.3s ease;
 }
 
-  .khoj-status-box .khoj-status-connected {
-    height: 12px;
-    width: 12px;
+.khoj-status-connected {
+    width: 10px;
+    height: 10px;
     border-radius: 50%;
-    background-color: rgb(90, 235, 90);
-  }
-  .khoj-status-box .khoj-status-not-connected {
-    height: 12px;
-    width: 12px;
-    border-radius: 50%;
-    background-color: rgb(235, 90, 90);
-  }
-
-  .khoj-status-box .khoj-status-text {
-    display: none;
+    background-color: #4CAF50; /* Green for connected */
+    margin-right: 8px;
+}
+
+.khoj-status-not-connected {
+    width: 10px;
+    height: 10px;
+    border-radius: 50%;
+    background-color: #F44336; /* Red for not connected */
+    margin-right: 8px;
+}
+
+.khoj-status-text {
+    color: #333; /* Neutral text color */
+    font-family: inherit;
+}
+
+.khoj-status-box:hover {
+    background-color: #e0e0e0; /* Slightly darker background on hover */
+    color: #000; /* Darker text on hover */
 }
-.khoj-status-box:hover .khoj-status-text {
-    display: block;
-  }
 
 a.khoj-nav {
     display: flex;
@@ -188,18 +195,18 @@ img.khoj-logo {
 .khoj-nav-dropdown-content.show {
     opacity: 1;
     pointer-events: auto;
-    border-radius: 20px;
+    border-radius: 8px;
 }
 .khoj-nav-dropdown-content a {
     color: black;
     padding: 12px 16px;
     text-decoration: none;
     display: block;
-    border-radius: 20px;
 }
 .khoj-nav-dropdown-content a:hover {
-    background-color: var(--primary-hover);
+    background-color: hsla(24.6 95% 53.1% / 0.125);
 }
+
 .khoj-nav-username {
     padding: 12px 16px;
     text-decoration: none;
@@ -233,6 +240,17 @@ img.khoj-logo {
     border: 3px solid var(--primary-hover);
 }
 
+.khoj-nav-icon {
+    width: 20px;
+    height: 20px;
+}
+
+a.khoj-nav-link {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+}
+
 @media screen and (max-width: 600px) {
     .khoj-nav-dropdown-content {
         display: block;
diff --git a/src/interface/desktop/chat.html b/src/interface/desktop/chat.html
deleted file mode 100644
index 4c2258cc..00000000
--- a/src/interface/desktop/chat.html
+++ /dev/null
@@ -1,1744 +0,0 @@
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0 maximum-scale=1.0">
-        <title>Khoj - Chat</title>
-
-        <link rel="stylesheet" href="./assets/khoj.css">
-        <link rel="icon" type="image/png" sizes="128x128" href="./assets/icons/favicon-128x128.png">
-        <link rel="manifest" href="/static/khoj.webmanifest">
-    </head>
-    <script type="text/javascript" src="./assets/purify.min.js?v={{ khoj_version }}"></script>
-    <script type="text/javascript" src="./assets/markdown-it.min.js"></script>
-    <link rel="stylesheet" href="https://assets.khoj.dev/higlightjs/solarized-dark.min.css">
-    <script src="https://assets.khoj.dev/higlightjs/highlight.min.js"></script>
-    <script src="./utils.js"></script>
-    <script src="chatutils.js"></script>
-    <script>
-        // Add keyboard shortcuts to the chat view
-        window.addEventListener("keydown", function(event) {
-            // If enter key is pressed, send the message
-            if (event.key === "Enter" && !event.shiftKey) {
-                event.preventDefault();
-                chat();
-            // If ^O then Open the chat sessions panel
-            } else if (event.key === "o" && event.ctrlKey) {
-                handleCollapseSidePanel();
-            // If ^N then Create a new conversation
-            } else if (event.key === "n" && event.ctrlKey) {
-                createNewConversation();
-            // If ^D then Delete the conversation history
-            } else if (event.key === "d" && event.ctrlKey) {
-                clearConversationHistory();
-            }
-        });
-        let chatOptions = [];
-        function createCopyParentText(message) {
-            return function(event) {
-                copyParentText(event, message);
-            }
-        }
-        function copyParentText(event, message=null) {
-            const button = event.currentTarget;
-            const textContent = message ?? button.parentNode.textContent.trim();
-            navigator.clipboard.writeText(textContent).then(() => {
-                button.firstChild.src = "./assets/icons/copy-button-success.svg";
-                setTimeout(() => {
-                    button.firstChild.src = "./assets/icons/copy-button.svg";
-                }, 1000);
-            }).catch((error) => {
-                console.error("Error copying text to clipboard:", error);
-                const originalButtonText = button.innerHTML;
-                button.innerHTML = "⛔️";
-                setTimeout(() => {
-                    button.innerHTML = originalButtonText;
-                    button.firstChild.src = "./assets/icons/copy-button.svg";
-                }, 2000);
-            });
-        }
-
-        let region = null;
-        let city = null;
-        let countryName = null;
-        let countryCode = null;
-        let timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
-        let chatMessageState = {
-            newResponseTextEl: null,
-            newResponseEl: null,
-            loadingEllipsis: null,
-            references: {},
-            rawResponse: "",
-            isVoice: false,
-        }
-
-        fetch("https://ipapi.co/json")
-            .then(response => response.json())
-            .then(data => {
-                region = data.region;
-                city = data.city;
-                countryName = data.country_name;
-                countryCode = data.country_code;
-                timezone = data.timezone;
-            })
-            .catch(err => {
-                console.log(err);
-                return;
-            });
-
-        async function chat(isVoice=false) {
-            // Extract chat message from chat input form
-            let query = document.getElementById("chat-input").value.trim();
-            console.log(`Query: ${query}`);
-
-            // Short circuit on empty query
-            if (query.length === 0)
-                return;
-
-            // Add message by user to chat body
-            renderMessage(query, "you");
-            document.getElementById("chat-input").value = "";
-            autoResize();
-            document.getElementById("chat-input").setAttribute("disabled", "disabled");
-
-            let chatBody = document.getElementById("chat-body");
-
-            let conversationID = chatBody.dataset.conversationId;
-            let hostURL = await window.hostURLAPI.getURL();
-            const khojToken = await window.tokenAPI.getToken();
-            const headers = { 'Authorization': `Bearer ${khojToken}`, 'Content-Type': 'application/json' };
-
-            if (!conversationID) {
-                let response = await fetch(`${hostURL}/api/chat/sessions`, { method: "POST", headers });
-                let data = await response.json();
-                conversationID = data.conversation_id;
-                chatBody.dataset.conversationId = conversationID;
-                await refreshChatSessionsPanel();
-            }
-
-            let newResponseEl = document.createElement("div");
-            newResponseEl.classList.add("chat-message", "khoj");
-            newResponseEl.attributes["data-meta"] = "🏮 Khoj at " + formatDate(new Date());
-            chatBody.appendChild(newResponseEl);
-
-            let newResponseTextEl = document.createElement("div");
-            newResponseTextEl.classList.add("chat-message-text", "khoj");
-            newResponseEl.appendChild(newResponseTextEl);
-
-            // Temporary status message to indicate that Khoj is thinking
-            let loadingEllipsis = createLoadingEllipsis();
-
-            newResponseTextEl.appendChild(loadingEllipsis);
-            document.getElementById("chat-body").scrollTop = document.getElementById("chat-body").scrollHeight;
-
-            let chatTooltip = document.getElementById("chat-tooltip");
-            chatTooltip.style.display = "none";
-
-            let chatInput = document.getElementById("chat-input");
-            chatInput.classList.remove("option-enabled");
-
-            // Setup chat message state
-            chatMessageState = {
-                newResponseTextEl,
-                newResponseEl,
-                loadingEllipsis,
-                references: {},
-                rawResponse: "",
-                rawQuery: query,
-                isVoice: isVoice,
-            }
-            // Reset toggle to show speak and hide send button
-            document.getElementById("speak-button").style.display = "block";
-            document.getElementById("send-button").style.display = "none";
-
-            // Call Khoj chat API
-            const chatApi = `${hostURL}/api/chat?client=desktop`;
-            const chatApiBody = {
-                q: query,
-                conversation_id: conversationID,
-                stream: true,
-                ...(!!city && { city: city }),
-                ...(!!region && { region: region }),
-                ...(!!countryName && { country: countryName }),
-                ...(!!countryCode && { country_code: countryCode }),
-                ...(!!timezone && { timezone: timezone }),
-            };
-
-            const response = await fetch(chatApi, {
-                method: "POST",
-                headers: headers,
-                body: JSON.stringify(chatApiBody),
-            });
-
-            try {
-                if (!response.ok) throw new Error(response.statusText);
-                if (!response.body) throw new Error("Response body is empty");
-                // Stream and render chat response
-                await readChatStream(response);
-            } catch (err) {
-                console.error(`Khoj chat response failed with\n${err}`);
-                if (chatMessageState.newResponseEl.getElementsByClassName("lds-ellipsis").length > 0 && chatMessageState.loadingEllipsis)
-                    chatMessageState.newResponseTextEl.removeChild(chatMessageState.loadingEllipsis);
-                let errorMsg = "Sorry, unable to get response from Khoj backend ❤️‍🩹. Retry or contact developers for help at <a href=mailto:'team@khoj.dev'>team@khoj.dev</a> or <a href='https://discord.gg/BDgyabRM6e'>on Discord</a>";
-                newResponseTextEl.textContent = errorMsg;
-            }
-        }
-
-        function incrementalChat(event) {
-            if (!event.shiftKey && event.key === 'Enter') {
-                event.preventDefault();
-                chat();
-            }
-        }
-
-        function fillCommandInPrompt(command) {
-            let chatTooltip = document.getElementById("chat-tooltip");
-            chatTooltip.style.display = "none";
-
-            let chatInput = document.getElementById("chat-input");
-            chatInput.value = "/" + command + " ";
-            chatInput.classList.add("option-enabled");
-            chatInput.focus();
-        }
-
-        function onChatInput() {
-            let chatInput = document.getElementById("chat-input");
-            chatInput.value = chatInput.value.trimStart();
-
-            let questionStarterSuggestions = document.getElementById("question-starters");
-            questionStarterSuggestions.innerHTML = "";
-            questionStarterSuggestions.style.display = "none";
-
-            if (chatInput.value.startsWith("/") && chatInput.value.split(" ").length === 1) {
-                let chatTooltip = document.getElementById("chat-tooltip");
-                chatTooltip.style.display = "block";
-                let helpText = "<div>";
-                const command = chatInput.value.split(" ")[0].substring(1);
-                for (let key in chatOptions) {
-                    if (!!!command || key.startsWith(command)) {
-                        helpText += `<div class="helpoption" onclick="fillCommandInPrompt('${key}')"><b>/${key}</b>: ${chatOptions[key]}</div>`;
-                    }
-                }
-                chatTooltip.innerHTML = helpText;
-            } else if (chatInput.value.startsWith("/")) {
-                const firstWord = chatInput.value.split(" ")[0];
-                if (firstWord.substring(1) in chatOptions) {
-                    chatInput.classList.add("option-enabled");
-                } else {
-                    chatInput.classList.remove("option-enabled");
-                }
-                let chatTooltip = document.getElementById("chat-tooltip");
-                chatTooltip.style.display = "none";
-            } else {
-                let chatTooltip = document.getElementById("chat-tooltip");
-                chatTooltip.style.display = "none";
-                chatInput.classList.remove("option-enabled");
-            }
-
-            // Toggle visibility of speak and send buttons
-            let speakButton = document.getElementById("speak-button");
-            let sendButton = document.getElementById("send-button");
-
-            if (chatInput.value.trim().length > 0) {
-                speakButton.style.display = "none";
-                sendButton.style.display = "block";
-            } else {
-                speakButton.style.display = "block";
-                sendButton.style.display = "none";
-            }
-
-            autoResize();
-        }
-
-        function autoResize() {
-            const textarea = document.getElementById('chat-input');
-            const scrollTop = textarea.scrollTop;
-            textarea.style.height = '0';
-            const scrollHeight = textarea.scrollHeight + 8;  // +8 accounts for padding
-            textarea.style.height = Math.min(scrollHeight, 200) + 'px';
-            textarea.scrollTop = scrollTop;
-            document.getElementById("chat-body").scrollTop = document.getElementById("chat-body").scrollHeight;
-        }
-
-        window.addEventListener("DOMContentLoaded", async() => {
-            // Setup the header pane
-            document.getElementById("khoj-header").innerHTML = await populateHeaderPane();
-            // Setup the nav menu
-            document.getElementById("profile-picture").addEventListener("click", toggleNavMenu);
-            // Set the active nav pane
-            document.getElementById("chat-nav")?.classList.add("khoj-nav-selected");
-        })
-
-        window.addEventListener('load', async() => {
-            await loadChat();
-        });
-
-        async function getChatHistoryUrl() {
-            const hostURL = await window.hostURLAPI.getURL();
-            const khojToken = await window.tokenAPI.getToken();
-            const headers = { 'Authorization': `Bearer ${khojToken}` };
-
-            let chatBody = document.getElementById("chat-body");
-            chatBody.innerHTML = "";
-            let chatHistoryUrl = `${hostURL}/api/chat/history?client=desktop`;
-            if (chatBody.dataset.conversationId) {
-                chatHistoryUrl += `&conversation_id=${chatBody.dataset.conversationId}`;
-            }
-            return { chatHistoryUrl, headers };
-        }
-
-        async function loadChat() {
-            // Load chat history and body
-            const hostURL = await window.hostURLAPI.getURL();
-            const { chatHistoryUrl, headers } = await getChatHistoryUrl();
-
-            // Create loading screen and add it to chat-body
-            let loadingScreen = document.createElement('div');
-            loadingScreen.classList.add("loading-spinner");
-            let yellowOrb = document.createElement('div');
-            loadingScreen.appendChild(yellowOrb);
-            let chatBody = document.getElementById("chat-body");
-            chatBody.appendChild(loadingScreen);
-
-            // Get the most recent 10 chat messages from conversation history
-            let firstRunSetupMessageRendered = false;
-            fetch(`${chatHistoryUrl}&n=10`, { headers })
-                .then(response => response.json())
-                .then(data => {
-                    if (data.detail) {
-                        // If the server returns a 500 error with detail, render a setup hint.
-                        renderFirstRunSetupMessage();
-                        firstRunSetupMessageRendered = true;
-                    } else if (data.status != "ok") {
-                        throw new Error(data.message);
-                    } else {
-                        // Set welcome message on load
-                        renderMessage("Hey 👋🏾, what's up?", "khoj");
-                    }
-                    return data.response;
-                })
-                .then(response => {
-                    let chatBody = document.getElementById("chat-body");
-                    chatBody.dataset.conversationId = response.conversation_id;
-                    chatBody.dataset.conversationTitle = response.slug || `New conversation 🌱`;
-
-                    // Create a new IntersectionObserver
-                    let fetchRemainingMessagesObserver = new IntersectionObserver((entries, observer) => {
-                        entries.forEach(entry => {
-                            // If the element is in the viewport, fetch the remaining message and unobserve the element
-                            if (entry.isIntersecting) {
-                                fetchRemainingChatMessages(chatHistoryUrl, headers, chatBody.dataset.conversation_id, hostURL);
-                                observer.unobserve(entry.target);
-                            }
-                        });
-                    }, {rootMargin: '0px 0px 0px 0px'});
-
-                    const fullChatLog = response.chat || [];
-                    fullChatLog.forEach((chat_log, index) => {
-                        if (chat_log.message != null) {
-                            let messageElement = renderMessageWithReference(
-                                chat_log.message,
-                                chat_log.by,
-                                chat_log.context,
-                                new Date(chat_log.created),
-                                chat_log.onlineContext,
-                                chat_log.intent?.type,
-                                chat_log.intent?.["inferred-queries"],
-                                chatBody.dataset.conversationId ?? "",
-                                hostURL,
-                            );
-
-                            chatBody.appendChild(messageElement);
-
-                            // When the 4th oldest message is within viewing distance (~60% scrolled up)
-                            // Fetch the remaining chat messages
-                            if (index === 4) {
-                                fetchRemainingMessagesObserver.observe(messageElement);
-                            }
-                        }
-                        loadingScreen.style.height = chatBody.scrollHeight + 'px';
-                    })
-
-                    // Scroll to bottom of chat-body element
-                    chatBody.scrollTop = chatBody.scrollHeight;
-
-                    // Set height of chat-body element to the height of the chat-body-wrapper
-                    let chatBodyWrapper = document.getElementById("chat-body-wrapper");
-                    let chatBodyWrapperHeight = chatBodyWrapper.clientHeight;
-                    chatBody.style.height = chatBodyWrapperHeight;
-
-                    // Add fade out animation to loading screen and remove it after the animation ends
-                    fadeOutLoadingAnimation(loadingScreen);
-                })
-                .catch(err => {
-                    // If the server returns a 500 error with detail, render a setup hint.
-                    if (!firstRunSetupMessageRendered) {
-                        renderFirstRunSetupMessage();
-                    }
-                    fadeOutLoadingAnimation(loadingScreen);
-                    return;
-                });
-
-            await refreshChatSessionsPanel();
-
-            fetch(`${hostURL}/api/chat/starters?client=desktop`, { headers })
-                .then(response => response.json())
-                .then(data => {
-                    // Render conversation starters, if any
-                    if (data.length > 0) {
-                        let questionStarterSuggestions = document.getElementById("question-starters");
-                        questionStarterSuggestions.innerHTML = "";
-                        data.forEach((questionStarter) => {
-                            let questionStarterButton = document.createElement('button');
-                            questionStarterButton.innerHTML = questionStarter;
-                            questionStarterButton.classList.add("question-starter");
-                            questionStarterButton.addEventListener('click', function() {
-                                questionStarterSuggestions.style.display = "none";
-                                document.getElementById("chat-input").value = questionStarter;
-                                chat();
-                            });
-                            questionStarterSuggestions.appendChild(questionStarterButton);
-                        });
-                        questionStarterSuggestions.style.display = "grid";
-                    }
-                })
-                .catch(err => {
-                    return;
-                });
-
-            fetch(`${hostURL}/api/chat/options`, { headers })
-                .then(response => response.json())
-                .then(data => {
-                    // Render chat options, if any
-                    if (data) {
-                        chatOptions = data;
-                    }
-                })
-                .catch(err => {
-                    return;
-                });
-
-            // Fill query field with value passed in URL query parameters, if any.
-            var query_via_url = new URLSearchParams(window.location.search).get("q");
-            if (query_via_url) {
-                document.getElementById("chat-input").value = query_via_url;
-                chat();
-            }
-        }
-
-        function fetchRemainingChatMessages(chatHistoryUrl, headers, conversationId, hostURL) {
-            // Create a new IntersectionObserver
-            let observer = new IntersectionObserver((entries, observer) => {
-                entries.forEach(entry => {
-                    // If the element is in the viewport, render the message and unobserve the element
-                    if (entry.isIntersecting) {
-                        let chat_log = entry.target.chat_log;
-                        let messageElement = renderMessageWithReference(
-                            chat_log.message,
-                            chat_log.by,
-                            chat_log.context,
-                            new Date(chat_log.created),
-                            chat_log.onlineContext,
-                            chat_log.intent?.type,
-                            chat_log.intent?.["inferred-queries"],
-                            chatBody.dataset.conversationId ?? "",
-                            hostURL,
-                        );
-                        entry.target.replaceWith(messageElement);
-
-                        // Remove the observer after the element has been rendered
-                        observer.unobserve(entry.target);
-                    }
-                });
-            }, {rootMargin: '0px 0px 200px 0px'});  // Trigger when the element is within 200px of the viewport
-
-            // Fetch remaining chat messages from conversation history
-            fetch(`${chatHistoryUrl}&n=-10`, { headers })
-                .then(response => response.json())
-                .then(data => {
-                    if (data.status != "ok") {
-                        throw new Error(data.message);
-                    }
-                    return data.response;
-                })
-                .then(response => {
-                    const fullChatLog = response.chat || [];
-                    let chatBody = document.getElementById("chat-body");
-                    fullChatLog
-                    .reverse()
-                    .forEach(chat_log => {
-                        if (chat_log.message != null) {
-                            // Create a new element for each chat log
-                            let placeholder = document.createElement('div');
-                            placeholder.chat_log = chat_log;
-
-                            // Insert the message placeholder as the first child of chat body after the welcome message
-                            chatBody.insertBefore(placeholder, chatBody.firstChild.nextSibling);
-
-                            // Observe the element
-                            placeholder.style.height = "20px";
-                            observer.observe(placeholder);
-                        }
-                    });
-                })
-                .catch(err => {
-                    console.log(err);
-                    return;
-                });
-        }
-
-        function fadeOutLoadingAnimation(loadingScreen) {
-            let chatBody = document.getElementById("chat-body");
-            let chatBodyWrapper = document.getElementById("chat-body-wrapper");
-            chatBodyWrapperHeight = chatBodyWrapper.clientHeight;
-            chatBody.style.height = chatBodyWrapperHeight;
-            setTimeout(() => {
-                loadingScreen.remove();
-                chatBody.classList.remove("relative-position");
-            }, 500);
-        }
-
-        function renderFirstRunSetupMessage() {
-            first_run_message = `<p class="first-run-message-heading">Hi 👋🏾, to get started:<p>
-            <ol>
-                <li class="first-run-message-text">Generate an API token <a id='first-run-web-config' class='first-run-message-link'>Khoj Web settings</a></li>
-                <li class="first-run-message-text">Paste it into the API Key field <a id='first-run-desktop-config' class='first-run-message-link'>Khoj Desktop settings</a></li>
-            </ol>`
-            .trim()
-            .replace(/(\r\n|\n|\r)/gm, "");
-
-            renderMessage(first_run_message, "khoj", null, null, true);
-
-            // Open relevant setup links
-            document.getElementById("first-run-web-config").addEventListener('click', (event) => window.navigateAPI.navigateToWebSettings('settings'));
-            document.getElementById("first-run-desktop-config").addEventListener('click', (event) => window.navigateAPI.navigateToSettings('settings.html'));
-
-            // Disable chat input field and update placeholder text
-            document.getElementById("chat-input").setAttribute("disabled", "disabled");
-            document.getElementById("chat-input").setAttribute("placeholder", "Configure Khoj to enable chat");
-        }
-
-        function flashStatusInChatInput(message) {
-            // Get chat input element and original placeholder
-            let chatInput = document.getElementById("chat-input");
-            let originalPlaceholder = chatInput.placeholder;
-            // Set placeholder to message
-            chatInput.placeholder = message;
-            // Reset placeholder after 2 seconds
-            setTimeout(() => {
-                chatInput.placeholder = originalPlaceholder;
-            }, 2000);
-        }
-
-        function createNewConversation() {
-            let chatBody = document.getElementById("chat-body");
-            chatBody.innerHTML = "";
-            flashStatusInChatInput("📝 New conversation started");
-            chatBody.dataset.conversationId = "";
-            chatBody.dataset.conversationTitle = "";
-            renderMessage("Hey 👋🏾, what's up?", "khoj");
-        }
-
-        async function clearConversationHistory() {
-            let chatInput = document.getElementById("chat-input");
-            let originalPlaceholder = chatInput.placeholder;
-            let chatBody = document.getElementById("chat-body");
-            let conversationId = chatBody.dataset.conversationId;
-
-            let deleteURL = `/api/chat/history?client=desktop`;
-            if (conversationId) {
-                deleteURL += `&conversation_id=${conversationId}`;
-            }
-
-            const hostURL = await window.hostURLAPI.getURL();
-            const khojToken = await window.tokenAPI.getToken();
-            const headers = { 'Authorization': `Bearer ${khojToken}` };
-
-            fetch(`${hostURL}${deleteURL}`, { method: "DELETE", headers })
-                .then(response => response.ok ? response.json() : Promise.reject(response))
-                .then(data => {
-                    chatBody.innerHTML = "";
-                    chatBody.dataset.conversationId = "";
-                    chatBody.dataset.conversationTitle = "";
-                    loadChat();
-                })
-                .catch(err => {
-                    flashStatusInChatInput("⛔️ Failed to clear conversation history");
-                })
-        }
-
-        async function refreshChatSessionsPanel() {
-            const hostURL = await window.hostURLAPI.getURL();
-            const khojToken = await window.tokenAPI.getToken();
-            const headers = { 'Authorization': `Bearer ${khojToken}` };
-
-            fetch(`${hostURL}/api/chat/sessions`, { method: "GET", headers })
-                .then(response => response.json())
-                .then(data => {
-                    let conversationListBody = document.getElementById("conversation-list-body");
-                    conversationListBody.innerHTML = "";
-                    let conversationListBodyHeader = document.getElementById("conversation-list-header");
-
-                    let chatBody = document.getElementById("chat-body");
-                    conversationId = chatBody.dataset.conversationId;
-
-                    if (data.length > 0) {
-                        conversationListBodyHeader.style.display = "block";
-                        for (let index in data) {
-                            let conversation = data[index];
-                            let conversationButton = document.createElement('div');
-                            let incomingConversationId = conversation["conversation_id"];
-                            const conversationTitle = conversation["slug"] || `New conversation 🌱`;
-                            conversationButton.textContent = conversationTitle;
-                            conversationButton.classList.add("conversation-button");
-                            if (incomingConversationId == conversationId) {
-                                conversationButton.classList.add("selected-conversation");
-                            }
-                            conversationButton.addEventListener('click', function() {
-                                let chatBody = document.getElementById("chat-body");
-                                chatBody.innerHTML = "";
-                                chatBody.dataset.conversationId = incomingConversationId;
-                                chatBody.dataset.conversationTitle = conversationTitle;
-                                loadChat();
-                            });
-                            let threeDotMenu = document.createElement('div');
-                            threeDotMenu.classList.add("three-dot-menu");
-                            let threeDotMenuButton = document.createElement('button');
-                            threeDotMenuButton.innerHTML = "⋮";
-                            threeDotMenuButton.classList.add("three-dot-menu-button");
-                            threeDotMenuButton.addEventListener('click', function(event) {
-                                event.stopPropagation();
-
-                                let existingChildren = threeDotMenu.children;
-
-                                if (existingChildren.length > 1) {
-                                    // Skip deleting the first, since that's the menu button.
-                                    for (let i = 1; i < existingChildren.length; i++) {
-                                        existingChildren[i].remove();
-                                    }
-                                    return;
-                                }
-
-                                let conversationMenu = document.createElement('div');
-                                conversationMenu.classList.add("conversation-menu");
-
-                                let editTitleButton = document.createElement('button');
-                                editTitleButton.innerHTML = "Rename";
-                                editTitleButton.classList.add("edit-title-button");
-                                editTitleButton.classList.add("three-dot-menu-button-item");
-                                editTitleButton.addEventListener('click', function(event) {
-                                    event.stopPropagation();
-
-                                    let conversationMenuChildren = conversationMenu.children;
-
-                                    let totalItems = conversationMenuChildren.length;
-
-                                    for (let i = totalItems - 1; i >= 0; i--) {
-                                        conversationMenuChildren[i].remove();
-                                    }
-
-                                    // Create a dialog box to get new title for conversation
-                                    let conversationTitleInputBox = document.createElement('div');
-                                    conversationTitleInputBox.classList.add("conversation-title-input-box");
-                                    let conversationTitleInput = document.createElement('input');
-                                    conversationTitleInput.classList.add("conversation-title-input");
-
-                                    conversationTitleInput.value = conversationTitle;
-
-                                    conversationTitleInput.addEventListener('click', function(event) {
-                                        event.stopPropagation();
-                                    });
-                                    conversationTitleInput.addEventListener('keydown', function(event) {
-                                        if (event.key === "Enter") {
-                                            event.preventDefault();
-                                            conversationTitleInputButton.click();
-                                        }
-                                    });
-                                    conversationTitleInputBox.appendChild(conversationTitleInput);
-                                    let conversationTitleInputButton = document.createElement('button');
-                                    conversationTitleInputButton.innerHTML = "Save";
-                                    conversationTitleInputButton.classList.add("three-dot-menu-button-item");
-                                    conversationTitleInputButton.addEventListener('click', function(event) {
-                                        event.stopPropagation();
-                                        let newTitle = conversationTitleInput.value;
-                                        if (newTitle != null) {
-                                            let editURL = `/api/chat/title?client=web&conversation_id=${incomingConversationId}&title=${newTitle}`;
-                                            fetch(`${hostURL}${editURL}` , { method: "PATCH", headers })
-                                                .then(response => response.ok ? response.json() : Promise.reject(response))
-                                                .then(data => {
-                                                    conversationButton.textContent = newTitle;
-                                                })
-                                                .catch(err => {
-                                                    return;
-                                                });
-                                        conversationTitleInputBox.remove();
-                                    }});
-                                    conversationTitleInputBox.appendChild(conversationTitleInputButton);
-                                    conversationMenu.appendChild(conversationTitleInputBox);
-                                });
-
-                                conversationMenu.appendChild(editTitleButton);
-                                threeDotMenu.appendChild(conversationMenu);
-
-                                let deleteButton = document.createElement('button');
-                                deleteButton.type = "button";
-                                deleteButton.innerHTML = "Delete";
-                                deleteButton.classList.add("delete-conversation-button");
-                                deleteButton.classList.add("three-dot-menu-button-item");
-                                deleteButton.addEventListener('click', function(event) {
-                                    event.preventDefault();
-                                    let confirmation = confirm('Are you sure you want to delete this chat session?');
-                                    if (!confirmation) return;
-                                    let deleteURL = `/api/chat/history?client=web&conversation_id=${incomingConversationId}`;
-                                    fetch(`${hostURL}${deleteURL}` , { method: "DELETE", headers })
-                                        .then(response => response.ok ? response.json() : Promise.reject(response))
-                                        .then(data => {
-                                            let chatBody = document.getElementById("chat-body");
-                                            chatBody.innerHTML = "";
-                                            chatBody.dataset.conversationId = "";
-                                            chatBody.dataset.conversationTitle = "";
-                                            loadChat();
-                                        })
-                                        .catch(err => {
-                                            return;
-                                        });
-                                });
-
-                                conversationMenu.appendChild(deleteButton);
-                                threeDotMenu.appendChild(conversationMenu);
-                            });
-                            threeDotMenu.appendChild(threeDotMenuButton);
-                            conversationButton.appendChild(threeDotMenu);
-                            conversationListBody.appendChild(conversationButton);
-                        }
-                    }
-                }).catch(err => {
-                    return;
-            });
-        }
-
-        let sendMessageTimeout;
-        let mediaRecorder;
-        async function speechToText(event) {
-            event.preventDefault();
-            const speakButtonImg = document.getElementById('speak-button-img');
-            const stopRecordButtonImg = document.getElementById('stop-record-button-img');
-            const sendButtonImg = document.getElementById('send-button-img');
-            const stopSendButtonImg = document.getElementById('stop-send-button-img');
-            const chatInput = document.getElementById('chat-input');
-
-            const hostURL = await window.hostURLAPI.getURL();
-            let url = `${hostURL}/api/transcribe?client=desktop`;
-            const khojToken = await window.tokenAPI.getToken();
-            const headers = { 'Authorization': `Bearer ${khojToken}` };
-
-            const sendToServer = (audioBlob) => {
-                const formData = new FormData();
-                formData.append('file', audioBlob);
-
-                fetch(url, { method: 'POST', body: formData, headers})
-                    .then(response => response.ok ? response.json() : Promise.reject(response))
-                    .then(data => { chatInput.value += data.text.trimStart(); autoResize(); })
-                    .then(() => {
-                        // Don't auto-send empty messages
-                        if (chatInput.value.length === 0) return;
-
-                        // Send message after 3 seconds, unless stop send button is clicked
-                        sendButtonImg.style.display = 'none';
-                        stopSendButtonImg.style.display = 'initial';
-
-                        // Start the countdown timer UI
-                        document.getElementById('countdown-circle').style.animation = "countdown 3s linear 1 forwards";
-
-                        sendMessageTimeout = setTimeout(() => {
-                            // Revert to showing send-button and hide the stop-send-button
-                            sendButtonImg.style.display = 'initial';
-                            stopSendButtonImg.style.display = 'none';
-
-                            // Stop the countdown timer UI
-                            document.getElementById('countdown-circle').style.animation = "none";
-
-                            // Send message
-                            chat();
-                        }, 3000);
-                    })
-                    .catch(err => {
-                        if (err.status === 501) {
-                          flashStatusInChatInput("⛔️ Configure speech-to-text model on server.")
-                        } else if (err.status === 422) {
-                          flashStatusInChatInput("⛔️ Audio file to large to process.")
-                        } else {
-                          flashStatusInChatInput("⛔️ Failed to transcribe audio.")
-                        }
-                    });
-            };
-
-            const handleRecording = (stream) => {
-                const audioChunks = [];
-                const recordingConfig = { mimeType: 'audio/webm' };
-                mediaRecorder = new MediaRecorder(stream, recordingConfig);
-
-                mediaRecorder.addEventListener("dataavailable", function(event) {
-                    if (event.data.size > 0) audioChunks.push(event.data);
-                });
-
-                mediaRecorder.addEventListener("stop", function() {
-                    const audioBlob = new Blob(audioChunks, { type: 'audio/webm' });
-                    sendToServer(audioBlob);
-                });
-
-                mediaRecorder.start();
-                speakButtonImg.style.display = 'none';
-                stopRecordButtonImg.style.display = 'initial';
-            };
-
-            // Toggle recording
-            if (!mediaRecorder || mediaRecorder.state === 'inactive' || event.type === 'touchstart') {
-                navigator.mediaDevices
-                ?.getUserMedia({ audio: true })
-                .then(handleRecording)
-                .catch((e) => {
-                    flashStatusInChatInput("⛔️ Failed to access microphone");
-                });
-            } else if (mediaRecorder.state === 'recording' || event.type === 'touchend' || event.type === 'touchcancel') {
-                mediaRecorder.stop();
-                mediaRecorder.stream.getTracks().forEach(track => track.stop());
-                mediaRecorder = null;
-                speakButtonImg.style.display = 'initial';
-                stopRecordButtonImg.style.display = 'none';
-            }
-        }
-
-        function cancelSendMessage() {
-            // Cancel the chat() call if the stop-send-button is clicked
-            clearTimeout(sendMessageTimeout);
-
-            // Revert to showing send-button and hide the stop-send-button
-            document.getElementById('stop-send-button-img').style.display = 'none';
-            document.getElementById('send-button-img').style.display = 'initial';
-
-            // Stop the countdown timer UI
-            document.getElementById('countdown-circle').style.animation = "none";
-        };
-
-        function handleCollapseSidePanel() {
-            document.getElementById('side-panel').classList.toggle('collapsed');
-            document.getElementById('new-conversation').classList.toggle('collapsed');
-            document.getElementById('existing-conversations').classList.toggle('collapsed');
-            document.getElementById('side-panel-collapse').style.transform = document.getElementById('side-panel').classList.contains('collapsed') ? 'rotate(0deg)' : 'rotate(180deg)';
-        }
-    </script>
-    <body>
-        <div id="khoj-empty-container" class="khoj-empty-container"></div>
-
-        <!--Add Header Logo and Nav Pane-->
-        <div id="khoj-header" class="khoj-header"></div>
-
-        <div id="chat-section-wrapper">
-            <div id="side-panel-wrapper">
-                <div id="side-panel">
-                    <div id="new-conversation">
-                       <div id="conversation-list-header" style="display: none;">Conversations</div>
-                       <button class="side-panel-button" id="new-conversation-button" onclick="createNewConversation()">
-                            New
-                            <svg class="new-convo-button" viewBox="0 0 40 40" fill="#000000" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg">
-                                <path d="M16 0c-8.836 0-16 7.163-16 16s7.163 16 16 16c8.837 0 16-7.163 16-16s-7.163-16-16-16zM16 30.032c-7.72 0-14-6.312-14-14.032s6.28-14 14-14 14 6.28 14 14-6.28 14.032-14 14.032zM23 15h-6v-6c0-0.552-0.448-1-1-1s-1 0.448-1 1v6h-6c-0.552 0-1 0.448-1 1s0.448 1 1 1h6v6c0 0.552 0.448 1 1 1s1-0.448 1-1v-6h6c0.552 0 1-0.448 1-1s-0.448-1-1-1z"></path>
-                            </svg>
-                        </button>
-                    </div>
-                    <div id="existing-conversations">
-                        <div id="conversation-list">
-                            <div id="conversation-list-header" style="display: none;">Recent Conversations</div>
-                            <div id="conversation-list-body"></div>
-                        </div>
-                    </div>
-                </div>
-                <div id="collapse-side-panel">
-                    <button
-                        class="side-panel-button"
-                        id="collapse-side-panel-button"
-                        onclick="handleCollapseSidePanel()"
-                    >
-                        <svg id="side-panel-collapse" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-                            <path d="M7.82054 20.7313C8.21107 21.1218 8.84423 21.1218 9.23476 20.7313L15.8792 14.0868C17.0505 12.9155 17.0508 11.0167 15.88 9.84497L9.3097 3.26958C8.91918 2.87905 8.28601 2.87905 7.89549 3.26958C7.50497 3.6601 7.50497 4.29327 7.89549 4.68379L14.4675 11.2558C14.8581 11.6464 14.8581 12.2795 14.4675 12.67L7.82054 19.317C7.43002 19.7076 7.43002 20.3407 7.82054 20.7313Z" fill="#0F0F0F"/>
-                        </svg>
-                    </button>
-                </div>
-            </div>
-            <div id="chat-body-wrapper">
-                <!-- Chat Body -->
-                <div id="chat-body"></div>
-
-                <!-- Chat Suggestions -->
-                <div id="question-starters" style="display: none;"></div>
-
-                <!-- Chat Footer -->
-                <div id="chat-footer">
-                    <div id="chat-tooltip" style="display: none;"></div>
-                    <div id="input-row">
-                        <textarea id="chat-input" class="option" oninput="onChatInput()" onkeydown=incrementalChat(event) autofocus="autofocus" placeholder="Type / to see a list of commands"></textarea>
-                        <button id="speak-button" class="input-row-button"
-                            ontouchstart="speechToText(event)" ontouchend="speechToText(event)" ontouchcancel="speechToText(event)" onmousedown="speechToText(event)">
-                            <svg id="speak-button-img" class="input-row-button-img" alt="Transcribe" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
-                                <path d="M3.5 6.5A.5.5 0 0 1 4 7v1a4 4 0 0 0 8 0V7a.5.5 0 0 1 1 0v1a5 5 0 0 1-4.5 4.975V15h3a.5.5 0 0 1 0 1h-7a.5.5 0 0 1 0-1h3v-2.025A5 5 0 0 1 3 8V7a.5.5 0 0 1 .5-.5z"/>
-                                <path d="M10 8a2 2 0 1 1-4 0V3a2 2 0 1 1 4 0v5zM8 0a3 3 0 0 0-3 3v5a3 3 0 0 0 6 0V3a3 3 0 0 0-3-3z"/>
-                            </svg>
-                            <svg id="stop-record-button-img" style="display: none" class="input-row-button-img" alt="Stop Transcribing" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
-                                <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z"/>
-                                <path d="M5 6.5A1.5 1.5 0 0 1 6.5 5h3A1.5 1.5 0 0 1 11 6.5v3A1.5 1.5 0 0 1 9.5 11h-3A1.5 1.5 0 0 1 5 9.5v-3z"/>
-                            </svg>
-                        </button>
-                        <button id="send-button" class="input-row-button" alt="Send message" style="display: none;">
-                            <svg id="send-button-img" onclick="chat()" class="input-row-button-img" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
-                                <path fill-rule="evenodd" d="M1 8a7 7 0 1 0 14 0A7 7 0 0 0 1 8zm15 0A8 8 0 1 1 0 8a8 8 0 0 1 16 0zm-7.5 3.5a.5.5 0 0 1-1 0V5.707L5.354 7.854a.5.5 0 1 1-.708-.708l3-3a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1-.708.708L8.5 5.707V11.5z"/>
-                            </svg>
-                            <svg id="stop-send-button-img" onclick="cancelSendMessage()" style="display: none" class="input-row-button-img" alt="Stop Message Send" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
-                                <circle id="countdown-circle" class="countdown-circle" cx="8" cy="8" r="7" />
-                                <path d="M5 6.5A1.5 1.5 0 0 1 6.5 5h3A1.5 1.5 0 0 1 11 6.5v3A1.5 1.5 0 0 1 9.5 11h-3A1.5 1.5 0 0 1 5 9.5v-3z"/>
-                            </svg>
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </body>
-
-    <style>
-        html, body {
-            height: 100%;
-            width: 100%;
-            padding: 0px;
-            margin: 0px;
-        }
-        body {
-            display: grid;
-            background: var(--background-color);
-            color: var(--main-text-color);
-            text-align: center;
-            font-family: var(--font-family);
-            font-size: small;
-            font-weight: 300;
-            line-height: 1.5em;
-        }
-
-        body > * {
-            padding: 10px;
-            margin: 10px;
-        }
-
-        input.conversation-title-input {
-            font-family: var(--font-family);
-            font-size: 14px;
-            font-weight: 300;
-            line-height: 1.5em;
-            padding: 5px;
-            border: 1px solid var(--main-text-color);
-            border-radius: 5px;
-            margin: 4px;
-        }
-
-        input.conversation-title-input:focus {
-            outline: none;
-        }
-
-        #chat-section-wrapper {
-            display: grid;
-            grid-template-columns: auto 1fr;
-            grid-column-gap: 10px;
-            grid-row-gap: 10px;
-            padding: 10px;
-            margin: 10px;
-            overflow-y: scroll;
-        }
-
-        #chat-body-wrapper {
-            display: flex;
-            flex-direction: column;
-            overflow: hidden;
-        }
-
-        #side-panel {
-            width: 250px;
-            padding: 10px;
-            background: var(--background-color);
-            border-radius: 5px;
-            box-shadow: 0 0 11px #aaa;
-            overflow-y: scroll;
-            text-align: left;
-            transition: width 0.3s ease-in-out;
-        }
-
-        div#side-panel.collapsed {
-            width: 0;
-            padding: 0;
-            display: block;
-            overflow: hidden;
-        }
-
-        div#collapse-side-panel {
-            align-self: center;
-            padding: 8px;
-        }
-
-        div#conversation-list-body {
-            display: grid;
-            grid-template-columns: 1fr;
-            grid-gap: 8px;
-        }
-
-        div#side-panel-wrapper {
-            display: flex;
-            min-height: 0;
-        }
-
-
-        #chat-body {
-            height: 100%;
-            font-size: small;
-            margin: 0px;
-            line-height: 20px;
-            overflow-y: scroll;
-            overflow-x: hidden;
-        }
-        /* add chat metatdata to bottom of bubble */
-        .chat-message::after {
-            content: attr(data-meta);
-            display: block;
-            font-size: x-small;
-            color: #475569;
-            margin: -8px 4px 0px 0px;
-        }
-        /* move message by khoj to left */
-        .chat-message.khoj {
-            margin-left: auto;
-            text-align: left;
-            height: fit-content;
-        }
-        /* move message by you to right */
-        .chat-message.you {
-            margin-right: auto;
-            text-align: right;
-            height: fit-content;
-        }
-        /* basic style chat message text */
-        .chat-message-text {
-            margin: 10px;
-            border-radius: 10px;
-            padding: 10px;
-            position: relative;
-            display: inline-block;
-            max-width: 80%;
-            text-align: left;
-            white-space: pre-line;
-        }
-        /* color chat bubble by khoj blue */
-        .chat-message-text.khoj {
-            color: var(--primary-inverse);
-            background: var(--primary);
-            margin-left: auto;
-        }
-        .chat-message-text ol,
-        .chat-message-text ul {
-            white-space: normal;
-            margin: 0;
-        }
-        .chat-message-text-response {
-            margin-bottom: 0px;
-        }
-
-        /* Spinner symbol when the chat message is loading */
-        .spinner {
-            border: 4px solid #f3f3f3;
-            border-top: 4px solid var(--primary-inverse);
-            border-radius: 50%;
-            width: 12px;
-            height: 12px;
-            animation: spin 2s linear infinite;
-            margin: 0px 0px 0px 10px;
-            display: inline-block;
-        }
-        @keyframes spin {
-            0% { transform: rotate(0deg); }
-            100% { transform: rotate(360deg); }
-        }
-        /* add left protrusion to khoj chat bubble */
-        .chat-message-text.khoj:after {
-            content: '';
-            position: absolute;
-            bottom: -2px;
-            left: -7px;
-            border: 10px solid transparent;
-            border-top-color: var(--primary);
-            border-bottom: 0;
-            transform: rotate(-60deg);
-        }
-        /* color chat bubble by you dark grey */
-        .chat-message-text.you {
-            color: #f8fafc;
-            background: #475569;
-            margin-right: auto;
-        }
-        /* add right protrusion to you chat bubble */
-        .chat-message-text.you:after {
-            content: '';
-            position: absolute;
-            top: 91%;
-            right: -2px;
-            border: 10px solid transparent;
-            border-left-color: #475569;
-            border-right: 0;
-            margin-top: -10px;
-            transform: rotate(-60deg)
-        }
-        img.text-to-image {
-            max-width: 60%;
-        }
-
-        #chat-footer {
-            padding: 0;
-            margin: 8px;
-            display: grid;
-            grid-template-columns: minmax(70px, 100%);
-            grid-column-gap: 10px;
-            grid-row-gap: 10px;
-        }
-        #input-row {
-            display: grid;
-            grid-template-columns: auto 40px;
-            grid-column-gap: 10px;
-            grid-row-gap: 10px;
-            background: #f9fafc;
-            align-items: center;
-            background-color: var(--background-color);
-        }
-        .option:hover {
-            box-shadow: 0 0 11px #aaa;
-        }
-        #chat-input {
-            font-family: var(--font-family);
-            font-size: small;
-            height: 48px;
-            border-radius: 16px;
-            resize: none;
-            overflow-y: hidden;
-            max-height: 200px;
-            box-sizing: border-box;
-            padding: 7px 0 0 12px;
-            line-height: 1.5em;
-            margin: 0;
-        }
-        #chat-input:focus {
-            outline: none !important;
-        }
-        .input-row-button {
-            background: var(--background-color);
-            border: none;
-            box-shadow: none;
-            border-radius: 50%;
-            font-size: 14px;
-            font-weight: 300;
-            padding: 0;
-            line-height: 1.5em;
-            cursor: pointer;
-            transition: background 0.3s ease-in-out;
-            width: 40px;
-            height: 40px;
-            margin-top: -2px;
-            margin-left: -5px;
-        }
-
-        .side-panel-button {
-            background: var(--background-color);
-            border: none;
-            box-shadow: none;
-            font-size: 14px;
-            font-weight: 300;
-            line-height: 1.5em;
-            cursor: pointer;
-            transition: background 0.3s ease-in-out;
-            border-radius: 5%;;
-            font-family: var(--font-family);
-        }
-
-        svg#side-panel-collapse {
-            width: 30px;
-            height: 30px;
-        }
-
-        .side-panel-button:hover,
-        .input-row-button:hover {
-            background: var(--primary-hover);
-        }
-
-        .side-panel-button:active,
-        .input-row-button:active {
-            background: var(--primary-active);
-        }
-        .input-row-button-img {
-            width: 24px;
-            height: 24px;
-        }
-        #send-button {
-            padding: 0;
-            position: relative;
-        }
-        #send-button-img {
-            width: 28px;
-            height: 28px;
-            background: var(--primary-hover);
-            border-radius: 50%;
-        }
-        #stop-send-button-img {
-            position: absolute;
-            top: 6px;
-            right: 6px;
-            width: 28px;
-            height: 28px;
-            transform: rotateY(-180deg) rotateZ(-90deg);
-        }
-        #countdown-circle {
-            stroke-dasharray: 44px;  /* The circumference of the circle with 7px radius */
-            stroke-dashoffset: 0px;
-            stroke-linecap: round;
-            stroke-width: 1px;
-            stroke: var(--main-text-color);
-            fill: none;
-        }
-        @keyframes countdown {
-            from {
-                stroke-dashoffset: 0px;
-            }
-            to {
-                stroke-dashoffset: -44px;  /* The circumference of the circle with 7px radius */
-            }
-        }
-
-        .option-enabled {
-            box-shadow: 0 0 12px rgb(119, 156, 46);
-        }
-
-        div.collapsed {
-            display: none;
-        }
-
-        div.expanded {
-            display: block;
-        }
-
-        div.reference {
-            display: grid;
-            grid-template-rows: auto;
-            grid-auto-flow: row;
-            grid-column-gap: 10px;
-            grid-row-gap: 10px;
-            margin: 10px;
-        }
-
-        div.expanded.reference-section {
-            display: grid;
-            grid-template-rows: auto;
-            grid-auto-flow: row;
-            grid-column-gap: 10px;
-            grid-row-gap: 10px;
-            margin: 10px;
-        }
-
-        div#question-starters {
-            grid-template-columns: repeat(auto-fit, minmax(100px, 1fr));
-            grid-column-gap: 8px;
-        }
-
-        button.question-starter {
-            background: var(--background-color);
-            color: var(--main-text-color);
-            border: 1px solid var(--main-text-color);
-            border-radius: 16px;
-            padding: 5px;
-            font-size: 14px;
-            font-weight: 300;
-            line-height: 1.5em;
-            cursor: pointer;
-            transition: background 0.2s ease-in-out;
-            text-align: left;
-            max-height: 75px;
-            transition: max-height 0.3s ease-in-out;
-            overflow: hidden;
-        }
-        button.question-starter:hover {
-            background: var(--primary-hover);
-        }
-
-        code.chat-response {
-            background: var(--primary-hover);
-            color: var(--primary-inverse);
-            border-radius: 5px;
-            padding: 5px;
-            font-size: 14px;
-            font-weight: 300;
-            line-height: 1.5em;
-        }
-
-        button.reference-button {
-            background: var(--background-color);
-            color: var(--main-text-color);
-            border: 1px solid var(--main-text-color);
-            border-radius: 5px;
-            font-size: 14px;
-            font-weight: 300;
-            line-height: 1.5em;
-            cursor: pointer;
-            transition: background 0.2s ease-in-out;
-            text-align: left;
-            max-height: 75px;
-            transition: max-height 0.3s ease-in-out;
-            overflow: hidden;
-        }
-        button.reference-button.expanded {
-            max-height: none;
-            white-space: pre-wrap;
-        }
-
-        button.reference-button::before {
-            content: "▶";
-            margin-right: 5px;
-            display: inline-block;
-            transition: transform 0.1s ease-in-out;
-        }
-
-        button.reference-button.expanded::before,
-        button.reference-button:active:before,
-        button.reference-button[aria-expanded="true"]::before {
-            transform: rotate(90deg);
-        }
-
-        button.reference-expand-button {
-            background: var(--background-color);
-            color: var(--main-text-color);
-            border: 1px dotted var(--main-text-color);
-            border-radius: 5px;
-            padding: 5px;
-            font-size: 14px;
-            font-weight: 300;
-            line-height: 1.5em;
-            cursor: pointer;
-            transition: background 0.4s ease-in-out;
-            text-align: left;
-        }
-
-        button.reference-expand-button:hover {
-            background: var(--primary-hover);
-        }
-
-        .option-enabled:focus {
-            outline: none !important;
-            border:1px solid #475569;
-            box-shadow: 0 0 16px var(--primary);
-        }
-
-        .first-run-message-heading {
-            font-size: 20px;
-            font-weight: 300;
-            line-height: 1.5em;
-            color: var(--main-text-color);
-            margin: 0;
-            padding: 10px;
-        }
-
-        .first-run-message-text {
-            font-size: 18px;
-            font-weight: 300;
-            line-height: 1.5em;
-            color: var(--main-text-color);
-            margin: 0;
-            padding-bottom: 25px;
-        }
-
-        a.inline-chat-link {
-            color: #475569;
-            text-decoration: none;
-            border-bottom: 1px dotted #475569;
-        }
-
-        a.first-run-message-link {
-            display: block;
-            text-align: center;
-            font-size: 14px;
-            color: #fff;
-            padding: 6px 15px;
-            border-radius: 999px;
-            text-decoration: none;
-            background-color: rgba(71, 85, 105, 0.6);
-            transition: background-color 0.3s ease-in-out;
-        }
-
-        a.first-run-message-link:hover {
-            background-color: #475569;
-        }
-
-        a.reference-link {
-            color: var(--main-text-color);
-            border-bottom: 1px dotted var(--main-text-color);
-        }
-
-        button.copy-button {
-            border-radius: 4px;
-            background-color: var(--background-color);
-            border: 1px solid var(--main-text-color);
-            text-align: center;
-            font-size: 16px;
-            transition: all 0.5s;
-            cursor: pointer;
-            padding: 4px;
-            float: right;
-        }
-
-        button.copy-button span {
-            cursor: pointer;
-            display: inline-block;
-            position: relative;
-            transition: 0.5s;
-        }
-
-        img.copy-icon {
-            width: 16px;
-            height: 16px;
-        }
-
-        button.copy-button:hover {
-            background-color: var(--primary-hover);
-            color: #f5f5f5;
-        }
-
-        pre {
-            text-wrap: unset;
-        }
-
-        div.khoj-empty-container {
-            padding: 0;
-            margin: 0;
-        }
-
-        @media (pointer: coarse), (hover: none) {
-            abbr[title] {
-                position: relative;
-                padding-left: 4px;  /* space references out to ease tapping */
-            }
-            abbr[title]:focus:after {
-                content: attr(title);
-
-                /* position tooltip */
-                position: absolute;
-                left: 16px;  /* open tooltip to right of ref link, instead of on top of it */
-                width: auto;
-                z-index: 1;  /* show tooltip above chat messages */
-
-                /* style tooltip */
-                background-color: #aaa;
-                color: #f8fafc;
-                border-radius: 2px;
-                box-shadow: 1px 1px 4px 0 rgba(0, 0, 0, 0.4);
-                font-size: small;
-                padding: 2px 4px;
-            }
-        }
-        @media only screen and (max-width: 600px) {
-            body {
-                grid-template-columns: 1fr;
-                grid-template-rows: auto auto minmax(80px, 100%) auto;
-            }
-            body > * {
-                grid-column: 1;
-            }
-            #chat-footer {
-                padding: 0;
-                margin: 4px;
-                grid-template-columns: auto;
-            }
-            img.text-to-image {
-                max-width: 100%;
-            }
-            #clear-chat-button {
-                margin-left: 0;
-            }
-
-            div#side-panel.collapsed {
-                width: 0px;
-                display: block;
-                overflow: hidden;
-                padding: 0;
-            }
-
-            svg#side-panel-collapse {
-                width: 24px;
-                height: 24px;
-            }
-
-            #chat-body-wrapper {
-                min-width: 0;
-            }
-
-            div#chat-section-wrapper {
-                padding: 4px;
-                margin: 4px;
-                grid-column-gap: 4px;
-            }
-            div#collapse-side-panel {
-                align-self: center;
-                padding: 0px;
-            }
-        }
-        @media only screen and (min-width: 600px) {
-            body {
-                grid-template-columns: auto min(90vw, 100%) auto;
-                grid-template-rows: auto auto minmax(80px, 100%) auto;
-            }
-            body > * {
-                grid-column: 2;
-            }
-        }
-
-        div#chat-tooltip {
-            text-align: left;
-            font-size: medium;
-        }
-        div#chat-tooltip:hover {
-            cursor: pointer;
-        }
-
-        svg.new-convo-button {
-            width: 20px;
-            margin-left: 5px;
-        }
-
-        div#new-conversation {
-            display: grid;
-            grid-auto-flow: column;
-            font-size: medium;
-            text-align: left;
-            border-bottom: 1px solid var(--main-text-color);
-            margin: 8px 0;
-        }
-
-        button#new-conversation-button {
-            display: inline-flex;
-            align-items: center;
-            justify-self: end;
-        }
-
-        div.conversation-button {
-            background: var(--background-color);
-            color: var(--main-text-color);
-            border: 1px solid var(--main-text-color);
-            border-radius: 5px;
-            padding: 5px;
-            font-size: small;
-            font-weight: 300;
-            line-height: 1.5em;
-            cursor: pointer;
-            transition: background 0.2s ease-in-out;
-            text-align: left;
-            display: flex;
-            position: relative;
-        }
-
-        .three-dot-menu {
-            display: none;
-            /* background: var(--background-color); */
-            /* border: 1px solid var(--main-text-color); */
-            border-radius: 5px;
-            /* position: relative; */
-            position: absolute;
-            right: 4;
-            top: 4;
-        }
-
-        button.three-dot-menu-button-item {
-            background: var(--background-color);
-            color: var(--main-text-color);
-            border: none;
-            box-shadow: none;
-            font-size: 14px;
-            font-weight: 300;
-            line-height: 1.5em;
-            cursor: pointer;
-            transition: background 0.3s ease-in-out;
-            font-family: var(--font-family);
-            border-radius: 4px;
-            right: 0;
-        }
-
-        button.three-dot-menu-button-item:hover {
-            background: var(--primary-hover);
-            color: var(--primary-inverse);
-        }
-
-        .three-dot-menu-button {
-            background: var(--background-color);
-            border: none;
-            box-shadow: none;
-            font-size: 14px;
-            font-weight: 300;
-            line-height: 1.5em;
-            cursor: pointer;
-            transition: background 0.3s ease-in-out;
-            font-family: var(--font-family);
-            border-radius: 4px;
-            right: 0;
-        }
-
-        .conversation-button:hover .three-dot-menu {
-            display: block;
-        }
-
-        div.conversation-menu {
-            position: absolute;
-            z-index: 1;
-            top: 100%;
-            right: 0;
-            text-align: right;
-            background-color: var(--background-color);
-            border: 1px solid var(--main-text-color);
-            border-radius: 5px;
-            padding: 5px;
-            box-shadow: 0 0 11px #aaa;
-        }
-
-        div.conversation-button:hover {
-            background: var(--primary-hover);
-            color: var(--primary-inverse);
-        }
-
-        div.selected-conversation {
-            background: var(--primary-hover) !important;
-            color: var(--primary-inverse) !important;
-        }
-
-        @keyframes gradient {
-            0% {
-                background-position: 0% 50%;
-            }
-            50% {
-                background-position: 100% 50%;
-            }
-            100% {
-                background-position: 0% 50%;
-            }
-        }
-
-        a.khoj-logo {
-            text-align: center;
-        }
-
-        p {
-            margin: 0;
-        }
-
-        div.programmatic-output {
-            background-color: #f5f5f5;
-            border: 1px solid #ddd;
-            border-radius: 3px;
-            box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
-            color: #333;
-            font-family: monospace;
-            font-size: small;
-            line-height: 1.5;
-            margin: 10px 0;
-            overflow-x: auto;
-            padding: 10px;
-            white-space: pre-wrap;
-        }
-
-        .loading-spinner {
-            display: inline-block;
-            position: relative;
-            width: 80px;
-            height: 80px;
-        }
-        .loading-spinner div {
-            position: absolute;
-            border: 4px solid var(--primary-hover);
-            opacity: 1;
-            border-radius: 50%;
-            animation: lds-ripple 0.5s cubic-bezier(0, 0.2, 0.8, 1) infinite;
-        }
-        .loading-spinner div:nth-child(2) {
-            animation-delay: -0.5s;
-        }
-        @keyframes lds-ripple {
-            0% {
-                top: 36px;
-                left: 36px;
-                width: 0;
-                height: 0;
-                opacity: 1;
-                border-color: var(--primary-hover);
-            }
-            50% {
-                border-color: var(--flower);
-            }
-            100% {
-                top: 0px;
-                left: 0px;
-                width: 72px;
-                height: 72px;
-                opacity: 0;
-                border-color: var(--water);
-            }
-        }
-
-        .lds-ellipsis {
-            display: inline-block;
-            position: relative;
-            width: 60px;
-            height: 32px;
-        }
-        .lds-ellipsis div {
-            position: absolute;
-            top: 12px;
-            width: 8px;
-            height: 8px;
-            border-radius: 50%;
-            background: var(--main-text-color);
-            animation-timing-function: cubic-bezier(0, 1, 1, 0);
-        }
-        .lds-ellipsis div:nth-child(1) {
-            left: 8px;
-            animation: lds-ellipsis1 0.6s infinite;
-        }
-        .lds-ellipsis div:nth-child(2) {
-            left: 8px;
-            animation: lds-ellipsis2 0.6s infinite;
-        }
-        .lds-ellipsis div:nth-child(3) {
-            left: 32px;
-            animation: lds-ellipsis2 0.6s infinite;
-        }
-        .lds-ellipsis div:nth-child(4) {
-            left: 56px;
-            animation: lds-ellipsis3 0.6s infinite;
-        }
-        @keyframes lds-ellipsis1 {
-            0% {
-                transform: scale(0);
-            }
-            100% {
-                transform: scale(1);
-            }
-        }
-        @keyframes lds-ellipsis3 {
-            0% {
-                transform: scale(1);
-            }
-            100% {
-                transform: scale(0);
-            }
-        }
-        @keyframes lds-ellipsis2 {
-            0% {
-                transform: translate(0, 0);
-            }
-            100% {
-                transform: translate(24px, 0);
-            }
-        }
-    </style>
-</html>
diff --git a/src/interface/desktop/main.js b/src/interface/desktop/main.js
index 7c7bf4fc..a2d382de 100644
--- a/src/interface/desktop/main.js
+++ b/src/interface/desktop/main.js
@@ -440,7 +440,7 @@ let titleBarStyle = process.platform === 'win32' ? 'default' : 'hidden';
 const {globalShortcut, clipboard} = require('electron'); // global shortcut and clipboard dependencies for shortcut window
 const openShortcutWindowKeyBind = 'CommandOrControl+Shift+K'
 
-const createWindow = (tab = 'chat.html') => {
+const createWindow = (tab = 'settings.html') => {
     win = new BrowserWindow({
       width: 800,
       height: 800,
@@ -602,6 +602,14 @@ app.whenReady().then(() => {
     });
     ipcMain.handle('deleteAllFiles', deleteAllFiles);
 
+    ipcMain.handle('openFile', async (_, path) => {
+        try {
+            await shell.openPath(path);
+        } catch (error) {
+            console.error('Error opening file:', error);
+        }
+    });
+
     const mainWindow = createWindow();
 
     app.setAboutPanelOptions({
@@ -652,7 +660,7 @@ app.whenReady().then(() => {
             globalShortcut.unregister('Escape');
         });
         ipcMain.on('continue-conversation-button-clicked', () => {
-            openWindow('chat.html');
+            openWindow('settings.html');
             if (shortcutWin && !shortcutWin.isDestroyed()) {
                 shortcutWin.close();
             }
@@ -727,8 +735,6 @@ app.whenReady().then(() => {
     tray = new Tray(icon)
 
     const contextMenu = Menu.buildFromTemplate([
-        { label: 'Chat', type: 'normal', click: () => { openWindow('chat.html'); }},
-        { label: 'Search', type: 'normal', click: () => { openWindow('search.html') }},
         { label: 'Configure', type: 'normal', click: () => { openWindow('settings.html') }},
         { type: 'separator' },
         { label: 'About Khoj', type: 'normal', click: () => { openAboutWindow(); } },
diff --git a/src/interface/desktop/package.json b/src/interface/desktop/package.json
index 7a635e4b..a67b218d 100644
--- a/src/interface/desktop/package.json
+++ b/src/interface/desktop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Khoj",
-  "version": "1.30.1",
+  "version": "1.31.0",
   "description": "Your Second Brain",
   "author": "Khoj Inc. <team@khoj.dev>",
   "license": "GPL-3.0-or-later",
@@ -16,7 +16,7 @@
     "start": "yarn electron ."
   },
   "dependencies": {
-    "@todesktop/runtime": "^1.6.4",
+    "@todesktop/runtime": "^2.0.0",
     "axios": "^1.7.4",
     "cron": "^2.4.3",
     "electron-store": "^8.1.0"
diff --git a/src/interface/desktop/preload.js b/src/interface/desktop/preload.js
index e8f13ff3..a2649609 100644
--- a/src/interface/desktop/preload.js
+++ b/src/interface/desktop/preload.js
@@ -83,4 +83,9 @@ contextBridge.exposeInMainWorld('appInfoAPI', {
 contextBridge.exposeInMainWorld('navigateAPI', {
   navigateToSettings: () => ipcRenderer.send('navigate', 'settings.html'),
   navigateToWebSettings: () => ipcRenderer.send('navigateToWebApp', 'settings'),
+  navigateToWebHome: () => ipcRenderer.send('navigateToWebApp', ''),
 })
+
+contextBridge.exposeInMainWorld('openFileAPI', {
+  openFile: (path) => ipcRenderer.invoke('openFile', path)
+});
diff --git a/src/interface/desktop/renderer.js b/src/interface/desktop/renderer.js
index 78387813..aa359274 100644
--- a/src/interface/desktop/renderer.js
+++ b/src/interface/desktop/renderer.js
@@ -26,37 +26,10 @@ async function removeFolder(folderPath) {
     }
 }
 
-const toggleFilesButton = document.getElementById('toggle-files');
 const currentFiles = document.getElementById('current-files');
 
-const toggleFilesSVG = document.getElementById('toggle-files-svg');
-
-toggleFilesButton.addEventListener('click', () => {
-    if (currentFiles.style.display === 'none') {
-        currentFiles.style.display = 'block';
-        toggleFilesSVG.style.transform = 'rotate(0deg)';
-    } else {
-        currentFiles.style.display = 'none';
-        toggleFilesSVG.style.transform = 'rotate(180deg)';
-    }
-});
-
-const toggleFoldersButton = document.getElementById('toggle-folders');
 const currentFolders = document.getElementById('current-folders');
 
-const toggleFoldersSVG = document.getElementById('toggle-folders-svg');
-
-
-toggleFoldersButton.addEventListener('click', () => {
-    if (currentFolders.style.display === 'none') {
-        currentFolders.style.display = 'block';
-        toggleFoldersSVG.style.transform = 'rotate(0deg)';
-    } else {
-        currentFolders.style.display = 'none';
-        toggleFoldersSVG.style.transform = 'rotate(180deg)';
-    }
-});
-
 function makeFileElement(file) {
     let fileElement = document.createElement("div");
     fileElement.classList.add("file-element");
@@ -64,20 +37,34 @@ function makeFileElement(file) {
     let fileNameElement = document.createElement("div");
     fileNameElement.classList.add("content-name");
     fileNameElement.innerHTML = file.path;
+    fileNameElement.style.cursor = "pointer";
+
+    fileNameElement.addEventListener("click", () => {
+        window.openFileAPI.openFile(file.path);
+    });
+
     fileElement.appendChild(fileNameElement);
 
     let buttonContainer = document.createElement("div");
     buttonContainer.classList.add("remove-button-container");
     let removeFileButton = document.createElement("button");
-    let fileSyncedImage = document.createElement("img")
+    let fileSyncedImage = document.createElement("img");
     fileSyncedImage.classList.add("file-synced-image");
+    fileSyncedImage.src = "./assets/icons/file-synced.svg";
+
+    // Create trash icon image
+    let trashIcon = document.createElement("img");
+    trashIcon.src = "./assets/icons/trash-solid.svg";
+    trashIcon.classList.add("trash-icon");
+
     removeFileButton.classList.add("remove-file-button");
-    removeFileButton.innerHTML = "🗑️";
+    removeFileButton.appendChild(trashIcon);
     removeFileButton.addEventListener("click", () => {
         removeFile(file.path);
     });
+
     buttonContainer.appendChild(removeFileButton);
-    buttonContainer.insertAdjacentElement("afterbegin",fileSyncedImage);
+    buttonContainer.insertAdjacentElement("afterbegin", fileSyncedImage);
     fileElement.appendChild(buttonContainer);
     return fileElement;
 }
@@ -89,13 +76,26 @@ function makeFolderElement(folder) {
     let folderNameElement = document.createElement("div");
     folderNameElement.classList.add("content-name");
     folderNameElement.innerHTML = folder.path;
+    folderNameElement.style.cursor = "pointer";
+
+    folderNameElement.addEventListener("click", () => {
+        window.openFileAPI.openFile(folder.path);
+    });
+
     folderElement.appendChild(folderNameElement);
 
     let buttonContainer = document.createElement("div");
     buttonContainer.classList.add("remove-button-container");
     let removeFolderButton = document.createElement("button");
     removeFolderButton.classList.add("remove-folder-button");
-    removeFolderButton.innerHTML = "🗑️";
+
+    // Create trash icon image
+    let trashIcon = document.createElement("img");
+    trashIcon.src = "./assets/icons/trash-solid.svg";
+    trashIcon.classList.add("trash-icon");
+
+    removeFolderButton.appendChild(trashIcon);
+
     removeFolderButton.addEventListener("click", () => {
         removeFolder(folder.path);
     });
@@ -104,7 +104,7 @@ function makeFolderElement(folder) {
     return folderElement;
 }
 
-(async function() {
+(async function () {
     const files = await window.getFilesAPI.getFiles();
     let currentFilesElement = document.getElementById("current-files");
     for (const file of files) {
@@ -157,26 +157,35 @@ window.updateStateAPI.onUpdateState((event, state) => {
     console.log("state was updated", state);
     loadingBar.style.display = 'none';
     let syncStatusElement = document.getElementById("sync-status");
+    syncStatusElement.innerHTML = '';
     const currentTime = new Date();
     nextSyncTime = new Date();
     nextSyncTime.setMinutes(Math.ceil((nextSyncTime.getMinutes() + 1) / 10) * 10);
     if (state.completed == false) {
 
-        fileSyncedImage.forEach((image)=> {
+        fileSyncedImage.forEach((image) => {
             image.style.display = "block"
             image.src = "./assets/icons/file-not-synced.svg"
         })
         if (state.error) syncStatusElement.innerHTML = state.error;
         return;
     } else {
-        fileSyncedImage.forEach((image)=> {
+        fileSyncedImage.forEach((image) => {
             image.style.display = "block"
             image.src = "./assets/icons/file-synced.svg"
         })
 
     }
     const options = { hour: '2-digit', minute: '2-digit' };
-    syncStatusElement.innerHTML = `⏱️ Synced at ${currentTime.toLocaleTimeString(undefined, options)}. Next sync at ${nextSyncTime.toLocaleTimeString(undefined, options)}.`;
+
+    const clockElement = document.createElement("div");
+    const clockIcon = document.createElement("img");
+    clockIcon.src = "./assets/icons/clock.svg";
+    clockIcon.classList.add("clock-icon");
+
+    clockElement.appendChild(clockIcon);
+    syncStatusElement.appendChild(clockElement);
+    syncStatusElement.innerHTML += ` Synced at ${currentTime.toLocaleTimeString(undefined, options)}. Next sync at ${nextSyncTime.toLocaleTimeString(undefined, options)}.`;
 });
 
 window.needsSubscriptionAPI.onNeedsSubscription((event, needsSubscription) => {
@@ -188,7 +197,7 @@ window.needsSubscriptionAPI.onNeedsSubscription((event, needsSubscription) => {
 });
 
 const urlInput = document.getElementById('khoj-host-url');
-(async function() {
+(async function () {
     const url = await window.hostURLAPI.getURL();
     urlInput.value = url;
 })();
@@ -210,7 +219,7 @@ urlInput.addEventListener('blur', async () => {
 });
 
 const khojKeyInput = document.getElementById('khoj-access-key');
-(async function() {
+(async function () {
     const token = await window.tokenAPI.getToken();
     khojKeyInput.value = token;
 })();
diff --git a/src/interface/desktop/search.html b/src/interface/desktop/search.html
deleted file mode 100644
index 792470a6..00000000
--- a/src/interface/desktop/search.html
+++ /dev/null
@@ -1,458 +0,0 @@
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0 maximum-scale=1.0">
-        <meta property="og:image" content="https://assets.khoj.dev/khoj_hero.png">
-        <title>Khoj - Search</title>
-
-        <link rel="icon" type="image/png" sizes="128x128" href="./assets/icons/favicon-128x128.png">
-        <link rel="manifest" href="./khoj.webmanifest">
-        <link rel="stylesheet" href="./assets/khoj.css">
-    </head>
-    <script type="text/javascript" src="./assets/org.min.js"></script>
-    <script type="text/javascript" src="./assets/markdown-it.min.js"></script>
-    <script src="./utils.js"></script>
-
-    <script>
-        function render_image(item) {
-            return `
-            <div class="results-image">
-            <a href="${item.entry}" class="image-link">
-                <img id=${item.score} src="${item.entry}?${Math.random()}"
-                    title="Effective Score: ${item.score}, Meta: ${item.additional.metadata_score}, Image: ${item.additional.image_score}"
-                    class="image">
-            </a>
-            </div>`;
-        }
-
-        function render_org(query, data, classPrefix="") {
-            return data.map(function (item) {
-                var orgParser = new Org.Parser();
-                var orgDocument = orgParser.parse(item.entry);
-                var orgHTMLDocument = orgDocument.convert(Org.ConverterHTML, { htmlClassPrefix: classPrefix, suppressNewLines: true });
-                return `<div class="results-org">` + orgHTMLDocument.toString() + `</div>`;
-            }).join("\n");
-        }
-
-        function render_markdown(query, data) {
-            var md = window.markdownit();
-            return data.map(function (item) {
-                let rendered = "";
-                if (item.additional.file.startsWith("http")) {
-                    lines = item.entry.split("\n");
-                    rendered = md.render(`${lines[0]}\t[*](${item.additional.file})\n${lines.slice(1).join("\n")}`);
-                }
-                else {
-                    rendered = md.render(`${item.entry}`);
-                }
-                return `<div class="results-markdown">` + rendered + `</div>`;
-            }).join("\n");
-        }
-
-        function render_pdf(query, data) {
-            return data.map(function (item) {
-                let compiled_lines = item.additional.compiled.split("\n");
-                let filename = compiled_lines.shift();
-                let text_match = compiled_lines.join("\n")
-                return `<div class="results-pdf">` + `<h2>${filename}</h2>\n<p>${text_match}</p>` + `</div>`;
-            }).join("\n");
-        }
-
-        function render_html(query, data) {
-            return data.map(function (item) {
-                let document = new DOMParser().parseFromString(item.entry, "text/html");
-                // Scrub the HTML to remove any script tags and associated content
-                let script_tags = document.querySelectorAll("script");
-                for (let i = 0; i < script_tags.length; i++) {
-                    script_tags[i].remove();
-                }
-                // Scrub the HTML to remove any style tags and associated content
-                let style_tags = document.querySelectorAll("style");
-                for (let i = 0; i < style_tags.length; i++) {
-                    style_tags[i].remove();
-                }
-                // Scrub the HTML to remove any noscript tags and associated content
-                let noscript_tags = document.querySelectorAll("noscript");
-                for (let i = 0; i < noscript_tags.length; i++) {
-                    noscript_tags[i].remove();
-                }
-                // Scrub the HTML to remove any iframe tags and associated content
-                let iframe_tags = document.querySelectorAll("iframe");
-                for (let i = 0; i < iframe_tags.length; i++) {
-                    iframe_tags[i].remove();
-                }
-                // Scrub the HTML to remove any object tags and associated content
-                let object_tags = document.querySelectorAll("object");
-                for (let i = 0; i < object_tags.length; i++) {
-                    object_tags[i].remove();
-                }
-                // Scrub the HTML to remove any embed tags and associated content
-                let embed_tags = document.querySelectorAll("embed");
-                for (let i = 0; i < embed_tags.length; i++) {
-                    embed_tags[i].remove();
-                }
-                let scrubbedHTML = document.body.outerHTML;
-                return `<div class="results-html">` + scrubbedHTML + `</div>`;
-            }).join("\n");
-        }
-
-        function render_xml(query, data) {
-            return data.map(function (item) {
-                return `<div class="results-xml">` +
-                    `<b><a href="${item.additional.file}">${item.additional.heading}</a></b>` +
-                    `<xml>${item.entry}</xml>` +
-                    `</div>`
-            }).join("\n");
-        }
-
-        function render_multiple(query, data, type) {
-            let html = "";
-            data.forEach(item => {
-                if (item.additional.file.endsWith(".org")) {
-                    html += render_org(query, [item], "org-");
-                } else if (
-                    item.additional.file.endsWith(".md") ||
-                    item.additional.file.endsWith(".markdown") ||
-                        (item.additional.file.includes("issues") && item.additional.source === "github") ||
-                        (item.additional.file.includes("commit") && item.additional.source === "github")
-                    )
-                {
-                    html += render_markdown(query, [item]);
-                } else if (item.additional.file.endsWith(".pdf")) {
-                    html += render_pdf(query, [item]);
-                } else if (item.additional.source == "notion") {
-                    html += `<div class="results-notion">` + `<b><a href="${item.additional.file}">${item.additional.heading}</a></b>` + `<p>${item.entry}</p>` + `</div>`;
-                } else if (item.additional.file.endsWith(".html")) {
-                    html += render_html(query, [item]);
-                } else if (item.additional.file.endsWith(".xml")) {
-                    html += render_xml(query, [item])
-                } else {
-                    html += `<div class="results-plugin">` + `<b><a href="${item.additional.file}">${item.additional.heading}</a></b>` + `<p>${item.entry}</p>` + `</div>`;
-                }
-            });
-            return html;
-        }
-
-        function render_results(data, query, type) {
-            let results = "";
-            if (type === "markdown") {
-                results = render_markdown(query, data);
-            } else if (type === "org") {
-                results = render_org(query, data, "org-");
-            } else if (type === "image") {
-                results = data.map(render_image).join('');
-            } else if (type === "pdf") {
-                results = render_pdf(query, data);
-            } else if (type === "github" || type === "all" || type === "notion") {
-                results = render_multiple(query, data, type);
-            } else {
-                results = data.map((item) => `<div class="results-plugin">` + `<p>${item.entry}</p>` + `</div>`).join("\n")
-            }
-
-            // Any POST rendering goes here.
-
-            let renderedResults = document.createElement("div");
-            renderedResults.id = `results-${type}`;
-            renderedResults.innerHTML = results;
-
-            // For all elements that are of type img in the results html and have a src with 'avatar' in the URL, add the class 'avatar'
-            // This is used to make the avatar images round
-            let images = renderedResults.querySelectorAll("img[src*='avatar']");
-            for (let i = 0; i < images.length; i++) {
-                images[i].classList.add("avatar");
-            }
-
-            return renderedResults.outerHTML;
-        }
-
-        async function search(rerank=false) {
-            // Extract required fields for search from form
-            query = document.getElementById("query").value.trim();
-            type = 'all';
-            results_count = localStorage.getItem("khojResultsCount") || 5;
-            console.log(`Query: ${query}, Type: ${type}, Results Count: ${results_count}`);
-
-            // Short circuit on empty query
-            if (query.length === 0) {
-                return;
-            }
-
-            // If set query field in url query param on rerank
-            if (rerank)
-                setQueryFieldInUrl(query);
-
-            // Execute Search and Render Results
-            url = await createRequestUrl(query, type, results_count || 5, rerank);
-            const khojToken = await window.tokenAPI.getToken();
-            const headers = { 'Authorization': `Bearer ${khojToken}` };
-
-            fetch(url, { headers })
-                .then(response => response.json())
-                .then(data => {
-                    document.getElementById("results").innerHTML = render_results(data, query, type);
-                });
-        }
-
-        let debounceTimeout;
-        function incrementalSearch(event) {
-            // Run incremental search only after waitTime passed since the last key press
-            let waitTime = 300;
-            clearTimeout(debounceTimeout);
-            debounceTimeout = setTimeout(() => {
-                type = 'all';
-                // Search with reranking on 'Enter'
-                let should_rerank = event.key === 'Enter';
-                search(rerank=should_rerank);
-            }, waitTime);
-        }
-
-        async function populate_type_dropdown() {
-            const hostURL = await window.hostURLAPI.getURL();
-            const khojToken = await window.tokenAPI.getToken();
-            const headers = { 'Authorization': `Bearer ${khojToken}` };
-
-            // Populate type dropdown field with enabled content types only
-            fetch(`${hostURL}/api/content/types`, { headers })
-                .then(response => response.json())
-                .then(enabled_types => {
-                    // Show warning if no content types are enabled
-                    if (enabled_types.detail) {
-                        document.getElementById("results").innerHTML = "<div id='results-error'>To use Khoj search, setup your content plugins on the Khoj <a class='inline-chat-link' href='/settings'>settings page</a>.</div>";
-                        document.getElementById("query").setAttribute("disabled", "disabled");
-                        document.getElementById("query").setAttribute("placeholder", "Configure Khoj to enable search");
-                        return [];
-                    }
-
-                    return enabled_types;
-                });
-        }
-
-        async function createRequestUrl(query, type, results_count, rerank) {
-            // Generate Backend API URL to execute Search
-            const hostURL = await window.hostURLAPI.getURL();
-
-            let url = `${hostURL}/api/search?q=${encodeURIComponent(query)}&n=${results_count}&client=web`;
-            // If type is not 'all', append type to URL
-            if (type !== 'all')
-                url += `&t=${type}`;
-            // Rerank is only supported by text types
-            if (type !== "image")
-                url += `&r=${rerank}`;
-            return url;
-        }
-
-        function setQueryFieldInUrl(query) {
-            var url = new URL(window.location.href);
-            url.searchParams.set("q", query);
-            window.history.pushState({}, "", url.href);
-        }
-
-        window.addEventListener("DOMContentLoaded", async() => {
-            // Setup the header pane
-            document.getElementById("khoj-header").innerHTML = await populateHeaderPane();
-            // Setup the nav menu
-            document.getElementById("profile-picture").addEventListener("click", toggleNavMenu);
-            // Set the active nav pane
-            document.getElementById("search-nav")?.classList.add("khoj-nav-selected");
-        })
-
-
-        window.addEventListener("load", async function() {
-            // Dynamically populate type dropdown based on enabled content types and type passed as URL query parameter
-            await populate_type_dropdown();
-
-            // Fill query field with value passed in URL query parameters, if any.
-            var query_via_url = new URLSearchParams(window.location.search).get("q");
-            if (query_via_url)
-                document.getElementById("query").value = query_via_url;
-        });
-    </script>
-
-    <body>
-        <!--Add Header Logo and Nav Pane-->
-        <div id="khoj-header" class="khoj-header"></div>
-
-        <!--Add Text Box To Enter Query, Trigger Incremental Search OnChange -->
-        <input type="text" id="query" class="option" onkeyup=incrementalSearch(event) autofocus="autofocus" placeholder="Search your knowledge base using natural language">
-
-        <!-- Section to Render Results -->
-        <div id="results"></div>
-    </body>
-
-    <style>
-        @media only screen and (max-width: 600px) {
-            body {
-                display: grid;
-                grid-template-columns: 1fr;
-                grid-template-rows: 1fr auto auto auto minmax(80px, 100%);
-                font-size: small!important;
-            }
-            body > * {
-                grid-column: 1;
-            }
-        }
-        @media only screen and (min-width: 600px) {
-            body {
-                display: grid;
-                grid-template-columns: 1fr min(70vw, 100%) 1fr;
-                grid-template-rows: 1fr auto auto auto minmax(80px, 100%);
-                padding-top: 60vw;
-            }
-            body > * {
-                grid-column: 2;
-            }
-        }
-        body {
-            padding: 0px;
-            margin: 0px;
-            background: var(--background-color);
-            color: var(--main-text-color);
-            font-family: var(--font-family);
-            font-size: small;
-            font-weight: 300;
-            line-height: 1.5em;
-        }
-        body > * {
-            padding: 10px;
-            margin: 10px;
-        }
-        #options {
-            padding: 0;
-            display: grid;
-            grid-template-columns: 1fr;
-        }
-        #options > * {
-            padding: 15px;
-            border-radius: 5px;
-            border: 1px solid #475569;
-            background: #f9fafc
-        }
-        .option:hover {
-            box-shadow: 0 0 11px #aaa;
-        }
-        #options > button {
-            margin-right: 10px;
-        }
-
-        #query {
-            font-size: small;
-        }
-        #results {
-            font-size: small;
-            margin: 0px;
-            line-height: 20px;
-        }
-        .results-image {
-            display: grid;
-            grid-template-columns: repeat(3, 1fr);
-        }
-        .image-link {
-            place-self: center;
-        }
-        .image {
-            width: 20vw;
-            border-radius: 10px;
-            border: 1px solid #475569;
-        }
-        #json {
-            white-space: pre-wrap;
-        }
-        .results-pdf,
-        .results-notion,
-        .results-html,
-        .results-plugin {
-            text-align: left;
-            white-space: pre-line;
-        }
-        .results-markdown,
-        .results-github {
-            text-align: left;
-        }
-        .results-org {
-            text-align: left;
-            /* white-space: pre-line; */
-        }
-        .results-org h3 {
-            margin: 20px 0 0 0;
-            font-size: small;
-        }
-        span.org-task-status {
-            color: white;
-            padding: 3.5px 3.5px 0;
-            margin-right: 5px;
-            border-radius: 5px;
-            background-color: #eab308;
-            font-size: small;
-        }
-        span.org-task-status.todo {
-            background-color: #3b82f6
-        }
-        span.org-task-status.done {
-            background-color: #22c55e;
-        }
-        span.org-task-tag {
-            color: white;
-            padding: 3.5px 3.5px 0;
-            margin-right: 5px;
-            border-radius: 5px;
-            border: 1px solid #475569;
-            background-color: #ef4444;
-            font-size: small;
-        }
-
-        pre {
-            max-width: 100;
-        }
-
-        a {
-            color: #3b82f6;
-            text-decoration: none;
-        }
-
-        img.avatar {
-            width: 20px;
-            height: 20px;
-            border-radius: 50%;
-        }
-
-        div#results-error,
-        div.results-markdown,
-        div.results-notion,
-        div.results-org,
-        div.results-plugin,
-        div.results-html,
-        div.results-pdf {
-            text-align: left;
-            box-shadow: 2px 2px 2px var(--primary-hover);
-            border-radius: 5px;
-            padding: 10px;
-            margin: 10px 0;
-            border: 4px solid rgb(229, 229, 229);
-        }
-
-        div#results-error {
-            box-shadow: 2px 2px 2px #FF5722;
-        }
-
-        img {
-            max-width: 90%;
-        }
-
-        @keyframes gradient {
-            0% {
-                background-position: 0% 50%;
-            }
-            50% {
-                background-position: 100% 50%;
-            }
-            100% {
-                background-position: 0% 50%;
-            }
-        }
-
-        a.khoj-logo {
-            text-align: center;
-        }
-
-    </style>
-</html>
diff --git a/src/interface/desktop/settings.html b/src/interface/desktop/settings.html
index f6a283d3..601cb27b 100644
--- a/src/interface/desktop/settings.html
+++ b/src/interface/desktop/settings.html
@@ -1,16 +1,264 @@
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0 maximum-scale=1.0">
-        <title>Khoj - Settings</title>
+<!DOCTYPE html>
+<html lang="en">
 
-        <link rel="icon" type="image/png" sizes="128x128" href="./assets/icons/favicon-128x128.png">
-        <link rel="manifest" href="./khoj.webmanifest">
-        <link rel="stylesheet" href="./assets/khoj.css">
-    </head>
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Khoj - Settings</title>
+    <link rel="icon" type="image/png" sizes="128x128" href="./assets/icons/favicon-128x128.png">
+    <link rel="stylesheet" href="./assets/khoj.css">
+    <style>
+        :root {
+            --background-color: #f9fafb;
+            --primary-color: hsla(24.6 95% 53.1%);
+            --secondary-color: #f3f4f6;
+            --text-color: #111827;
+            --card-bg: #ffffff;
+            --card-border: #e5e7eb;
+        }
+
+        body {
+            margin: 0;
+            padding: 0;
+            font-family: var(--font-family);
+            background-color: var(--background-color);
+            color: var(--text-color);
+            display: grid;
+            grid-template-columns: 1fr;
+            height: 100vh;
+        }
+
+        /* Main Content */
+        .main-content {
+            padding: 20px;
+            display: flex;
+            flex-direction: column;
+            gap: 20px;
+        }
+
+        .header {
+            font-size: 1.5rem;
+            font-weight: bold;
+            text-align: left;
+            margin-bottom: 20px;
+        }
+
+        .section-cards {
+            display: grid;
+            grid-template-columns: 1fr;
+            gap: 20px;
+        }
+
+        .card {
+            background-color: var(--card-bg);
+            border: 1px solid var(--card-border);
+            border-radius: 12px;
+            padding: 20px;
+            box-shadow: 0px 4px 6px rgba(0, 0, 0, 0.1);
+            transition: transform 0.2s ease, box-shadow 0.2s ease;
+        }
+
+        .card:hover {
+            transform: translateY(-5px);
+            box-shadow: 0px 6px 10px rgba(0, 0, 0, 0.15);
+        }
+
+        .card-title {
+            font-size: 1.2rem;
+            font-weight: 600;
+            margin-bottom: 10px;
+        }
+
+        .card-input {
+            width: -webkit-fill-available;
+            padding: 10px;
+            border: 1px solid var(--card-border);
+            border-radius: 8px;
+            font-size: 1rem;
+        }
+
+        input,
+        button {
+            font-family: var(--font-family);
+        }
+
+        .card-button {
+            background-color: var(--primary-color);
+            color: white;
+            border: none;
+            padding: 10px 20px;
+            border-radius: 8px;
+            font-size: 1rem;
+            cursor: pointer;
+            transition: background-color 0.3s ease;
+        }
+
+        .card-button:hover {
+            background-color: hsla(24.6 95% 53.1% / 0.5);
+        }
+
+        .secondary-button {
+            background-color: var(--secondary-color);
+            color: var(--text-color);
+            border: none;
+            padding: 10px 20px;
+            border-radius: 8px;
+            font-size: 1rem;
+            cursor: pointer;
+            transition: background-color 0.3s ease;
+        }
+
+        .secondary-button:hover {
+            background-color: #e5e7eb;
+        }
+
+        .sync-data {
+            display: flex;
+            justify-content: left;
+            align-items: baseline;
+            gap: 10px;
+            flex-direction: column;
+        }
+
+        div.folder-element,
+        div.file-element {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+        }
+
+        img.file-synced-image {
+            width: 16px;
+            height: 16px;
+        }
+
+        div.remove-button-container {
+            display: flex;
+            flex-direction: row;
+            justify-content: right;
+            align-items: center;
+            gap: 12px;
+        }
+
+        button.remove-folder-button,
+        button.remove-file-button {
+            background-color: transparent;
+            border: none;
+            cursor: pointer;
+            border-radius: 8px;
+        }
+
+        button.remove-folder-button:hover,
+        button.remove-file-button:hover {
+            background-color: #f3f4f6;
+        }
+
+        div#sync-status {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            gap: 10px;
+        }
+
+        div#big-actions {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            gap: 10px;
+        }
+
+        div#big-actions button {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            gap: 8px;
+        }
+
+        .content-name:hover {
+            text-decoration: underline;
+            color: var(--primary-color);
+        }
+
+        .sync-icon,
+        .clock-icon,
+        .trash-icon {
+            width: 16px;
+            height: 16px;
+        }
+
+        #loading-bar {
+            width: 100%;
+            height: 4px;
+            background: linear-gradient(90deg,
+                    hsla(24.6 95% 53.1% / 0.2) 0%,
+                    var(--primary-color) 50%,
+                    hsla(24.6 95% 53.1% / 0.2) 100%);
+            border-radius: 2px;
+            background-size: 200% 100%;
+            animation: loading 1.5s infinite;
+            margin: 10px 0;
+            transition: opacity 0.3s ease;
+        }
+
+        @keyframes loading {
+            0% {
+                background-position: 200% 0;
+            }
+
+            100% {
+                background-position: -200% 0;
+            }
+        }
+
+        #loading-bar[style*="display: none"] {
+            opacity: 0;
+        }
+
+        #loading-bar {
+            opacity: 1;
+        }
+
+        details.collapsible {
+            background-color: var(--card-bg);
+            border: 1px solid var(--card-border);
+            border-radius: 12px;
+            padding: 20px;
+            box-shadow: 0px 4px 6px rgba(0, 0, 0, 0.1);
+            transition: transform 0.2s ease, box-shadow 0.2s ease;
+        }
+
+        details.collapsible:hover {
+            transform: translateY(-5px);
+            box-shadow: 0px 6px 10px rgba(0, 0, 0, 0.15);
+        }
+
+        details.collapsible summary {
+            font-size: 1.2rem;
+            font-weight: 600;
+            cursor: pointer;
+            list-style: none;
+            display: flex;
+            align-items: center;
+            gap: 8px;
+        }
+
+        details.collapsible summary::after {
+            content: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="6 9 12 15 18 9"></polyline></svg>');
+            font-size: 0.8em;
+            transition: transform 0.2s;
+        }
+
+        details.collapsible[open] summary::after {
+            transform: rotate(180deg);
+        }
+
+        details.collapsible .content {
+            margin-top: 10px;
+        }
+    </style>
     <script src="./utils.js"></script>
     <script>
-        window.addEventListener("DOMContentLoaded", async() => {
+        window.addEventListener("DOMContentLoaded", async () => {
             // Setup the header pane
             document.getElementById("khoj-header").innerHTML = await populateHeaderPane();
             // Setup the nav menu
@@ -19,358 +267,54 @@
             document.getElementById("settings-nav")?.classList.add("khoj-nav-selected");
         })
     </script>
+</head>
 
-    <body>
-        <!--Add Header Logo and Nav Pane-->
+<body>
+    <!-- Main Content -->
+    <div class="main-content">
         <div id="khoj-header" class="khoj-header"></div>
         <div class="section-cards">
-            <div class="card-description-row">
-                <div class="card configuration">
-                    <div class="card-title-row">
-                        <img class="card-icon" src="./assets/icons/link.svg" alt="Khoj Server URL">
-                        <h3 class="card-title">
-                            Server URL
-                        </h3>
-                    </div>
-                    <div class="card-description-row">
-                        <input id="khoj-host-url" class="card-input" type="text">
-                    </div>
-                    <div class="card-title-row">
-                        <img class="card-icon" src="./assets/icons/key.svg" alt="Khoj Access Key">
-                        <h3 class="card-title">
-                            API Key
-                        </h3>
-                    </div>
-                    <div class="card-description-row">
-                        <input id="khoj-access-key" class="card-input" type="text" placeholder="Enter API key to access your Khoj">
-                    </div>
+            <!-- Replace the server URL and API key cards with: -->
+            <details class="collapsible">
+                <summary>Server URL</summary>
+                <div class="content">
+                    <input type="text" class="card-input" id="khoj-host-url" placeholder="Enter server URL">
                 </div>
+            </details>
+
+            <details class="collapsible">
+                <summary>API Key</summary>
+                <div class="content">
+                    <input type="text" class="card-input" id="khoj-access-key" placeholder="Enter API key">
+                </div>
+            </details>
+            <div class="card">
+                <div class="card-title">Files</div>
+                <div id="current-files"></div>
+                <button class="secondary-button" id="update-file" title="Add a file to be indexed to your Khoj knowledge base. Will be synced automatically.">Add File</button>
             </div>
-            <div class="card-description-row">
-                <div class="card configuration">
-                    <div class="card-title-row">
-                        <img class="card-icon" src="./assets/icons/plaintext.svg" alt="File">
-                        <h3 class="card-title">
-                            Files
-                            <button id="toggle-files" class="card-button">
-                                <svg id="toggle-files-svg" xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M12 5v14M5 12l7 7 7-7"></path></svg>
-                            </button>
-                        </h3>
-                    </div>
-                    <div class="card-description-row">
-                        <div id="current-files"></div>
-                    </div>
-                    <div class="card-action-row">
-                        <button id="update-file" class="card-button">
-                            Add
-                            <img class="add-files-icon" src="./assets/icons/circular-add.svg" alt="Add">
-                        </button>
-                    </div>
-                </div>
+            <div class="card">
+                <div class="card-title">Folders</div>
+                <div id="current-folders"></div>
+                <button class="secondary-button" id="update-folder" title="Add a folder to be indexed to your Khoj knowledge base. All valid files will be synced automatically.">Add Folder</button>
             </div>
-            <div class="card-description-row">
-                <div class="card configuration">
-                    <div class="card-title-row">
-                        <img class="card-icon" src="./assets/icons/folder.svg" alt="Folder">
-                        <h3 class="card-title">
-                            Folders
-                            <button id="toggle-folders" class="card-button">
-                                <svg id="toggle-folders-svg" xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M12 5v14M5 12l7 7 7-7"></path></svg>
-                            </button>
-                        </h3>
-                    </div>
-                    <div class="card-description-row">
-                        <div id="current-folders"></div>
-                    </div>
-                    <div class="card-action-row">
-                        <button id="update-folder" class="card-button">
-                            Add
-                            <img class="add-files-icon" src="./assets/icons/circular-add.svg" alt="Add">
-                        </button>
-                    </div>
-                </div>
-            </div>
-            <div class="section-action-row">
-                <div class="card-description-row">
-                    <button id="sync-force" class="sync-data">💾 Save</button>
-                </div>
-                <div class="card-description-row">
-                    <button id="delete-all" class="sync-data">🗑️ Delete All</button>
-                </div>
-            </div>
-            <div id="loading-bar" style="display: none;"></div>
-            <div class="card-description-row">
+            <div class="sync-data">
+                <div id="loading-bar" style="display: none;"></div>
                 <div id="sync-status"></div>
+                <div id="big-actions">
+                    <button class="card-button" id="sync-force" title="Delete and re-index all configured files and folders">
+                        <img src="./assets/icons/upload.svg" class="sync-icon" alt="Sync">
+                        Force Sync
+                    </button>
+                    <button class="card-button" id="delete-all" title="Remove all indexed content from Khoj">
+                        <img src="./assets/icons/trash-solid.svg" class="trash-icon" alt="Delete All">
+                        Delete All
+                    </button>
+                </div>
             </div>
         </div>
-    </body>
-
-    <style>
-        @media only screen and (max-width: 600px) {
-            body {
-                display: grid;
-                grid-template-columns: 1fr;
-                grid-template-rows: 1fr auto;
-                font-size: small!important;
-            }
-            body > * {
-                grid-column: 1;
-            }
-        }
-        @media only screen and (min-width: 600px) {
-            body {
-                display: grid;
-                grid-template-columns: 1fr min(70vw, 100%) 1fr;
-                grid-template-rows: 80px auto;
-            }
-            body > * {
-                grid-column: 2;
-            }
-        }
-        body, input {
-            padding: 0px;
-            margin: 0px;
-            background: var(--background-color);
-            color: #475569;
-            font-family: var(--font-family);
-            font-size: small;
-            font-weight: 300;
-            line-height: 1.5em;
-        }
-        body > * {
-            padding: 10px;
-            margin: 10px;
-        }
-
-        svg {
-            transition: transform 0.3s ease-in-out;
-        }
-
-        a.khoj-logo {
-            text-align: center;
-        }
-
-        #loading-bar {
-            height: 10px;
-            width: 100%;
-            background-color: #ddd;
-            position: relative;
-            overflow: hidden;
-        }
-
-        #loading-bar:before {
-            content: "";
-            display: block;
-            position: absolute;
-            left: -200px;
-            width: 200px;
-            height: 100%;
-            background-color: #2980b9;
-            animation: loading-bar 2s linear infinite;
-        }
-
-        @keyframes loading-bar {
-            0% {
-                left: -200px;
-            }
-            100% {
-                left: 100%;
-            }
-        }
-
-        .card-input {
-            padding: 4px;
-            box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.3);
-            border: none;
-            width: 450px;
-        }
-
-        .card {
-            display: grid;
-            gap: 8px;
-            padding: 24px 16px;
-            width: 450px;
-            background: var(--background-color);
-            border: 1px solid rgb(229, 229, 229);
-            border-radius: 4px;
-            box-shadow: 0px 1px 3px 0px rgba(0,0,0,0.1),0px 1px 2px -1px rgba(0,0,0,0.1);
-            overflow: hidden;
-        }
-
-        .section-cards {
-            display: grid;
-            gap: 16px;
-            justify-items: center;
-            margin: 0;
-        }
-        .section-action-row {
-            display: grid;
-            grid-auto-flow: column;
-            gap: 16px;
-            height: fit-content;
-        }
-
-        .card-title-row {
-            display: grid;
-            grid-template-columns: auto 1fr;
-            padding: 0;
-            gap: 12px;
-        }
-        .card-icon {
-            width: 28px;
-            height: 28px;
-        }
-        .add-files-icon {
-            width: 16px;
-            height: 16px;
-        }
-        .card-title {
-            font-size: medium;
-            font-weight: normal;
-            margin: 0;
-            padding: 0;
-            align-self: center;
-        }
-        .card-title-text {
-            vertical-align: middle;
-        }
-        .card-description {
-            margin: 0;
-            color: grey;
-            font-size: small;
-        }
-        .card-button-row {
-            display: grid;
-            grid-template-columns: auto;
-            text-align: right;
-        }
-        .card-button {
-            border: none;
-            font-weight: bold;
-            color: rgb(64,64,64);
-            background: transparent;
-            font-size: small;
-            cursor: pointer;
-            margin: 0;
-            padding: 0;
-            height: 32px;
-            text-align: right;
-        }
-        .primary-button {
-            border: none;
-            color: var(--background-color);
-            padding: 15px 32px;
-            text-align: center;
-            text-decoration: none;
-            display: inline-block;
-            font-size: small;
-        }
-
-        button.card-button.disabled {
-            color: var(--flower);
-            background: transparent;
-            font-size: small;
-            cursor: pointer;
-            margin: 0;
-            padding: 0;
-            height: 32px;
-            text-align: right;
-            text-align: left;
-        }
-
-        button.card-button.happy {
-            color: var(--leaf);
-        }
-
-        img.configured-icon {
-            max-width: 16px;
-        }
-
-        div.card-action-row.enabled{
-            display: block;
-        }
-
-        img.configured-icon.enabled {
-            display: inline;
-        }
-
-        div.card-action-row.disabled,
-        img.configured-icon.disabled {
-            display: none;
-        }
-
-        div.file-element,
-        div.folder-element {
-            display: grid;
-            grid-template-columns: auto 1fr;
-            border: 1px solid rgb(229, 229, 229);
-            border-radius: 4px;
-            box-shadow: 0px 1px 3px 0px rgba(0,0,0,0.1),0px 1px 2px -1px rgba(0,0,0,0.8);
-            padding: 4px;
-            margin-bottom: 8px;
-        }
-
-        div.content-name {
-            overflow-wrap: break-word;
-        }
-
-        div.remove-button-container {
-            text-align: right;
-            display: flex;
-            margin-left: auto;
-            gap: 8px;
-        }
-
-        .file-synced-image{
-            width: 20px;
-            display: none;
-        }
-
-        button.remove-folder-button,
-        button.remove-file-button {
-            background-color: rgb(253 214 214);
-            border-radius: 3px;
-            border: none;
-            color: var(--flower);
-            padding: 4px;
-        }
-
-        button.remove-folder-button:hover,
-        button.remove-file-button:hover {
-            background-color: rgb(255 235 235);
-            border-radius: 3px;
-            border: none;
-            color: var(--flower);
-            padding: 4px;
-            cursor: pointer;
-        }
-        button.sync-data {
-            background-color: var(--primary-hover);
-            border: none;
-            color: var(--main-text-color);
-            padding: 12px;
-            text-align: center;
-            text-decoration: none;
-            display: inline-block;
-            font-size: 16px;
-            border-radius: 4px;
-            cursor: pointer;
-            transition: background-color 0.3s ease;
-            box-shadow: 0px 5px 0px var(--background-color);
-        }
-
-        button.sync-data:hover {
-            background-color: var(--summer-sun);
-            box-shadow: 0px 3px 0px var(--background-color);
-            cursor: pointer;
-        }
-        .sync-force-toggle {
-            align-content: center;
-            display: grid;
-            grid-auto-flow: column;
-            gap: 4px;
-        }
-    </style>
-    <script src="./renderer.js"></script>
+    </div>
+</body>
+<script src="./renderer.js"></script>
 
 </html>
diff --git a/src/interface/desktop/utils.js b/src/interface/desktop/utils.js
index 84e50460..8d244ff1 100644
--- a/src/interface/desktop/utils.js
+++ b/src/interface/desktop/utils.js
@@ -31,7 +31,7 @@ function toggleNavMenu() {
 }
 
 // Close the dropdown menu if the user clicks outside of it
-document.addEventListener('click', function(event) {
+document.addEventListener('click', function (event) {
     let menu = document.getElementById("khoj-nav-menu");
     let menuContainer = document.getElementById("khoj-nav-menu-container");
     let isClickOnMenu = menuContainer?.contains(event.target) || menuContainer === event.target;
@@ -56,25 +56,19 @@ async function populateHeaderPane() {
     // Populate the header element with the navigation pane
     return `
         <a class="khoj-logo" href="/">
-            <img class="khoj-logo" src="./assets/icons/khoj-logo-sideways-500.png" alt="Khoj"></img>
+            <img class="khoj-logo" src="./assets/icons/khoj_logo.png" alt="Khoj"></img>
         </a>
         <nav class="khoj-nav">
-        ${
-            userInfo && userInfo.email
-              ? `<div class="khoj-status-box">
+        ${userInfo && userInfo.email
+            ? `<div class="khoj-status-box">
               <span class="khoj-status-connected"></span>
                <span class="khoj-status-text">Connected to server</span>
                </div>`
-              : `<div class="khoj-status-box">
+            : `<div class="khoj-status-box">
               <span class="khoj-status-not-connected"></span>
                <span class="khoj-status-text">Not connected to server</span>
                </div>`
-          }
-            <a id="chat-nav" class="khoj-nav" href="./chat.html">
-              <img class="nav-icon" src="./assets/icons/chat.svg" alt="Chat">
-              <span class="khoj-nav-item-text">Chat</span>
-            </a>
-            ${has_documents ? '<a id="search-nav" class="khoj-nav" href="./search.html"><img class="nav-icon" src="./assets/icons/search.svg" alt="Search"> <span class="khoj-nav-item-text">Search</span></a>' : ''}
+        }
             ${username ? `
                 <div id="khoj-nav-menu-container" class="khoj-nav dropdown">
                     ${user_photo && user_photo != "None" ? `
@@ -84,7 +78,10 @@ async function populateHeaderPane() {
                     `}
                     <div id="khoj-nav-menu" class="khoj-nav-dropdown-content">
                         <div class="khoj-nav-username"> ${username} </div>
-                        <a id="settings-nav" class="khoj-nav" href="./settings.html">⚙️ Settings</a>
+                        <a onclick="window.navigateAPI.navigateToWebHome()" class="khoj-nav-link">
+                        <img class="khoj-nav-icon" src="./assets/icons/open-link.svg" alt="Open Host Url"></img>
+                        Open App
+                        </a>
                     </div>
                 </div>
             ` : ''}
diff --git a/src/interface/desktop/yarn.lock b/src/interface/desktop/yarn.lock
index cbe35457..207f0f99 100644
--- a/src/interface/desktop/yarn.lock
+++ b/src/interface/desktop/yarn.lock
@@ -50,17 +50,17 @@
   dependencies:
     defer-to-connect "^2.0.0"
 
-"@todesktop/runtime@^1.6.4":
-  version "1.6.4"
-  resolved "https://registry.yarnpkg.com/@todesktop/runtime/-/runtime-1.6.4.tgz#a9d62a021cf2647c51371c892bfb1d4c5a29ed7e"
-  integrity sha512-n6dOxhrKKsXMM+i2u9iRvoJSR2KCWw0orYK+FT9RbWNPykhuFIYd0yy8dYgYy/OuClKGyGl4SJFi2757FLhWDA==
+"@todesktop/runtime@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@todesktop/runtime/-/runtime-2.0.0.tgz#dfd409186ae664f5e28186a03b99e620ec7b7f82"
+  integrity sha512-0a2tmWpIc/HJE/873xRMZKQNggfrYhoKYIchfN+k8RqKdzTPwTWa5ztur7GdCHLHBUaiMBPNRzF3h4kwHd1NCw==
   dependencies:
-    del "^6.0.0"
-    electron-updater "^4.6.1"
-    eventemitter2 "^6.4.5"
+    del "^6.1.1"
+    electron-updater "^6.3.9"
+    eventemitter2 "^6.4.9"
     execa "^5.0.0"
     lodash.once "^4.1.1"
-    semver "^7.3.2"
+    semver "^7.6.3"
 
 "@types/cacheable-request@^6.0.1":
   version "6.0.3"
@@ -90,16 +90,16 @@
   integrity sha512-jYvz8UMLDgy3a5SkGJne8H7VA7zPV2Lwohjx0V8V31+SqAjNmurWMkk9cQhfvlcnXWudBpK9xPM1n4rljOcHYQ==
 
 "@types/node@*":
-  version "22.9.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.9.1.tgz#bdf91c36e0e7ecfb7257b2d75bf1b206b308ca71"
-  integrity sha512-p8Yy/8sw1caA8CdRIQBG5tiLHmxtQKObCijiAa9Ez+d4+PRffM4054xbju0msf+cvhJpnFEeNjxmVT/0ipktrg==
+  version "22.10.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.10.1.tgz#41ffeee127b8975a05f8c4f83fb89bcb2987d766"
+  integrity sha512-qKgsUwfHZV2WCWLAnVP1JqnpE6Im6h3Y0+fYgMTasNQ7V++CBX5OT1as0g0f+OyubbFqhf6XVNIsmN4IIhEgGQ==
   dependencies:
-    undici-types "~6.19.8"
+    undici-types "~6.20.0"
 
 "@types/node@^18.11.18":
-  version "18.19.64"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.64.tgz#122897fb79f2a9ec9c979bded01c11461b2b1478"
-  integrity sha512-955mDqvO2vFf/oL7V3WiUtiz+BugyX8uVbaT2H8oj3+8dRyH2FLiNdowe7eNqRM7IOIZvzDH76EoAT+gwm6aIQ==
+  version "18.19.67"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.67.tgz#77c4b01641a1e3e1509aff7e10d39e4afd5ae06d"
+  integrity sha512-wI8uHusga+0ZugNp0Ol/3BqQfEcCCNfojtO6Oou9iVNGPTL6QNSdnUdqq85fRgIorLhLMuPIKpsN98QE9Nh+KQ==
   dependencies:
     undici-types "~5.26.4"
 
@@ -110,11 +110,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/semver@^7.3.6":
-  version "7.5.8"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e"
-  integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==
-
 "@types/yauzl@^2.9.1":
   version "2.10.3"
   resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.3.tgz#e9b2808b4f109504a03cda958259876f61017999"
@@ -168,9 +163,9 @@ atomically@^1.7.0:
   integrity sha512-Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w==
 
 axios@^1.7.4:
-  version "1.7.7"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.7.tgz#2f554296f9892a72ac8d8e4c5b79c14a91d0a47f"
-  integrity sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.8.tgz#1997b1496b394c21953e68c14aaa51b7b5de3d6e"
+  integrity sha512-Uu0wb7KNqK2t5K+YQyVCLM76prD5sRFjKHbJYCP1J7JFGEQ6nN7HWn9+04LAeiJ3ji54lgS/gZCH1oxyrf1SPw==
   dependencies:
     follow-redirects "^1.15.6"
     form-data "^4.0.0"
@@ -206,12 +201,12 @@ buffer-crc32@~0.2.3:
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
   integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
 
-builder-util-runtime@8.9.2:
-  version "8.9.2"
-  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz#a9669ae5b5dcabfe411ded26678e7ae997246c28"
-  integrity sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A==
+builder-util-runtime@9.2.10:
+  version "9.2.10"
+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.10.tgz#a0f7d9e214158402e78b74a745c8d9f870c604bc"
+  integrity sha512-6p/gfG1RJSQeIbz8TK5aPNkoztgY1q5TgmGFMAXcY8itsGW6Y2ld1ALsZ5UJn8rog7hKF3zHx5iQbNQ8uLcRlw==
   dependencies:
-    debug "^4.3.2"
+    debug "^4.3.4"
     sax "^1.2.4"
 
 cacheable-lookup@^5.0.3:
@@ -296,7 +291,7 @@ debounce-fn@^4.0.0:
   dependencies:
     mimic-fn "^3.0.0"
 
-debug@^4.1.0, debug@^4.1.1, debug@^4.3.2:
+debug@^4.1.0, debug@^4.1.1, debug@^4.3.4:
   version "4.3.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
   integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
@@ -333,7 +328,7 @@ define-properties@^1.2.1:
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
-del@^6.0.0:
+del@^6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/del/-/del-6.1.1.tgz#3b70314f1ec0aa325c6b14eb36b95786671edb7a"
   integrity sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==
@@ -379,19 +374,19 @@ electron-store@^8.1.0:
     conf "^10.2.0"
     type-fest "^2.17.0"
 
-electron-updater@^4.6.1:
-  version "4.6.5"
-  resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.6.5.tgz#e9a75458bbfd6bb41a58a829839e150ad2eb2d3d"
-  integrity sha512-kdTly8O9mSZfm9fslc1mnCY+mYOeaYRy7ERa2Fed240u01BKll3aiupzkd07qKw69KvhBSzuHroIW3mF0D8DWA==
+electron-updater@^6.3.9:
+  version "6.3.9"
+  resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-6.3.9.tgz#e1e7f155624c58e6f3760f376c3a584028165ec4"
+  integrity sha512-2PJNONi+iBidkoC5D1nzT9XqsE8Q1X28Fn6xRQhO3YX8qRRyJ3mkV4F1aQsuRnYPqq6Hw+E51y27W75WgDoofw==
   dependencies:
-    "@types/semver" "^7.3.6"
-    builder-util-runtime "8.9.2"
-    fs-extra "^10.0.0"
+    builder-util-runtime "9.2.10"
+    fs-extra "^10.1.0"
     js-yaml "^4.1.0"
     lazy-val "^1.0.5"
     lodash.escaperegexp "^4.1.2"
     lodash.isequal "^4.5.0"
-    semver "^7.3.5"
+    semver "^7.6.3"
+    tiny-typed-emitter "^2.1.0"
 
 electron@28.2.1:
   version "28.2.1"
@@ -436,7 +431,7 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-eventemitter2@^6.4.5:
+eventemitter2@^6.4.9:
   version "6.4.9"
   resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.9.tgz#41f2750781b4230ed58827bc119d293471ecb125"
   integrity sha512-JEPTiaOt9f04oa6NOkc4aH+nVp5I3wEjpHbIPqfgCdD5v5bUzy7xQqwcVO2aDQgOWhI28da57HksMrzK9HlRxg==
@@ -530,7 +525,7 @@ form-data@^4.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
-fs-extra@^10.0.0:
+fs-extra@^10.1.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
   integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
@@ -1115,7 +1110,7 @@ semver@^6.2.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.2, semver@^7.3.5:
+semver@^7.3.2, semver@^7.3.5, semver@^7.6.3:
   version "7.6.3"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
   integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
@@ -1166,6 +1161,11 @@ sumchecker@^3.0.1:
   dependencies:
     debug "^4.1.0"
 
+tiny-typed-emitter@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/tiny-typed-emitter/-/tiny-typed-emitter-2.1.0.tgz#b3b027fdd389ff81a152c8e847ee2f5be9fad7b5"
+  integrity sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA==
+
 to-regex-range@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
@@ -1188,10 +1188,10 @@ undici-types@~5.26.4:
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
   integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
 
-undici-types@~6.19.8:
-  version "6.19.8"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
-  integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
+undici-types@~6.20.0:
+  version "6.20.0"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.20.0.tgz#8171bf22c1f588d1554d55bf204bc624af388433"
+  integrity sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==
 
 universalify@^0.1.0:
   version "0.1.2"
diff --git a/src/interface/emacs/khoj.el b/src/interface/emacs/khoj.el
index fadf8ca2..c43ae762 100644
--- a/src/interface/emacs/khoj.el
+++ b/src/interface/emacs/khoj.el
@@ -6,7 +6,7 @@
 ;;         Saba Imran <saba@khoj.dev>
 ;; Description: Your Second Brain
 ;; Keywords: search, chat, ai, org-mode, outlines, markdown, pdf, image
-;; Version: 1.30.1
+;; Version: 1.31.0
 ;; Package-Requires: ((emacs "27.1") (transient "0.3.0") (dash "2.19.1"))
 ;; URL: https://github.com/khoj-ai/khoj/tree/master/src/interface/emacs
 
@@ -434,9 +434,9 @@ Auto invokes setup steps on calling main entrypoint."
 Append 'TYPE-QUERY' as query parameter in request url.
 Specify `BOUNDARY' used to separate files in request header."
   (let ((url-request-method (if force "PUT" "PATCH"))
-        (url-request-data body)
-          (url-request-extra-headers `(("content-type" . ,(format "multipart/form-data; boundary=%s" boundary))
-                                       ("Authorization" . ,(format "Bearer %s" khoj-api-key)))))
+        (url-request-data (encode-coding-string body 'utf-8))
+        (url-request-extra-headers `(("content-type" . ,(format "multipart/form-data; boundary=%s" boundary))
+                                     ("Authorization" . ,(encode-coding-string (format "Bearer %s" khoj-api-key) 'utf-8)))))
       (with-current-buffer
           (url-retrieve (format "%s/api/content?%s&client=emacs" khoj-server-url type-query)
                         ;; render response from indexing API endpoint on server
@@ -668,9 +668,9 @@ Simplified fork of `org-cycle-content' from Emacs 29.1 to work with >=27.1."
   "Sync call API at PATH with METHOD, query PARAMS and BODY as kv assoc list.
 Optionally apply CALLBACK with JSON parsed response and CBARGS."
   (let* ((url-request-method (or method "GET"))
-         (url-request-extra-headers `(("Authorization" . ,(format "Bearer %s" khoj-api-key))))
-         (url-request-extra-headers `(("Authorization" . ,(format "Bearer %s" khoj-api-key)) ("Content-Type" . "application/json")))
-         (url-request-data (if body (json-encode body) nil))
+         (url-request-extra-headers `(("Authorization" . ,(encode-coding-string (format "Bearer %s" khoj-api-key) 'utf-8))
+                                      ("Content-Type" . "application/json")))
+         (url-request-data (if body (encode-coding-string (json-encode body) 'utf-8) nil))
          (param-string (url-build-query-string (append params '((client "emacs")))))
          (query-url (format "%s%s?%s" khoj-server-url path param-string))
          (cbargs (if (and (listp cbargs) (listp (car cbargs))) (car cbargs) cbargs))) ; normalize cbargs to (a b) from ((a b)) if required
@@ -689,8 +689,9 @@ Optionally apply CALLBACK with JSON parsed response and CBARGS."
   "Async call to API at PATH with specified METHOD, query PARAMS and request BODY.
 Optionally apply CALLBACK with JSON parsed response and CBARGS."
   (let* ((url-request-method (or method "GET"))
-         (url-request-extra-headers `(("Authorization" . ,(format "Bearer %s" khoj-api-key)) ("Content-Type" . "application/json")))
-         (url-request-data (if body (json-encode body) nil))
+         (url-request-extra-headers `(("Authorization" . ,(encode-coding-string (format "Bearer %s" khoj-api-key) 'utf-8))
+                                      ("Content-Type" . "application/json")))
+         (url-request-data (if body (encode-coding-string (json-encode body) 'utf-8) nil))
          (param-string (url-build-query-string (append params '((client "emacs")))))
          (query-url (format "%s%s?%s" khoj-server-url path param-string))
          (cbargs (if (and (listp cbargs) (listp (car cbargs))) (car cbargs) cbargs))) ; normalize cbargs to (a b) from ((a b)) if required
@@ -716,7 +717,10 @@ Optionally apply CALLBACK with JSON parsed response and CBARGS."
 Render search results in BUFFER-NAME using CONTENT-TYPE and QUERY.
 Filter out first similar result if IS-FIND-SIMILAR set."
   (let* ((rerank (or rerank "false"))
-         (params `((q ,query) (t ,content-type) (r ,rerank) (n ,khoj-results-count)))
+         (params `((q ,(encode-coding-string query 'utf-8))
+                   (t ,content-type)
+                   (r ,rerank)
+                   (n ,khoj-results-count)))
          (path "/api/search"))
     (khoj--call-api-async path
                     "GET"
diff --git a/src/interface/obsidian/manifest.json b/src/interface/obsidian/manifest.json
index fbe0a70d..5c7d60aa 100644
--- a/src/interface/obsidian/manifest.json
+++ b/src/interface/obsidian/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "khoj",
 	"name": "Khoj",
-	"version": "1.30.1",
+	"version": "1.31.0",
 	"minAppVersion": "0.15.0",
 	"description": "Your Second Brain",
 	"author": "Khoj Inc.",
diff --git a/src/interface/obsidian/package.json b/src/interface/obsidian/package.json
index 5912a51e..7302043a 100644
--- a/src/interface/obsidian/package.json
+++ b/src/interface/obsidian/package.json
@@ -1,6 +1,6 @@
 {
     "name": "Khoj",
-    "version": "1.30.1",
+    "version": "1.31.0",
     "description": "Your Second Brain",
     "author": "Debanjum Singh Solanky, Saba Imran <team@khoj.dev>",
     "license": "GPL-3.0-or-later",
diff --git a/src/interface/obsidian/src/chat_view.ts b/src/interface/obsidian/src/chat_view.ts
index 552a54bd..86d5e1f9 100644
--- a/src/interface/obsidian/src/chat_view.ts
+++ b/src/interface/obsidian/src/chat_view.ts
@@ -1,4 +1,4 @@
-import {ItemView, MarkdownRenderer, Scope, WorkspaceLeaf, request, requestUrl, setIcon, Platform} from 'obsidian';
+import { ItemView, MarkdownRenderer, Scope, WorkspaceLeaf, request, requestUrl, setIcon, Platform } from 'obsidian';
 import * as DOMPurify from 'dompurify';
 import { KhojSetting } from 'src/settings';
 import { KhojPaneView } from 'src/pane_view';
@@ -27,6 +27,7 @@ interface ChatMessageState {
     newResponseEl: HTMLElement | null;
     loadingEllipsis: HTMLElement | null;
     references: any;
+    generatedAssets: string;
     rawResponse: string;
     rawQuery: string;
     isVoice: boolean;
@@ -46,10 +47,10 @@ export class KhojChatView extends KhojPaneView {
     waitingForLocation: boolean;
     location: Location = { timezone: Intl.DateTimeFormat().resolvedOptions().timeZone };
     keyPressTimeout: NodeJS.Timeout | null = null;
-	userMessages: string[] = [];  // Store user sent messages for input history cycling
-	currentMessageIndex: number = -1;  // Track current message index in userMessages array
-	private currentUserInput: string = ""; // Stores the current user input that is being typed in chat
-	private startingMessage: string = "Message";
+    userMessages: string[] = [];  // Store user sent messages for input history cycling
+    currentMessageIndex: number = -1;  // Track current message index in userMessages array
+    private currentUserInput: string = ""; // Stores the current user input that is being typed in chat
+    private startingMessage: string = "Message";
     chatMessageState: ChatMessageState;
 
     constructor(leaf: WorkspaceLeaf, setting: KhojSetting) {
@@ -102,14 +103,14 @@ export class KhojChatView extends KhojPaneView {
 
         // Clear text after extracting message to send
         let user_message = input_el.value.trim();
-		// Store the message in the array if it's not empty
-		if (user_message) {
-			this.userMessages.push(user_message);
-			// Update starting message after sending a new message
-			const modifierKey = Platform.isMacOS ? '⌘' : '^';
-			this.startingMessage = `(${modifierKey}+↑/↓) for prev messages`;
-			input_el.placeholder = this.startingMessage;
-		}
+        // Store the message in the array if it's not empty
+        if (user_message) {
+            this.userMessages.push(user_message);
+            // Update starting message after sending a new message
+            const modifierKey = Platform.isMacOS ? '⌘' : '^';
+            this.startingMessage = `(${modifierKey}+↑/↓) for prev messages`;
+            input_el.placeholder = this.startingMessage;
+        }
         input_el.value = "";
         this.autoResize();
 
@@ -162,9 +163,9 @@ export class KhojChatView extends KhojPaneView {
         })
         chatInput.addEventListener('input', (_) => { this.onChatInput() });
         chatInput.addEventListener('keydown', (event) => {
-			this.incrementalChat(event);
-			this.handleArrowKeys(event);
-		});
+            this.incrementalChat(event);
+            this.handleArrowKeys(event);
+        });
 
         // Add event listeners for long press keybinding
         this.contentEl.addEventListener('keydown', this.handleKeyDown.bind(this));
@@ -199,7 +200,7 @@ export class KhojChatView extends KhojPaneView {
         // Get chat history from Khoj backend and set chat input state
         let getChatHistorySucessfully = await this.getChatHistory(chatBodyEl);
 
-        let placeholderText : string = getChatHistorySucessfully ? this.startingMessage : "Configure Khoj to enable chat";
+        let placeholderText: string = getChatHistorySucessfully ? this.startingMessage : "Configure Khoj to enable chat";
         chatInput.placeholder = placeholderText;
         chatInput.disabled = !getChatHistorySucessfully;
 
@@ -214,7 +215,7 @@ export class KhojChatView extends KhojPaneView {
         });
     }
 
-    startSpeechToText(event: KeyboardEvent | MouseEvent | TouchEvent, timeout=200) {
+    startSpeechToText(event: KeyboardEvent | MouseEvent | TouchEvent, timeout = 200) {
         if (!this.keyPressTimeout) {
             this.keyPressTimeout = setTimeout(async () => {
                 // Reset auto send voice message timer, UI if running
@@ -320,7 +321,7 @@ export class KhojChatView extends KhojPaneView {
         referenceButton.tabIndex = 0;
 
         // Add event listener to toggle full reference on click
-        referenceButton.addEventListener('click', function() {
+        referenceButton.addEventListener('click', function () {
             if (this.classList.contains("collapsed")) {
                 this.classList.remove("collapsed");
                 this.classList.add("expanded");
@@ -375,7 +376,7 @@ export class KhojChatView extends KhojPaneView {
         referenceButton.tabIndex = 0;
 
         // Add event listener to toggle full reference on click
-        referenceButton.addEventListener('click', function() {
+        referenceButton.addEventListener('click', function () {
             if (this.classList.contains("collapsed")) {
                 this.classList.remove("collapsed");
                 this.classList.add("expanded");
@@ -420,23 +421,23 @@ export class KhojChatView extends KhojPaneView {
                 "Authorization": `Bearer ${this.setting.khojApiKey}`,
             },
         })
-        .then(response => response.arrayBuffer())
-        .then(arrayBuffer => context.decodeAudioData(arrayBuffer))
-        .then(audioBuffer => {
-            const source = context.createBufferSource();
-            source.buffer = audioBuffer;
-            source.connect(context.destination);
-            source.start(0);
-            source.onended = function() {
+            .then(response => response.arrayBuffer())
+            .then(arrayBuffer => context.decodeAudioData(arrayBuffer))
+            .then(audioBuffer => {
+                const source = context.createBufferSource();
+                source.buffer = audioBuffer;
+                source.connect(context.destination);
+                source.start(0);
+                source.onended = function () {
+                    speechButton.removeChild(loader);
+                    speechButton.disabled = false;
+                };
+            })
+            .catch(err => {
+                console.error("Error playing speech:", err);
                 speechButton.removeChild(loader);
-                speechButton.disabled = false;
-            };
-        })
-        .catch(err => {
-            console.error("Error playing speech:", err);
-            speechButton.removeChild(loader);
-            speechButton.disabled = false; // Consider enabling the button again to allow retrying
-        });
+                speechButton.disabled = false; // Consider enabling the button again to allow retrying
+            });
     }
 
     formatHTMLMessage(message: string, raw = false, willReplace = true) {
@@ -463,7 +464,7 @@ export class KhojChatView extends KhojPaneView {
         let virtualChatMessageBodyTextEl = document.createElement("div");
 
         // Convert the message to html
-        MarkdownRenderer.renderMarkdown(markdownText, virtualChatMessageBodyTextEl, '', component);
+        MarkdownRenderer.render(this.app, markdownText, virtualChatMessageBodyTextEl, '', component);
 
         // Remove image HTML elements with any non whitelisted src prefix
         virtualChatMessageBodyTextEl.innerHTML = virtualChatMessageBodyTextEl.innerHTML.replace(
@@ -485,12 +486,18 @@ export class KhojChatView extends KhojPaneView {
         intentType?: string,
         inferredQueries?: string[],
         conversationId?: string,
+        images?: string[],
+        excalidrawDiagram?: string
     ) {
         if (!message) return;
 
         let chatMessageEl;
-        if (intentType?.includes("text-to-image") || intentType === "excalidraw") {
-            let imageMarkdown = this.generateImageMarkdown(message, intentType, inferredQueries, conversationId);
+        if (
+            intentType?.includes("text-to-image") ||
+            intentType === "excalidraw" ||
+            (images && images.length > 0) ||
+            excalidrawDiagram) {
+            let imageMarkdown = this.generateImageMarkdown(message, intentType ?? "", inferredQueries, conversationId, images, excalidrawDiagram);
             chatMessageEl = this.renderMessage(chatEl, imageMarkdown, sender, dt);
         } else {
             chatMessageEl = this.renderMessage(chatEl, message, sender, dt);
@@ -510,7 +517,7 @@ export class KhojChatView extends KhojPaneView {
         chatMessageBodyEl.appendChild(this.createReferenceSection(references));
     }
 
-    generateImageMarkdown(message: string, intentType: string, inferredQueries?: string[], conversationId?: string): string {
+    generateImageMarkdown(message: string, intentType: string, inferredQueries?: string[], conversationId?: string, images?: string[], excalidrawDiagram?: string): string {
         let imageMarkdown = "";
         if (intentType === "text-to-image") {
             imageMarkdown = `![](data:image/png;base64,${message})`;
@@ -518,12 +525,23 @@ export class KhojChatView extends KhojPaneView {
             imageMarkdown = `![](${message})`;
         } else if (intentType === "text-to-image-v3") {
             imageMarkdown = `![](data:image/webp;base64,${message})`;
-        } else if (intentType === "excalidraw") {
+        } else if (intentType === "excalidraw" || excalidrawDiagram) {
             const domain = this.setting.khojUrl.endsWith("/") ? this.setting.khojUrl : `${this.setting.khojUrl}/`;
             const redirectMessage = `Hey, I'm not ready to show you diagrams yet here. But you can view it in ${domain}chat?conversationId=${conversationId}`;
             imageMarkdown = redirectMessage;
+        } else if (images && images.length > 0) {
+            for (let image of images) {
+                if (image.startsWith("https://")) {
+                    imageMarkdown += `![](${image})\n\n`;
+                } else {
+                    imageMarkdown += `![](data:image/png;base64,${image})\n\n`;
+                }
+            }
+
+            imageMarkdown += `${message}`;
         }
-        if (inferredQueries) {
+
+        if (images?.length === 0 && inferredQueries) {
             imageMarkdown += "\n\n**Inferred Query**:";
             for (let inferredQuery of inferredQueries) {
                 imageMarkdown += `\n\n${inferredQuery}`;
@@ -534,13 +552,12 @@ export class KhojChatView extends KhojPaneView {
 
     renderMessage(chatBodyEl: Element, message: string, sender: string, dt?: Date, raw: boolean = false, willReplace: boolean = true): Element {
         let message_time = this.formatDate(dt ?? new Date());
-        let emojified_sender = sender == "khoj" ? "🏮 Khoj" : "🤔 You";
 
         // Append message to conversation history HTML element.
         // The chat logs should display above the message input box to follow standard UI semantics
         let chatMessageEl = chatBodyEl.createDiv({
             attr: {
-                "data-meta": `${emojified_sender} at ${message_time}`,
+                "data-meta": message_time,
                 class: `khoj-chat-message ${sender}`
             },
         })
@@ -580,7 +597,7 @@ export class KhojChatView extends KhojPaneView {
         let chatBodyEl = this.contentEl.getElementsByClassName("khoj-chat-body")[0];
         let chatMessageEl = chatBodyEl.createDiv({
             attr: {
-                "data-meta": `🏮 Khoj at ${messageTime}`,
+                "data-meta": messageTime,
                 class: `khoj-chat-message khoj`
             },
         })
@@ -650,26 +667,26 @@ export class KhojChatView extends KhojPaneView {
         chatBodyEl.innerHTML = "";
         chatBodyEl.dataset.conversationId = "";
         chatBodyEl.dataset.conversationTitle = "";
-		this.userMessages = [];
-		this.startingMessage = "Message";
+        this.userMessages = [];
+        this.startingMessage = "Message";
 
-		// Update the placeholder of the chat input
-		const chatInput = this.contentEl.querySelector('.khoj-chat-input') as HTMLTextAreaElement;
-		if (chatInput) {
-			chatInput.placeholder = this.startingMessage;
-		}
+        // Update the placeholder of the chat input
+        const chatInput = this.contentEl.querySelector('.khoj-chat-input') as HTMLTextAreaElement;
+        if (chatInput) {
+            chatInput.placeholder = this.startingMessage;
+        }
         this.renderMessage(chatBodyEl, "Hey 👋🏾, what's up?", "khoj");
     }
 
     async toggleChatSessions(forceShow: boolean = false): Promise<boolean> {
-		this.userMessages = [];  // clear user previous message history
+        this.userMessages = [];  // clear user previous message history
         let chatBodyEl = this.contentEl.getElementsByClassName("khoj-chat-body")[0] as HTMLElement;
         if (!forceShow && this.contentEl.getElementsByClassName("side-panel")?.length > 0) {
             chatBodyEl.innerHTML = "";
             return this.getChatHistory(chatBodyEl);
         }
         chatBodyEl.innerHTML = "";
-        const sidePanelEl = this.contentEl.createDiv("side-panel");
+        const sidePanelEl = chatBodyEl.createDiv("side-panel");
         const newConversationEl = sidePanelEl.createDiv("new-conversation");
         const conversationHeaderTitleEl = newConversationEl.createDiv("conversation-header-title");
         conversationHeaderTitleEl.textContent = "Conversations";
@@ -727,7 +744,6 @@ export class KhojChatView extends KhojPaneView {
 
                     conversationSessionEl.appendChild(conversationMenuEl);
                     conversationListBodyEl.appendChild(conversationSessionEl);
-                    chatBodyEl.appendChild(sidePanelEl);
                 }
             }
         } catch (err) {
@@ -768,10 +784,10 @@ export class KhojChatView extends KhojPaneView {
             let editConversationTitleInputEl = this.contentEl.createEl('input');
             editConversationTitleInputEl.classList.add("conversation-title-input");
             editConversationTitleInputEl.value = conversationTitle;
-            editConversationTitleInputEl.addEventListener('click', function(event) {
+            editConversationTitleInputEl.addEventListener('click', function (event) {
                 event.stopPropagation();
             });
-            editConversationTitleInputEl.addEventListener('keydown', function(event) {
+            editConversationTitleInputEl.addEventListener('keydown', function (event) {
                 if (event.key === "Enter") {
                     event.preventDefault();
                     editConversationTitleSaveButtonEl.click();
@@ -890,15 +906,17 @@ export class KhojChatView extends KhojPaneView {
                         chatLog.intent?.type,
                         chatLog.intent?.["inferred-queries"],
                         chatBodyEl.dataset.conversationId ?? "",
+                        chatLog.images,
+                        chatLog.excalidrawDiagram,
                     );
                     // push the user messages to the chat history
-                    if(chatLog.by === "you"){
+                    if (chatLog.by === "you") {
                         this.userMessages.push(chatLog.message);
                     }
                 });
 
                 // Update starting message after loading history
-			    const modifierKey: string = Platform.isMacOS ? '⌘' : '^';
+                const modifierKey: string = Platform.isMacOS ? '⌘' : '^';
                 this.startingMessage = this.userMessages.length > 0
                     ? `(${modifierKey}+↑/↓) for prev messages`
                     : "Message";
@@ -922,15 +940,15 @@ export class KhojChatView extends KhojPaneView {
             try {
                 let jsonChunk = JSON.parse(rawChunk);
                 if (!jsonChunk.type)
-                    jsonChunk = {type: 'message', data: jsonChunk};
+                    jsonChunk = { type: 'message', data: jsonChunk };
                 return jsonChunk;
             } catch (e) {
-                return {type: 'message', data: rawChunk};
+                return { type: 'message', data: rawChunk };
             }
         } else if (rawChunk.length > 0) {
-            return {type: 'message', data: rawChunk};
+            return { type: 'message', data: rawChunk };
         }
-        return {type: '', data: ''};
+        return { type: '', data: '' };
     }
 
     processMessageChunk(rawChunk: string): void {
@@ -941,6 +959,11 @@ export class KhojChatView extends KhojPaneView {
             console.log(`status: ${chunk.data}`);
             const statusMessage = chunk.data;
             this.handleStreamResponse(this.chatMessageState.newResponseTextEl, statusMessage, this.chatMessageState.loadingEllipsis, false);
+        } else if (chunk.type === 'generated_assets') {
+            const generatedAssets = chunk.data;
+            const imageData = this.handleImageResponse(generatedAssets, this.chatMessageState.rawResponse);
+            this.chatMessageState.generatedAssets = imageData;
+            this.handleStreamResponse(this.chatMessageState.newResponseTextEl, imageData, this.chatMessageState.loadingEllipsis, false);
         } else if (chunk.type === 'start_llm_response') {
             console.log("Started streaming", new Date());
         } else if (chunk.type === 'end_llm_response') {
@@ -963,9 +986,10 @@ export class KhojChatView extends KhojPaneView {
                 rawResponse: "",
                 rawQuery: liveQuery,
                 isVoice: false,
+                generatedAssets: "",
             };
         } else if (chunk.type === "references") {
-            this.chatMessageState.references = {"notes": chunk.data.context, "online": chunk.data.onlineContext};
+            this.chatMessageState.references = { "notes": chunk.data.context, "online": chunk.data.onlineContext };
         } else if (chunk.type === 'message') {
             const chunkData = chunk.data;
             if (typeof chunkData === 'object' && chunkData !== null) {
@@ -978,17 +1002,17 @@ export class KhojChatView extends KhojPaneView {
                     this.handleJsonResponse(jsonData);
                 } catch (e) {
                     this.chatMessageState.rawResponse += chunkData;
-                    this.handleStreamResponse(this.chatMessageState.newResponseTextEl, this.chatMessageState.rawResponse, this.chatMessageState.loadingEllipsis);
+                    this.handleStreamResponse(this.chatMessageState.newResponseTextEl, this.chatMessageState.rawResponse + this.chatMessageState.generatedAssets, this.chatMessageState.loadingEllipsis);
                 }
             } else {
                 this.chatMessageState.rawResponse += chunkData;
-                this.handleStreamResponse(this.chatMessageState.newResponseTextEl, this.chatMessageState.rawResponse, this.chatMessageState.loadingEllipsis);
+                this.handleStreamResponse(this.chatMessageState.newResponseTextEl, this.chatMessageState.rawResponse + this.chatMessageState.generatedAssets, this.chatMessageState.loadingEllipsis);
             }
         }
     }
 
     handleJsonResponse(jsonData: any): void {
-        if (jsonData.image || jsonData.detail) {
+        if (jsonData.image || jsonData.detail || jsonData.images || jsonData.excalidrawDiagram) {
             this.chatMessageState.rawResponse = this.handleImageResponse(jsonData, this.chatMessageState.rawResponse);
         } else if (jsonData.response) {
             this.chatMessageState.rawResponse = jsonData.response;
@@ -1088,6 +1112,7 @@ export class KhojChatView extends KhojPaneView {
             rawQuery: query,
             rawResponse: "",
             isVoice: isVoice,
+            generatedAssets: "",
         };
 
         let response = await fetch(chatUrl, {
@@ -1234,11 +1259,11 @@ export class KhojChatView extends KhojPaneView {
             const recordingConfig = { mimeType: 'audio/webm' };
             this.mediaRecorder = new MediaRecorder(stream, recordingConfig);
 
-            this.mediaRecorder.addEventListener("dataavailable", function(event) {
+            this.mediaRecorder.addEventListener("dataavailable", function (event) {
                 if (event.data.size > 0) audioChunks.push(event.data);
             });
 
-            this.mediaRecorder.addEventListener("stop", async function() {
+            this.mediaRecorder.addEventListener("stop", async function () {
                 const audioBlob = new Blob(audioChunks, { type: 'audio/webm' });
                 await sendToServer(audioBlob);
             });
@@ -1368,7 +1393,22 @@ export class KhojChatView extends KhojPaneView {
             if (inferredQuery) {
                 rawResponse += `\n\n**Inferred Query**:\n\n${inferredQuery}`;
             }
+        } else if (imageJson.images) {
+            // If response has images field, response is a list of generated images.
+            imageJson.images.forEach((image: any) => {
+
+                if (image.startsWith("http")) {
+                    rawResponse += `![generated_image](${image})\n\n`;
+                } else {
+                    rawResponse += `![generated_image](data:image/png;base64,${image})\n\n`;
+                }
+            });
+        } else if (imageJson.excalidrawDiagram) {
+            const domain = this.setting.khojUrl.endsWith("/") ? this.setting.khojUrl : `${this.setting.khojUrl}/`;
+            const redirectMessage = `Hey, I'm not ready to show you diagrams yet here. But you can view it in ${domain}`;
+            rawResponse += redirectMessage;
         }
+
         // If response has detail field, response is an error message.
         if (imageJson.detail) rawResponse += imageJson.detail;
 
@@ -1407,7 +1447,7 @@ export class KhojChatView extends KhojPaneView {
         referenceExpandButton.classList.add("reference-expand-button");
         referenceExpandButton.innerHTML = numReferences == 1 ? "1 reference" : `${numReferences} references`;
 
-        referenceExpandButton.addEventListener('click', function() {
+        referenceExpandButton.addEventListener('click', function () {
             if (referenceSection.classList.contains("collapsed")) {
                 referenceSection.classList.remove("collapsed");
                 referenceSection.classList.add("expanded");
diff --git a/src/interface/obsidian/styles.css b/src/interface/obsidian/styles.css
index b02b2ff3..0d2ea1d4 100644
--- a/src/interface/obsidian/styles.css
+++ b/src/interface/obsidian/styles.css
@@ -50,12 +50,12 @@ If your plugin does not need CSS, delete this file.
     overflow-y: scroll; /* Make chat body scroll to see history */
 }
 /* add chat metatdata to bottom of bubble */
-.khoj-chat-message::after {
+.khoj-chat-message.khoj::after {
     content: attr(data-meta);
     display: block;
     font-size: var(--font-ui-smaller);
     color: var(--text-muted);
-    margin: -12px 7px 0 -5px;
+    margin: -12px 7px 0 0px;
 }
 /* move message by khoj to left */
 .khoj-chat-message.khoj {
@@ -82,7 +82,8 @@ If your plugin does not need CSS, delete this file.
 }
 /* color chat bubble by khoj blue */
 .khoj-chat-message-text.khoj {
-    border: 1px solid var(--khoj-sun);
+    border-left: 2px solid var(--khoj-sun);
+    border-radius: 0px;
     margin-left: auto;
     white-space: pre-line;
 }
@@ -104,8 +105,9 @@ If your plugin does not need CSS, delete this file.
 }
 /* color chat bubble by you dark grey */
 .khoj-chat-message-text.you {
-    border: 1px solid var(--color-accent);
+    color: var(--text-normal);
     margin-right: auto;
+    background-color: var(--background-modifier-cover);
 }
 /* add right protrusion to you chat bubble */
 .khoj-chat-message-text.you:after {
@@ -240,6 +242,10 @@ div.new-conversation {
     grid-auto-flow: column;
     grid-template-columns: 1fr auto;
     margin-bottom: 16px;
+    position: sticky;
+    top: 0;
+    z-index: 10;
+    background-color: var(--background-primary)
 }
 div.conversation-header-title {
     text-align: left;
@@ -314,6 +320,9 @@ div.selected-conversation {
     background: var(--background-primary);
     margin: 0 0 0 -8px;
     align-items: center;
+    position: sticky;
+    bottom: 0;
+    z-index: 10;
 }
 #khoj-chat-input.option:hover {
     box-shadow: 0 0 11px var(--background-modifier-box-shadow);
diff --git a/src/interface/obsidian/versions.json b/src/interface/obsidian/versions.json
index d727a9b1..56597ada 100644
--- a/src/interface/obsidian/versions.json
+++ b/src/interface/obsidian/versions.json
@@ -92,5 +92,15 @@
 	"1.29.0": "0.15.0",
 	"1.29.1": "0.15.0",
 	"1.30.0": "0.15.0",
-	"1.30.1": "0.15.0"
+	"1.30.1": "0.15.0",
+	"1.30.2": "0.15.0",
+	"1.30.3": "0.15.0",
+	"1.30.4": "0.15.0",
+	"1.30.5": "0.15.0",
+	"1.30.6": "0.15.0",
+	"1.30.7": "0.15.0",
+	"1.30.8": "0.15.0",
+	"1.30.9": "0.15.0",
+	"1.30.10": "0.15.0",
+	"1.31.0": "0.15.0"
 }
diff --git a/src/interface/web/app/agents/layout.tsx b/src/interface/web/app/agents/layout.tsx
index b30c782d..5749ef4c 100644
--- a/src/interface/web/app/agents/layout.tsx
+++ b/src/interface/web/app/agents/layout.tsx
@@ -1,8 +1,7 @@
 import type { Metadata } from "next";
-import { Noto_Sans } from "next/font/google";
+import { noto_sans, noto_sans_arabic } from "@/app/fonts";
 import "../globals.css";
-
-const inter = Noto_Sans({ subsets: ["latin"] });
+import { ContentSecurityPolicy } from "../common/layoutHelper";
 
 export const metadata: Metadata = {
     title: "Khoj AI - Agents",
@@ -33,20 +32,9 @@ export default function RootLayout({
     children: React.ReactNode;
 }>) {
     return (
-        <html lang="en">
-            <meta
-                httpEquiv="Content-Security-Policy"
-                content="default-src 'self' https://assets.khoj.dev;
-                       media-src * blob:;
-                       script-src 'self' https://assets.khoj.dev 'unsafe-inline' 'unsafe-eval';
-                       connect-src 'self' https://ipapi.co/json ws://localhost:42110;
-                       style-src 'self' https://assets.khoj.dev 'unsafe-inline' https://fonts.googleapis.com;
-                       img-src 'self' data: https://*.khoj.dev https://*.googleusercontent.com https://*.google.com/ https://*.gstatic.com;
-                       font-src 'self' https://assets.khoj.dev https://fonts.gstatic.com;
-                       child-src 'none';
-                       object-src 'none';"
-            ></meta>
-            <body className={inter.className}>{children}</body>
+        <html lang="en" className={`${noto_sans.variable} ${noto_sans_arabic.variable}`}>
+            <ContentSecurityPolicy />
+            <body>{children}</body>
         </html>
     );
 }
diff --git a/src/interface/web/app/automations/layout.tsx b/src/interface/web/app/automations/layout.tsx
index 05686bef..aca8ec50 100644
--- a/src/interface/web/app/automations/layout.tsx
+++ b/src/interface/web/app/automations/layout.tsx
@@ -2,6 +2,7 @@ import type { Metadata } from "next";
 import { Toaster } from "@/components/ui/toaster";
 
 import "../globals.css";
+import { ContentSecurityPolicy } from "../common/layoutHelper";
 
 export const metadata: Metadata = {
     title: "Khoj AI - Automations",
@@ -32,9 +33,12 @@ export default function RootLayout({
     children: React.ReactNode;
 }>) {
     return (
-        <div>
-            {children}
-            <Toaster />
-        </div>
+        <html>
+            <ContentSecurityPolicy />
+            <body>
+                {children}
+                <Toaster />
+            </body>
+        </html>
     );
 }
diff --git a/src/interface/web/app/automations/page.tsx b/src/interface/web/app/automations/page.tsx
index e2c0c3f9..0ecf5809 100644
--- a/src/interface/web/app/automations/page.tsx
+++ b/src/interface/web/app/automations/page.tsx
@@ -994,7 +994,7 @@ export default function Automations() {
     const [suggestedAutomations, setSuggestedAutomations] = useState<AutomationsData[]>([]);
     const [showLoginPrompt, setShowLoginPrompt] = useState(false);
     const isMobileWidth = useIsMobileWidth();
-    const ipLocationData = useIPLocationData();
+    const { locationData, locationDataError, locationDataLoading } = useIPLocationData();
 
     useEffect(() => {
         if (newAutomationData) {
@@ -1044,18 +1044,18 @@ export default function Automations() {
                                     {authenticatedData.email}
                                 </span>
                             ) : null}
-                            {ipLocationData && (
+                            {locationData && (
                                 <span className="rounded-lg text-sm border-secondary border p-1 flex items-center shadow-sm">
                                     <MapPinSimple className="h-4 w-4 mr-2 inline text-purple-500" />
-                                    {ipLocationData
-                                        ? `${ipLocationData.city}, ${ipLocationData.country}`
+                                    {locationData
+                                        ? `${locationData.city}, ${locationData.country}`
                                         : "Unknown"}
                                 </span>
                             )}
-                            {ipLocationData && (
+                            {locationData && (
                                 <span className="rounded-lg text-sm border-secondary border p-1 flex items-center shadow-sm">
                                     <Clock className="h-4 w-4 mr-2 inline text-green-500" />
-                                    {ipLocationData ? `${ipLocationData.timezone}` : "Unknown"}
+                                    {locationData ? `${locationData.timezone}` : "Unknown"}
                                 </span>
                             )}
                         </div>
@@ -1086,7 +1086,7 @@ export default function Automations() {
                                 setNewAutomationData={setNewAutomationData}
                                 authenticatedData={authenticatedData}
                                 isCreating={isCreating}
-                                ipLocationData={ipLocationData}
+                                ipLocationData={locationData}
                             />
                         ) : (
                             <Button
@@ -1103,7 +1103,7 @@ export default function Automations() {
                         <SharedAutomationCard
                             isMobileWidth={isMobileWidth}
                             authenticatedData={authenticatedData}
-                            locationData={ipLocationData}
+                            locationData={locationData}
                             isLoggedIn={authenticatedData ? true : false}
                             setShowLoginPrompt={setShowLoginPrompt}
                             setNewAutomationData={setNewAutomationData}
@@ -1125,7 +1125,7 @@ export default function Automations() {
                                             setNewAutomationData={setNewAutomationData}
                                             authenticatedData={authenticatedData}
                                             isCreating={isCreating}
-                                            ipLocationData={ipLocationData}
+                                            ipLocationData={locationData}
                                         />
                                     ) : (
                                         <Button
@@ -1147,7 +1147,7 @@ export default function Automations() {
                                     key={automation.id}
                                     authenticatedData={authenticatedData}
                                     automation={automation}
-                                    locationData={ipLocationData}
+                                    locationData={locationData}
                                     isLoggedIn={authenticatedData ? true : false}
                                     setShowLoginPrompt={setShowLoginPrompt}
                                 />
@@ -1158,7 +1158,7 @@ export default function Automations() {
                                 key={automation.id}
                                 authenticatedData={authenticatedData}
                                 automation={automation}
-                                locationData={ipLocationData}
+                                locationData={locationData}
                                 isLoggedIn={authenticatedData ? true : false}
                                 setShowLoginPrompt={setShowLoginPrompt}
                             />
@@ -1173,7 +1173,7 @@ export default function Automations() {
                                 key={automation.id}
                                 authenticatedData={authenticatedData}
                                 automation={automation}
-                                locationData={ipLocationData}
+                                locationData={locationData}
                                 isLoggedIn={authenticatedData ? true : false}
                                 setShowLoginPrompt={setShowLoginPrompt}
                                 suggestedCard={true}
diff --git a/src/interface/web/app/chat/layout.tsx b/src/interface/web/app/chat/layout.tsx
index 09c3afb7..83778d80 100644
--- a/src/interface/web/app/chat/layout.tsx
+++ b/src/interface/web/app/chat/layout.tsx
@@ -1,8 +1,7 @@
 import type { Metadata } from "next";
-import { Noto_Sans } from "next/font/google";
+import { noto_sans, noto_sans_arabic } from "@/app/fonts";
 import "../globals.css";
-
-const inter = Noto_Sans({ subsets: ["latin"] });
+import { ContentSecurityPolicy } from "../common/layoutHelper";
 
 export const metadata: Metadata = {
     title: "Khoj AI - Chat",
@@ -34,20 +33,9 @@ export default function RootLayout({
     children: React.ReactNode;
 }>) {
     return (
-        <html lang="en">
-            <meta
-                httpEquiv="Content-Security-Policy"
-                content="default-src 'self' https://assets.khoj.dev;
-                       media-src * blob:;
-                       script-src 'self' https://assets.khoj.dev 'unsafe-inline' 'unsafe-eval';
-                       connect-src 'self' blob: https://ipapi.co/json ws://localhost:42110;
-                       style-src 'self' https://assets.khoj.dev 'unsafe-inline' https://fonts.googleapis.com;
-                       img-src 'self' data: blob: https://*.khoj.dev https://*.googleusercontent.com https://*.google.com/ https://*.gstatic.com;
-                       font-src 'self' https://assets.khoj.dev https://fonts.gstatic.com;
-                       child-src 'none';
-                       object-src 'none';"
-            ></meta>
-            <body className={inter.className}>
+        <html lang="en" className={`${noto_sans.variable} ${noto_sans_arabic.variable}`}>
+            <ContentSecurityPolicy />
+            <body>
                 {children}
                 <script
                     dangerouslySetInnerHTML={{
diff --git a/src/interface/web/app/chat/page.tsx b/src/interface/web/app/chat/page.tsx
index 5a391b4d..ed73e66f 100644
--- a/src/interface/web/app/chat/page.tsx
+++ b/src/interface/web/app/chat/page.tsx
@@ -184,8 +184,10 @@ export default function Chat() {
         useState<AbortController | null>(null);
     const [triggeredAbort, setTriggeredAbort] = useState(false);
 
-    const locationData = useIPLocationData() || {
-        timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+    const { locationData, locationDataError, locationDataLoading } = useIPLocationData() || {
+        locationData: {
+            timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+        },
     };
     const authenticatedData = useAuthenticatedData();
     const isMobileWidth = useIsMobileWidth();
@@ -239,9 +241,13 @@ export default function Chat() {
 
     useEffect(() => {
         if (processQuerySignal) {
+            if (locationDataLoading) {
+                return;
+            }
+
             chat();
         }
-    }, [processQuerySignal]);
+    }, [processQuerySignal, locationDataLoading]);
 
     async function readChatStream(response: Response) {
         if (!response.ok) throw new Error(response.statusText);
@@ -380,7 +386,7 @@ export default function Chat() {
             <title>
                 {`${defaultTitle}${!!title && title !== defaultTitle ? `: ${title}` : ""}`}
             </title>
-            <div>
+            <div className={isMobileWidth ? "h-1" : "h-auto"}>
                 <SidePanel
                     conversationId={conversationId}
                     uploadedFiles={[]}
@@ -389,9 +395,9 @@ export default function Chat() {
             </div>
             <div className={styles.chatBox}>
                 <div className={styles.chatBoxBody}>
-                    {!isMobileWidth && conversationId && (
+                    {conversationId && (
                         <div
-                            className={`${styles.chatTitleWrapper} text-nowrap text-ellipsis overflow-hidden max-w-screen-md grid items-top font-bold mr-8 pt-6 col-auto h-fit`}
+                            className={`${styles.chatTitleWrapper} text-nowrap text-ellipsis overflow-hidden max-w-screen-md grid items-top font-bold mx-2 md:mr-8 md:pt-6 col-auto h-fit`}
                         >
                             {title && (
                                 <h2
@@ -403,7 +409,7 @@ export default function Chat() {
                             <ChatSessionActionMenu
                                 conversationId={conversationId}
                                 setTitle={setTitle}
-                                sizing="md"
+                                sizing={isMobileWidth ? "sm" : "md"}
                             />
                         </div>
                     )}
diff --git a/src/interface/web/app/common/auth.ts b/src/interface/web/app/common/auth.ts
index 1c634184..17a90fc8 100644
--- a/src/interface/web/app/common/auth.ts
+++ b/src/interface/web/app/common/auth.ts
@@ -9,6 +9,7 @@ export interface UserProfile {
     is_active: boolean;
     has_documents: boolean;
     detail: string;
+    khoj_version: string;
 }
 
 const fetcher = (url: string) =>
diff --git a/src/interface/web/app/common/chatFunctions.ts b/src/interface/web/app/common/chatFunctions.ts
index 6585b4c9..c64e81ba 100644
--- a/src/interface/web/app/common/chatFunctions.ts
+++ b/src/interface/web/app/common/chatFunctions.ts
@@ -1,3 +1,4 @@
+import { AttachedFileText } from "../components/chatInputArea/chatInputArea";
 import {
     CodeContext,
     Context,
@@ -16,6 +17,12 @@ export interface MessageMetadata {
     turnId: string;
 }
 
+export interface GeneratedAssetsData {
+    images: string[];
+    excalidrawDiagram: string;
+    files: AttachedFileText[];
+}
+
 export interface ResponseWithIntent {
     intentType: string;
     response: string;
@@ -84,6 +91,8 @@ export function processMessageChunk(
 
     if (!currentMessage || !chunk || !chunk.type) return { context, onlineContext, codeContext };
 
+    console.log(`chunk type: ${chunk.type}`);
+
     if (chunk.type === "status") {
         console.log(`status: ${chunk.data}`);
         const statusMessage = chunk.data as string;
@@ -98,6 +107,20 @@ export function processMessageChunk(
     } else if (chunk.type === "metadata") {
         const messageMetadata = chunk.data as MessageMetadata;
         currentMessage.turnId = messageMetadata.turnId;
+    } else if (chunk.type === "generated_assets") {
+        const generatedAssets = chunk.data as GeneratedAssetsData;
+
+        if (generatedAssets.images) {
+            currentMessage.generatedImages = generatedAssets.images;
+        }
+
+        if (generatedAssets.excalidrawDiagram) {
+            currentMessage.generatedExcalidrawDiagram = generatedAssets.excalidrawDiagram;
+        }
+
+        if (generatedAssets.files) {
+            currentMessage.generatedFiles = generatedAssets.files;
+        }
     } else if (chunk.type === "message") {
         const chunkData = chunk.data;
         // Here, handle if the response is a JSON response with an image, but the intentType is excalidraw
diff --git a/src/interface/web/app/common/iconUtils.tsx b/src/interface/web/app/common/iconUtils.tsx
index 6f1afe81..0ef7f09a 100644
--- a/src/interface/web/app/common/iconUtils.tsx
+++ b/src/interface/web/app/common/iconUtils.tsx
@@ -51,6 +51,7 @@ import {
     FilePdf,
     FileMd,
     MicrosoftWordLogo,
+    Microscope,
 } from "@phosphor-icons/react";
 import { OrgMode } from "@/app/components/logo/fileLogo";
 
@@ -219,6 +220,10 @@ export function getIconForSlashCommand(command: string, customClassName: string
         return <Code className={className} />;
     }
 
+    if (command.includes("research")) {
+        return <Microscope className={className} />;
+    }
+
     return <ArrowRight className={className} />;
 }
 
diff --git a/src/interface/web/app/common/layoutHelper.tsx b/src/interface/web/app/common/layoutHelper.tsx
new file mode 100644
index 00000000..11b1043d
--- /dev/null
+++ b/src/interface/web/app/common/layoutHelper.tsx
@@ -0,0 +1,16 @@
+export function ContentSecurityPolicy() {
+    return (
+        <meta
+            httpEquiv="Content-Security-Policy"
+            content="default-src 'self' https://assets.khoj.dev;
+               media-src * blob:;
+               script-src 'self' https://assets.khoj.dev https://app.chatwoot.com 'unsafe-inline' 'unsafe-eval';
+               connect-src 'self' blob: https://ipapi.co/json ws://localhost:42110;
+               style-src 'self' https://assets.khoj.dev 'unsafe-inline' https://fonts.googleapis.com;
+               img-src 'self' data: blob: https://*.khoj.dev https://*.googleusercontent.com https://*.google.com/ https://*.gstatic.com;
+               font-src 'self' https://assets.khoj.dev https://fonts.gstatic.com;
+               child-src 'self' https://app.chatwoot.com;
+               object-src 'none';"
+        ></meta>
+    );
+}
diff --git a/src/interface/web/app/common/utils.ts b/src/interface/web/app/common/utils.ts
index efa2c1d3..8bf6db84 100644
--- a/src/interface/web/app/common/utils.ts
+++ b/src/interface/web/app/common/utils.ts
@@ -23,32 +23,30 @@ export function welcomeConsole() {
         `%c %s`,
         "font-family:monospace",
         `
-        __  __     __  __     ______       __        _____      __
-       /\\ \\/ /    /\\ \\_\\ \\   /\\  __ \\     /\\ \\      /\\  __ \\   /\\ \\
-       \\ \\  _"-.  \\ \\  __ \\  \\ \\ \\/\\ \\   _\\_\\ \\     \\ \\  __ \\  \\ \\ \\
-        \\ \\_\\ \\_\\  \\ \\_\\ \\_\\  \\ \\_____\\ /\\_____\\     \\ \\_\\ \\_\\  \\ \\_\\
-         \\/_/\\/_/   \\/_/\\/_/   \\/_____/ \\/_____/      \\/_/\\/_/   \\/_/
+ __  __     __  __     ______       __        _____      __
+/\\ \\/ /    /\\ \\_\\ \\   /\\  __ \\     /\\ \\      /\\  __ \\   /\\ \\
+\\ \\  _"-.  \\ \\  __ \\  \\ \\ \\/\\ \\   _\\_\\ \\     \\ \\  __ \\  \\ \\ \\
+ \\ \\_\\ \\_\\  \\ \\_\\ \\_\\  \\ \\_____\\ /\\_____\\     \\ \\_\\ \\_\\  \\ \\_\\
+  \\/_/\\/_/   \\/_/\\/_/   \\/_____/ \\/_____/      \\/_/\\/_/   \\/_/
 
 
-       Greetings traveller,
+Greetings traveller,
 
-       I am ✨Khoj✨, your open-source, personal AI copilot.
+I am ✨Khoj✨, your open-source, personal AI copilot.
 
-       See my source code at https://github.com/khoj-ai/khoj
-       Read my operating manual at https://docs.khoj.dev
-       `,
+See my source code at https://github.com/khoj-ai/khoj
+Read my operating manual at https://docs.khoj.dev
+`,
     );
 }
 
 export function useIPLocationData() {
-    const { data: locationData, error: locationDataError } = useSWR<LocationData>(
-        "/api/ip",
-        locationFetcher,
-        { revalidateOnFocus: false },
-    );
-
-    if (locationDataError || !locationData) return;
-    return locationData;
+    const {
+        data: locationData,
+        error: locationDataError,
+        isLoading: locationDataLoading,
+    } = useSWR<LocationData>("/api/ip", locationFetcher, { revalidateOnFocus: false });
+    return { locationData, locationDataError, locationDataLoading };
 }
 
 export function useIsMobileWidth() {
diff --git a/src/interface/web/app/components/chatHistory/chatHistory.tsx b/src/interface/web/app/components/chatHistory/chatHistory.tsx
index ea566df4..5a750e8b 100644
--- a/src/interface/web/app/components/chatHistory/chatHistory.tsx
+++ b/src/interface/web/app/components/chatHistory/chatHistory.tsx
@@ -54,6 +54,12 @@ function TrainOfThoughtComponent(props: TrainOfThoughtComponentProps) {
     const lastIndex = props.trainOfThought.length - 1;
     const [collapsed, setCollapsed] = useState(props.completed);
 
+    useEffect(() => {
+        if (props.completed) {
+            setCollapsed(true);
+        }
+    }, [props.completed]);
+
     return (
         <div
             className={`${!collapsed ? styles.trainOfThought + " shadow-sm" : ""}`}
@@ -410,6 +416,9 @@ export default function ChatHistory(props: ChatHistoryProps) {
                                                 "inferred-queries": message.inferredQueries || [],
                                             },
                                             conversationId: props.conversationId,
+                                            images: message.generatedImages,
+                                            queryFiles: message.generatedFiles,
+                                            excalidrawDiagram: message.generatedExcalidrawDiagram,
                                             turnId: messageTurnId,
                                         }}
                                         conversationId={props.conversationId}
diff --git a/src/interface/web/app/components/chatMessage/chatMessage.module.css b/src/interface/web/app/components/chatMessage/chatMessage.module.css
index b055d0a5..2abfdda7 100644
--- a/src/interface/web/app/components/chatMessage/chatMessage.module.css
+++ b/src/interface/web/app/components/chatMessage/chatMessage.module.css
@@ -77,6 +77,21 @@ div.imageWrapper img {
     border-radius: 8px;
 }
 
+div.khoj div.imageWrapper img {
+    height: 512px;
+}
+
+div.khoj div.imageWrapper {
+    flex: 1 1 auto;
+}
+
+div.khoj div.imagesContainer {
+    display: flex;
+    flex-wrap: wrap;
+    flex-direction: row;
+    overflow-x: hidden;
+}
+
 div.chatMessageContainer > img {
     width: auto;
     height: auto;
@@ -178,4 +193,9 @@ div.trainOfThoughtElement ul {
     div.youfullHistory {
         max-width: 90%;
     }
+
+    div.khoj div.imageWrapper img {
+        width: 100%;
+        height: auto;
+    }
 }
diff --git a/src/interface/web/app/components/chatMessage/chatMessage.tsx b/src/interface/web/app/components/chatMessage/chatMessage.tsx
index 990aff5b..89c3038a 100644
--- a/src/interface/web/app/components/chatMessage/chatMessage.tsx
+++ b/src/interface/web/app/components/chatMessage/chatMessage.tsx
@@ -163,6 +163,7 @@ export interface SingleChatMessage {
     conversationId: string;
     turnId?: string;
     queryFiles?: AttachedFileText[];
+    excalidrawDiagram?: string;
 }
 
 export interface StreamMessage {
@@ -180,6 +181,10 @@ export interface StreamMessage {
     inferredQueries?: string[];
     turnId?: string;
     queryFiles?: AttachedFileText[];
+    excalidrawDiagram?: string;
+    generatedFiles?: AttachedFileText[];
+    generatedImages?: string[];
+    generatedExcalidrawDiagram?: string;
 }
 
 export interface ChatHistoryData {
@@ -264,6 +269,9 @@ interface ChatMessageProps {
     onDeleteMessage: (turnId?: string) => void;
     conversationId: string;
     turnId?: string;
+    generatedImage?: string;
+    excalidrawDiagram?: string;
+    generatedFiles?: AttachedFileText[];
 }
 
 interface TrainOfThoughtProps {
@@ -389,9 +397,8 @@ const ChatMessage = forwardRef<HTMLDivElement, ChatMessageProps>((props, ref) =>
         // Prepare initial message for rendering
         let message = props.chatMessage.message;
 
-        if (props.chatMessage.intent && props.chatMessage.intent.type == "excalidraw") {
-            message = props.chatMessage.intent["inferred-queries"][0];
-            setExcalidrawData(props.chatMessage.message);
+        if (props.chatMessage.excalidrawDiagram) {
+            setExcalidrawData(props.chatMessage.excalidrawDiagram);
         }
 
         // Replace LaTeX delimiters with placeholders
@@ -401,27 +408,6 @@ const ChatMessage = forwardRef<HTMLDivElement, ChatMessageProps>((props, ref) =>
             .replace(/\\\[/g, "LEFTBRACKET")
             .replace(/\\\]/g, "RIGHTBRACKET");
 
-        const intentTypeHandlers = {
-            "text-to-image": (msg: string) => `![generated image](data:image/png;base64,${msg})`,
-            "text-to-image2": (msg: string) => `![generated image](${msg})`,
-            "text-to-image-v3": (msg: string) =>
-                `![generated image](data:image/webp;base64,${msg})`,
-            excalidraw: (msg: string) => msg,
-        };
-
-        // Handle intent-specific rendering
-        if (props.chatMessage.intent) {
-            const { type, "inferred-queries": inferredQueries } = props.chatMessage.intent;
-
-            if (type in intentTypeHandlers) {
-                message = intentTypeHandlers[type as keyof typeof intentTypeHandlers](message);
-            }
-
-            if (type.includes("text-to-image") && inferredQueries?.length > 0) {
-                message += `\n\n${inferredQueries[0]}`;
-            }
-        }
-
         // Replace file links with base64 data
         message = renderCodeGenImageInline(message, props.chatMessage.codeContext);
 
diff --git a/src/interface/web/app/components/chatWoot/ChatwootWidget.tsx b/src/interface/web/app/components/chatWoot/ChatwootWidget.tsx
new file mode 100644
index 00000000..7870a255
--- /dev/null
+++ b/src/interface/web/app/components/chatWoot/ChatwootWidget.tsx
@@ -0,0 +1,35 @@
+"use client";
+
+import Script from "next/script";
+
+export function ChatwootWidget() {
+    return (
+        <Script
+            id="chatwoot-widget"
+            strategy="afterInteractive"
+            dangerouslySetInnerHTML={{
+                __html: `
+          window.chatwootSettings = {
+            position: "right",
+            type: "standard",
+            launcherTitle: "Chat with us"
+          };
+          (function(d,t) {
+            var BASE_URL="https://app.chatwoot.com";
+            var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
+            g.src=BASE_URL+"/packs/js/sdk.js";
+            g.defer = true;
+            g.async = true;
+            s.parentNode.insertBefore(g,s);
+            g.onload=function(){
+              window.chatwootSDK.run({
+                websiteToken: '5uV59Ay2pvMJenJary2hvvVM',
+                baseUrl: BASE_URL
+              })
+            }
+          })(document,"script");
+        `,
+            }}
+        />
+    );
+}
diff --git a/src/interface/web/app/components/navMenu/navMenu.module.css b/src/interface/web/app/components/navMenu/navMenu.module.css
index a8debe78..aab37b5b 100644
--- a/src/interface/web/app/components/navMenu/navMenu.module.css
+++ b/src/interface/web/app/components/navMenu/navMenu.module.css
@@ -52,7 +52,7 @@ div.settingsMenuOptions {
     grid-auto-flow: row;
     position: absolute;
     background-color: var(--background-color);
-    box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
+    box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
     top: 64px;
     text-align: left;
     padding: 8px;
@@ -69,6 +69,6 @@ div.settingsMenuOptions {
     }
 
     div.titleBar {
-        padding: 8px;
+        padding: 4px;
     }
 }
diff --git a/src/interface/web/app/components/navMenu/navMenu.tsx b/src/interface/web/app/components/navMenu/navMenu.tsx
index 256c7d77..01215863 100644
--- a/src/interface/web/app/components/navMenu/navMenu.tsx
+++ b/src/interface/web/app/components/navMenu/navMenu.tsx
@@ -22,7 +22,7 @@ import {
     DropdownMenuSeparator,
     DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
-import { Moon, Sun, UserCircle, Question, GearFine, ArrowRight } from "@phosphor-icons/react";
+import { Moon, Sun, UserCircle, Question, GearFine, ArrowRight, Code } from "@phosphor-icons/react";
 import { KhojAgentLogo, KhojAutomationLogo, KhojSearchLogo } from "../logo/khojLogo";
 import { useIsMobileWidth } from "@/app/common/utils";
 
@@ -37,6 +37,15 @@ function SubscriptionBadge({ is_active }: { is_active: boolean }) {
     );
 }
 
+function VersionBadge({ version }: { version: string }) {
+    return (
+        <div className="flex flex-row items-center">
+            <div className="w-3 h-3 rounded-full bg-green-500 mr-1"></div>
+            <p className="text-xs">{version}</p>
+        </div>
+    );
+}
+
 export default function NavMenu() {
     const userData = useAuthenticatedData();
     const [darkMode, setDarkMode] = useState(false);
@@ -99,6 +108,9 @@ export default function NavMenu() {
                             <div className="flex flex-col">
                                 <p className="font-semibold">{userData?.email}</p>
                                 <SubscriptionBadge is_active={userData?.is_active ?? false} />
+                                {userData?.khoj_version && (
+                                    <VersionBadge version={userData?.khoj_version} />
+                                )}
                             </div>
                         </DropdownMenuItem>
                         <DropdownMenuSeparator />
@@ -143,18 +155,18 @@ export default function NavMenu() {
                                 </Link>
                             </DropdownMenuItem>
                         )}
+                        {userData && (
+                            <DropdownMenuItem>
+                                <Link href="/settings" className="no-underline w-full">
+                                    <div className="flex flex-rows">
+                                        <GearFine className="w-6 h-6" />
+                                        <p className="ml-3 font-semibold">Settings</p>
+                                    </div>
+                                </Link>
+                            </DropdownMenuItem>
+                        )}
                         <>
                             <DropdownMenuSeparator />
-                            {userData && (
-                                <DropdownMenuItem>
-                                    <Link href="/settings" className="no-underline w-full">
-                                        <div className="flex flex-rows">
-                                            <GearFine className="w-6 h-6" />
-                                            <p className="ml-3 font-semibold">Settings</p>
-                                        </div>
-                                    </Link>
-                                </DropdownMenuItem>
-                            )}
                             <DropdownMenuItem>
                                 <Link href="https://docs.khoj.dev" className="no-underline w-full">
                                     <div className="flex flex-rows">
@@ -163,6 +175,17 @@ export default function NavMenu() {
                                     </div>
                                 </Link>
                             </DropdownMenuItem>
+                            <DropdownMenuItem>
+                                <Link
+                                    href="https://github.com/khoj-ai/khoj/releases"
+                                    className="no-underline w-full"
+                                >
+                                    <div className="flex flex-rows">
+                                        <Code className="w-6 h-6" />
+                                        <p className="ml-3 font-semibold">Releases</p>
+                                    </div>
+                                </Link>
+                            </DropdownMenuItem>
                             {userData ? (
                                 <DropdownMenuItem>
                                     <Link href="/auth/logout" className="no-underline w-full">
@@ -207,6 +230,9 @@ export default function NavMenu() {
                                 <div className="flex flex-col">
                                     <p className="font-semibold">{userData?.email}</p>
                                     <SubscriptionBadge is_active={userData?.is_active ?? false} />
+                                    {userData?.khoj_version && (
+                                        <VersionBadge version={userData?.khoj_version} />
+                                    )}
                                 </div>
                             </MenubarItem>
                             <MenubarSeparator className="dark:bg-white height-[2px] bg-black" />
@@ -251,6 +277,16 @@ export default function NavMenu() {
                                     </Link>
                                 </MenubarItem>
                             )}
+                            {userData && (
+                                <MenubarItem>
+                                    <Link href="/settings" className="no-underline w-full">
+                                        <div className="flex flex-rows">
+                                            <GearFine className="w-6 h-6" />
+                                            <p className="ml-3 font-semibold">Settings</p>
+                                        </div>
+                                    </Link>
+                                </MenubarItem>
+                            )}
                             <>
                                 <MenubarSeparator className="dark:bg-white height-[2px] bg-black" />
                                 <MenubarItem>
@@ -264,16 +300,18 @@ export default function NavMenu() {
                                         </div>
                                     </Link>
                                 </MenubarItem>
-                                {userData && (
-                                    <MenubarItem>
-                                        <Link href="/settings" className="no-underline w-full">
-                                            <div className="flex flex-rows">
-                                                <GearFine className="w-6 h-6" />
-                                                <p className="ml-3 font-semibold">Settings</p>
-                                            </div>
-                                        </Link>
-                                    </MenubarItem>
-                                )}
+
+                                <MenubarItem>
+                                    <Link
+                                        href="https://github.com/khoj-ai/khoj/releases"
+                                        className="no-underline w-full"
+                                    >
+                                        <div className="flex flex-rows">
+                                            <Code className="w-6 h-6" />
+                                            <p className="ml-3 font-semibold">Releases</p>
+                                        </div>
+                                    </Link>
+                                </MenubarItem>
                                 {userData ? (
                                     <MenubarItem>
                                         <Link href="/auth/logout" className="no-underline w-full">
diff --git a/src/interface/web/app/components/sidePanel/chatHistorySidePanel.tsx b/src/interface/web/app/components/sidePanel/chatHistorySidePanel.tsx
index a372835e..51fdf9db 100644
--- a/src/interface/web/app/components/sidePanel/chatHistorySidePanel.tsx
+++ b/src/interface/web/app/components/sidePanel/chatHistorySidePanel.tsx
@@ -105,7 +105,6 @@ import { ScrollAreaScrollbar } from "@radix-ui/react-scroll-area";
 import { KhojLogoType } from "@/app/components/logo/khojLogo";
 import NavMenu from "@/app/components/navMenu/navMenu";
 import { getIconFromIconName } from "@/app/common/iconUtils";
-import AgentProfileCard from "../profileCard/profileCard";
 
 // Define a fetcher function
 const fetcher = (url: string) =>
@@ -627,43 +626,56 @@ export function ChatSessionActionMenu(props: ChatSessionActionMenuProps) {
     const size = sizeClass();
 
     return (
-        <DropdownMenu onOpenChange={(open) => setIsOpen(open)} open={isOpen}>
-            <DropdownMenuTrigger>
-                <DotsThreeVertical className={`${size}`} />
-            </DropdownMenuTrigger>
-            <DropdownMenuContent>
-                <DropdownMenuItem>
-                    <Button
-                        className="p-0 text-sm h-auto"
-                        variant={"ghost"}
-                        onClick={() => setIsRenaming(true)}
-                    >
-                        <Pencil className={`mr-2 ${size}`} />
-                        Rename
-                    </Button>
-                </DropdownMenuItem>
-                <DropdownMenuItem>
-                    <Button
-                        className="p-0 text-sm h-auto"
-                        variant={"ghost"}
-                        onClick={() => setIsSharing(true)}
-                    >
-                        <Share className={`mr-2 ${size}`} />
-                        Share
-                    </Button>
-                </DropdownMenuItem>
-                <DropdownMenuItem>
-                    <Button
-                        className="p-0 text-sm h-auto text-rose-300 hover:text-rose-400"
-                        variant={"ghost"}
-                        onClick={() => setIsDeleting(true)}
-                    >
-                        <Trash className={`mr-2 ${size}`} />
-                        Delete
-                    </Button>
-                </DropdownMenuItem>
-            </DropdownMenuContent>
-        </DropdownMenu>
+        <div className="flex items-center gap-2">
+            {(props.sizing === "lg" || props.sizing === "md") && (
+                <Button
+                    className="p-0 text-sm h-auto"
+                    variant={"ghost"}
+                    onClick={() => setIsSharing(true)}
+                >
+                    <Share className={`${size}`} />
+                </Button>
+            )}
+            <DropdownMenu onOpenChange={(open) => setIsOpen(open)} open={isOpen}>
+                <DropdownMenuTrigger>
+                    <DotsThreeVertical className={`${size}`} />
+                </DropdownMenuTrigger>
+                <DropdownMenuContent>
+                    <DropdownMenuItem>
+                        <Button
+                            className="p-0 text-sm h-auto"
+                            variant={"ghost"}
+                            onClick={() => setIsRenaming(true)}
+                        >
+                            <Pencil className={`mr-2 ${size}`} />
+                            Rename
+                        </Button>
+                    </DropdownMenuItem>
+                    {props.sizing === "sm" && (
+                        <DropdownMenuItem>
+                            <Button
+                                className="p-0 text-sm h-auto"
+                                variant={"ghost"}
+                                onClick={() => setIsSharing(true)}
+                            >
+                                <Share className={`mr-2 ${size}`} />
+                                Share
+                            </Button>
+                        </DropdownMenuItem>
+                    )}
+                    <DropdownMenuItem>
+                        <Button
+                            className="p-0 text-sm h-auto text-rose-300 hover:text-rose-400"
+                            variant={"ghost"}
+                            onClick={() => setIsDeleting(true)}
+                        >
+                            <Trash className={`mr-2 ${size}`} />
+                            Delete
+                        </Button>
+                    </DropdownMenuItem>
+                </DropdownMenuContent>
+            </DropdownMenu>
+        </div>
     );
 }
 
@@ -685,7 +697,11 @@ function ChatSession(props: ChatHistory) {
             >
                 <p className={styles.session}>{title}</p>
             </Link>
-            <ChatSessionActionMenu conversationId={props.conversation_id} setTitle={setTitle} />
+            <ChatSessionActionMenu
+                conversationId={props.conversation_id}
+                setTitle={setTitle}
+                sizing="sm"
+            />
         </div>
     );
 }
@@ -726,7 +742,6 @@ function ChatSessionsModal({ data, showSidePanel }: ChatSessionsModalProps) {
                     }
                 });
             });
-            console.log(agentNameToStyleMapLocal);
             setAgentNameToStyleMap(agentNameToStyleMapLocal);
             setAgentOptions(agents);
         }
@@ -950,7 +965,7 @@ export default function SidePanel(props: SidePanelProps) {
                         }}
                     >
                         <DrawerTrigger>
-                            <Sidebar className="h-8 w-8 mx-2" weight="thin" />
+                            <Sidebar className="h-6 w-6 mx-2" weight="thin" />
                         </DrawerTrigger>
                         <DrawerContent>
                             <DrawerHeader>
@@ -1022,7 +1037,7 @@ export default function SidePanel(props: SidePanelProps) {
                     </div>
                 )}
                 {props.isMobileWidth && (
-                    <Link href="/" className="content-center">
+                    <Link href="/" className="content-center h-fit self-center">
                         <KhojLogoType />
                     </Link>
                 )}
diff --git a/src/interface/web/app/components/suggestions/suggestionsData.ts b/src/interface/web/app/components/suggestions/suggestionsData.ts
index bd1a3836..43058bd6 100644
--- a/src/interface/web/app/components/suggestions/suggestionsData.ts
+++ b/src/interface/web/app/components/suggestions/suggestionsData.ts
@@ -724,12 +724,6 @@ export const suggestionsData: Suggestion[] = [
         description: "Draw a diagram illustrating the structure of the United States government.",
         link: "",
     },
-    {
-        type: SuggestionType.Health,
-        color: suggestionToColorMap[SuggestionType.Health] || DEFAULT_COLOR,
-        description: "Draw a diagram of the human skeletal system.",
-        link: "",
-    },
     {
         type: SuggestionType.Code,
         color: suggestionToColorMap[SuggestionType.Code] || DEFAULT_COLOR,
diff --git a/src/interface/web/app/fonts.ts b/src/interface/web/app/fonts.ts
new file mode 100644
index 00000000..0fc7ca56
--- /dev/null
+++ b/src/interface/web/app/fonts.ts
@@ -0,0 +1,13 @@
+import { Noto_Sans, Noto_Sans_Arabic } from "next/font/google";
+
+export const noto_sans = Noto_Sans({
+    subsets: ["latin", "latin-ext", "cyrillic", "cyrillic-ext", "devanagari", "vietnamese"],
+    display: "swap",
+    variable: "--font-noto-sans",
+});
+
+export const noto_sans_arabic = Noto_Sans_Arabic({
+    subsets: ["arabic"],
+    display: "swap",
+    variable: "--font-noto-sans-arabic",
+});
diff --git a/src/interface/web/app/globals.css b/src/interface/web/app/globals.css
index c0215a67..fa1583b1 100644
--- a/src/interface/web/app/globals.css
+++ b/src/interface/web/app/globals.css
@@ -1,7 +1,6 @@
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
-@import url("https://fonts.googleapis.com/css2?family=Noto+Sans+Arabic:wght@100..900&family=Noto+Sans:ital,wght@0,100..900;1,100..900&display=swap");
 
 @layer base {
     :root {
@@ -25,7 +24,7 @@
         --input: 220 13% 91%;
         --ring: 24.6 95% 53.1%;
         --radius: 0.5rem;
-        --font-family: "Noto Sans", "Noto Sans Arabic", sans-serif !important;
+        --font-family: var(--font-noto-sans), var(--font-noto-sans-arabic), sans-serif !important;
 
         /* Khoj Custom Colors */
         --frosted-background-color: 20 13% 95%;
@@ -188,7 +187,7 @@
         --border: 0 0% 9%;
         --input: 0 0% 9%;
         --ring: 20.5 90.2% 48.2%;
-        --font-family: "Noto Sans", "Noto Sans Arabic", sans-serif !important;
+        --font-family: var(--font-noto-sans), var(--font-noto-sans-arabic), sans-serif !important;
 
         /* Imported from highlight.js */
         pre code.hljs {
diff --git a/src/interface/web/app/layout.tsx b/src/interface/web/app/layout.tsx
index 1d0d970f..d27a785f 100644
--- a/src/interface/web/app/layout.tsx
+++ b/src/interface/web/app/layout.tsx
@@ -1,8 +1,7 @@
 import type { Metadata } from "next";
-import { Noto_Sans } from "next/font/google";
+import { noto_sans, noto_sans_arabic } from "@/app/fonts";
 import "./globals.css";
-
-const inter = Noto_Sans({ subsets: ["latin"] });
+import { ContentSecurityPolicy } from "./common/layoutHelper";
 
 export const metadata: Metadata = {
     title: "Khoj AI - Home",
@@ -39,20 +38,9 @@ export default function RootLayout({
     children: React.ReactNode;
 }>) {
     return (
-        <html lang="en">
-            {/* <meta
-                httpEquiv="Content-Security-Policy"
-                content="default-src 'self' https://assets.khoj.dev;
-                       media-src * blob:;
-                       script-src 'self' https://assets.khoj.dev 'unsafe-inline' 'unsafe-eval';
-                       connect-src 'self' blob: https://ipapi.co/json ws://localhost:42110;
-                       style-src 'self' https://assets.khoj.dev 'unsafe-inline' https://fonts.googleapis.com;
-                       img-src 'self' data: blob: https://*.khoj.dev https://*.googleusercontent.com https://*.google.com/ https://*.gstatic.com;
-                       font-src 'self' https://assets.khoj.dev https://fonts.gstatic.com;
-                       child-src 'none';
-                       object-src 'none';"
-            ></meta> */}
-            <body className={inter.className}>{children}</body>
+        <html lang="en" className={`${noto_sans.variable} ${noto_sans_arabic.variable}`}>
+            <ContentSecurityPolicy />
+            <body>{children}</body>
         </html>
     );
 }
diff --git a/src/interface/web/app/search/layout.tsx b/src/interface/web/app/search/layout.tsx
index 98a6f279..ecaa2992 100644
--- a/src/interface/web/app/search/layout.tsx
+++ b/src/interface/web/app/search/layout.tsx
@@ -1,6 +1,7 @@
 import type { Metadata } from "next";
 
 import "../globals.css";
+import { ContentSecurityPolicy } from "../common/layoutHelper";
 
 export const metadata: Metadata = {
     title: "Khoj AI - Search",
@@ -31,5 +32,10 @@ export default function RootLayout({
 }: Readonly<{
     children: React.ReactNode;
 }>) {
-    return <div>{children}</div>;
+    return (
+        <html>
+            <ContentSecurityPolicy />
+            <body>{children}</body>
+        </html>
+    );
 }
diff --git a/src/interface/web/app/settings/layout.tsx b/src/interface/web/app/settings/layout.tsx
index 6337543f..9df90944 100644
--- a/src/interface/web/app/settings/layout.tsx
+++ b/src/interface/web/app/settings/layout.tsx
@@ -1,9 +1,9 @@
 import type { Metadata } from "next";
-import { Noto_Sans } from "next/font/google";
+import { noto_sans, noto_sans_arabic } from "@/app/fonts";
 import "../globals.css";
 import { Toaster } from "@/components/ui/toaster";
-
-const inter = Noto_Sans({ subsets: ["latin"] });
+import { ContentSecurityPolicy } from "../common/layoutHelper";
+import { ChatwootWidget } from "../components/chatWoot/ChatwootWidget";
 
 export const metadata: Metadata = {
     title: "Khoj AI - Settings",
@@ -34,21 +34,12 @@ export default function RootLayout({
     children: React.ReactNode;
 }>) {
     return (
-        <html lang="en">
-            <meta
-                httpEquiv="Content-Security-Policy"
-                content="default-src 'self' https://assets.khoj.dev;
-                        script-src 'self' https://assets.khoj.dev 'unsafe-inline' 'unsafe-eval';
-                        connect-src 'self' https://ipapi.co/json ws://localhost:42110;
-                        style-src 'self' https://assets.khoj.dev 'unsafe-inline' https://fonts.googleapis.com;
-                        img-src 'self' data: https://*.khoj.dev https://*.googleusercontent.com;
-                        font-src 'self' https://assets.khoj.dev https://fonts.gstatic.com;
-                        child-src 'none';
-                        object-src 'none';"
-            ></meta>
-            <body className={inter.className}>
+        <html lang="en" className={`${noto_sans.variable} ${noto_sans_arabic.variable}`}>
+            <ContentSecurityPolicy />
+            <body>
                 {children}
                 <Toaster />
+                <ChatwootWidget />
             </body>
         </html>
     );
diff --git a/src/interface/web/app/share/chat/layout.tsx b/src/interface/web/app/share/chat/layout.tsx
index e147bd0e..1d1a1b1d 100644
--- a/src/interface/web/app/share/chat/layout.tsx
+++ b/src/interface/web/app/share/chat/layout.tsx
@@ -1,8 +1,7 @@
 import type { Metadata } from "next";
-import { Noto_Sans } from "next/font/google";
+import { noto_sans, noto_sans_arabic } from "@/app/fonts";
 import "../../globals.css";
-
-const inter = Noto_Sans({ subsets: ["latin"] });
+import { ContentSecurityPolicy } from "@/app/common/layoutHelper";
 
 export const metadata: Metadata = {
     title: "Khoj AI - Chat",
@@ -15,19 +14,9 @@ export default function RootLayout({
     children: React.ReactNode;
 }>) {
     return (
-        <html lang="en">
-            <meta
-                httpEquiv="Content-Security-Policy"
-                content="default-src 'self' https://assets.khoj.dev;
-                       script-src 'self' https://assets.khoj.dev 'unsafe-inline' 'unsafe-eval';
-                       connect-src 'self' blob: https://ipapi.co/json ws://localhost:42110;
-                       style-src 'self' https://assets.khoj.dev 'unsafe-inline' https://fonts.googleapis.com;
-                       img-src 'self' data: blob: https://*.khoj.dev https://*.googleusercontent.com https://*.google.com/ https://*.gstatic.com;
-                       font-src 'self' https://assets.khoj.dev https://fonts.gstatic.com;
-                       child-src 'none';
-                       object-src 'none';"
-            ></meta>
-            <body className={inter.className}>
+        <html lang="en" className={`${noto_sans.variable} ${noto_sans_arabic.variable}`}>
+            <ContentSecurityPolicy />
+            <body>
                 {children}
                 <script
                     dangerouslySetInnerHTML={{
diff --git a/src/interface/web/package.json b/src/interface/web/package.json
index f8cad28a..10832f71 100644
--- a/src/interface/web/package.json
+++ b/src/interface/web/package.json
@@ -1,6 +1,6 @@
 {
     "name": "khoj-ai",
-    "version": "1.30.1",
+    "version": "1.31.0",
     "private": true,
     "scripts": {
         "dev": "next dev",
@@ -62,6 +62,9 @@
         "react-hook-form": "^7.52.1",
         "shadcn-ui": "^0.8.0",
         "swr": "^2.2.5",
+        "tailwind-merge": "^2.3.0",
+        "tailwindcss": "^3.4.6",
+        "tailwindcss-animate": "^1.0.7",
         "typescript": "^5",
         "vaul": "^0.9.1",
         "zod": "^3.23.8"
@@ -82,9 +85,6 @@
         "lint-staged": "^15.2.7",
         "nodemon": "^3.1.3",
         "prettier": "3.3.3",
-        "tailwind-merge": "^2.3.0",
-        "tailwindcss": "^3.4.6",
-        "tailwindcss-animate": "^1.0.7",
         "typescript": "^5"
     },
     "prettier": {
diff --git a/src/interface/web/public/assets/icons/khoj_lantern.svg b/src/interface/web/public/assets/icons/khoj_lantern.svg
new file mode 100644
index 00000000..d78bddd5
--- /dev/null
+++ b/src/interface/web/public/assets/icons/khoj_lantern.svg
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="200"
+   height="200"
+   viewBox="0 0 200 200"
+   className="fill-zinc-950 dark:fill-zinc-300"
+   version="1.1"
+   id="svg14"
+   sodipodi:docname="khoj.svg"
+   inkscape:export-filename="khoj_lantern_512x512.png"
+   inkscape:export-xdpi="245.75999"
+   inkscape:export-ydpi="245.75999"
+   inkscape:version="1.3 (0e150ed, 2023-07-21)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview14"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="1.18"
+     inkscape:cx="99.576271"
+     inkscape:cy="77.542373"
+     inkscape:window-width="1680"
+     inkscape:window-height="1022"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg14"
+     inkscape:export-bgcolor="#ffffffe0" />
+  <g
+     clipPath="url(#clip0_45_75)"
+     id="g14"
+     transform="matrix(1.0349659,0,0,1.0429132,13.551981,6.7616199)">
+    <!-- Fire -->
+    <path
+       d="m 57.9394,93.0404 9.6002,-43.9341 c 1.2591,0.4205 4.1969,2.8379 7.1871,2.8379 3.7772,0 4.5116,-4.5196 11.4364,-6.1487 5.5084,-1.3138 10.1773,-0.3679 12.9053,1.8394 0,0 0.6295,5.991 2.0986,7.7778 1.364,1.6291 3.462,1.051 3.462,1.051 3.043,14.3469 9.443,44.1973 10.65,48.7693 1.521,5.728 -4.355,8.881 -6.61,14.136 -2.256,5.256 -14.427,7.515 -21.6141,8.251 -7.187,0.736 -27.3319,-7.988 -29.1155,-10.405 -1.7837,-2.418 -2.5706,-7.358 -2.8329,-12.035 -0.2623,-3.731 1.7837,-9.6696 2.8329,-12.1396 z"
+       fill="#fae80b"
+       id="path1" />
+    <path
+       d="m 57.9394,92.9879 4.3542,-18.1833 c 1.259,0.4205 4.669,-1.3663 9.1806,-5.7282 2.6755,-2.6276 8.3936,-10.1952 14.584,-13.7163 4.5116,-2.5751 8.8658,-1.1561 11.5413,1.0511 0,0 2.4135,1.2087 5.2465,1.2087 2.098,0 1.783,-1.2087 1.783,-1.2087 3.043,14.3469 9.443,44.1968 10.65,48.7688 1.521,5.728 -4.355,8.882 -6.61,14.137 -2.256,5.255 -14.427,7.515 -21.6141,8.251 -7.187,0.735 -27.3319,-7.988 -29.1155,-10.406 -1.7837,-2.417 -2.5706,-7.357 -2.8329,-12.034 -0.2623,-3.679 1.7837,-9.6176 2.8329,-12.1401 z"
+       fill="#ffcc09"
+       id="path2" />
+    <path
+       d="m 69.3233,123.731 c -10.3347,-2.627 -13.4299,-14.662 -13.6922,-20.338 3.1476,3.206 11.4889,9.407 19.5153,8.566 10.0724,-1.051 17.5743,-5.097 25.7056,-11.456 8.131,-6.3064 13.692,-3.3109 13.692,6.306 0,9.617 -6.925,11.299 -9.023,15.661 -2.098,4.414 -23.24,4.572 -36.1977,1.261 z"
+       fill="#fba719"
+       id="path3" />
+    <!-- Lamp -->
+    <path
+       d="m 46.6374,143.679 c -3.0428,0 -5.351,-0.841 -6.9773,-2.575 -2.9378,-3.1 -2.1509,-7.725 -2.0984,-7.935 0.1573,-0.894 14.7414,-89.2874 16.1053,-97.9586 1.2591,-8.0406 10.3872,-9.8274 15.0562,-9.6172 l -0.1049,3.1532 c -0.0525,0 -2.8853,-0.1051 -5.7707,0.7883 -3.5673,1.1036 -5.6132,3.1531 -6.0854,6.1487 -1.3115,8.6712 -15.948,97.1176 -16.1054,98.0106 0,0.053 -0.5246,3.311 1.3116,5.256 1.3115,1.366 3.5148,1.839 6.6624,1.418 l 0.3673,3.101 c -0.7869,0.158 -1.5738,0.21 -2.3607,0.21 z"
+       id="path4" />
+    <path
+       d="m 106.023,33.371 h -3.095 c 0.052,-0.1577 0.052,-0.3679 0.052,-0.5255 V 15.2403 c 0,-1.7343 -1.416,-3.1532 -3.1476,-3.1532 H 89.4977 c 1.3639,-1.2087 2.2558,-2.99549 2.2558,-4.99249 0,-3.67869 -2.9903,-6.6742 -6.6625,-6.6742 -3.6722,0 -6.6625,2.99551 -6.6625,6.6742 0,1.997 0.8394,3.78379 2.2558,4.99249 h -9.8626 c -1.7312,0 -3.1476,1.4189 -3.1476,3.1532 v 17.6052 c 0,0.2102 0,0.3678 0.0524,0.5255 h -3.6722 c -2.4656,0 -4.5116,2.0495 -4.5116,4.5195 0,2.5226 2.046,4.5196 4.5116,4.5196 h 42.0207 c 2.466,0 4.512,-2.0496 4.512,-4.5196 -0.053,-2.5225 -2.046,-4.5195 -4.564,-4.5195 z M 85.0385,3.52103 c 1.941,0 3.5149,1.57657 3.5149,3.52102 0,1.94446 -1.5739,3.52105 -3.5149,3.52105 -1.941,0 -3.5148,-1.57659 -3.5148,-3.52105 0,-1.94445 1.5738,-3.52102 3.5148,-3.52102 z"
+       id="path5" />
+    <path
+       d="m 123.177,143.679 c -0.734,0 -1.521,-0.052 -2.361,-0.157 l 0.368,-3.101 c 3.147,0.42 5.351,-0.105 6.662,-1.419 1.836,-1.944 1.312,-5.203 1.312,-5.203 -0.158,-0.893 -14.794,-89.3394 -16.106,-98.0106 -0.472,-2.9955 -2.518,-5.0451 -6.085,-6.1487 -2.885,-0.8934 -5.718,-0.7883 -5.771,-0.7883 l -0.105,-3.1531 c 4.669,-0.2102 13.85,1.5766 15.056,9.6171 1.312,8.6712 15.948,97.0646 16.106,97.9586 0.052,0.157 0.839,4.782 -2.099,7.883 -1.626,1.629 -3.934,2.522 -6.977,2.522 z"
+       id="path6" />
+    <path
+       d="m 122.443,151.142 -0.053,-21.337 c 0,-5.045 -12.748,-9.774 -12.748,-9.774 h -0.209 c -4.407,4.309 -11.8565,7.409 -24.1847,7.409 -12.3282,0 -19.7252,-3.1 -24.1843,-7.409 h -0.2099 c 0,0 -12.7478,4.729 -12.7478,9.774 0,5.045 0,21.337 0,21.337 0,0 -5.9281,3.836 -5.9281,8.303 0,4.467 0,7.725 0,7.725 0,0 5.0362,10.984 43.0701,10.984 h 0.0524 c 38.0343,0 43.0703,-10.984 43.0703,-10.984 0,0 0,-3.258 0,-7.725 0,-4.467 -5.928,-8.303 -5.928,-8.303 z"
+       id="path7" />
+    <path
+       d="m 117.931,87.658 c -1.206,-2.4174 -4.511,-7.1472 -5.875,-9.0916 l -8.132,-37.4176 -2.833,0.6307 11.647,53.4461 0.052,0.1577 c 0,0.0525 0.472,1.4714 0.84,3.6787 -0.578,0.5255 -1.26,0.998 -2.046,1.471 -3.253,1.945 -14.7943,5.361 -26.2831,8.461 -11.4364,-3.1 -22.9253,-6.516 -26.1778,-8.461 -0.8394,-0.525 -1.5738,-1.0506 -2.2034,-1.6287 0.3673,-2.1547 0.7869,-3.521 0.8394,-3.5736 V 95.2782 L 69.4053,41.5167 66.5725,40.886 58.3362,79.0394 c -1.5214,2.1546 -4.4592,6.4114 -5.5608,8.6712 -0.9443,1.8919 -1.9935,6.8318 1.259,11.1412 -0.7869,4.8872 -1.0492,12.9282 3.7247,19.5492 5.0362,6.99 14.2693,10.511 27.4893,10.511 13.2201,0 22.4536,-3.521 27.4896,-10.511 4.721,-6.569 4.511,-14.452 3.777,-19.339 3.515,-4.4145 2.413,-9.4595 1.416,-11.404 z m -1.836,0.946 c 0.63,1.3138 1.364,4.3618 -0.105,7.4099 -0.21,-0.7883 -0.367,-1.2613 -0.419,-1.4715 l -2.309,-10.5631 c 1.102,1.6817 2.256,3.4685 2.833,4.6247 z m -61.431,0 c 0.5246,-1.0511 1.4688,-2.5751 2.518,-4.1517 l -2.2033,10.0376 c -0.0525,0.1576 -0.2098,0.5781 -0.3672,1.2087 -1.2066,-2.943 -0.5246,-5.8334 0.0525,-7.0946 z m 1.9934,12.77 c 0.4197,0.316 0.9443,0.631 1.4165,0.946 3.0427,1.84 12.9053,4.835 23.24,7.725 -10.7544,2.891 -20.4596,5.256 -21.8761,5.624 -2.8853,-4.73 -3.1476,-10.196 -2.7804,-14.295 z m 28.6435,24.595 c -11.6463,0 -19.8825,-2.838 -24.4991,-8.461 3.305,-0.788 13.7447,-3.416 24.5515,-6.359 10.5971,2.89 20.9847,5.466 24.4467,6.359 -4.617,5.623 -12.8529,8.461 -24.4991,8.461 z m 25.8101,-10.3 c -1.941,-0.473 -11.3835,-2.838 -21.7707,-5.624 10.3872,-2.89 20.2497,-5.938 23.3447,-7.777 0.472,-0.263 0.84,-0.526 1.259,-0.841 0.367,4.099 0.053,9.564 -2.833,14.242 z"
+       id="path8" />
+    <path
+       d="m 39.188,44.7224 c -0.3147,0 -0.577,-0.1051 -0.8393,-0.2627 l -14.0594,-9.88 c -0.682,-0.4729 -0.8394,-1.3663 -0.3673,-2.0495 0.4722,-0.6832 1.364,-0.8409 2.046,-0.3679 l 14.0594,9.8799 c 0.682,0.473 0.8394,1.3664 0.3672,2.0496 -0.3147,0.4204 -0.7344,0.6306 -1.2066,0.6306 z"
+       id="path9" />
+    <path
+       d="M 18.8334,80.6685 1.67885,80.6159 c -0.786909,0 -1.468889,-0.6306 -1.468889,-1.4714 0,-0.8409 0.629519,-1.4715 1.468889,-1.4715 l 17.15455,0.0525 c 0.7869,0 1.4689,0.6307 1.4689,1.4715 0,0.8409 -0.682,1.4715 -1.4689,1.4715 z"
+       id="path10" />
+    <path
+       d="m 13.2726,128.754 c -0.4722,0 -0.9443,-0.21 -1.2066,-0.683 -0.4197,-0.683 -0.2098,-1.576 0.4197,-1.997 l 14.4266,-9.249 c 0.682,-0.421 1.5738,-0.263 1.9935,0.42 0.4197,0.683 0.2099,1.577 -0.4197,1.997 l -14.4266,9.25 c -0.2098,0.157 -0.4721,0.262 -0.7869,0.262 z"
+       id="path11" />
+    <path
+       d="m 130.889,43.6188 c -0.472,0 -0.892,-0.2102 -1.207,-0.6307 -0.472,-0.6831 -0.314,-1.5765 0.368,-2.0495 l 14.059,-9.8799 c 0.629,-0.473 1.574,-0.3154 2.046,0.3678 0.472,0.6832 0.315,1.5766 -0.367,2.0496 l -14.06,9.8799 c -0.262,0.1577 -0.524,0.2628 -0.839,0.2628 z"
+       id="path12" />
+    <path
+       d="m 151.244,79.5649 c -0.787,0 -1.469,-0.6306 -1.469,-1.4715 0,-0.7883 0.629,-1.4715 1.469,-1.4715 l 17.154,-0.0525 c 0.787,0 1.469,0.6306 1.469,1.4715 0,0.7883 -0.629,1.4714 -1.469,1.4714 z"
+       id="path13" />
+    <path
+       d="m 156.804,127.598 c -0.262,0 -0.524,-0.052 -0.787,-0.21 l -14.426,-9.249 c -0.682,-0.421 -0.892,-1.314 -0.42,-1.997 0.42,-0.684 1.312,-0.894 1.994,-0.421 l 14.426,9.249 c 0.682,0.421 0.892,1.314 0.42,1.997 -0.262,0.421 -0.734,0.631 -1.207,0.631 z"
+       id="path14" />
+  </g>
+  <defs
+     id="defs14">
+    <clipPath
+       id="clip0_45_75">
+      <rect
+         width="200"
+         height="200"
+         fill="currentColor"
+         id="rect14" />
+    </clipPath>
+  </defs>
+</svg>
diff --git a/src/interface/web/public/assets/icons/khoj_lantern_1200x1200.png b/src/interface/web/public/assets/icons/khoj_lantern_1200x1200.png
new file mode 100644
index 00000000..14a8b28b
Binary files /dev/null and b/src/interface/web/public/assets/icons/khoj_lantern_1200x1200.png differ
diff --git a/src/interface/web/public/assets/icons/khoj_lantern_128x128_dark.png b/src/interface/web/public/assets/icons/khoj_lantern_128x128_dark.png
new file mode 100644
index 00000000..8fc673a5
Binary files /dev/null and b/src/interface/web/public/assets/icons/khoj_lantern_128x128_dark.png differ
diff --git a/src/interface/web/public/assets/icons/khoj_lantern_512x512.png b/src/interface/web/public/assets/icons/khoj_lantern_512x512.png
new file mode 100644
index 00000000..046db170
Binary files /dev/null and b/src/interface/web/public/assets/icons/khoj_lantern_512x512.png differ
diff --git a/src/interface/web/public/khoj.webmanifest b/src/interface/web/public/khoj.webmanifest
index e0ed3744..29522389 100644
--- a/src/interface/web/public/khoj.webmanifest
+++ b/src/interface/web/public/khoj.webmanifest
@@ -1,11 +1,18 @@
 {
-    "name": "Khoj",
+    "id": "https://app.khoj.dev",
+    "name": "Khoj AI - Get Answers, Create Anything",
     "short_name": "Khoj",
     "display": "standalone",
     "start_url": "/",
-    "description": "The open, personal AI for your digital brain. You can ask Khoj to draft a message, paint your imagination, find information on the internet and even answer questions from your documents.",
+    "scope": "/",
+    "description": "Khoj is your open, personal AI. Gets answers from the internet and your documents. Quickly draft messages, summarize any information, generate beautiful paintings, create personal agents and do deep research.",
+    "categories": ["productivity", "utilities", "personalization", "education"],
     "theme_color": "#ffffff",
     "background_color": "#ffffff",
+    "orientation": "natural",
+    "launch_handler": {
+        "client_mode": ["navigate-existing", "auto"]
+    },
     "icons": [
         {
             "src": "/static/assets/icons/khoj_lantern_128x128.png",
@@ -16,6 +23,24 @@
             "src": "/static/assets/icons/khoj_lantern_256x256.png",
             "sizes": "256x256",
             "type": "image/png"
+        },
+        {
+            "src": "/static/assets/icons/khoj_lantern_512x512.png",
+            "sizes": "512x512",
+            "type": "image/png",
+            "purpose": "any"
+        },
+        {
+            "src": "/static/assets/icons/khoj_lantern_512x512.png",
+            "sizes": "512x512",
+            "type": "image/png",
+            "purpose": "maskable"
+        },
+        {
+            "src": "/static/assets/icons/khoj_lantern_1200x1200.png",
+            "sizes": "1200x1200",
+            "type": "image/png",
+            "purpose": "any"
         }
     ],
     "screenshots": [
diff --git a/src/interface/web/tailwind.config.ts b/src/interface/web/tailwind.config.ts
index 32e66d3b..bc557603 100644
--- a/src/interface/web/tailwind.config.ts
+++ b/src/interface/web/tailwind.config.ts
@@ -55,6 +55,9 @@ const config = {
             },
         },
         extend: {
+            fontFamily: {
+                sans: ["var(--font-noto-sans)", "var(--font-noto-sans-arabic)"],
+            },
             colors: {
                 border: "hsl(var(--border))",
                 input: "hsl(var(--input))",
diff --git a/src/khoj/app/settings.py b/src/khoj/app/settings.py
index 020b2b2e..708e11d0 100644
--- a/src/khoj/app/settings.py
+++ b/src/khoj/app/settings.py
@@ -13,6 +13,8 @@ https://docs.djangoproject.com/en/4.2/ref/settings/
 import os
 from pathlib import Path
 
+from django.templatetags.static import static
+
 from khoj.utils.helpers import in_debug_mode, is_env_var_true
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
@@ -72,6 +74,7 @@ INSTALLED_APPS = [
     "django.contrib.auth",
     "django.contrib.contenttypes",
     "khoj.database.apps.DatabaseConfig",
+    "unfold",
     "django.contrib.admin",
     "django.contrib.sessions",
     "django.contrib.messages",
@@ -195,3 +198,21 @@ APSCHEDULER_DATETIME_FORMAT = "N j, Y, f:s a"
 # that supports multiple background worker processes instead (e.g. Dramatiq, Celery, Django-RQ,
 # etc. See: https://djangopackages.org/grids/g/workers-queues-tasks/ for popular options).
 APSCHEDULER_RUN_NOW_TIMEOUT = 240  # Seconds
+
+UNFOLD = {
+    "SITE_TITLE": "Khoj Admin Panel",
+    "SITE_HEADER": "Khoj Admin Panel",
+    "SITE_URL": "/",
+    "SITE_ICON": {
+        "light": lambda request: static("assets/icons/khoj_lantern_128x128.png"),
+        "dark": lambda request: static("assets/icons/khoj_lantern_128x128_dark.png"),
+    },
+    "SITE_FAVICONS": [
+        {
+            "rel": "icon",
+            "sizes": "32x32",
+            "type": "image/svg+xml",
+            "href": lambda request: static("assets/icons/khoj_lantern.svg"),
+        },
+    ],
+}
diff --git a/src/khoj/configure.py b/src/khoj/configure.py
index 0ed5aa63..33008b6c 100644
--- a/src/khoj/configure.py
+++ b/src/khoj/configure.py
@@ -232,9 +232,9 @@ def configure_server(
         config = FullConfig()
     state.config = config
 
-    if ConversationAdapters.has_valid_openai_conversation_config():
-        openai_config = ConversationAdapters.get_openai_conversation_config()
-        state.openai_client = openai.OpenAI(api_key=openai_config.api_key)
+    if ConversationAdapters.has_valid_ai_model_api():
+        ai_model_api = ConversationAdapters.get_ai_model_api()
+        state.openai_client = openai.OpenAI(api_key=ai_model_api.api_key)
 
     # Initialize Search Models from Config and initialize content
     try:
diff --git a/src/khoj/database/adapters/__init__.py b/src/khoj/database/adapters/__init__.py
index 46a65c79..9dee6684 100644
--- a/src/khoj/database/adapters/__init__.py
+++ b/src/khoj/database/adapters/__init__.py
@@ -35,6 +35,7 @@ from torch import Tensor
 
 from khoj.database.models import (
     Agent,
+    AiModelApi,
     ChatModelOptions,
     ClientApplication,
     Conversation,
@@ -46,7 +47,6 @@ from khoj.database.models import (
     KhojApiUser,
     KhojUser,
     NotionConfig,
-    OpenAIProcessorConversationConfig,
     ProcessLock,
     PublicConversation,
     ReflectiveQuestion,
@@ -224,7 +224,9 @@ async def acreate_user_by_phone_number(phone_number: str) -> KhojUser:
     )
     await user.asave()
 
-    await Subscription.objects.acreate(user=user, type=Subscription.Type.STANDARD)
+    user_subscription = await Subscription.objects.filter(user=user).afirst()
+    if not user_subscription:
+        await Subscription.objects.acreate(user=user, type=Subscription.Type.STANDARD)
 
     return user
 
@@ -296,7 +298,9 @@ async def create_user_by_google_token(token: dict) -> KhojUser:
         user=user,
     )
 
-    await Subscription.objects.acreate(user=user, type=Subscription.Type.STANDARD)
+    user_subscription = await Subscription.objects.filter(user=user).afirst()
+    if not user_subscription:
+        await Subscription.objects.acreate(user=user, type=Subscription.Type.STANDARD)
 
     return user
 
@@ -853,7 +857,7 @@ class ConversationAdapters:
             agent=conversation.agent,
             conversation_log=conversation.conversation_log,
             slug=conversation.slug,
-            title=conversation.title,
+            title=conversation.title if conversation.title else conversation.slug,
         )
 
     @staticmethod
@@ -977,7 +981,7 @@ class ConversationAdapters:
 
     @staticmethod
     async def aget_all_conversation_configs():
-        return await sync_to_async(list)(ChatModelOptions.objects.prefetch_related("openai_config").all())
+        return await sync_to_async(list)(ChatModelOptions.objects.prefetch_related("ai_model_api").all())
 
     @staticmethod
     def get_vision_enabled_config():
@@ -996,12 +1000,12 @@ class ConversationAdapters:
         return None
 
     @staticmethod
-    def get_openai_conversation_config():
-        return OpenAIProcessorConversationConfig.objects.filter().first()
+    def get_ai_model_api():
+        return AiModelApi.objects.filter().first()
 
     @staticmethod
-    def has_valid_openai_conversation_config():
-        return OpenAIProcessorConversationConfig.objects.filter().exists()
+    def has_valid_ai_model_api():
+        return AiModelApi.objects.filter().exists()
 
     @staticmethod
     @arequire_valid_user
@@ -1089,7 +1093,7 @@ class ConversationAdapters:
         server_chat_settings: ServerChatSettings = (
             await ServerChatSettings.objects.filter()
             .prefetch_related(
-                "chat_default", "chat_default__openai_config", "chat_advanced", "chat_advanced__openai_config"
+                "chat_default", "chat_default__ai_model_api", "chat_advanced", "chat_advanced__ai_model_api"
             )
             .afirst()
         )
@@ -1105,7 +1109,7 @@ class ConversationAdapters:
 
         # Get the user's chat settings, if the server chat settings are not set
         user_chat_settings = (
-            (await UserConversationConfig.objects.filter(user=user).prefetch_related("setting__openai_config").afirst())
+            (await UserConversationConfig.objects.filter(user=user).prefetch_related("setting__ai_model_api").afirst())
             if user
             else None
         )
@@ -1113,7 +1117,7 @@ class ConversationAdapters:
             return user_chat_settings.setting
 
         # Get the first chat model if even the user chat settings are not set
-        return await ChatModelOptions.objects.filter().prefetch_related("openai_config").afirst()
+        return await ChatModelOptions.objects.filter().prefetch_related("ai_model_api").afirst()
 
     @staticmethod
     def get_advanced_conversation_config(user: KhojUser):
@@ -1126,7 +1130,7 @@ class ConversationAdapters:
     async def aget_advanced_conversation_config(user: KhojUser = None):
         server_chat_settings: ServerChatSettings = (
             await ServerChatSettings.objects.filter()
-            .prefetch_related("chat_advanced", "chat_advanced__openai_config")
+            .prefetch_related("chat_advanced", "chat_advanced__ai_model_api")
             .afirst()
         )
         if server_chat_settings is not None and server_chat_settings.chat_advanced is not None:
@@ -1254,7 +1258,7 @@ class ConversationAdapters:
     @staticmethod
     async def aget_user_conversation_config(user: KhojUser):
         config = (
-            await UserConversationConfig.objects.filter(user=user).prefetch_related("setting__openai_config").afirst()
+            await UserConversationConfig.objects.filter(user=user).prefetch_related("setting__ai_model_api").afirst()
         )
         if not config:
             return None
@@ -1309,7 +1313,7 @@ class ConversationAdapters:
                 ChatModelOptions.ModelType.OPENAI,
                 ChatModelOptions.ModelType.GOOGLE,
             ]
-        ) and conversation_config.openai_config:
+        ) and conversation_config.ai_model_api:
             return conversation_config
 
         else:
@@ -1317,7 +1321,7 @@ class ConversationAdapters:
 
     @staticmethod
     async def aget_text_to_image_model_config():
-        return await TextToImageModelConfig.objects.filter().prefetch_related("openai_config").afirst()
+        return await TextToImageModelConfig.objects.filter().prefetch_related("ai_model_api").afirst()
 
     @staticmethod
     def get_text_to_image_model_config():
@@ -1339,9 +1343,9 @@ class ConversationAdapters:
 
     @staticmethod
     async def aget_user_text_to_image_model(user: KhojUser) -> Optional[TextToImageModelConfig]:
-        # Create a custom queryset for prefetching settings__openai_config, handling null cases
+        # Create a custom queryset for prefetching settings__ai_model_api, handling null cases
         settings_prefetch = Prefetch(
-            "setting", queryset=TextToImageModelConfig.objects.prefetch_related("openai_config")
+            "setting", queryset=TextToImageModelConfig.objects.prefetch_related("ai_model_api")
         )
 
         config = await UserTextToImageModelConfig.objects.filter(user=user).prefetch_related(settings_prefetch).afirst()
diff --git a/src/khoj/database/admin.py b/src/khoj/database/admin.py
index 906f2ffe..ce1060c1 100644
--- a/src/khoj/database/admin.py
+++ b/src/khoj/database/admin.py
@@ -1,17 +1,21 @@
 import csv
 import json
-from datetime import date, datetime, timedelta, timezone
+from datetime import datetime, timedelta
 
 from apscheduler.job import Job
 from django.contrib import admin, messages
-from django.contrib.auth.admin import UserAdmin
+from django.contrib.auth.admin import GroupAdmin as BaseGroupAdmin
+from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
+from django.contrib.auth.models import Group
 from django.http import HttpResponse
-from django_apscheduler.admin import DjangoJobAdmin
+from django_apscheduler.admin import DjangoJobAdmin, DjangoJobExecutionAdmin
 from django_apscheduler.jobstores import DjangoJobStore
-from django_apscheduler.models import DjangoJob
+from django_apscheduler.models import DjangoJob, DjangoJobExecution
+from unfold import admin as unfold_admin
 
 from khoj.database.models import (
     Agent,
+    AiModelApi,
     ChatModelOptions,
     ClientApplication,
     Conversation,
@@ -19,7 +23,6 @@ from khoj.database.models import (
     GithubConfig,
     KhojUser,
     NotionConfig,
-    OpenAIProcessorConversationConfig,
     ProcessLock,
     ReflectiveQuestion,
     SearchModelConfig,
@@ -35,10 +38,8 @@ from khoj.database.models import (
 )
 from khoj.utils.helpers import ImageIntentType
 
-admin.site.unregister(DjangoJob)
 
-
-class KhojDjangoJobAdmin(DjangoJobAdmin):
+class KhojDjangoJobAdmin(DjangoJobAdmin, unfold_admin.ModelAdmin):
     list_display = (
         "id",
         "next_run_time",
@@ -62,10 +63,25 @@ class KhojDjangoJobAdmin(DjangoJobAdmin):
         return queryset, use_distinct
 
 
+class KhojDjangoJobExecutionAdmin(DjangoJobExecutionAdmin, unfold_admin.ModelAdmin):
+    pass
+
+
+admin.site.unregister(DjangoJob)
 admin.site.register(DjangoJob, KhojDjangoJobAdmin)
+admin.site.unregister(DjangoJobExecution)
+admin.site.register(DjangoJobExecution, KhojDjangoJobExecutionAdmin)
 
 
-class KhojUserAdmin(UserAdmin):
+class GroupAdmin(BaseGroupAdmin, unfold_admin.ModelAdmin):
+    pass
+
+
+class UserAdmin(BaseUserAdmin, unfold_admin.ModelAdmin):
+    pass
+
+
+class KhojUserAdmin(UserAdmin, unfold_admin.ModelAdmin):
     class DateJoinedAfterFilter(admin.SimpleListFilter):
         title = "Joined after"
         parameter_name = "joined_after"
@@ -137,31 +153,33 @@ class KhojUserAdmin(UserAdmin):
     get_email_login_url.short_description = "Get email login URL"  # type: ignore
 
 
+admin.site.unregister(Group)
 admin.site.register(KhojUser, KhojUserAdmin)
 
-admin.site.register(ProcessLock)
-admin.site.register(SpeechToTextModelOptions)
-admin.site.register(ReflectiveQuestion)
-admin.site.register(ClientApplication)
-admin.site.register(GithubConfig)
-admin.site.register(NotionConfig)
-admin.site.register(UserVoiceModelConfig)
-admin.site.register(VoiceModelOption)
-admin.site.register(UserRequests)
+admin.site.register(ProcessLock, unfold_admin.ModelAdmin)
+admin.site.register(SpeechToTextModelOptions, unfold_admin.ModelAdmin)
+admin.site.register(ReflectiveQuestion, unfold_admin.ModelAdmin)
+admin.site.register(ClientApplication, unfold_admin.ModelAdmin)
+admin.site.register(GithubConfig, unfold_admin.ModelAdmin)
+admin.site.register(NotionConfig, unfold_admin.ModelAdmin)
+admin.site.register(UserVoiceModelConfig, unfold_admin.ModelAdmin)
+admin.site.register(VoiceModelOption, unfold_admin.ModelAdmin)
+admin.site.register(UserRequests, unfold_admin.ModelAdmin)
 
 
 @admin.register(Agent)
-class AgentAdmin(admin.ModelAdmin):
+class AgentAdmin(unfold_admin.ModelAdmin):
     list_display = (
         "id",
         "name",
     )
     search_fields = ("id", "name")
+    list_filter = ("privacy_level",)
     ordering = ("-created_at",)
 
 
 @admin.register(Entry)
-class EntryAdmin(admin.ModelAdmin):
+class EntryAdmin(unfold_admin.ModelAdmin):
     list_display = (
         "id",
         "created_at",
@@ -183,7 +201,7 @@ class EntryAdmin(admin.ModelAdmin):
 
 
 @admin.register(Subscription)
-class KhojUserSubscription(admin.ModelAdmin):
+class KhojUserSubscription(unfold_admin.ModelAdmin):
     list_display = (
         "id",
         "user",
@@ -195,18 +213,18 @@ class KhojUserSubscription(admin.ModelAdmin):
 
 
 @admin.register(ChatModelOptions)
-class ChatModelOptionsAdmin(admin.ModelAdmin):
+class ChatModelOptionsAdmin(unfold_admin.ModelAdmin):
     list_display = (
         "id",
         "chat_model",
-        "model_type",
+        "ai_model_api",
         "max_prompt_size",
     )
-    search_fields = ("id", "chat_model", "model_type")
+    search_fields = ("id", "chat_model", "ai_model_api__name")
 
 
 @admin.register(TextToImageModelConfig)
-class TextToImageModelOptionsAdmin(admin.ModelAdmin):
+class TextToImageModelOptionsAdmin(unfold_admin.ModelAdmin):
     list_display = (
         "id",
         "model_name",
@@ -215,8 +233,8 @@ class TextToImageModelOptionsAdmin(admin.ModelAdmin):
     search_fields = ("id", "model_name", "model_type")
 
 
-@admin.register(OpenAIProcessorConversationConfig)
-class OpenAIProcessorConversationConfigAdmin(admin.ModelAdmin):
+@admin.register(AiModelApi)
+class AiModelApiAdmin(unfold_admin.ModelAdmin):
     list_display = (
         "id",
         "name",
@@ -227,7 +245,7 @@ class OpenAIProcessorConversationConfigAdmin(admin.ModelAdmin):
 
 
 @admin.register(SearchModelConfig)
-class SearchModelConfigAdmin(admin.ModelAdmin):
+class SearchModelConfigAdmin(unfold_admin.ModelAdmin):
     list_display = (
         "id",
         "name",
@@ -238,7 +256,7 @@ class SearchModelConfigAdmin(admin.ModelAdmin):
 
 
 @admin.register(ServerChatSettings)
-class ServerChatSettingsAdmin(admin.ModelAdmin):
+class ServerChatSettingsAdmin(unfold_admin.ModelAdmin):
     list_display = (
         "chat_default",
         "chat_advanced",
@@ -247,7 +265,7 @@ class ServerChatSettingsAdmin(admin.ModelAdmin):
 
 
 @admin.register(WebScraper)
-class WebScraperAdmin(admin.ModelAdmin):
+class WebScraperAdmin(unfold_admin.ModelAdmin):
     list_display = (
         "priority",
         "name",
@@ -261,7 +279,7 @@ class WebScraperAdmin(admin.ModelAdmin):
 
 
 @admin.register(Conversation)
-class ConversationAdmin(admin.ModelAdmin):
+class ConversationAdmin(unfold_admin.ModelAdmin):
     list_display = (
         "id",
         "user",
@@ -270,7 +288,7 @@ class ConversationAdmin(admin.ModelAdmin):
         "client",
     )
     search_fields = ("id", "user__email", "user__username", "client__name")
-    list_filter = ("agent",)
+    list_filter = ("agent", "client", "user")
     ordering = ("-created_at",)
 
     actions = ["export_selected_objects", "export_selected_minimal_objects"]
@@ -286,17 +304,10 @@ class ConversationAdmin(admin.ModelAdmin):
             modified_log = conversation.conversation_log
             chat_log = modified_log.get("chat", [])
             for idx, log in enumerate(chat_log):
-                if (
-                    log["by"] == "khoj"
-                    and log["intent"]
-                    and log["intent"]["type"]
-                    and (
-                        log["intent"]["type"] == ImageIntentType.TEXT_TO_IMAGE.value
-                        or log["intent"]["type"] == ImageIntentType.TEXT_TO_IMAGE_V3.value
-                    )
-                ):
-                    log["message"] = "inline image redacted for space"
+                if log["by"] == "khoj" and log["images"]:
+                    log["images"] = ["inline image redacted for space"]
                     chat_log[idx] = log
+
             modified_log["chat"] = chat_log
 
             writer.writerow(
@@ -367,7 +378,7 @@ class ConversationAdmin(admin.ModelAdmin):
 
 
 @admin.register(UserConversationConfig)
-class UserConversationConfigAdmin(admin.ModelAdmin):
+class UserConversationConfigAdmin(unfold_admin.ModelAdmin):
     list_display = (
         "id",
         "get_user_email",
diff --git a/src/khoj/database/migrations/0075_migrate_generated_assets_and_validate.py b/src/khoj/database/migrations/0075_migrate_generated_assets_and_validate.py
new file mode 100644
index 00000000..40c74ebf
--- /dev/null
+++ b/src/khoj/database/migrations/0075_migrate_generated_assets_and_validate.py
@@ -0,0 +1,85 @@
+# Made manually by sabaimran for use by Django 5.0.9 on 2024-12-01 16:59
+
+from django.db import migrations, models
+
+# This script was written alongside when Pydantic validation was added to the Conversation conversation_log field.
+
+
+def migrate_generated_assets(apps, schema_editor):
+    Conversation = apps.get_model("database", "Conversation")
+
+    # Process conversations in chunks
+    for conversation in Conversation.objects.iterator():
+        try:
+            meta_log = conversation.conversation_log
+            modified = False
+
+            for chat in meta_log.get("chat", []):
+                intent_type = chat.get("intent", {}).get("type")
+
+                if intent_type and chat["by"] == "khoj":
+                    if intent_type and "text-to-image" in intent_type:
+                        # Migrate the generated image to the new format
+                        chat["images"] = [chat.get("message")]
+                        chat["message"] = chat["intent"]["inferred-queries"][0]
+                        modified = True
+
+                    if intent_type and "excalidraw" in intent_type:
+                        # Migrate the generated excalidraw to the new format
+                        chat["excalidrawDiagram"] = chat.get("message")
+                        chat["message"] = chat["intent"]["inferred-queries"][0]
+                        modified = True
+
+            # Only save if changes were made
+            if modified:
+                conversation.conversation_log = meta_log
+                conversation.save()
+
+        except Exception as e:
+            print(f"Error processing conversation {conversation.id}: {str(e)}")
+            continue
+
+
+def reverse_migration(apps, schema_editor):
+    Conversation = apps.get_model("database", "Conversation")
+
+    # Process conversations in chunks
+    for conversation in Conversation.objects.iterator():
+        try:
+            meta_log = conversation.conversation_log
+            modified = False
+
+            for chat in meta_log.get("chat", []):
+                intent_type = chat.get("intent", {}).get("type")
+
+                if intent_type and chat["by"] == "khoj":
+                    if intent_type and "text-to-image" in intent_type:
+                        # Migrate the generated image back to the old format
+                        chat["message"] = chat.get("images", [])[0]
+                        chat.pop("images", None)
+                        modified = True
+
+                    if intent_type and "excalidraw" in intent_type:
+                        # Migrate the generated excalidraw back to the old format
+                        chat["message"] = chat.get("excalidrawDiagram")
+                        chat.pop("excalidrawDiagram", None)
+                        modified = True
+
+            # Only save if changes were made
+            if modified:
+                conversation.conversation_log = meta_log
+                conversation.save()
+
+        except Exception as e:
+            print(f"Error processing conversation {conversation.id}: {str(e)}")
+            continue
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("database", "0074_alter_conversation_title"),
+    ]
+
+    operations = [
+        migrations.RunPython(migrate_generated_assets, reverse_migration),
+    ]
diff --git a/src/khoj/database/migrations/0076_rename_openaiprocessorconversationconfig_aimodelapi_and_more.py b/src/khoj/database/migrations/0076_rename_openaiprocessorconversationconfig_aimodelapi_and_more.py
new file mode 100644
index 00000000..d9f536f9
--- /dev/null
+++ b/src/khoj/database/migrations/0076_rename_openaiprocessorconversationconfig_aimodelapi_and_more.py
@@ -0,0 +1,26 @@
+# Generated by Django 5.0.9 on 2024-12-05 09:00
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("database", "0075_migrate_generated_assets_and_validate"),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name="OpenAIProcessorConversationConfig",
+            new_name="AiModelApi",
+        ),
+        migrations.RenameField(
+            model_name="chatmodeloptions",
+            old_name="openai_config",
+            new_name="ai_model_api",
+        ),
+        migrations.RenameField(
+            model_name="texttoimagemodelconfig",
+            old_name="openai_config",
+            new_name="ai_model_api",
+        ),
+    ]
diff --git a/src/khoj/database/models/__init__.py b/src/khoj/database/models/__init__.py
index 8f6c5c78..2b1f5022 100644
--- a/src/khoj/database/models/__init__.py
+++ b/src/khoj/database/models/__init__.py
@@ -1,7 +1,9 @@
+import logging
 import os
 import re
 import uuid
 from random import choice
+from typing import Dict, List, Optional, Union
 
 from django.contrib.auth.models import AbstractUser
 from django.contrib.postgres.fields import ArrayField
@@ -11,9 +13,109 @@ from django.db.models.signals import pre_save
 from django.dispatch import receiver
 from pgvector.django import VectorField
 from phonenumber_field.modelfields import PhoneNumberField
+from pydantic import BaseModel as PydanticBaseModel
+from pydantic import Field
+
+logger = logging.getLogger(__name__)
 
 
-class BaseModel(models.Model):
+# Pydantic models for type Chat Message validation
+class Context(PydanticBaseModel):
+    compiled: str
+    file: str
+
+
+class CodeContextFile(PydanticBaseModel):
+    filename: str
+    b64_data: str
+
+
+class CodeContextResult(PydanticBaseModel):
+    success: bool
+    output_files: List[CodeContextFile]
+    std_out: str
+    std_err: str
+    code_runtime: int
+
+
+class CodeContextData(PydanticBaseModel):
+    code: str
+    result: Optional[CodeContextResult] = None
+
+
+class WebPage(PydanticBaseModel):
+    link: str
+    query: Optional[str] = None
+    snippet: str
+
+
+class AnswerBox(PydanticBaseModel):
+    link: Optional[str] = None
+    snippet: Optional[str] = None
+    title: str
+    snippetHighlighted: Optional[List[str]] = None
+
+
+class PeopleAlsoAsk(PydanticBaseModel):
+    link: Optional[str] = None
+    question: Optional[str] = None
+    snippet: Optional[str] = None
+    title: str
+
+
+class KnowledgeGraph(PydanticBaseModel):
+    attributes: Optional[Dict[str, str]] = None
+    description: Optional[str] = None
+    descriptionLink: Optional[str] = None
+    descriptionSource: Optional[str] = None
+    imageUrl: Optional[str] = None
+    title: str
+    type: Optional[str] = None
+
+
+class OrganicContext(PydanticBaseModel):
+    snippet: str
+    title: str
+    link: str
+
+
+class OnlineContext(PydanticBaseModel):
+    webpages: Optional[Union[WebPage, List[WebPage]]] = None
+    answerBox: Optional[AnswerBox] = None
+    peopleAlsoAsk: Optional[List[PeopleAlsoAsk]] = None
+    knowledgeGraph: Optional[KnowledgeGraph] = None
+    organicContext: Optional[List[OrganicContext]] = None
+
+
+class Intent(PydanticBaseModel):
+    type: str
+    query: str
+    memory_type: str = Field(alias="memory-type")
+    inferred_queries: Optional[List[str]] = Field(default=None, alias="inferred-queries")
+
+
+class TrainOfThought(PydanticBaseModel):
+    type: str
+    data: str
+
+
+class ChatMessage(PydanticBaseModel):
+    message: str
+    trainOfThought: List[TrainOfThought] = []
+    context: List[Context] = []
+    onlineContext: Dict[str, OnlineContext] = {}
+    codeContext: Dict[str, CodeContextData] = {}
+    created: str
+    images: Optional[List[str]] = None
+    queryFiles: Optional[List[Dict]] = None
+    excalidrawDiagram: Optional[List[Dict]] = None
+    by: str
+    turnId: Optional[str] = None
+    intent: Optional[Intent] = None
+    automationId: Optional[str] = None
+
+
+class DbBaseModel(models.Model):
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
 
@@ -21,7 +123,7 @@ class BaseModel(models.Model):
         abstract = True
 
 
-class ClientApplication(BaseModel):
+class ClientApplication(DbBaseModel):
     name = models.CharField(max_length=200)
     client_id = models.CharField(max_length=200)
     client_secret = models.CharField(max_length=200)
@@ -42,6 +144,9 @@ class KhojUser(AbstractUser):
             self.uuid = uuid.uuid4()
         super().save(*args, **kwargs)
 
+    def __str__(self):
+        return f"{self.username} ({self.uuid})"
+
 
 class GoogleUser(models.Model):
     user = models.OneToOneField(KhojUser, on_delete=models.CASCADE)
@@ -67,7 +172,7 @@ class KhojApiUser(models.Model):
     accessed_at = models.DateTimeField(null=True, default=None)
 
 
-class Subscription(BaseModel):
+class Subscription(DbBaseModel):
     class Type(models.TextChoices):
         TRIAL = "trial"
         STANDARD = "standard"
@@ -79,13 +184,16 @@ class Subscription(BaseModel):
     enabled_trial_at = models.DateTimeField(null=True, default=None, blank=True)
 
 
-class OpenAIProcessorConversationConfig(BaseModel):
+class AiModelApi(DbBaseModel):
     name = models.CharField(max_length=200)
     api_key = models.CharField(max_length=200)
     api_base_url = models.URLField(max_length=200, default=None, blank=True, null=True)
 
+    def __str__(self):
+        return self.name
 
-class ChatModelOptions(BaseModel):
+
+class ChatModelOptions(DbBaseModel):
     class ModelType(models.TextChoices):
         OPENAI = "openai"
         OFFLINE = "offline"
@@ -98,17 +206,18 @@ class ChatModelOptions(BaseModel):
     chat_model = models.CharField(max_length=200, default="bartowski/Meta-Llama-3.1-8B-Instruct-GGUF")
     model_type = models.CharField(max_length=200, choices=ModelType.choices, default=ModelType.OFFLINE)
     vision_enabled = models.BooleanField(default=False)
-    openai_config = models.ForeignKey(
-        OpenAIProcessorConversationConfig, on_delete=models.CASCADE, default=None, null=True, blank=True
-    )
+    ai_model_api = models.ForeignKey(AiModelApi, on_delete=models.CASCADE, default=None, null=True, blank=True)
+
+    def __str__(self):
+        return self.chat_model
 
 
-class VoiceModelOption(BaseModel):
+class VoiceModelOption(DbBaseModel):
     model_id = models.CharField(max_length=200)
     name = models.CharField(max_length=200)
 
 
-class Agent(BaseModel):
+class Agent(DbBaseModel):
     class StyleColorTypes(models.TextChoices):
         BLUE = "blue"
         GREEN = "green"
@@ -207,8 +316,11 @@ class Agent(BaseModel):
 
         super().save(*args, **kwargs)
 
+    def __str__(self):
+        return self.name
 
-class ProcessLock(BaseModel):
+
+class ProcessLock(DbBaseModel):
     class Operation(models.TextChoices):
         INDEX_CONTENT = "index_content"
         SCHEDULED_JOB = "scheduled_job"
@@ -231,24 +343,24 @@ def verify_agent(sender, instance, **kwargs):
             raise ValidationError(f"A private Agent with the name {instance.name} already exists.")
 
 
-class NotionConfig(BaseModel):
+class NotionConfig(DbBaseModel):
     token = models.CharField(max_length=200)
     user = models.ForeignKey(KhojUser, on_delete=models.CASCADE)
 
 
-class GithubConfig(BaseModel):
+class GithubConfig(DbBaseModel):
     pat_token = models.CharField(max_length=200)
     user = models.ForeignKey(KhojUser, on_delete=models.CASCADE)
 
 
-class GithubRepoConfig(BaseModel):
+class GithubRepoConfig(DbBaseModel):
     name = models.CharField(max_length=200)
     owner = models.CharField(max_length=200)
     branch = models.CharField(max_length=200)
     github_config = models.ForeignKey(GithubConfig, on_delete=models.CASCADE, related_name="githubrepoconfig")
 
 
-class WebScraper(BaseModel):
+class WebScraper(DbBaseModel):
     class WebScraperType(models.TextChoices):
         FIRECRAWL = "Firecrawl"
         OLOSTEP = "Olostep"
@@ -320,8 +432,11 @@ class WebScraper(BaseModel):
 
         super().save(*args, **kwargs)
 
+    def __str__(self):
+        return self.name
 
-class ServerChatSettings(BaseModel):
+
+class ServerChatSettings(DbBaseModel):
     chat_default = models.ForeignKey(
         ChatModelOptions, on_delete=models.CASCADE, default=None, null=True, blank=True, related_name="chat_default"
     )
@@ -333,35 +448,35 @@ class ServerChatSettings(BaseModel):
     )
 
 
-class LocalOrgConfig(BaseModel):
+class LocalOrgConfig(DbBaseModel):
     input_files = models.JSONField(default=list, null=True)
     input_filter = models.JSONField(default=list, null=True)
     index_heading_entries = models.BooleanField(default=False)
     user = models.ForeignKey(KhojUser, on_delete=models.CASCADE)
 
 
-class LocalMarkdownConfig(BaseModel):
+class LocalMarkdownConfig(DbBaseModel):
     input_files = models.JSONField(default=list, null=True)
     input_filter = models.JSONField(default=list, null=True)
     index_heading_entries = models.BooleanField(default=False)
     user = models.ForeignKey(KhojUser, on_delete=models.CASCADE)
 
 
-class LocalPdfConfig(BaseModel):
+class LocalPdfConfig(DbBaseModel):
     input_files = models.JSONField(default=list, null=True)
     input_filter = models.JSONField(default=list, null=True)
     index_heading_entries = models.BooleanField(default=False)
     user = models.ForeignKey(KhojUser, on_delete=models.CASCADE)
 
 
-class LocalPlaintextConfig(BaseModel):
+class LocalPlaintextConfig(DbBaseModel):
     input_files = models.JSONField(default=list, null=True)
     input_filter = models.JSONField(default=list, null=True)
     index_heading_entries = models.BooleanField(default=False)
     user = models.ForeignKey(KhojUser, on_delete=models.CASCADE)
 
 
-class SearchModelConfig(BaseModel):
+class SearchModelConfig(DbBaseModel):
     class ModelType(models.TextChoices):
         TEXT = "text"
 
@@ -392,8 +507,11 @@ class SearchModelConfig(BaseModel):
     # The confidence threshold of the bi_encoder model to consider the embeddings as relevant
     bi_encoder_confidence_threshold = models.FloatField(default=0.18)
 
+    def __str__(self):
+        return self.name
 
-class TextToImageModelConfig(BaseModel):
+
+class TextToImageModelConfig(DbBaseModel):
     class ModelType(models.TextChoices):
         OPENAI = "openai"
         STABILITYAI = "stability-ai"
@@ -402,26 +520,24 @@ class TextToImageModelConfig(BaseModel):
     model_name = models.CharField(max_length=200, default="dall-e-3")
     model_type = models.CharField(max_length=200, choices=ModelType.choices, default=ModelType.OPENAI)
     api_key = models.CharField(max_length=200, default=None, null=True, blank=True)
-    openai_config = models.ForeignKey(
-        OpenAIProcessorConversationConfig, on_delete=models.CASCADE, default=None, null=True, blank=True
-    )
+    ai_model_api = models.ForeignKey(AiModelApi, on_delete=models.CASCADE, default=None, null=True, blank=True)
 
     def clean(self):
         # Custom validation logic
         error = {}
         if self.model_type == self.ModelType.OPENAI:
-            if self.api_key and self.openai_config:
+            if self.api_key and self.ai_model_api:
                 error[
                     "api_key"
-                ] = "Both API key and OpenAI config cannot be set for OpenAI models. Please set only one of them."
+                ] = "Both API key and AI Model API cannot be set for OpenAI models. Please set only one of them."
                 error[
-                    "openai_config"
+                    "ai_model_api"
                 ] = "Both API key and OpenAI config cannot be set for OpenAI models. Please set only one of them."
         if self.model_type != self.ModelType.OPENAI:
             if not self.api_key:
                 error["api_key"] = "The API key field must be set for non OpenAI models."
-            if self.openai_config:
-                error["openai_config"] = "OpenAI config cannot be set for non OpenAI models."
+            if self.ai_model_api:
+                error["ai_model_api"] = "AI Model API cannot be set for non OpenAI models."
         if error:
             raise ValidationError(error)
 
@@ -429,8 +545,11 @@ class TextToImageModelConfig(BaseModel):
         self.clean()
         super().save(*args, **kwargs)
 
+    def __str__(self):
+        return f"{self.model_name} - {self.model_type}"
 
-class SpeechToTextModelOptions(BaseModel):
+
+class SpeechToTextModelOptions(DbBaseModel):
     class ModelType(models.TextChoices):
         OPENAI = "openai"
         OFFLINE = "offline"
@@ -438,23 +557,26 @@ class SpeechToTextModelOptions(BaseModel):
     model_name = models.CharField(max_length=200, default="base")
     model_type = models.CharField(max_length=200, choices=ModelType.choices, default=ModelType.OFFLINE)
 
+    def __str__(self):
+        return f"{self.model_name} - {self.model_type}"
 
-class UserConversationConfig(BaseModel):
+
+class UserConversationConfig(DbBaseModel):
     user = models.OneToOneField(KhojUser, on_delete=models.CASCADE)
     setting = models.ForeignKey(ChatModelOptions, on_delete=models.CASCADE, default=None, null=True, blank=True)
 
 
-class UserVoiceModelConfig(BaseModel):
+class UserVoiceModelConfig(DbBaseModel):
     user = models.OneToOneField(KhojUser, on_delete=models.CASCADE)
     setting = models.ForeignKey(VoiceModelOption, on_delete=models.CASCADE, default=None, null=True, blank=True)
 
 
-class UserTextToImageModelConfig(BaseModel):
+class UserTextToImageModelConfig(DbBaseModel):
     user = models.OneToOneField(KhojUser, on_delete=models.CASCADE)
     setting = models.ForeignKey(TextToImageModelConfig, on_delete=models.CASCADE)
 
 
-class Conversation(BaseModel):
+class Conversation(DbBaseModel):
     user = models.ForeignKey(KhojUser, on_delete=models.CASCADE)
     conversation_log = models.JSONField(default=dict)
     client = models.ForeignKey(ClientApplication, on_delete=models.CASCADE, default=None, null=True, blank=True)
@@ -468,8 +590,39 @@ class Conversation(BaseModel):
     file_filters = models.JSONField(default=list)
     id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True, db_index=True)
 
+    def clean(self):
+        # Validate conversation_log structure
+        try:
+            messages = self.conversation_log.get("chat", [])
+            for msg in messages:
+                ChatMessage.model_validate(msg)
+        except Exception as e:
+            raise ValidationError(f"Invalid conversation_log format: {str(e)}")
 
-class PublicConversation(BaseModel):
+    def save(self, *args, **kwargs):
+        self.clean()
+        super().save(*args, **kwargs)
+
+    @property
+    def messages(self) -> List[ChatMessage]:
+        """Type-hinted accessor for conversation messages"""
+        validated_messages = []
+        for msg in self.conversation_log.get("chat", []):
+            try:
+                # Clean up inferred queries if they contain None
+                if msg.get("intent") and msg["intent"].get("inferred-queries"):
+                    msg["intent"]["inferred-queries"] = [
+                        q for q in msg["intent"]["inferred-queries"] if q is not None and isinstance(q, str)
+                    ]
+                msg["message"] = str(msg.get("message", ""))
+                validated_messages.append(ChatMessage.model_validate(msg))
+            except ValidationError as e:
+                logger.warning(f"Skipping invalid message in conversation: {e}")
+                continue
+        return validated_messages
+
+
+class PublicConversation(DbBaseModel):
     source_owner = models.ForeignKey(KhojUser, on_delete=models.CASCADE)
     conversation_log = models.JSONField(default=dict)
     slug = models.CharField(max_length=200, default=None, null=True, blank=True)
@@ -499,12 +652,12 @@ def verify_public_conversation(sender, instance, **kwargs):
         instance.slug = slug
 
 
-class ReflectiveQuestion(BaseModel):
+class ReflectiveQuestion(DbBaseModel):
     question = models.CharField(max_length=500)
     user = models.ForeignKey(KhojUser, on_delete=models.CASCADE, default=None, null=True, blank=True)
 
 
-class Entry(BaseModel):
+class Entry(DbBaseModel):
     class EntryType(models.TextChoices):
         IMAGE = "image"
         PDF = "pdf"
@@ -541,7 +694,7 @@ class Entry(BaseModel):
             raise ValidationError("An Entry cannot be associated with both a user and an agent.")
 
 
-class FileObject(BaseModel):
+class FileObject(DbBaseModel):
     # Same as Entry but raw will be a much larger string
     file_name = models.CharField(max_length=400, default=None, null=True, blank=True)
     raw_text = models.TextField()
@@ -549,7 +702,7 @@ class FileObject(BaseModel):
     agent = models.ForeignKey(Agent, on_delete=models.CASCADE, default=None, null=True, blank=True)
 
 
-class EntryDates(BaseModel):
+class EntryDates(DbBaseModel):
     date = models.DateField()
     entry = models.ForeignKey(Entry, on_delete=models.CASCADE, related_name="embeddings_dates")
 
@@ -559,12 +712,12 @@ class EntryDates(BaseModel):
         ]
 
 
-class UserRequests(BaseModel):
+class UserRequests(DbBaseModel):
     user = models.ForeignKey(KhojUser, on_delete=models.CASCADE)
     slug = models.CharField(max_length=200)
 
 
-class DataStore(BaseModel):
+class DataStore(DbBaseModel):
     key = models.CharField(max_length=200, unique=True)
     value = models.JSONField(default=dict)
     private = models.BooleanField(default=False)
diff --git a/src/khoj/interface/web/.well-known/assetlinks.json b/src/khoj/interface/web/.well-known/assetlinks.json
new file mode 100644
index 00000000..dea482e0
--- /dev/null
+++ b/src/khoj/interface/web/.well-known/assetlinks.json
@@ -0,0 +1,11 @@
+[{
+ "relation": ["delegate_permission/common.handle_all_urls"],
+ "target": {
+   "namespace": "android_app",
+   "package_name": "dev.khoj.app",
+    "sha256_cert_fingerprints": [
+      "CC:98:4A:0A:F1:CC:84:26:AC:02:86:49:AA:69:64:B9:5E:63:A3:EF:18:56:EA:CA:13:C1:3A:15:CA:49:77:46",
+      "D4:5A:6F:6C:18:28:D2:1C:78:27:92:C6:AC:DB:4C:12:C4:52:A1:88:9B:A1:F5:67:D1:22:FE:A0:0F:B1:AE:92"
+    ]
+ }
+}]
diff --git a/src/khoj/migrations/migrate_server_pg.py b/src/khoj/migrations/migrate_server_pg.py
index a770a38d..a46664c3 100644
--- a/src/khoj/migrations/migrate_server_pg.py
+++ b/src/khoj/migrations/migrate_server_pg.py
@@ -60,11 +60,7 @@ import logging
 
 from packaging import version
 
-from khoj.database.models import (
-    ChatModelOptions,
-    OpenAIProcessorConversationConfig,
-    SearchModelConfig,
-)
+from khoj.database.models import AiModelApi, ChatModelOptions, SearchModelConfig
 from khoj.utils.yaml import load_config_from_file, save_config_to_file
 
 logger = logging.getLogger(__name__)
@@ -121,16 +117,14 @@ def migrate_server_pg(args):
                     if openai.get("chat-model") is None:
                         openai["chat-model"] = "gpt-3.5-turbo"
 
-                    openai_config = OpenAIProcessorConversationConfig.objects.create(
-                        api_key=openai.get("api-key"), name="default"
-                    )
+                    openai_model_api = AiModelApi.objects.create(api_key=openai.get("api-key"), name="default")
 
                     ChatModelOptions.objects.create(
                         chat_model=openai.get("chat-model"),
                         tokenizer=processor_conversation.get("tokenizer"),
                         max_prompt_size=processor_conversation.get("max-prompt-size"),
                         model_type=ChatModelOptions.ModelType.OPENAI,
-                        openai_config=openai_config,
+                        ai_model_api=openai_model_api,
                     )
 
         save_config_to_file(raw_config, args.config_file)
diff --git a/src/khoj/processor/content/markdown/markdown_to_entries.py b/src/khoj/processor/content/markdown/markdown_to_entries.py
index c4ee03ef..8d1fbbf4 100644
--- a/src/khoj/processor/content/markdown/markdown_to_entries.py
+++ b/src/khoj/processor/content/markdown/markdown_to_entries.py
@@ -3,7 +3,7 @@ import re
 from pathlib import Path
 from typing import Dict, List, Tuple
 
-import urllib3
+import urllib3.util
 
 from khoj.database.models import Entry as DbEntry
 from khoj.database.models import KhojUser
@@ -51,11 +51,11 @@ class MarkdownToEntries(TextToEntries):
         return num_new_embeddings, num_deleted_embeddings
 
     @staticmethod
-    def extract_markdown_entries(markdown_files, max_tokens=256) -> Tuple[Dict, List[Entry]]:
+    def extract_markdown_entries(markdown_files: Dict[str, str], max_tokens=256) -> Tuple[Dict[str, str], List[Entry]]:
         "Extract entries by heading from specified Markdown files"
         entries: List[str] = []
         entry_to_file_map: List[Tuple[str, str]] = []
-        file_to_text_map = dict()
+        file_to_text_map: Dict[str, str] = dict()
         for markdown_file in markdown_files:
             try:
                 markdown_content = markdown_files[markdown_file]
@@ -128,7 +128,7 @@ class MarkdownToEntries(TextToEntries):
         return entries, entry_to_file_map
 
     @staticmethod
-    def convert_markdown_entries_to_maps(parsed_entries: List[str], entry_to_file_map) -> List[Entry]:
+    def convert_markdown_entries_to_maps(parsed_entries: List[str], entry_to_file_map: Dict[str, str]) -> List[Entry]:
         "Convert each Markdown entries into a dictionary"
         entries: List[Entry] = []
         for parsed_entry in parsed_entries:
@@ -139,7 +139,7 @@ class MarkdownToEntries(TextToEntries):
                 # Escape the URL to avoid issues with special characters
                 entry_filename = urllib3.util.parse_url(raw_filename).url
             else:
-                entry_filename = str(Path(raw_filename))
+                entry_filename = raw_filename
 
             heading = parsed_entry.splitlines()[0] if re.search(r"^#+\s", parsed_entry) else ""
             # Append base filename to compiled entry for context to model
@@ -151,7 +151,7 @@ class MarkdownToEntries(TextToEntries):
                     compiled=compiled_entry,
                     raw=parsed_entry,
                     heading=f"{prefix}{heading}",
-                    file=f"{entry_filename}",
+                    file=entry_filename,
                 )
             )
 
diff --git a/src/khoj/processor/content/org_mode/org_to_entries.py b/src/khoj/processor/content/org_mode/org_to_entries.py
index cfc17cc0..4b9fe3ae 100644
--- a/src/khoj/processor/content/org_mode/org_to_entries.py
+++ b/src/khoj/processor/content/org_mode/org_to_entries.py
@@ -208,7 +208,7 @@ class OrgToEntries(TextToEntries):
                     compiled += f"\n {parsed_entry.body}"
 
                 # Add the sub-entry contents to the entry
-                entry_compiled += f"{compiled}"
+                entry_compiled += compiled
                 entry_raw += f"{parsed_entry}"
                 if not entry_heading:
                     entry_heading = heading
@@ -218,8 +218,8 @@ class OrgToEntries(TextToEntries):
                     Entry(
                         compiled=entry_compiled,
                         raw=entry_raw,
-                        heading=f"{entry_heading}",
-                        file=f"{entry_to_file_map[parsed_entry]}",
+                        heading=entry_heading,
+                        file=entry_to_file_map[parsed_entry],
                     )
                 )
 
diff --git a/src/khoj/processor/conversation/anthropic/anthropic_chat.py b/src/khoj/processor/conversation/anthropic/anthropic_chat.py
index 65e28d21..fa5ff9d8 100644
--- a/src/khoj/processor/conversation/anthropic/anthropic_chat.py
+++ b/src/khoj/processor/conversation/anthropic/anthropic_chat.py
@@ -1,9 +1,8 @@
-import json
 import logging
-import re
 from datetime import datetime, timedelta
-from typing import Dict, Optional
+from typing import Dict, List, Optional
 
+import pyjson5
 from langchain.schema import ChatMessage
 
 from khoj.database.models import Agent, ChatModelOptions, KhojUser
@@ -24,7 +23,7 @@ from khoj.utils.helpers import (
     is_none_or_empty,
     truncate_code_context,
 )
-from khoj.utils.rawconfig import LocationData
+from khoj.utils.rawconfig import FileAttachment, LocationData
 from khoj.utils.yaml import yaml_dump
 
 logger = logging.getLogger(__name__)
@@ -56,7 +55,7 @@ def extract_questions_anthropic(
         [
             f'User: {chat["intent"]["query"]}\nAssistant: {{"queries": {chat["intent"].get("inferred-queries") or list([chat["intent"]["query"]])}}}\nA: {chat["message"]}\n\n'
             for chat in conversation_log.get("chat", [])[-4:]
-            if chat["by"] == "khoj" and "text-to-image" not in chat["intent"].get("type")
+            if chat["by"] == "khoj"
         ]
     )
 
@@ -110,7 +109,7 @@ def extract_questions_anthropic(
     # Extract, Clean Message from Claude's Response
     try:
         response = clean_json(response)
-        response = json.loads(response)
+        response = pyjson5.loads(response)
         response = [q.strip() for q in response["queries"] if q.strip()]
         if not isinstance(response, list) or not response:
             logger.error(f"Invalid response for constructing subqueries: {response}")
@@ -158,6 +157,9 @@ def converse_anthropic(
     query_images: Optional[list[str]] = None,
     vision_available: bool = False,
     query_files: str = None,
+    generated_files: List[FileAttachment] = None,
+    program_execution_context: Optional[List[str]] = None,
+    generated_asset_results: Dict[str, Dict] = {},
     tracer: dict = {},
 ):
     """
@@ -218,6 +220,9 @@ def converse_anthropic(
         vision_enabled=vision_available,
         model_type=ChatModelOptions.ModelType.ANTHROPIC,
         query_files=query_files,
+        generated_files=generated_files,
+        generated_asset_results=generated_asset_results,
+        program_execution_context=program_execution_context,
     )
 
     messages, system_prompt = format_messages_for_anthropic(messages, system_prompt)
diff --git a/src/khoj/processor/conversation/google/gemini_chat.py b/src/khoj/processor/conversation/google/gemini_chat.py
index 965d3010..3567efed 100644
--- a/src/khoj/processor/conversation/google/gemini_chat.py
+++ b/src/khoj/processor/conversation/google/gemini_chat.py
@@ -1,9 +1,8 @@
-import json
 import logging
-import re
 from datetime import datetime, timedelta
-from typing import Dict, Optional
+from typing import Dict, List, Optional
 
+import pyjson5
 from langchain.schema import ChatMessage
 
 from khoj.database.models import Agent, ChatModelOptions, KhojUser
@@ -24,7 +23,7 @@ from khoj.utils.helpers import (
     is_none_or_empty,
     truncate_code_context,
 )
-from khoj.utils.rawconfig import LocationData
+from khoj.utils.rawconfig import FileAttachment, LocationData
 from khoj.utils.yaml import yaml_dump
 
 logger = logging.getLogger(__name__)
@@ -57,7 +56,7 @@ def extract_questions_gemini(
         [
             f'User: {chat["intent"]["query"]}\nAssistant: {{"queries": {chat["intent"].get("inferred-queries") or list([chat["intent"]["query"]])}}}\nA: {chat["message"]}\n\n'
             for chat in conversation_log.get("chat", [])[-4:]
-            if chat["by"] == "khoj" and "text-to-image" not in chat["intent"].get("type")
+            if chat["by"] == "khoj"
         ]
     )
 
@@ -104,7 +103,7 @@ def extract_questions_gemini(
     # Extract, Clean Message from Gemini's Response
     try:
         response = clean_json(response)
-        response = json.loads(response)
+        response = pyjson5.loads(response)
         response = [q.strip() for q in response["queries"] if q.strip()]
         if not isinstance(response, list) or not response:
             logger.error(f"Invalid response for constructing subqueries: {response}")
@@ -168,6 +167,9 @@ def converse_gemini(
     query_images: Optional[list[str]] = None,
     vision_available: bool = False,
     query_files: str = None,
+    generated_files: List[FileAttachment] = None,
+    generated_asset_results: Dict[str, Dict] = {},
+    program_execution_context: List[str] = None,
     tracer={},
 ):
     """
@@ -229,6 +231,9 @@ def converse_gemini(
         vision_enabled=vision_available,
         model_type=ChatModelOptions.ModelType.GOOGLE,
         query_files=query_files,
+        generated_files=generated_files,
+        generated_asset_results=generated_asset_results,
+        program_execution_context=program_execution_context,
     )
 
     messages, system_prompt = format_messages_for_gemini(messages, system_prompt)
diff --git a/src/khoj/processor/conversation/offline/chat_model.py b/src/khoj/processor/conversation/offline/chat_model.py
index b1ab77fe..2091d0a9 100644
--- a/src/khoj/processor/conversation/offline/chat_model.py
+++ b/src/khoj/processor/conversation/offline/chat_model.py
@@ -3,8 +3,9 @@ import logging
 import os
 from datetime import datetime, timedelta
 from threading import Thread
-from typing import Any, Iterator, List, Optional, Union
+from typing import Any, Dict, Iterator, List, Optional, Union
 
+import pyjson5
 from langchain.schema import ChatMessage
 from llama_cpp import Llama
 
@@ -13,6 +14,7 @@ from khoj.processor.conversation import prompts
 from khoj.processor.conversation.offline.utils import download_model
 from khoj.processor.conversation.utils import (
     ThreadedGenerator,
+    clean_json,
     commit_conversation_trace,
     generate_chatml_messages_with_context,
     messages_to_print,
@@ -26,7 +28,7 @@ from khoj.utils.helpers import (
     is_promptrace_enabled,
     truncate_code_context,
 )
-from khoj.utils.rawconfig import LocationData
+from khoj.utils.rawconfig import FileAttachment, LocationData
 from khoj.utils.yaml import yaml_dump
 
 logger = logging.getLogger(__name__)
@@ -67,7 +69,7 @@ def extract_questions_offline(
 
     if use_history:
         for chat in conversation_log.get("chat", [])[-4:]:
-            if chat["by"] == "khoj" and "text-to-image" not in chat["intent"].get("type"):
+            if chat["by"] == "khoj":
                 chat_history += f"Q: {chat['intent']['query']}\n"
                 chat_history += f"Khoj: {chat['message']}\n\n"
 
@@ -114,8 +116,8 @@ def extract_questions_offline(
 
     # Extract and clean the chat model's response
     try:
-        response = response.strip(empty_escape_sequences)
-        response = json.loads(response)
+        response = clean_json(empty_escape_sequences)
+        response = pyjson5.loads(response)
         questions = [q.strip() for q in response["queries"] if q.strip()]
         questions = filter_questions(questions)
     except:
@@ -162,6 +164,9 @@ def converse_offline(
     user_name: str = None,
     agent: Agent = None,
     query_files: str = None,
+    generated_files: List[FileAttachment] = None,
+    additional_context: List[str] = None,
+    generated_asset_results: Dict[str, Dict] = {},
     tracer: dict = {},
 ) -> Union[ThreadedGenerator, Iterator[str]]:
     """
@@ -229,6 +234,9 @@ def converse_offline(
         tokenizer_name=tokenizer_name,
         model_type=ChatModelOptions.ModelType.OFFLINE,
         query_files=query_files,
+        generated_files=generated_files,
+        generated_asset_results=generated_asset_results,
+        program_execution_context=additional_context,
     )
 
     logger.debug(f"Conversation Context for {model}: {messages_to_print(messages)}")
diff --git a/src/khoj/processor/conversation/openai/gpt.py b/src/khoj/processor/conversation/openai/gpt.py
index e525fa75..83e6d0df 100644
--- a/src/khoj/processor/conversation/openai/gpt.py
+++ b/src/khoj/processor/conversation/openai/gpt.py
@@ -1,8 +1,8 @@
-import json
 import logging
 from datetime import datetime, timedelta
-from typing import Dict, Optional
+from typing import Dict, List, Optional
 
+import pyjson5
 from langchain.schema import ChatMessage
 
 from khoj.database.models import Agent, ChatModelOptions, KhojUser
@@ -22,7 +22,7 @@ from khoj.utils.helpers import (
     is_none_or_empty,
     truncate_code_context,
 )
-from khoj.utils.rawconfig import LocationData
+from khoj.utils.rawconfig import FileAttachment, LocationData
 from khoj.utils.yaml import yaml_dump
 
 logger = logging.getLogger(__name__)
@@ -104,7 +104,7 @@ def extract_questions(
     # Extract, Clean Message from GPT's Response
     try:
         response = clean_json(response)
-        response = json.loads(response)
+        response = pyjson5.loads(response)
         response = [q.strip() for q in response["queries"] if q.strip()]
         if not isinstance(response, list) or not response:
             logger.error(f"Invalid response for constructing subqueries: {response}")
@@ -137,7 +137,7 @@ def send_message_to_model(
     )
 
 
-def converse(
+def converse_openai(
     references,
     user_query,
     online_results: Optional[Dict[str, Dict]] = None,
@@ -157,6 +157,9 @@ def converse(
     query_images: Optional[list[str]] = None,
     vision_available: bool = False,
     query_files: str = None,
+    generated_files: List[FileAttachment] = None,
+    generated_asset_results: Dict[str, Dict] = {},
+    program_execution_context: List[str] = None,
     tracer: dict = {},
 ):
     """
@@ -219,6 +222,9 @@ def converse(
         vision_enabled=vision_available,
         model_type=ChatModelOptions.ModelType.OPENAI,
         query_files=query_files,
+        generated_files=generated_files,
+        generated_asset_results=generated_asset_results,
+        program_execution_context=program_execution_context,
     )
     logger.debug(f"Conversation Context for GPT: {messages_to_print(messages)}")
 
diff --git a/src/khoj/processor/conversation/openai/utils.py b/src/khoj/processor/conversation/openai/utils.py
index 2f01be32..160af77c 100644
--- a/src/khoj/processor/conversation/openai/utils.py
+++ b/src/khoj/processor/conversation/openai/utils.py
@@ -19,12 +19,7 @@ from khoj.processor.conversation.utils import (
     ThreadedGenerator,
     commit_conversation_trace,
 )
-from khoj.utils import state
-from khoj.utils.helpers import (
-    get_chat_usage_metrics,
-    in_debug_mode,
-    is_promptrace_enabled,
-)
+from khoj.utils.helpers import get_chat_usage_metrics, is_promptrace_enabled
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/khoj/processor/conversation/prompts.py b/src/khoj/processor/conversation/prompts.py
index ed701e22..b1268e47 100644
--- a/src/khoj/processor/conversation/prompts.py
+++ b/src/khoj/processor/conversation/prompts.py
@@ -11,11 +11,9 @@ You were created by Khoj Inc. with the following capabilities:
 - You *CAN REMEMBER ALL NOTES and PERSONAL INFORMATION FOREVER* that the user ever shares with you.
 - Users can share files and other information with you using the Khoj Desktop, Obsidian or Emacs app. They can also drag and drop their files into the chat window.
 - You *CAN* generate images, look-up real-time information from the internet, set reminders and answer questions based on the user's notes.
-- Say "I don't know" or "I don't understand" if you don't know what to say or if you don't know the answer to a question.
 - Make sure to use the specific LaTeX math mode delimiters for your response. LaTex math mode specific delimiters as following
     - inline math mode : \\( and \\)
     - display math mode: insert linebreak after opening $$, \\[ and before closing $$, \\]
-- Ask crisp follow-up questions to get additional context, when the answer cannot be inferred from the provided notes or past conversations.
 - Sometimes the user will share personal information that needs to be remembered, like an account ID or a residential address. These can be acknowledged with a simple "Got it" or "Okay".
 - Provide inline references to quotes from the user's notes or any web pages you refer to in your responses in markdown format. For example, "The farmer had ten sheep. [1](https://example.com)". *ALWAYS CITE YOUR SOURCES AND PROVIDE REFERENCES*. Add them inline to directly support your claim.
 
@@ -32,11 +30,9 @@ You were created by Khoj Inc. with the following capabilities:
 
 - You *CAN REMEMBER ALL NOTES and PERSONAL INFORMATION FOREVER* that the user ever shares with you.
 - Users can share files and other information with you using the Khoj Desktop, Obsidian or Emacs app. They can also drag and drop their files into the chat window.
-- Say "I don't know" or "I don't understand" if you don't know what to say or if you don't know the answer to a question.
 - Make sure to use the specific LaTeX math mode delimiters for your response. LaTex math mode specific delimiters as following
     - inline math mode : `\\(` and `\\)`
     - display math mode: insert linebreak after opening `$$`, `\\[` and before closing `$$`, `\\]`
-- Ask crisp follow-up questions to get additional context, when the answer cannot be inferred from the provided notes or past conversations.
 - Sometimes the user will share personal information that needs to be remembered, like an account ID or a residential address. These can be acknowledged with a simple "Got it" or "Okay".
 
 Today is {day_of_week}, {current_date} in UTC.
@@ -50,6 +46,10 @@ Instructions:\n{bio}
 gemini_verbose_language_personality = """
 All questions should be answered comprehensively with details, unless the user requests a concise response specifically.
 Respond in the same language as the query. Use markdown to format your responses.
+
+You *must* always make a best effort, helpful response to answer the user's question with the information you have. You may ask necessary, limited follow-up questions to clarify the user's intent.
+
+You must always provide a response to the user's query, even if imperfect. Do the best with the information you have, without relying on follow-up questions.
 """.strip()
 
 ## General Conversation
@@ -178,28 +178,41 @@ Improved Prompt:
 """.strip()
 )
 
+generated_assets_context = PromptTemplate.from_template(
+    """
+You have ALREADY created the assets described below. They will automatically be added to the final response.
+You can provide a summary of your reasoning from the information below or use it to respond to my previous query.
+
+Generated Assets:
+{generated_assets}
+
+Limit your response to 3 sentences max. Be succinct, clear, and informative.
+""".strip()
+)
+
+
 ## Diagram Generation
 ## --
 
 improve_diagram_description_prompt = PromptTemplate.from_template(
     """
-you are an architect working with a novice digital artist using a diagramming software.
+You are an architect working with a novice digital artist using a diagramming software.
 {personality_context}
 
-you need to convert the user's query to a description format that the novice artist can use very well. you are allowed to use primitives like
-- text
-- rectangle
-- ellipse
-- line
-- arrow
+You need to convert the user's query to a description format that the novice artist can use very well. you are allowed to use primitives like
+- Text
+- Rectangle
+- Ellipse
+- Line
+- Arrow
 
-use these primitives to describe what sort of diagram the drawer should create. the artist must recreate the diagram every time, so include all relevant prior information in your description.
+Use these primitives to describe what sort of diagram the drawer should create. The artist must recreate the diagram every time, so include all relevant prior information in your description.
 
-- include the full, exact description. the artist does not have much experience, so be precise.
-- describe the layout.
-- you can only use straight lines.
-- use simple, concise language.
-- keep it simple and easy to understand. the artist is easily distracted.
+- Include the full, exact description. the artist does not have much experience, so be precise.
+- Describe the layout.
+- You can only use straight lines.
+- Use simple, concise language.
+- Keep it simple and easy to understand. the artist is easily distracted.
 
 Today's Date: {current_date}
 User's Location: {location}
@@ -325,6 +338,17 @@ Diagram Description: {query}
 """.strip()
 )
 
+failed_diagram_generation = PromptTemplate.from_template(
+    """
+You attempted to programmatically generate a diagram but failed due to a system issue. You are normally able to generate diagrams, but you encountered a system issue this time.
+
+You can create an ASCII image of the diagram in response instead.
+
+This is the diagram you attempted to make:
+{attempted_diagram}
+""".strip()
+)
+
 ## Online Search Conversation
 ## --
 online_search_conversation = PromptTemplate.from_template(
@@ -838,7 +862,7 @@ python_code_generation_prompt = PromptTemplate.from_template(
 You are Khoj, an advanced python programmer. You are tasked with constructing a python program to best answer the user query.
 - The python program will run in a pyodide python sandbox with no network access.
 - You can write programs to run complex calculations, analyze data, create charts, generate documents to meticulously answer the query.
-- The sandbox has access to the standard library, matplotlib, panda, numpy, scipy, bs4, sympy, brotli, cryptography, fast-parquet.
+- The sandbox has access to the standard library, matplotlib, panda, numpy, scipy, bs4 and sympy packages. The requests, torch, catboost, tensorflow and tkinter packages are not available.
 - List known file paths to required user documents in "input_files" and known links to required documents from the web in the "input_links" field.
 - The python program should be self-contained. It can only read data generated by the program itself and from provided input_files, input_links by their basename (i.e filename excluding file path).
 - Do not try display images or plots in the code directly. The code should save the image or plot to a file instead.
@@ -1029,6 +1053,12 @@ A:
 """.strip()
 )
 
+additional_program_context = PromptTemplate.from_template(
+    """
+Here are some additional results from the query execution:
+{context}
+""".strip()
+)
 
 personality_prompt_safety_expert_lax = PromptTemplate.from_template(
     """
diff --git a/src/khoj/processor/conversation/utils.py b/src/khoj/processor/conversation/utils.py
index 21a95a29..8de9cccf 100644
--- a/src/khoj/processor/conversation/utils.py
+++ b/src/khoj/processor/conversation/utils.py
@@ -5,6 +5,7 @@ import math
 import mimetypes
 import os
 import queue
+import re
 import uuid
 from dataclasses import dataclass
 from datetime import datetime
@@ -14,6 +15,7 @@ from time import perf_counter
 from typing import Any, Callable, Dict, List, Optional
 
 import PIL.Image
+import pyjson5
 import requests
 import tiktoken
 import yaml
@@ -38,6 +40,7 @@ from khoj.utils.helpers import (
     merge_dicts,
 )
 from khoj.utils.rawconfig import FileAttachment
+from khoj.utils.yaml import yaml_dump
 
 logger = logging.getLogger(__name__)
 
@@ -152,7 +155,7 @@ def construct_chat_history(conversation_history: dict, n: int = 4, agent_name="A
                 chat_history += f'{agent_name}: {{"queries": {chat["intent"].get("inferred-queries")}}}\n'
 
             chat_history += f"{agent_name}: {chat['message']}\n\n"
-        elif chat["by"] == "khoj" and ("text-to-image" in chat["intent"].get("type")):
+        elif chat["by"] == "khoj" and chat.get("images"):
             chat_history += f"User: {chat['intent']['query']}\n"
             chat_history += f"{agent_name}: [generated image redacted for space]\n"
         elif chat["by"] == "khoj" and ("excalidraw" in chat["intent"].get("type")):
@@ -211,6 +214,7 @@ class ChatEvent(Enum):
     END_LLM_RESPONSE = "end_llm_response"
     MESSAGE = "message"
     REFERENCES = "references"
+    GENERATED_ASSETS = "generated_assets"
     STATUS = "status"
     METADATA = "metadata"
     USAGE = "usage"
@@ -223,7 +227,6 @@ def message_to_log(
     user_message_metadata={},
     khoj_message_metadata={},
     conversation_log=[],
-    train_of_thought=[],
 ):
     """Create json logs from messages, metadata for conversation log"""
     default_khoj_message_metadata = {
@@ -232,6 +235,10 @@ def message_to_log(
     }
     khoj_response_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
 
+    # Filter out any fields that are set to None
+    user_message_metadata = {k: v for k, v in user_message_metadata.items() if v is not None}
+    khoj_message_metadata = {k: v for k, v in khoj_message_metadata.items() if v is not None}
+
     # Create json log from Human's message
     human_log = merge_dicts({"message": user_message, "by": "you"}, user_message_metadata)
 
@@ -259,31 +266,41 @@ def save_to_conversation_log(
     automation_id: str = None,
     query_images: List[str] = None,
     raw_query_files: List[FileAttachment] = [],
+    generated_images: List[str] = [],
+    raw_generated_files: List[FileAttachment] = [],
+    generated_excalidraw_diagram: str = None,
     train_of_thought: List[Any] = [],
     tracer: Dict[str, Any] = {},
 ):
     user_message_time = user_message_time or datetime.now().strftime("%Y-%m-%d %H:%M:%S")
     turn_id = tracer.get("mid") or str(uuid.uuid4())
+
+    user_message_metadata = {"created": user_message_time, "images": query_images, "turnId": turn_id}
+
+    if raw_query_files and len(raw_query_files) > 0:
+        user_message_metadata["queryFiles"] = [file.model_dump(mode="json") for file in raw_query_files]
+
+    khoj_message_metadata = {
+        "context": compiled_references,
+        "intent": {"inferred-queries": inferred_queries, "type": intent_type},
+        "onlineContext": online_results,
+        "codeContext": code_results,
+        "automationId": automation_id,
+        "trainOfThought": train_of_thought,
+        "turnId": turn_id,
+        "images": generated_images,
+        "queryFiles": [file.model_dump(mode="json") for file in raw_generated_files],
+    }
+
+    if generated_excalidraw_diagram:
+        khoj_message_metadata["excalidrawDiagram"] = generated_excalidraw_diagram
+
     updated_conversation = message_to_log(
         user_message=q,
         chat_response=chat_response,
-        user_message_metadata={
-            "created": user_message_time,
-            "images": query_images,
-            "turnId": turn_id,
-            "queryFiles": [file.model_dump(mode="json") for file in raw_query_files],
-        },
-        khoj_message_metadata={
-            "context": compiled_references,
-            "intent": {"inferred-queries": inferred_queries, "type": intent_type},
-            "onlineContext": online_results,
-            "codeContext": code_results,
-            "automationId": automation_id,
-            "trainOfThought": train_of_thought,
-            "turnId": turn_id,
-        },
+        user_message_metadata=user_message_metadata,
+        khoj_message_metadata=khoj_message_metadata,
         conversation_log=meta_log.get("chat", []),
-        train_of_thought=train_of_thought,
     )
     ConversationAdapters.save_conversation(
         user,
@@ -301,13 +318,13 @@ def save_to_conversation_log(
 Saved Conversation Turn
 You ({user.username}): "{q}"
 
-Khoj: "{inferred_queries if ("text-to-image" in intent_type) else chat_response}"
+Khoj: "{chat_response}"
 """.strip()
     )
 
 
 def construct_structured_message(
-    message: str, images: list[str], model_type: str, vision_enabled: bool, attached_file_context: str
+    message: str, images: list[str], model_type: str, vision_enabled: bool, attached_file_context: str = None
 ):
     """
     Format messages into appropriate multimedia format for supported chat model types
@@ -317,15 +334,17 @@ def construct_structured_message(
         ChatModelOptions.ModelType.GOOGLE,
         ChatModelOptions.ModelType.ANTHROPIC,
     ]:
-        constructed_messages: List[Any] = [
-            {"type": "text", "text": message},
-        ]
+        if not attached_file_context and not (vision_enabled and images):
+            return message
+
+        constructed_messages: List[Any] = [{"type": "text", "text": message}]
 
         if not is_none_or_empty(attached_file_context):
             constructed_messages.append({"type": "text", "text": attached_file_context})
         if vision_enabled and images:
             for image in images:
-                constructed_messages.append({"type": "image_url", "image_url": {"url": image}})
+                if image.startswith("https://"):
+                    constructed_messages.append({"type": "image_url", "image_url": {"url": image}})
         return constructed_messages
 
     if not is_none_or_empty(attached_file_context):
@@ -363,6 +382,9 @@ def generate_chatml_messages_with_context(
     model_type="",
     context_message="",
     query_files: str = None,
+    generated_files: List[FileAttachment] = None,
+    generated_asset_results: Dict[str, Dict] = {},
+    program_execution_context: List[str] = [],
 ):
     """Generate chat messages with appropriate context from previous conversation to send to the chat model"""
     # Set max prompt size from user config or based on pre-configured for model and machine specs
@@ -381,10 +403,15 @@ def generate_chatml_messages_with_context(
         message_context = ""
         message_attached_files = ""
 
-        chat_message = chat.get("message")
+        generated_assets = {}
 
+        chat_message = chat.get("message")
+        role = "user" if chat["by"] == "you" else "assistant"
+
+        # Legacy code to handle excalidraw diagrams prior to Dec 2024
         if chat["by"] == "khoj" and "excalidraw" in chat["intent"].get("type", ""):
             chat_message = chat["intent"].get("inferred-queries")[0]
+
         if not is_none_or_empty(chat.get("context")):
             references = "\n\n".join(
                 {
@@ -402,7 +429,7 @@ def generate_chatml_messages_with_context(
                 query_files_dict[file["name"]] = file["content"]
 
             message_attached_files = gather_raw_query_files(query_files_dict)
-            chatml_messages.append(ChatMessage(content=message_attached_files, role="user"))
+            chatml_messages.append(ChatMessage(content=message_attached_files, role=role))
 
         if not is_none_or_empty(chat.get("onlineContext")):
             message_context += f"{prompts.online_search_conversation.format(online_results=chat.get('onlineContext'))}"
@@ -411,9 +438,26 @@ def generate_chatml_messages_with_context(
             reconstructed_context_message = ChatMessage(content=message_context, role="user")
             chatml_messages.insert(0, reconstructed_context_message)
 
-        role = "user" if chat["by"] == "you" else "assistant"
+        if not is_none_or_empty(chat.get("images")) and role == "assistant":
+            generated_assets["image"] = {
+                "query": chat.get("intent", {}).get("inferred-queries", [user_message])[0],
+            }
+
+        if not is_none_or_empty(chat.get("excalidrawDiagram")) and role == "assistant":
+            generated_assets["diagram"] = {
+                "query": chat.get("intent", {}).get("inferred-queries", [user_message])[0],
+            }
+
+        if not is_none_or_empty(generated_assets):
+            chatml_messages.append(
+                ChatMessage(
+                    content=f"{prompts.generated_assets_context.format(generated_assets=yaml_dump(generated_assets))}\n",
+                    role="user",
+                )
+            )
+
         message_content = construct_structured_message(
-            chat_message, chat.get("images"), model_type, vision_enabled, attached_file_context=query_files
+            chat_message, chat.get("images") if role == "user" else [], model_type, vision_enabled
         )
 
         reconstructed_message = ChatMessage(content=message_content, role=role)
@@ -423,6 +467,15 @@ def generate_chatml_messages_with_context(
             break
 
     messages = []
+
+    if not is_none_or_empty(generated_asset_results):
+        messages.append(
+            ChatMessage(
+                content=f"{prompts.generated_assets_context.format(generated_assets=yaml_dump(generated_asset_results))}\n\n",
+                role="user",
+            )
+        )
+
     if not is_none_or_empty(user_message):
         messages.append(
             ChatMessage(
@@ -432,6 +485,15 @@ def generate_chatml_messages_with_context(
                 role="user",
             )
         )
+
+    if generated_files:
+        message_attached_files = gather_raw_query_files({file.name: file.content for file in generated_files})
+        messages.append(ChatMessage(content=message_attached_files, role="assistant"))
+
+    if program_execution_context:
+        program_context_text = "\n".join(program_execution_context)
+        context_message += f"{prompts.additional_program_context.format(context=program_context_text)}\n"
+
     if not is_none_or_empty(context_message):
         messages.append(ChatMessage(content=context_message, role="user"))
 
@@ -538,6 +600,47 @@ def clean_code_python(code: str):
     return code.strip().removeprefix("```python").removesuffix("```")
 
 
+def load_complex_json(json_str):
+    """
+    Preprocess a raw JSON string to escape unescaped double quotes within value strings,
+    while preserving the JSON structure and already escaped quotes.
+    """
+
+    def replace_unescaped_quotes(match):
+        # Get the content between colons and commas/end braces
+        content = match.group(1)
+        # Replace unescaped double, single quotes that aren't already escaped
+        # Uses negative lookbehind to avoid replacing already escaped quotes
+        # Replace " with \"
+        processed_dq = re.sub(r'(?<!\\)"', '\\"', content)
+        # Replace \' with \\'
+        processed_final = re.sub(r"(?<!\\)\\'", r"\\\\'", processed_dq)
+        return f': "{processed_final}"'
+
+    # Match content between : and either , or }
+    # This pattern looks for ': ' followed by any characters until , or }
+    pattern = r':\s*"(.*?)(?<!\\)"(?=[,}])'
+
+    # Process the JSON string
+    cleaned = clean_json(rf"{json_str}")
+    processed = re.sub(pattern, replace_unescaped_quotes, cleaned)
+
+    # See which json loader can load the processed JSON as valid
+    errors = []
+    json_loaders_to_try = [json.loads, pyjson5.loads]
+    for loads in json_loaders_to_try:
+        try:
+            return loads(processed)
+        except (json.JSONDecodeError, pyjson5.Json5Exception) as e:
+            errors.append(f"{type(e).__name__}: {str(e)}")
+
+    # If all loaders fail, raise the aggregated error
+    raise ValueError(
+        f"Failed to load JSON with errors: {'; '.join(errors)}\n\n"
+        f"While attempting to load this cleaned JSON:\n{processed}"
+    )
+
+
 def defilter_query(query: str):
     """Remove any query filters in query"""
     defiltered_query = query
diff --git a/src/khoj/processor/image/generate.py b/src/khoj/processor/image/generate.py
index 6c1f71b6..a4628115 100644
--- a/src/khoj/processor/image/generate.py
+++ b/src/khoj/processor/image/generate.py
@@ -12,7 +12,7 @@ from khoj.database.models import Agent, KhojUser, TextToImageModelConfig
 from khoj.routers.helpers import ChatEvent, generate_better_image_prompt
 from khoj.routers.storage import upload_image
 from khoj.utils import state
-from khoj.utils.helpers import ImageIntentType, convert_image_to_webp, timer
+from khoj.utils.helpers import convert_image_to_webp, timer
 from khoj.utils.rawconfig import LocationData
 
 logger = logging.getLogger(__name__)
@@ -34,14 +34,13 @@ async def text_to_image(
     status_code = 200
     image = None
     image_url = None
-    intent_type = ImageIntentType.TEXT_TO_IMAGE_V3
 
     text_to_image_config = await ConversationAdapters.aget_user_text_to_image_model(user)
     if not text_to_image_config:
         # If the user has not configured a text to image model, return an unsupported on server error
         status_code = 501
         message = "Failed to generate image. Setup image generation on the server."
-        yield image_url or image, status_code, message, intent_type.value
+        yield image_url or image, status_code, message
         return
 
     text2image_model = text_to_image_config.model_name
@@ -50,8 +49,8 @@ async def text_to_image(
         if chat["by"] == "khoj" and chat["intent"].get("type") in ["remember", "reminder"]:
             chat_history += f"Q: {chat['intent']['query']}\n"
             chat_history += f"A: {chat['message']}\n"
-        elif chat["by"] == "khoj" and "text-to-image" in chat["intent"].get("type"):
-            chat_history += f"Q: Prompt: {chat['intent']['query']}\n"
+        elif chat["by"] == "khoj" and chat.get("images"):
+            chat_history += f"Q: {chat['intent']['query']}\n"
             chat_history += f"A: Improved Prompt: {chat['intent']['inferred-queries'][0]}\n"
 
     if send_status_func:
@@ -92,31 +91,29 @@ async def text_to_image(
                 logger.error(f"Image Generation blocked by OpenAI: {e}")
                 status_code = e.status_code  # type: ignore
                 message = f"Image generation blocked by OpenAI due to policy violation"  # type: ignore
-                yield image_url or image, status_code, message, intent_type.value
+                yield image_url or image, status_code, message
                 return
             else:
                 logger.error(f"Image Generation failed with {e}", exc_info=True)
                 message = f"Image generation failed using OpenAI"  # type: ignore
                 status_code = e.status_code  # type: ignore
-                yield image_url or image, status_code, message, intent_type.value
+                yield image_url or image, status_code, message
                 return
         except requests.RequestException as e:
             logger.error(f"Image Generation failed with {e}", exc_info=True)
             message = f"Image generation using {text2image_model} via {text_to_image_config.model_type} failed due to a network error."
             status_code = 502
-            yield image_url or image, status_code, message, intent_type.value
+            yield image_url or image, status_code, message
             return
 
     # Decide how to store the generated image
     with timer("Upload image to S3", logger):
         image_url = upload_image(webp_image_bytes, user.uuid)
-    if image_url:
-        intent_type = ImageIntentType.TEXT_TO_IMAGE2
-    else:
-        intent_type = ImageIntentType.TEXT_TO_IMAGE_V3
+
+    if not image_url:
         image = base64.b64encode(webp_image_bytes).decode("utf-8")
 
-    yield image_url or image, status_code, image_prompt, intent_type.value
+    yield image_url or image, status_code, image_prompt
 
 
 def generate_image_with_openai(
@@ -127,8 +124,8 @@ def generate_image_with_openai(
     # Get the API key from the user's configuration
     if text_to_image_config.api_key:
         api_key = text_to_image_config.api_key
-    elif text_to_image_config.openai_config:
-        api_key = text_to_image_config.openai_config.api_key
+    elif text_to_image_config.ai_model_api:
+        api_key = text_to_image_config.ai_model_api.api_key
     elif state.openai_client:
         api_key = state.openai_client.api_key
     auth_header = {"Authorization": f"Bearer {api_key}"} if api_key else {}
diff --git a/src/khoj/processor/tools/run_code.py b/src/khoj/processor/tools/run_code.py
index 22c8eca5..6c1eb125 100644
--- a/src/khoj/processor/tools/run_code.py
+++ b/src/khoj/processor/tools/run_code.py
@@ -1,6 +1,5 @@
 import base64
 import datetime
-import json
 import logging
 import mimetypes
 import os
@@ -15,8 +14,8 @@ from khoj.processor.conversation import prompts
 from khoj.processor.conversation.utils import (
     ChatEvent,
     clean_code_python,
-    clean_json,
     construct_chat_history,
+    load_complex_json,
 )
 from khoj.routers.helpers import send_message_to_model_wrapper
 from khoj.utils.helpers import is_none_or_empty, timer, truncate_code_context
@@ -135,8 +134,7 @@ async def generate_python_code(
     )
 
     # Validate that the response is a non-empty, JSON-serializable list
-    response = clean_json(response)
-    response = json.loads(response)
+    response = load_complex_json(response)
     code = response.get("code", "").strip()
     input_files = response.get("input_files", [])
     input_links = response.get("input_links", [])
diff --git a/src/khoj/routers/api.py b/src/khoj/routers/api.py
index 4516745a..11c72eb9 100644
--- a/src/khoj/routers/api.py
+++ b/src/khoj/routers/api.py
@@ -430,9 +430,8 @@ async def extract_references_and_questions(
                 tracer=tracer,
             )
         elif conversation_config.model_type == ChatModelOptions.ModelType.OPENAI:
-            openai_chat_config = conversation_config.openai_config
-            api_key = openai_chat_config.api_key
-            base_url = openai_chat_config.api_base_url
+            api_key = conversation_config.ai_model_api.api_key
+            base_url = conversation_config.ai_model_api.api_base_url
             chat_model = conversation_config.chat_model
             inferred_queries = extract_questions(
                 defiltered_query,
@@ -449,7 +448,7 @@ async def extract_references_and_questions(
                 tracer=tracer,
             )
         elif conversation_config.model_type == ChatModelOptions.ModelType.ANTHROPIC:
-            api_key = conversation_config.openai_config.api_key
+            api_key = conversation_config.ai_model_api.api_key
             chat_model = conversation_config.chat_model
             inferred_queries = extract_questions_anthropic(
                 defiltered_query,
@@ -465,7 +464,7 @@ async def extract_references_and_questions(
                 tracer=tracer,
             )
         elif conversation_config.model_type == ChatModelOptions.ModelType.GOOGLE:
-            api_key = conversation_config.openai_config.api_key
+            api_key = conversation_config.ai_model_api.api_key
             chat_model = conversation_config.chat_model
             inferred_queries = extract_questions_gemini(
                 defiltered_query,
@@ -537,6 +536,7 @@ def user_info(request: Request) -> Response:
         "photo": user_picture,
         "is_active": is_active,
         "has_documents": has_documents,
+        "khoj_version": state.khoj_version,
     }
 
     # Return user information as a JSON response
diff --git a/src/khoj/routers/api_chat.py b/src/khoj/routers/api_chat.py
index 5639a01e..eea291d3 100644
--- a/src/khoj/routers/api_chat.py
+++ b/src/khoj/routers/api_chat.py
@@ -23,6 +23,7 @@ from khoj.database.adapters import (
     aget_user_name,
 )
 from khoj.database.models import Agent, KhojUser
+from khoj.processor.conversation import prompts
 from khoj.processor.conversation.prompts import help_message, no_entries_found
 from khoj.processor.conversation.utils import defilter_query, save_to_conversation_log
 from khoj.processor.image.generate import text_to_image
@@ -77,6 +78,7 @@ from khoj.utils.helpers import (
 )
 from khoj.utils.rawconfig import (
     ChatRequestBody,
+    FileAttachment,
     FileFilterRequest,
     FilesFilterRequest,
     LocationData,
@@ -562,8 +564,7 @@ async def generate_chat_title(
         raise HTTPException(status_code=404, detail="Conversation not found")
 
     new_title = await acreate_title_from_history(request.user.object, conversation=conversation)
-
-    conversation.slug = new_title
+    conversation.slug = new_title[:200]
 
     await conversation.asave()
 
@@ -703,7 +704,7 @@ async def chat(
             chat_metadata["agent"] = conversation.agent.slug if conversation and conversation.agent else None
             chat_metadata["latency"] = f"{latency:.3f}"
             chat_metadata["ttft_latency"] = f"{ttft:.3f}"
-            chat_metadata["usage"] = tracer.get("usage")
+            chat_metadata["cost"] = f"{cost:.5f}"
 
             logger.info(f"Chat response time to first token: {ttft:.3f} seconds")
             logger.info(f"Chat response total time: {latency:.3f} seconds")
@@ -765,12 +766,18 @@ async def chat(
         researched_results = ""
         online_results: Dict = dict()
         code_results: Dict = dict()
+        generated_asset_results: Dict = dict()
         ## Extract Document References
         compiled_references: List[Any] = []
         inferred_queries: List[Any] = []
         file_filters = conversation.file_filters if conversation and conversation.file_filters else []
         attached_file_context = gather_raw_query_files(query_files)
 
+        generated_images: List[str] = []
+        generated_files: List[FileAttachment] = []
+        generated_excalidraw_diagram: str = None
+        program_execution_context: List[str] = []
+
         if conversation_commands == [ConversationCommand.Default] or is_automated_task:
             chosen_io = await aget_data_sources_and_output_format(
                 q,
@@ -876,21 +883,17 @@ async def chat(
                             async for result in send_llm_response(response, tracer.get("usage")):
                                 yield result
 
-            await sync_to_async(save_to_conversation_log)(
-                q,
-                response_log,
-                user,
-                meta_log,
-                user_message_time,
-                intent_type="summarize",
-                client_application=request.user.client_app,
-                conversation_id=conversation_id,
-                query_images=uploaded_images,
-                train_of_thought=train_of_thought,
-                raw_query_files=raw_query_files,
-                tracer=tracer,
+            summarized_document = FileAttachment(
+                name="Summarized Document",
+                content=response_log,
+                type="text/plain",
+                size=len(response_log.encode("utf-8")),
             )
-            return
+
+            async for result in send_event(ChatEvent.GENERATED_ASSETS, {"files": [summarized_document.model_dump()]}):
+                yield result
+
+            generated_files.append(summarized_document)
 
         custom_filters = []
         if conversation_commands == [ConversationCommand.Help]:
@@ -1079,6 +1082,7 @@ async def chat(
                 async for result in send_event(ChatEvent.STATUS, f"**Ran code snippets**: {len(code_results)}"):
                     yield result
             except ValueError as e:
+                program_execution_context.append(f"Failed to run code")
                 logger.warning(
                     f"Failed to use code tool: {e}. Attempting to respond without code results",
                     exc_info=True,
@@ -1116,51 +1120,32 @@ async def chat(
                 if isinstance(result, dict) and ChatEvent.STATUS in result:
                     yield result[ChatEvent.STATUS]
                 else:
-                    generated_image, status_code, improved_image_prompt, intent_type = result
+                    generated_image, status_code, improved_image_prompt = result
 
+            inferred_queries.append(improved_image_prompt)
             if generated_image is None or status_code != 200:
-                content_obj = {
-                    "content-type": "application/json",
-                    "intentType": intent_type,
-                    "detail": improved_image_prompt,
-                    "image": None,
-                }
-                async for result in send_llm_response(json.dumps(content_obj), tracer.get("usage")):
+                program_execution_context.append(f"Failed to generate image with {improved_image_prompt}")
+                async for result in send_event(ChatEvent.STATUS, f"Failed to generate image"):
                     yield result
-                return
+            else:
+                generated_images.append(generated_image)
 
-            await sync_to_async(save_to_conversation_log)(
-                q,
-                generated_image,
-                user,
-                meta_log,
-                user_message_time,
-                intent_type=intent_type,
-                inferred_queries=[improved_image_prompt],
-                client_application=request.user.client_app,
-                conversation_id=conversation_id,
-                compiled_references=compiled_references,
-                online_results=online_results,
-                code_results=code_results,
-                query_images=uploaded_images,
-                train_of_thought=train_of_thought,
-                raw_query_files=raw_query_files,
-                tracer=tracer,
-            )
-            content_obj = {
-                "intentType": intent_type,
-                "inferredQueries": [improved_image_prompt],
-                "image": generated_image,
-            }
-            async for result in send_llm_response(json.dumps(content_obj), tracer.get("usage")):
-                yield result
-            return
+                generated_asset_results["images"] = {
+                    "query": improved_image_prompt,
+                }
+
+                async for result in send_event(
+                    ChatEvent.GENERATED_ASSETS,
+                    {
+                        "images": [generated_image],
+                    },
+                ):
+                    yield result
 
         if ConversationCommand.Diagram in conversation_commands:
             async for result in send_event(ChatEvent.STATUS, f"Creating diagram"):
                 yield result
 
-            intent_type = "excalidraw"
             inferred_queries = []
             diagram_description = ""
 
@@ -1184,62 +1169,35 @@ async def chat(
                     if better_diagram_description_prompt and excalidraw_diagram_description:
                         inferred_queries.append(better_diagram_description_prompt)
                         diagram_description = excalidraw_diagram_description
+
+                        generated_excalidraw_diagram = diagram_description
+
+                        generated_asset_results["diagrams"] = {
+                            "query": better_diagram_description_prompt,
+                        }
+
+                        async for result in send_event(
+                            ChatEvent.GENERATED_ASSETS,
+                            {
+                                "excalidrawDiagram": excalidraw_diagram_description,
+                            },
+                        ):
+                            yield result
                     else:
                         error_message = "Failed to generate diagram. Please try again later."
-                        async for result in send_llm_response(error_message, tracer.get("usage")):
-                            yield result
-
-                        await sync_to_async(save_to_conversation_log)(
-                            q,
-                            error_message,
-                            user,
-                            meta_log,
-                            user_message_time,
-                            inferred_queries=[better_diagram_description_prompt],
-                            client_application=request.user.client_app,
-                            conversation_id=conversation_id,
-                            compiled_references=compiled_references,
-                            online_results=online_results,
-                            code_results=code_results,
-                            query_images=uploaded_images,
-                            train_of_thought=train_of_thought,
-                            raw_query_files=raw_query_files,
-                            tracer=tracer,
+                        program_execution_context.append(
+                            prompts.failed_diagram_generation.format(
+                                attempted_diagram=better_diagram_description_prompt
+                            )
                         )
-                        return
 
-            content_obj = {
-                "intentType": intent_type,
-                "inferredQueries": inferred_queries,
-                "image": diagram_description,
-            }
-
-            await sync_to_async(save_to_conversation_log)(
-                q,
-                excalidraw_diagram_description,
-                user,
-                meta_log,
-                user_message_time,
-                intent_type="excalidraw",
-                inferred_queries=[better_diagram_description_prompt],
-                client_application=request.user.client_app,
-                conversation_id=conversation_id,
-                compiled_references=compiled_references,
-                online_results=online_results,
-                code_results=code_results,
-                query_images=uploaded_images,
-                train_of_thought=train_of_thought,
-                raw_query_files=raw_query_files,
-                tracer=tracer,
-            )
-
-            async for result in send_llm_response(json.dumps(content_obj), tracer.get("usage")):
-                yield result
-            return
+                        async for result in send_event(ChatEvent.STATUS, error_message):
+                            yield result
 
         ## Generate Text Output
         async for result in send_event(ChatEvent.STATUS, f"**Generating a well-informed response**"):
             yield result
+
         llm_response, chat_metadata = await agenerate_chat_response(
             defiltered_query,
             meta_log,
@@ -1259,6 +1217,11 @@ async def chat(
             train_of_thought,
             attached_file_context,
             raw_query_files,
+            generated_images,
+            generated_files,
+            generated_excalidraw_diagram,
+            program_execution_context,
+            generated_asset_results,
             tracer,
         )
 
diff --git a/src/khoj/routers/helpers.py b/src/khoj/routers/helpers.py
index e160b8e3..36a8d008 100644
--- a/src/khoj/routers/helpers.py
+++ b/src/khoj/routers/helpers.py
@@ -27,6 +27,7 @@ from typing import (
 from urllib.parse import parse_qs, quote, unquote, urljoin, urlparse
 
 import cron_descriptor
+import pyjson5
 import pytz
 import requests
 from apscheduler.job import Job
@@ -87,7 +88,10 @@ from khoj.processor.conversation.offline.chat_model import (
     converse_offline,
     send_message_to_model_offline,
 )
-from khoj.processor.conversation.openai.gpt import converse, send_message_to_model
+from khoj.processor.conversation.openai.gpt import (
+    converse_openai,
+    send_message_to_model,
+)
 from khoj.processor.conversation.utils import (
     ChatEvent,
     ThreadedGenerator,
@@ -135,7 +139,7 @@ def validate_conversation_config(user: KhojUser):
     if default_config is None:
         raise HTTPException(status_code=500, detail="Contact the server administrator to add a chat model.")
 
-    if default_config.model_type == "openai" and not default_config.openai_config:
+    if default_config.model_type == "openai" and not default_config.ai_model_api:
         raise HTTPException(status_code=500, detail="Contact the server administrator to add a chat model.")
 
 
@@ -162,7 +166,7 @@ async def is_ready_to_chat(user: KhojUser):
                 ChatModelOptions.ModelType.GOOGLE,
             ]
         )
-        and user_conversation_config.openai_config
+        and user_conversation_config.ai_model_api
     ):
         return True
 
@@ -541,7 +545,7 @@ async def generate_online_subqueries(
     # Validate that the response is a non-empty, JSON-serializable list
     try:
         response = clean_json(response)
-        response = json.loads(response)
+        response = pyjson5.loads(response)
         response = {q.strip() for q in response["queries"] if q.strip()}
         if not isinstance(response, set) or not response or len(response) == 0:
             logger.error(f"Invalid response for constructing subqueries: {response}. Returning original query: {q}")
@@ -750,7 +754,7 @@ async def generate_excalidraw_diagram(
         )
     except Exception as e:
         logger.error(f"Error generating Excalidraw diagram for {user.email}: {e}", exc_info=True)
-        yield None, None
+        yield better_diagram_description_prompt, None
         return
 
     scratchpad = excalidraw_diagram_description.get("scratchpad")
@@ -989,7 +993,7 @@ async def send_message_to_model_wrapper(
         )
 
     elif model_type == ChatModelOptions.ModelType.OPENAI:
-        openai_chat_config = conversation_config.openai_config
+        openai_chat_config = conversation_config.ai_model_api
         api_key = openai_chat_config.api_key
         api_base_url = openai_chat_config.api_base_url
         truncated_messages = generate_chatml_messages_with_context(
@@ -1014,7 +1018,7 @@ async def send_message_to_model_wrapper(
             tracer=tracer,
         )
     elif model_type == ChatModelOptions.ModelType.ANTHROPIC:
-        api_key = conversation_config.openai_config.api_key
+        api_key = conversation_config.ai_model_api.api_key
         truncated_messages = generate_chatml_messages_with_context(
             user_message=query,
             context_message=context,
@@ -1036,7 +1040,7 @@ async def send_message_to_model_wrapper(
             tracer=tracer,
         )
     elif model_type == ChatModelOptions.ModelType.GOOGLE:
-        api_key = conversation_config.openai_config.api_key
+        api_key = conversation_config.ai_model_api.api_key
         truncated_messages = generate_chatml_messages_with_context(
             user_message=query,
             context_message=context,
@@ -1101,7 +1105,7 @@ def send_message_to_model_wrapper_sync(
         )
 
     elif conversation_config.model_type == ChatModelOptions.ModelType.OPENAI:
-        api_key = conversation_config.openai_config.api_key
+        api_key = conversation_config.ai_model_api.api_key
         truncated_messages = generate_chatml_messages_with_context(
             user_message=message,
             system_message=system_message,
@@ -1123,7 +1127,7 @@ def send_message_to_model_wrapper_sync(
         return openai_response
 
     elif conversation_config.model_type == ChatModelOptions.ModelType.ANTHROPIC:
-        api_key = conversation_config.openai_config.api_key
+        api_key = conversation_config.ai_model_api.api_key
         truncated_messages = generate_chatml_messages_with_context(
             user_message=message,
             system_message=system_message,
@@ -1143,7 +1147,7 @@ def send_message_to_model_wrapper_sync(
         )
 
     elif conversation_config.model_type == ChatModelOptions.ModelType.GOOGLE:
-        api_key = conversation_config.openai_config.api_key
+        api_key = conversation_config.ai_model_api.api_key
         truncated_messages = generate_chatml_messages_with_context(
             user_message=message,
             system_message=system_message,
@@ -1184,6 +1188,11 @@ def generate_chat_response(
     train_of_thought: List[Any] = [],
     query_files: str = None,
     raw_query_files: List[FileAttachment] = None,
+    generated_images: List[str] = None,
+    raw_generated_files: List[FileAttachment] = [],
+    generated_excalidraw_diagram: str = None,
+    program_execution_context: List[str] = [],
+    generated_asset_results: Dict[str, Dict] = {},
     tracer: dict = {},
 ) -> Tuple[Union[ThreadedGenerator, Iterator[str]], Dict[str, str]]:
     # Initialize Variables
@@ -1207,6 +1216,9 @@ def generate_chat_response(
             query_images=query_images,
             train_of_thought=train_of_thought,
             raw_query_files=raw_query_files,
+            generated_images=generated_images,
+            raw_generated_files=raw_generated_files,
+            generated_excalidraw_diagram=generated_excalidraw_diagram,
             tracer=tracer,
         )
 
@@ -1242,14 +1254,16 @@ def generate_chat_response(
                 user_name=user_name,
                 agent=agent,
                 query_files=query_files,
+                generated_files=raw_generated_files,
+                generated_asset_results=generated_asset_results,
                 tracer=tracer,
             )
 
         elif conversation_config.model_type == ChatModelOptions.ModelType.OPENAI:
-            openai_chat_config = conversation_config.openai_config
+            openai_chat_config = conversation_config.ai_model_api
             api_key = openai_chat_config.api_key
             chat_model = conversation_config.chat_model
-            chat_response = converse(
+            chat_response = converse_openai(
                 compiled_references,
                 query_to_run,
                 query_images=query_images,
@@ -1268,11 +1282,14 @@ def generate_chat_response(
                 agent=agent,
                 vision_available=vision_available,
                 query_files=query_files,
+                generated_files=raw_generated_files,
+                generated_asset_results=generated_asset_results,
+                program_execution_context=program_execution_context,
                 tracer=tracer,
             )
 
         elif conversation_config.model_type == ChatModelOptions.ModelType.ANTHROPIC:
-            api_key = conversation_config.openai_config.api_key
+            api_key = conversation_config.ai_model_api.api_key
             chat_response = converse_anthropic(
                 compiled_references,
                 query_to_run,
@@ -1291,10 +1308,13 @@ def generate_chat_response(
                 agent=agent,
                 vision_available=vision_available,
                 query_files=query_files,
+                generated_files=raw_generated_files,
+                generated_asset_results=generated_asset_results,
+                program_execution_context=program_execution_context,
                 tracer=tracer,
             )
         elif conversation_config.model_type == ChatModelOptions.ModelType.GOOGLE:
-            api_key = conversation_config.openai_config.api_key
+            api_key = conversation_config.ai_model_api.api_key
             chat_response = converse_gemini(
                 compiled_references,
                 query_to_run,
@@ -1313,6 +1333,9 @@ def generate_chat_response(
                 query_images=query_images,
                 vision_available=vision_available,
                 query_files=query_files,
+                generated_files=raw_generated_files,
+                generated_asset_results=generated_asset_results,
+                program_execution_context=program_execution_context,
                 tracer=tracer,
             )
 
@@ -1784,6 +1807,9 @@ class MessageProcessor:
         self.references = {}
         self.usage = {}
         self.raw_response = ""
+        self.generated_images = []
+        self.generated_files = []
+        self.generated_excalidraw_diagram = []
 
     def convert_message_chunk_to_json(self, raw_chunk: str) -> Dict[str, Any]:
         if raw_chunk.startswith("{") and raw_chunk.endswith("}"):
@@ -1822,6 +1848,16 @@ class MessageProcessor:
                     self.raw_response += chunk_data
             else:
                 self.raw_response += chunk_data
+        elif chunk_type == ChatEvent.GENERATED_ASSETS:
+            chunk_data = chunk["data"]
+            if isinstance(chunk_data, dict):
+                for key in chunk_data:
+                    if key == "images":
+                        self.generated_images = chunk_data[key]
+                    elif key == "files":
+                        self.generated_files = chunk_data[key]
+                    elif key == "excalidrawDiagram":
+                        self.generated_excalidraw_diagram = chunk_data[key]
 
     def handle_json_response(self, json_data: Dict[str, str]) -> str | Dict[str, str]:
         if "image" in json_data or "details" in json_data:
@@ -1852,7 +1888,14 @@ async def read_chat_stream(response_iterator: AsyncGenerator[str, None]) -> Dict
     if buffer:
         processor.process_message_chunk(buffer)
 
-    return {"response": processor.raw_response, "references": processor.references, "usage": processor.usage}
+    return {
+        "response": processor.raw_response,
+        "references": processor.references,
+        "usage": processor.usage,
+        "images": processor.generated_images,
+        "files": processor.generated_files,
+        "excalidrawDiagram": processor.generated_excalidraw_diagram,
+    }
 
 
 def get_user_config(user: KhojUser, request: Request, is_detailed: bool = False):
diff --git a/src/khoj/routers/research.py b/src/khoj/routers/research.py
index efeb3787..4417e8fe 100644
--- a/src/khoj/routers/research.py
+++ b/src/khoj/routers/research.py
@@ -1,4 +1,3 @@
-import json
 import logging
 from datetime import datetime
 from typing import Callable, Dict, List, Optional
@@ -10,10 +9,10 @@ from khoj.database.models import Agent, KhojUser
 from khoj.processor.conversation import prompts
 from khoj.processor.conversation.utils import (
     InformationCollectionIteration,
-    clean_json,
     construct_chat_history,
     construct_iteration_history,
     construct_tool_chat_history,
+    load_complex_json,
 )
 from khoj.processor.tools.online_search import read_webpages, search_online
 from khoj.processor.tools.run_code import run_code
@@ -106,8 +105,7 @@ async def apick_next_tool(
         return
 
     try:
-        response = clean_json(response)
-        response = json.loads(response)
+        response = load_complex_json(response)
         selected_tool = response.get("tool", None)
         generated_query = response.get("query", None)
         scratchpad = response.get("scratchpad", None)
diff --git a/src/khoj/routers/web_client.py b/src/khoj/routers/web_client.py
index 76ce7dd4..97297bab 100644
--- a/src/khoj/routers/web_client.py
+++ b/src/khoj/routers/web_client.py
@@ -134,3 +134,8 @@ def automations_config_page(
             "request": request,
         },
     )
+
+
+@web_client.get("/.well-known/assetlinks.json", response_class=FileResponse)
+def assetlinks(request: Request):
+    return FileResponse(constants.assetlinks_file_path)
diff --git a/src/khoj/utils/constants.py b/src/khoj/utils/constants.py
index 40320373..f2ab40c6 100644
--- a/src/khoj/utils/constants.py
+++ b/src/khoj/utils/constants.py
@@ -5,6 +5,7 @@ app_root_directory = Path(__file__).parent.parent.parent
 web_directory = app_root_directory / "khoj/interface/web/"
 next_js_directory = app_root_directory / "khoj/interface/built/"
 pypi_static_directory = app_root_directory / "khoj/interface/compiled/"
+assetlinks_file_path = web_directory / ".well-known/assetlinks.json"
 empty_escape_sequences = "\n|\r|\t| "
 app_env_filepath = "~/.khoj/env"
 telemetry_server = "https://khoj.beta.haletic.com/v1/telemetry"
diff --git a/src/khoj/utils/helpers.py b/src/khoj/utils/helpers.py
index 36e0e1d2..6fafa6d9 100644
--- a/src/khoj/utils/helpers.py
+++ b/src/khoj/utils/helpers.py
@@ -256,9 +256,9 @@ def get_server_id():
 
 
 def telemetry_disabled(app_config: AppConfig, telemetry_disable_env) -> bool:
-    return (
-        not app_config.should_log_telemetry if app_config and app_config.should_log_telemetry else telemetry_disable_env
-    )
+    if telemetry_disable_env is True:
+        return True
+    return not app_config or not app_config.should_log_telemetry
 
 
 def log_telemetry(
@@ -366,7 +366,7 @@ tool_descriptions_for_llm = {
     ConversationCommand.Notes: "To search the user's personal knowledge base. Especially helpful if the question expects context from the user's notes or documents.",
     ConversationCommand.Online: "To search for the latest, up-to-date information from the internet. Note: **Questions about Khoj should always use this data source**",
     ConversationCommand.Webpage: "To use if the user has directly provided the webpage urls or you are certain of the webpage urls to read.",
-    ConversationCommand.Code: "To run Python code in a Pyodide sandbox with no network access. Helpful when need to parse information, run complex calculations, create plaintext documents, and create charts with quantitative data. Matplotlib, bs4, pandas, numpy, etc. are available.",
+    ConversationCommand.Code: "To run Python code in a Pyodide sandbox with no network access. Helpful when need to parse complex information, run complex calculations, create plaintext documents, and create charts with quantitative data. Only matplotlib, panda, numpy, scipy, bs4 and sympy external packages are available.",
     ConversationCommand.Summarize: "To retrieve an answer that depends on the entire document or a large text.",
 }
 
@@ -374,7 +374,7 @@ function_calling_description_for_llm = {
     ConversationCommand.Notes: "To search the user's personal knowledge base. Especially helpful if the question expects context from the user's notes or documents.",
     ConversationCommand.Online: "To search the internet for information. Useful to get a quick, broad overview from the internet. Provide all relevant context to ensure new searches, not in previous iterations, are performed.",
     ConversationCommand.Webpage: "To extract information from webpages. Useful for more detailed research from the internet. Usually used when you know the webpage links to refer to. Share the webpage links and information to extract in your query.",
-    ConversationCommand.Code: "To run Python code in a Pyodide sandbox with no network access. Helpful when need to parse information, run complex calculations, create plaintext documents, and create charts with quantitative data. Matplotlib, bs4, pandas, numpy, etc. are available.",
+    ConversationCommand.Code: "To run Python code in a Pyodide sandbox with no network access. Helpful when need to parse complex information, run complex calculations, create plaintext documents, and create charts with quantitative data. Only matplotlib, panda, numpy, scipy, bs4 and sympy external packages are available.",
 }
 
 mode_descriptions_for_llm = {
diff --git a/src/khoj/utils/initialization.py b/src/khoj/utils/initialization.py
index 27decd65..91c6ce1a 100644
--- a/src/khoj/utils/initialization.py
+++ b/src/khoj/utils/initialization.py
@@ -6,9 +6,9 @@ import openai
 
 from khoj.database.adapters import ConversationAdapters
 from khoj.database.models import (
+    AiModelApi,
     ChatModelOptions,
     KhojUser,
-    OpenAIProcessorConversationConfig,
     SpeechToTextModelOptions,
     TextToImageModelConfig,
 )
@@ -56,8 +56,10 @@ def initialization(interactive: bool = True):
                 valid_default_models = [model for model in default_openai_chat_models if model in default_chat_models]
                 other_available_models = [model for model in default_chat_models if model not in valid_default_models]
                 default_chat_models = valid_default_models + other_available_models
-            except Exception:
-                logger.warning(f"⚠️ Failed to fetch {provider} chat models. Fallback to default models. Error: {e}")
+            except Exception as e:
+                logger.warning(
+                    f"⚠️ Failed to fetch {provider} chat models. Fallback to default models. Error: {str(e)}"
+                )
 
         # Set up OpenAI's online chat models
         openai_configured, openai_provider = _setup_chat_model_provider(
@@ -98,7 +100,7 @@ def initialization(interactive: bool = True):
             TextToImageModelConfig.objects.create(
                 model_name=openai_text_to_image_model,
                 model_type=TextToImageModelConfig.ModelType.OPENAI,
-                openai_config=openai_provider,
+                ai_model_api=openai_provider,
             )
 
         # Set up Google's Gemini online chat models
@@ -177,7 +179,7 @@ def initialization(interactive: bool = True):
         vision_enabled: bool = False,
         is_offline: bool = False,
         provider_name: str = None,
-    ) -> Tuple[bool, OpenAIProcessorConversationConfig]:
+    ) -> Tuple[bool, AiModelApi]:
         supported_vision_models = (
             default_openai_chat_models + default_anthropic_chat_models + default_gemini_chat_models
         )
@@ -192,16 +194,14 @@ def initialization(interactive: bool = True):
 
         logger.info(f"️💬 Setting up your {provider_name} chat configuration")
 
-        chat_provider = None
+        ai_model_api = None
         if not is_offline:
             if interactive:
                 user_api_key = input(f"Enter your {provider_name} API key (default: {default_api_key}): ")
                 api_key = user_api_key if user_api_key != "" else default_api_key
             else:
                 api_key = default_api_key
-            chat_provider = OpenAIProcessorConversationConfig.objects.create(
-                api_key=api_key, name=provider_name, api_base_url=api_base_url
-            )
+            ai_model_api = AiModelApi.objects.create(api_key=api_key, name=provider_name, api_base_url=api_base_url)
 
         if interactive:
             chat_model_names = input(
@@ -223,19 +223,23 @@ def initialization(interactive: bool = True):
                 "max_prompt_size": default_max_tokens,
                 "vision_enabled": vision_enabled,
                 "tokenizer": default_tokenizer,
-                "openai_config": chat_provider,
+                "ai_model_api": ai_model_api,
             }
 
             ChatModelOptions.objects.create(**chat_model_options)
 
         logger.info(f"🗣️ {provider_name} chat model configuration complete")
-        return True, chat_provider
+        return True, ai_model_api
 
     def _update_chat_model_options():
         """Update available chat models for OpenAI-compatible APIs"""
         try:
             # Get OpenAI configs with custom base URLs
-            custom_configs = OpenAIProcessorConversationConfig.objects.exclude(api_base_url__isnull=True)
+            custom_configs = AiModelApi.objects.exclude(api_base_url__isnull=True)
+
+            # Only enable for whitelisted provider names (i.e Ollama) for now
+            # TODO: This is hacky. Will be replaced with more robust solution based on provider type enum
+            custom_configs = custom_configs.filter(name__in=["Ollama"])
 
             for config in custom_configs:
                 try:
@@ -247,7 +251,7 @@ def initialization(interactive: bool = True):
 
                     # Get existing chat model options for this config
                     existing_models = ChatModelOptions.objects.filter(
-                        openai_config=config, model_type=ChatModelOptions.ModelType.OPENAI
+                        ai_model_api=config, model_type=ChatModelOptions.ModelType.OPENAI
                     )
 
                     # Add new models
@@ -259,7 +263,7 @@ def initialization(interactive: bool = True):
                                 max_prompt_size=model_to_prompt_size.get(model),
                                 vision_enabled=model in default_openai_chat_models,
                                 tokenizer=model_to_tokenizer.get(model),
-                                openai_config=config,
+                                ai_model_api=config,
                             )
 
                     # Remove models that are no longer available
diff --git a/tests/conftest.py b/tests/conftest.py
index 7c233594..7561d901 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -34,8 +34,8 @@ from khoj.utils.constants import web_directory
 from khoj.utils.helpers import resolve_absolute_path
 from khoj.utils.rawconfig import ContentConfig, ImageSearchConfig, SearchConfig
 from tests.helpers import (
+    AiModelApiFactory,
     ChatModelOptionsFactory,
-    OpenAIProcessorConversationConfigFactory,
     ProcessLockFactory,
     SubscriptionFactory,
     UserConversationProcessorConfigFactory,
@@ -319,9 +319,7 @@ def chat_client_builder(search_config, user, index_content=True, require_auth=Fa
     elif chat_provider == ChatModelOptions.ModelType.ANTHROPIC:
         online_chat_model = ChatModelOptionsFactory(chat_model="claude-3-5-haiku-20241022", model_type="anthropic")
     if online_chat_model:
-        online_chat_model.openai_config = OpenAIProcessorConversationConfigFactory(
-            api_key=get_chat_api_key(chat_provider)
-        )
+        online_chat_model.ai_model_api = AiModelApiFactory(api_key=get_chat_api_key(chat_provider))
         UserConversationProcessorConfigFactory(user=user, setting=online_chat_model)
 
     state.anonymous_mode = not require_auth
diff --git a/tests/evals/eval.py b/tests/evals/eval.py
index 30c842b2..eee3656f 100644
--- a/tests/evals/eval.py
+++ b/tests/evals/eval.py
@@ -3,8 +3,10 @@ import concurrent.futures
 import json
 import logging
 import os
+import re
 import time
 from datetime import datetime
+from functools import partial
 from io import StringIO
 from textwrap import dedent
 from threading import Lock
@@ -24,13 +26,10 @@ logger = logging.getLogger(__name__)
 KHOJ_URL = os.getenv("KHOJ_URL", "http://localhost:42110")
 KHOJ_CHAT_API_URL = f"{KHOJ_URL}/api/chat"
 KHOJ_API_KEY = os.getenv("KHOJ_API_KEY")
-KHOJ_MODE = os.getenv("KHOJ_MODE", "default")  # E.g research, general, notes etc.
+KHOJ_MODE = os.getenv("KHOJ_MODE", "default").lower()  # E.g research, general, notes etc.
 
 GEMINI_API_KEY = os.getenv("GEMINI_API_KEY")
 GEMINI_EVAL_MODEL = os.getenv("GEMINI_EVAL_MODEL", "gemini-1.5-pro-002")
-GEMINI_API_URL = (
-    f"https://generativelanguage.googleapis.com/v1beta/models/{GEMINI_EVAL_MODEL}:generateContent?key={GEMINI_API_KEY}"
-)
 
 SAMPLE_SIZE = os.getenv("SAMPLE_SIZE")  # Number of examples to evaluate
 RANDOMIZE = os.getenv("RANDOMIZE", "false").lower() == "true"  # Randomize examples
@@ -128,6 +127,99 @@ def load_simpleqa_dataset():
         return None
 
 
+def load_gpqa_dataset():
+    """
+    Load the Google GPQA benchmark dataset from HuggingFace
+
+    GPQA is a benchmark dataset to evaluate retrieval and answering capabilities of agents.
+    It contains ~800 requiring multi-hop retrieval and reasoning across various topics.
+
+    ### Data Fields
+    - Prompt: The question to be answered
+    - Answer: The ground truth answer
+    - reasoning_types: The type of reasoning required to answer the question
+    """
+    import random
+
+    def format_multiple_choice_question(row: Dict) -> tuple[str, str]:
+        """
+        Create GPQA multi-choice prompt from shuffled answer choices and question.
+        Refer: https://github.com/openai/simple-evals/blob/a8e85cc8a5dea497d915f870895250e07f9cc737/common.py#L12
+
+        Returns formatted prompt and correct answer letter.
+        """
+        # Gather choices
+        choices = [
+            row["Incorrect Answer 1"],
+            row["Incorrect Answer 2"],
+            row["Incorrect Answer 3"],
+            row["Correct Answer"],
+        ]
+        # Shuffle choices
+        random.shuffle(choices)
+
+        # Get correct answer letter
+        correct_index = choices.index(row["Correct Answer"])
+        correct_letter = "ABCD"[correct_index]
+
+        prompt = f"""
+Answer the following multiple choice question. Answer should be of the following format: 'Answer: $LETTER' (without quotes) where $LETTER is one of ABCD. Think step by step before answering.
+
+{row["Question"]}
+
+A) {choices[0]}
+B) {choices[1]}
+C) {choices[2]}
+D) {choices[3]}
+        """.strip()
+
+        return prompt, correct_letter
+
+    try:
+        dataset = load_dataset("Idavidrein/gpqa", "gpqa_diamond", split="train")
+
+        # Create multi-choice q&a prompt from choices and correct answer
+        prompts_and_answers = [format_multiple_choice_question(row) for row in dataset]
+
+        # Normalize dataset to FRAMES format
+        dataset = dataset.rename_columns({"Subdomain": "reasoning_types"})
+        dataset = dataset.add_column("Prompt", [p[0] for p in prompts_and_answers])
+        dataset = dataset.add_column("Answer", [p[1] for p in prompts_and_answers])
+
+        # Sample and shuffle dataset if configured
+        dataset = dataset.shuffle() if RANDOMIZE else dataset
+        dataset = dataset[: int(SAMPLE_SIZE)] if SAMPLE_SIZE else dataset
+
+        return dataset
+    except Exception as e:
+        logger.error(f"Error loading dataset: {e}")
+        return None
+
+
+def load_math500_dataset():
+    """
+    Load and format the MATH500 dataset to match the evaluation script's structure.
+
+    Args:
+        sample_size (int, optional): Number of samples to include. Defaults to None (use full dataset).
+        randomize (bool, optional): Whether to randomize the dataset. Defaults to False.
+
+    Returns:
+        Dataset: Formatted HuggingFace Dataset.
+    """
+    try:
+        # Load the MATH500 dataset from HuggingFace
+        dataset = load_dataset("HuggingFaceH4/MATH-500", split="test")
+        dataset = dataset.rename_columns({"problem": "Prompt", "answer": "Answer", "subject": "reasoning_types"})
+        dataset = dataset.shuffle() if RANDOMIZE else dataset
+        dataset = dataset.select(range(int(SAMPLE_SIZE))) if SAMPLE_SIZE else dataset
+
+        return dataset
+    except Exception as e:
+        print(f"Error loading and formatting MATH500 dataset: {e}")
+        return None
+
+
 def get_agent_response(prompt: str) -> Dict[str, Any]:
     """Get response from the Khoj API"""
     # Set headers
@@ -152,7 +244,30 @@ def get_agent_response(prompt: str) -> Dict[str, Any]:
         return {"response": "", "usage": {}}
 
 
-def evaluate_response(query: str, agent_response: str, ground_truth: str) -> tuple[bool | None, str, float]:
+def evaluate_response_with_mcq_match(
+    query: str, agent_response: str, ground_truth: str
+) -> tuple[bool | None, str, float]:
+    """Evaluate Khoj response against benchmark ground truth using string matching"""
+    try:
+        # Extract answer from agent response
+        answer_pattern_multichoice = r"(?i)Answer\s*:\s*([A-D])"
+        match = re.search(answer_pattern_multichoice, agent_response)
+        extracted_answer = match.group(1) if match else None
+
+        # Check if extracted answer matches ground truth
+        decision = extracted_answer == ground_truth
+        explanation = f"Agent response {'matches' if decision else 'does not match'} ground truth {ground_truth}"
+
+        # Return decision, explanation and cost in structured form
+        return decision, explanation, 0.0
+    except Exception as e:
+        logger.error(f"Error in evaluation: {e}")
+        return None, f"Evaluation failed: {str(e)}", 0.0
+
+
+def evaluate_response_with_gemini(
+    query: str, agent_response: str, ground_truth: str, eval_model=GEMINI_EVAL_MODEL
+) -> tuple[bool | None, str, float]:
     """Evaluate Khoj response against benchmark ground truth using Gemini"""
     evaluation_prompt = f"""
     Compare the following agent response with the ground truth answer.
@@ -166,10 +281,13 @@ def evaluate_response(query: str, agent_response: str, ground_truth: str) -> tup
     Provide your evaluation in the following json format:
     {"explanation:" "[How you made the decision?)", "decision:" "(TRUE if response contains key information, FALSE otherwise)"}
     """
+    gemini_api_url = (
+        f"https://generativelanguage.googleapis.com/v1beta/models/{eval_model}:generateContent?key={GEMINI_API_KEY}"
+    )
 
     try:
         response = requests.post(
-            GEMINI_API_URL,
+            gemini_api_url,
             headers={"Content-Type": "application/json"},
             json={
                 "contents": [{"parts": [{"text": evaluation_prompt}]}],
@@ -182,7 +300,7 @@ def evaluate_response(query: str, agent_response: str, ground_truth: str) -> tup
         # Update cost of evaluation
         input_tokens = response_json["usageMetadata"]["promptTokenCount"]
         ouput_tokens = response_json["usageMetadata"]["candidatesTokenCount"]
-        cost = get_cost_of_chat_message(GEMINI_EVAL_MODEL, input_tokens, ouput_tokens)
+        cost = get_cost_of_chat_message(eval_model, input_tokens, ouput_tokens)
 
         # Parse evaluation response
         eval_response: dict[str, str] = json.loads(
@@ -200,7 +318,7 @@ def evaluate_response(query: str, agent_response: str, ground_truth: str) -> tup
         return None, f"Evaluation failed: {str(e)}", 0.0
 
 
-def process_batch(batch, batch_start, results, dataset_length):
+def process_batch(batch, batch_start, results, dataset_length, response_evaluator):
     global running_cost
     for idx, (prompt, answer, reasoning_type) in enumerate(batch):
         current_index = batch_start + idx
@@ -219,7 +337,7 @@ def process_batch(batch, batch_start, results, dataset_length):
             decision = None
             explanation = "Agent response is empty. This maybe due to a service error."
         else:
-            decision, explanation, eval_cost = evaluate_response(prompt, agent_response, answer)
+            decision, explanation, eval_cost = response_evaluator(prompt, agent_response, answer)
 
         # Store results
         results.append(
@@ -292,7 +410,7 @@ def parse_args():
         "--dataset",
         "-d",
         default="frames",
-        choices=["frames", "simpleqa"],
+        choices=["frames", "simpleqa", "gpqa", "math500"],
         help="Dataset to use for evaluation (default: frames)",
     )
     return parser.parse_args()
@@ -309,12 +427,24 @@ def main():
             dataset = load_frames_dataset()
         elif args.dataset == "simpleqa":
             dataset = load_simpleqa_dataset()
+        elif args.dataset == "gpqa":
+            dataset = load_gpqa_dataset()
+        elif args.dataset == "math500":
+            dataset = load_math500_dataset()
     if dataset is None:
         return
 
     # Initialize variables
     results = []
     dataset_length = len(dataset["Prompt"])
+    if args.dataset == "gpqa":
+        response_evaluator = evaluate_response_with_mcq_match
+    elif args.dataset == "math500":
+        response_evaluator = partial(
+            evaluate_response_with_gemini, eval_model=os.getenv("GEMINI_EVAL_MODEL", "gemini-1.5-flash-002")
+        )
+    else:
+        response_evaluator = evaluate_response_with_gemini
 
     # Process examples in batches
     with concurrent.futures.ThreadPoolExecutor() as executor:
@@ -326,7 +456,9 @@ def main():
                 dataset["Answer"][i : i + BATCH_SIZE],
                 dataset["reasoning_types"][i : i + BATCH_SIZE],
             )
-            futures.append(executor.submit(process_batch, batch, batch_start, results, dataset_length))
+            futures.append(
+                executor.submit(process_batch, batch, batch_start, results, dataset_length, response_evaluator)
+            )
 
         # Wait for all futures to complete
         concurrent.futures.wait(futures)
diff --git a/tests/helpers.py b/tests/helpers.py
index 3824c615..04ed6df5 100644
--- a/tests/helpers.py
+++ b/tests/helpers.py
@@ -5,11 +5,11 @@ import factory
 from django.utils.timezone import make_aware
 
 from khoj.database.models import (
+    AiModelApi,
     ChatModelOptions,
     Conversation,
     KhojApiUser,
     KhojUser,
-    OpenAIProcessorConversationConfig,
     ProcessLock,
     SearchModelConfig,
     Subscription,
@@ -76,9 +76,9 @@ class ApiUserFactory(factory.django.DjangoModelFactory):
     token = factory.Faker("password")
 
 
-class OpenAIProcessorConversationConfigFactory(factory.django.DjangoModelFactory):
+class AiModelApiFactory(factory.django.DjangoModelFactory):
     class Meta:
-        model = OpenAIProcessorConversationConfig
+        model = AiModelApi
 
     api_key = get_chat_api_key()
 
@@ -91,9 +91,7 @@ class ChatModelOptionsFactory(factory.django.DjangoModelFactory):
     tokenizer = None
     chat_model = "bartowski/Meta-Llama-3.2-3B-Instruct-GGUF"
     model_type = get_chat_provider()
-    openai_config = factory.LazyAttribute(
-        lambda obj: OpenAIProcessorConversationConfigFactory() if get_chat_api_key() else None
-    )
+    ai_model_api = factory.LazyAttribute(lambda obj: AiModelApiFactory() if get_chat_api_key() else None)
 
 
 class UserConversationProcessorConfigFactory(factory.django.DjangoModelFactory):
diff --git a/tests/test_conversation_utils.py b/tests/test_conversation_utils.py
index 2f7a9862..54fe2a7f 100644
--- a/tests/test_conversation_utils.py
+++ b/tests/test_conversation_utils.py
@@ -104,6 +104,18 @@ class TestTruncateMessage:
         assert truncated_chat_history[0] != copy_big_chat_message
 
 
+def test_load_complex_raw_json_string():
+    # Arrange
+    raw_json = r"""{"key": "value with unescaped " and unescaped \' and escaped \" and escaped \\'"}"""
+    expeced_json = {"key": "value with unescaped \" and unescaped \\' and escaped \" and escaped \\'"}
+
+    # Act
+    parsed_json = utils.load_complex_json(raw_json)
+
+    # Assert
+    assert parsed_json == expeced_json
+
+
 def generate_content(count):
     return " ".join([f"{index}" for index, _ in enumerate(range(count))])
 
diff --git a/tests/test_offline_chat_actors.py b/tests/test_offline_chat_actors.py
index b404f0e8..e84612a2 100644
--- a/tests/test_offline_chat_actors.py
+++ b/tests/test_offline_chat_actors.py
@@ -22,7 +22,6 @@ from khoj.processor.conversation.offline.chat_model import (
     filter_questions,
 )
 from khoj.processor.conversation.offline.utils import download_model
-from khoj.processor.conversation.utils import message_to_log
 from khoj.utils.constants import default_offline_chat_models
 
 
diff --git a/tests/test_online_chat_actors.py b/tests/test_online_chat_actors.py
index 3a6db6f8..f873be45 100644
--- a/tests/test_online_chat_actors.py
+++ b/tests/test_online_chat_actors.py
@@ -4,7 +4,7 @@ import freezegun
 import pytest
 from freezegun import freeze_time
 
-from khoj.processor.conversation.openai.gpt import converse, extract_questions
+from khoj.processor.conversation.openai.gpt import converse_openai, extract_questions
 from khoj.processor.conversation.utils import message_to_log
 from khoj.routers.helpers import (
     aget_data_sources_and_output_format,
@@ -158,7 +158,7 @@ def test_generate_search_query_using_question_and_answer_from_chat_history():
 @pytest.mark.chatquality
 def test_chat_with_no_chat_history_or_retrieved_content():
     # Act
-    response_gen = converse(
+    response_gen = converse_openai(
         references=[],  # Assume no context retrieved from notes for the user_query
         user_query="Hello, my name is Testatron. Who are you?",
         api_key=api_key,
@@ -183,7 +183,7 @@ def test_answer_from_chat_history_and_no_content():
     ]
 
     # Act
-    response_gen = converse(
+    response_gen = converse_openai(
         references=[],  # Assume no context retrieved from notes for the user_query
         user_query="What is my name?",
         conversation_log=populate_chat_history(message_list),
@@ -214,7 +214,7 @@ def test_answer_from_chat_history_and_previously_retrieved_content():
     ]
 
     # Act
-    response_gen = converse(
+    response_gen = converse_openai(
         references=[],  # Assume no context retrieved from notes for the user_query
         user_query="Where was I born?",
         conversation_log=populate_chat_history(message_list),
@@ -239,7 +239,7 @@ def test_answer_from_chat_history_and_currently_retrieved_content():
     ]
 
     # Act
-    response_gen = converse(
+    response_gen = converse_openai(
         references=[
             {"compiled": "Testatron was born on 1st April 1984 in Testville.", "file": "background.md"}
         ],  # Assume context retrieved from notes for the user_query
@@ -265,7 +265,7 @@ def test_refuse_answering_unanswerable_question():
     ]
 
     # Act
-    response_gen = converse(
+    response_gen = converse_openai(
         references=[],  # Assume no context retrieved from notes for the user_query
         user_query="Where was I born?",
         conversation_log=populate_chat_history(message_list),
@@ -318,7 +318,7 @@ Expenses:Food:Dining  10.00 USD""",
     ]
 
     # Act
-    response_gen = converse(
+    response_gen = converse_openai(
         references=context,  # Assume context retrieved from notes for the user_query
         user_query="What did I have for Dinner today?",
         api_key=api_key,
@@ -362,7 +362,7 @@ Expenses:Food:Dining  10.00 USD""",
     ]
 
     # Act
-    response_gen = converse(
+    response_gen = converse_openai(
         references=context,  # Assume context retrieved from notes for the user_query
         user_query="How much did I spend on dining this year?",
         api_key=api_key,
@@ -386,7 +386,7 @@ def test_answer_general_question_not_in_chat_history_or_retrieved_content():
     ]
 
     # Act
-    response_gen = converse(
+    response_gen = converse_openai(
         references=[],  # Assume no context retrieved from notes for the user_query
         user_query="Write a haiku about unit testing in 3 lines. Do not say anything else",
         conversation_log=populate_chat_history(message_list),
@@ -426,7 +426,7 @@ My sister, Aiyla is married to Tolga. They have 3 kids, Yildiz, Ali and Ahmet.""
     ]
 
     # Act
-    response_gen = converse(
+    response_gen = converse_openai(
         references=context,  # Assume context retrieved from notes for the user_query
         user_query="How many kids does my older sister have?",
         api_key=api_key,
@@ -459,13 +459,13 @@ def test_agent_prompt_should_be_used(openai_agent):
     expected_responses = ["9.50", "9.5"]
 
     # Act
-    response_gen = converse(
+    response_gen = converse_openai(
         references=context,  # Assume context retrieved from notes for the user_query
         user_query="What did I buy?",
         api_key=api_key,
     )
     no_agent_response = "".join([response_chunk for response_chunk in response_gen])
-    response_gen = converse(
+    response_gen = converse_openai(
         references=context,  # Assume context retrieved from notes for the user_query
         user_query="What did I buy?",
         api_key=api_key,
diff --git a/tests/test_online_chat_director.py b/tests/test_online_chat_director.py
index 94545b4c..ea3a6e1c 100644
--- a/tests/test_online_chat_director.py
+++ b/tests/test_online_chat_director.py
@@ -6,7 +6,6 @@ from freezegun import freeze_time
 
 from khoj.database.models import Agent, Entry, KhojUser
 from khoj.processor.conversation import prompts
-from khoj.processor.conversation.utils import message_to_log
 from tests.helpers import ConversationFactory, generate_chat_history, get_chat_api_key
 
 # Initialize variables for tests
diff --git a/versions.json b/versions.json
index d727a9b1..56597ada 100644
--- a/versions.json
+++ b/versions.json
@@ -92,5 +92,15 @@
 	"1.29.0": "0.15.0",
 	"1.29.1": "0.15.0",
 	"1.30.0": "0.15.0",
-	"1.30.1": "0.15.0"
+	"1.30.1": "0.15.0",
+	"1.30.2": "0.15.0",
+	"1.30.3": "0.15.0",
+	"1.30.4": "0.15.0",
+	"1.30.5": "0.15.0",
+	"1.30.6": "0.15.0",
+	"1.30.7": "0.15.0",
+	"1.30.8": "0.15.0",
+	"1.30.9": "0.15.0",
+	"1.30.10": "0.15.0",
+	"1.31.0": "0.15.0"
 }