diff --git a/.env b/.env
index 53204db2..0b1e8cee 100755
--- a/.env
+++ b/.env
@@ -1,5 +1,4 @@
 # Default execution environment for workers
-ORG_ID=Shuffle
 ENVIRONMENT_NAME=Shuffle
 
 # Sanitize liquid.py input
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000..5990d9c6
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/nightly-release.yaml b/.github/workflows/dockerbuild-nightly.yaml
similarity index 73%
rename from .github/workflows/nightly-release.yaml
rename to .github/workflows/dockerbuild-nightly.yaml
index b66f9559..cb7907c6 100644
--- a/.github/workflows/nightly-release.yaml
+++ b/.github/workflows/dockerbuild-nightly.yaml
@@ -1,11 +1,15 @@
-name: Nightly Release
-on:
-  release:
-    types: [published]
-    branches:
-      - main
-      - nightly
+name: nightly-dockerbuild
 
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - nightly
+    paths:
+      - "**"
+      - "!.github/**"
+      - "!**.md"
+      - "!docker-compose.yml"
 jobs:
   main:
     runs-on: ubuntu-latest
@@ -16,28 +20,23 @@ jobs:
         include:
           - app: frontend
             path: frontend
+            version: nightly
             experimental: true
           - app: backend
             path: backend
+            version: nightly
             experimental: true
           - app: orborus
             path: functions/onprem/orborus
+            version: nightly
             experimental: true
           - app: worker
             path: functions/onprem/worker
+            version: nightly
             experimental: true
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      
-      - name: Set version
-        id: set_version
-        run: |
-          if [[ ${{ github.event_name }} == 'release' ]]; then
-            echo "VERSION=${{ github.event.release.tag_name }}" >> $GITHUB_OUTPUT
-          else
-            echo "VERSION=nightly-untagged-latest" >> $GITHUB_OUTPUT
-          fi
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -74,10 +73,10 @@ jobs:
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
           tags: |
-            ghcr.io/shuffle/shuffle-${{ matrix.app }}:${{ steps.set_version.outputs.VERSION }}
-            ${{ secrets.DOCKERHUB_USERNAME }}/shuffle-${{ matrix.app }}:${{ steps.set_version.outputs.VERSION }}
-            frikky/shuffle-${{ matrix.app }}:${{ steps.set_version.outputs.VERSION }}
+            ghcr.io/shuffle/shuffle-${{ matrix.app }}:${{ matrix.version }}
+            ${{ secrets.DOCKERHUB_USERNAME }}/shuffle-${{ matrix.app }}:${{ matrix.version }}
+            frikky/shuffle-${{ matrix.app }}:${{ matrix.version }}
             frikky/shuffle:${{ matrix.app }}
 
       - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
\ No newline at end of file
+        run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/.github/workflows/dockerbuild.yaml b/.github/workflows/dockerbuild.yaml
index a04e87bd..c1e9640c 100644
--- a/.github/workflows/dockerbuild.yaml
+++ b/.github/workflows/dockerbuild.yaml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - nightly
+      - main
     paths:
       - "**"
       - "!.github/**"
@@ -20,19 +20,19 @@ jobs:
         include:
           - app: frontend
             path: frontend
-            version: nightly
+            version: 2.0.2
             experimental: true
           - app: backend
             path: backend
-            version: nightly
+            version: 2.0.2
             experimental: true
           - app: orborus
             path: functions/onprem/orborus
-            version: nightly
+            version: 2.0.2
             experimental: true
           - app: worker
             path: functions/onprem/worker
-            version: nightly
+            version: 2.0.2
             experimental: true
     steps:
       - name: Checkout
@@ -74,6 +74,7 @@ jobs:
           cache-to: type=local,dest=/tmp/.buildx-cache
           tags: |
             ghcr.io/shuffle/shuffle-${{ matrix.app }}:${{ matrix.version }}
+            ghcr.io/shuffle/shuffle-${{ matrix.app }}:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/shuffle-${{ matrix.app }}:${{ matrix.version }}
             frikky/shuffle-${{ matrix.app }}:${{ matrix.version }}
             frikky/shuffle:${{ matrix.app }}
diff --git a/.github/workflows/helm-release.yml b/.github/workflows/helm-release.yml
index e365080e..4c3c6b6f 100644
--- a/.github/workflows/helm-release.yml
+++ b/.github/workflows/helm-release.yml
@@ -33,16 +33,21 @@ jobs:
           sudo apt-get install helm -y --no-install-recommends
 
       - name: Set versions
-        id: set_versions
         run: |
           if [[ ${{ github.event_name }} == 'release' ]]; then
-            CHART_VERSION="${{ github.event.release.tag_name }}"
-            APP_VERSION="${{ github.event.release.tag_name }}"
+            TAG_NAME="${{ github.event.release.tag_name }}"
+
+            # Remove the v prefix
+            VERSION=${TAG_NAME#v}
+
+            APP_VERSION="${VERSION}"
+            CHART_VERSION="${VERSION}"
           else
-            CHART_VERSION="0.0.0-nightly-untagged-latest"
             APP_VERSION="nightly"
+            CHART_VERSION="0.0.0-nightly-untagged-latest"
           fi
 
+          echo "APP_VERSION set to ${APP_VERSION}"
           echo "CHART_VERSION set to ${CHART_VERSION}. Validating..."
 
           # https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string
@@ -55,8 +60,8 @@ jobs:
             exit 1;
           fi
 
-          echo "CHART_VERSION=${CHART_VERSION}" >> $GITHUB_OUTPUT
-          echo "APP_VERSION=${APP_VERSION}" >> $GITHUB_OUTPUT
+          echo "CHART_VERSION=${CHART_VERSION}" >> "$GITHUB_ENV"
+          echo "APP_VERSION=${APP_VERSION}" >> "$GITHUB_ENV"
 
       - name: Update helm dependencies
         run: helm dependency update ./functions/kubernetes/charts/shuffle
@@ -68,4 +73,4 @@ jobs:
         run: helm registry login ghcr.io --username ${{ github.actor }} --password ${{ secrets.GITHUB_TOKEN }}
 
       - name: Push helm chart
-        run: helm push ./functions/kubernetes/charts/shuffle-*.tgz oci://ghcr.io/shuffle/shuffle/charts
+        run: helm push ./functions/kubernetes/charts/shuffle-*.tgz oci://ghcr.io/shuffle/charts
diff --git a/.github/workflows/project_automation.yml b/.github/workflows/project_automation.yml
deleted file mode 100644
index 0e3bf945..00000000
--- a/.github/workflows/project_automation.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Automation - Add all new issues to roadmap project
-
-on:
-  issues:
-    types:
-      - opened
-
-jobs:
-  add-to-project:
-    name: Add issue to project
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/add-to-project@v0.5.0
-        with:
-          project-url: https://github.com/orgs/Shuffle/projects/8
-          github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
diff --git a/.github/workflows/quick-testing.yml b/.github/workflows/quick-testing.yml
index 6bf468d0..cf35967a 100644
--- a/.github/workflows/quick-testing.yml
+++ b/.github/workflows/quick-testing.yml
@@ -14,16 +14,21 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         architecture: [x64, arm64]
-
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
-    
+
+    - name: Install Docker Compose
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y docker-compose
+        docker-compose --version
+
     - name: Set up opensearch directory
       run: chmod -R 777 shuffle-database
 
     - name: Build the stack
-      run: docker-compose up -d
+      run: docker compose up -d
 
     - name: Wait for 30 seconds
       run: sleep 30
@@ -55,7 +60,6 @@ jobs:
           echo "The word 'Shuffle' was not found in the response."
           exit 1
         fi
-
     - name: Register a user and check the status code
       run: |
         MAX_RETRIES=30
@@ -96,31 +100,36 @@ jobs:
         echo "User registration failed after $MAX_RETRIES attempts."
         exit 1
 
+    - name: Run Selenium testing for frontend
+      run: |
+        cd $GITHUB_WORKSPACE/frontend
+        # write some log to see the current directory
+        chmod +x frontend-testing.sh
+        ./frontend-testing.sh
+
     - name: Get the API key and run a health check
+      id: health_check
       run: |
         RESPONSE=$(curl -s -k -u admin:StrongShufflePassword321! 'https://localhost:9200/users/_search')
+        echo "Raw Response: $RESPONSE"
+
         API_KEY=$(echo "$RESPONSE" | jq -r '.hits.hits[0]._source.apikey')
-        if [ -n "$API_KEY" ]; then
+        if [ -n "$API_KEY" ] && [ "$API_KEY" != "null" ]; then
           echo "Admin API key: $API_KEY"
+          echo "API_KEY=$API_KEY" >> $GITHUB_ENV
         else
           echo "Failed to retrieve the API key for the admin user."
           exit 1
         fi
 
+        echo "Waiting 1 minute before sending the health API request..."
+        sleep 60
+
+        echo "Checking health API..."
         HEALTH_RESPONSE=$(curl -s 'http://localhost:3001/api/v1/health?force=true' \
-          -H 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7' \
-          -H 'Accept-Language: en-US,en;q=0.9' \
-          -H 'Connection: keep-alive' \
-          -H 'Sec-Fetch-Dest: document' \
-          -H 'Sec-Fetch-Mode: navigate' \
-          -H 'Sec-Fetch-Site: none' \
-          -H "Authorization: Bearer $API_KEY" \
-          -H 'Sec-Fetch-User: ?1' \
-          -H 'Upgrade-Insecure-Requests: 1' \
-          -H 'User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36' \
-          -H 'sec-ch-ua: "Chromium";v="124", "Google Chrome";v="124", "Not-A.Brand";v="99"' \
-          -H 'sec-ch-ua-mobile: ?0' \
-          -H 'sec-ch-ua-platform: "macOS"')
+          -H "Authorization: Bearer $API_KEY")
+
+        echo "Health API Response: $HEALTH_RESPONSE"
 
         WORKFLOWS_CREATE=$(echo "$HEALTH_RESPONSE" | jq -r '.workflows.create')
         WORKFLOWS_RUN=$(echo "$HEALTH_RESPONSE" | jq -r '.workflows.run')
@@ -128,9 +137,35 @@ jobs:
         WORKFLOWS_RUN_STATUS=$(echo "$HEALTH_RESPONSE" | jq -r '.workflows.run_status')
         WORKFLOWS_DELETE=$(echo "$HEALTH_RESPONSE" | jq -r '.workflows.delete')
 
+        echo "WORKFLOWS_CREATE: $WORKFLOWS_CREATE"
+        echo "WORKFLOWS_RUN: $WORKFLOWS_RUN"
+        echo "WORKFLOWS_RUN_FINISHED: $WORKFLOWS_RUN_FINISHED"
+        echo "WORKFLOWS_RUN_STATUS: $WORKFLOWS_RUN_STATUS"
+        echo "WORKFLOWS_DELETE: $WORKFLOWS_DELETE"
+
         if [ "$WORKFLOWS_CREATE" = "true" ] && [ "$WORKFLOWS_RUN" = "true" ] && [ "$WORKFLOWS_RUN_FINISHED" = "true" ] && [ "$WORKFLOWS_RUN_STATUS" = "FINISHED" ] && [ "$WORKFLOWS_DELETE" = "true" ]; then
           echo "Health endpoint check was successful."
+          exit 0
         else
-          echo "Health endpoint check failed. Response did not meet expected criteria."
+          echo "Health check failed."
           exit 1
         fi
+
+  notify:
+    needs: build
+    if: failure()
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send Twilio Alert
+        run: |
+          WORKFLOW_URL="https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+          MESSAGE="🚨 Shuffle Workflow Failed!
+          Repository: ${{ github.repository }}
+          Branch: ${{ github.ref_name }}
+          Workflow URL: $WORKFLOW_URL"
+          
+          curl -s -X POST https://api.twilio.com/2010-04-01/Accounts/${{ secrets.TWILIO_ACCOUNT_SID }}/Messages.json \
+              --data-urlencode "To=${{ secrets.TWILIO_TO_NUMBER }}" \
+              --data-urlencode "From=${{ secrets.TWILIO_FROM_NUMBER }}" \
+              --data-urlencode "Body=$MESSAGE" \
+              -u "${{ secrets.TWILIO_ACCOUNT_SID }}:${{ secrets.TWILIO_AUTH_TOKEN }}" > /dev/null
diff --git a/.github/workflows/snyk-container-analysis.yml b/.github/workflows/snyk-container-analysis.yml
deleted file mode 100755
index f9a406b2..00000000
--- a/.github/workflows/snyk-container-analysis.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-# A sample workflow which checks out the code, builds a container
-# image using Docker and scans that image for vulnerabilities using
-# Snyk. The results are then uploaded to GitHub Security Code Scanning
-#
-# For more examples, including how to limit scans to only high-severity
-# issues, monitor images for newly disclosed vulnerabilities in Snyk and
-# fail PR checks for new vulnerabilities, see https://github.com/snyk/actions/
-
-name: Snyk Container
-
-on:
-  push:
-    branches: 
-      - launch 
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: 
-      - master
-      - launch 
-  schedule:
-    - cron: '18 4 * * 3'
-
-jobs:
-  snyk:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - name: Build a Docker image
-      run: docker build -t frontend .
-
-    - name: Run Snyk to check Docker image for vulnerabilities
-      # Snyk can be used to break the build when it detects vulnerabilities.
-      # In this case we want to upload the issues to GitHub Code Scanning
-      continue-on-error: true
-      uses: snyk/actions/docker@master
-      env:
-        # In order to use the Snyk Action you will need to have a Snyk API token.
-        # More details in https://github.com/snyk/actions#getting-your-snyk-token
-        # or you can signup for free at https://snyk.io/login
-        SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
-      with:
-        image: your/image-to-test
-        args: --file=Dockerfile
-
-    - name: Upload result to GitHub Code Scanning
-      uses: github/codeql-action/upload-sarif@v1
-      with:
-        sarif_file: snyk.sarif
diff --git a/.github/workflows/snyk-infrastructure-analysis.yml b/.github/workflows/snyk-infrastructure-analysis.yml
deleted file mode 100755
index 4402487d..00000000
--- a/.github/workflows/snyk-infrastructure-analysis.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-# A sample workflow which checks out your Infrastructure as Code Configuration files,
-# such as Kubernetes, Helm & Terraform and scans them for any security issues.
-# The results are then uploaded to GitHub Security Code Scanning
-#
-# For more examples, including how to limit scans to only high-severity issues
-# and fail PR checks, see https://github.com/snyk/actions/
-
-name: Snyk Infrastructure as Code
-
-on:
-  push:
-    branches: 
-      - master
-      - launch 
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches:
-      - master
-      - launch 
-  schedule:
-    - cron: '41 16 * * 2'
-
-jobs:
-  snyk:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Run Snyk to check configuration files for security issues
-        # Snyk can be used to break the build when it detects security issues.
-        # In this case we want to upload the issues to GitHub Code Scanning
-        continue-on-error: true
-        uses: snyk/actions/iac@master
-        env:
-          # In order to use the Snyk Action you will need to have a Snyk API token.
-          # More details in https://github.com/snyk/actions#getting-your-snyk-token
-          # or you can signup for free at https://snyk.io/login
-          SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
-        with:
-          # Add the path to the configuration file that you would like to test.
-          # For example `deployment.yaml` for a Kubernetes deployment manifest
-          # or `main.tf` for a Terraform configuration file
-          file: your-file-to-test.yaml
-      - name: Upload result to GitHub Code Scanning
-        uses: github/codeql-action/upload-sarif@v1
-        with:
-          sarif_file: snyk.sarif
diff --git a/backend/Dockerfile b/backend/Dockerfile
index 7cab5e27..9e27ffbe 100755
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22 as builder
+FROM golang:1.24 as builder
 
 # Add files
 RUN mkdir /app
@@ -14,9 +14,8 @@ ADD ./go-app/go.mod /app
 RUN wget -O /app_sdk/app_base.py https://raw.githubusercontent.com/Shuffle/app_sdk/refs/heads/main/shuffle_sdk/shuffle_sdk.py
 ADD ./app_gen /app_gen
 
-RUN go get -v
-#RUN go mod tidy
-#RUN go clean -modcache
+RUN go mod download
+RUN go mod tidy
 
 # From November 2022, CGO is enabled due to packages
 # that we use requiring it. This is a temporary fix
diff --git a/backend/app_gen/openapi/baseline/requirements.txt b/backend/app_gen/openapi/baseline/requirements.txt
index dfad3eb9..c0d2f96f 100755
--- a/backend/app_gen/openapi/baseline/requirements.txt
+++ b/backend/app_gen/openapi/baseline/requirements.txt
@@ -1,3 +1,11 @@
 # No extra requirements needed
-requests
-urllib3
+requests==2.32.3
+urllib3==2.3.0
+liquidpy==0.8.2
+MarkupSafe==3.0.2
+flask[async]==3.1.0
+python-dateutil==2.9.0.post0
+PyJWT==2.10.1
+cryptography==44.0.2
+shufflepy==0.1.0
+shuffle-sdk==0.0.25
diff --git a/backend/app_sdk/requirements.txt b/backend/app_sdk/requirements.txt
deleted file mode 100644
index 2dfbed0d..00000000
--- a/backend/app_sdk/requirements.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-urllib3==1.26.19
-requests==2.31.0
-MarkupSafe==2.0.1
-liquidpy==0.8.1
-flask[async]==2.0.2
-waitress==2.1.0
-#flask==1.1.2
-python-dateutil==2.8.1
-
diff --git a/backend/go-app/docker.go b/backend/go-app/docker.go
index 57d4aaf8..b7ee7e6d 100755
--- a/backend/go-app/docker.go
+++ b/backend/go-app/docker.go
@@ -211,7 +211,7 @@ func fixTags(tags []string) []string {
 func buildImageMemory(fs billy.Filesystem, tags []string, dockerfileFolder string, downloadIfFail bool) error {
 	ctx := context.Background()
 	client, err := client.NewEnvClient()
-        defer client.Close()
+	defer client.Close()
 	if err != nil {
 		log.Printf("Unable to create docker client: %s", err)
 		return err
@@ -473,73 +473,84 @@ func buildImage(tags []string, dockerfileLocation string) error {
 				}
 			}
 		}
-	} else {
-
-		ctx := context.Background()
-		client, err := client.NewEnvClient()
-                defer client.Close()
-		if err != nil {
-			log.Printf("Unable to create docker client: %s", err)
-			return err
-		}
-
-		log.Printf("[INFO] Docker Tags: %s", tags)
-		dockerfileSplit := strings.Split(dockerfileLocation, "/")
-
-		// Create a buffer
-		buf := new(bytes.Buffer)
-		tw := tar.NewWriter(buf)
-		defer tw.Close()
-		baseDir := strings.Join(dockerfileSplit[0:len(dockerfileSplit)-1], "/")
-
-		// Builds the entire folder into buf
-		err = getParsedTar(tw, baseDir, "")
-		if err != nil {
-			log.Printf("Tar issue: %s", err)
-		}
-
-		dockerFileTarReader := bytes.NewReader(buf.Bytes())
-		buildOptions := types.ImageBuildOptions{
-			Remove:    true,
-			Tags:      tags,
-			BuildArgs: map[string]*string{},
-		}
-		//NetworkMode: "host",
-
-		httpProxy := os.Getenv("HTTP_PROXY")
-		if len(httpProxy) > 0 {
-			buildOptions.BuildArgs["HTTP_PROXY"] = &httpProxy
-		}
-		httpsProxy := os.Getenv("HTTPS_PROXY")
-		if len(httpProxy) > 0 {
-			buildOptions.BuildArgs["https_proxy"] = &httpsProxy
-		}
-
-		// Build the actual image
-		imageBuildResponse, err := client.ImageBuild(
-			ctx,
-			dockerFileTarReader,
-			buildOptions,
-		)
-
-		if err != nil {
-			return err
-		}
-
-		// Read the STDOUT from the build process
-		defer imageBuildResponse.Body.Close()
-		buildBuf := new(strings.Builder)
-		_, err = io.Copy(buildBuf, imageBuildResponse.Body)
-		if err != nil {
-			return err
-		} else {
-			if strings.Contains(buildBuf.String(), "errorDetail") {
-				log.Printf("[ERROR] Docker build:\n%s\nERROR ABOVE: Trying to pull tags from: %s", buildBuf.String(), strings.Join(tags, "\n"))
-				return errors.New(fmt.Sprintf("Failed building %s. Check backend logs for details. Most likely means you have an old version of Docker.", strings.Join(tags, ",")))
-			}
-		}
 
+		return nil
 	}
+
+	ctx := context.Background()
+	client, err := client.NewEnvClient()
+	defer client.Close()
+	if err != nil {
+		log.Printf("Unable to create docker client: %s", err)
+		return err
+	}
+
+	log.Printf("[INFO] Docker Tags: %s", tags)
+	dockerfileSplit := strings.Split(dockerfileLocation, "/")
+
+	// Create a buffer
+	buf := new(bytes.Buffer)
+	tw := tar.NewWriter(buf)
+	defer tw.Close()
+	baseDir := strings.Join(dockerfileSplit[0:len(dockerfileSplit)-1], "/")
+
+	// Builds the entire folder into buf
+	err = getParsedTar(tw, baseDir, "")
+	if err != nil {
+		log.Printf("[ERROR] Tar issue during app build: %s", err)
+	}
+
+	dockerFileTarReader := bytes.NewReader(buf.Bytes())
+	buildOptions := types.ImageBuildOptions{
+		Remove:    true,
+		Tags:      tags,
+		BuildArgs: map[string]*string{},
+	}
+	//NetworkMode: "host",
+
+	httpProxy := os.Getenv("HTTP_PROXY")
+	if len(httpProxy) > 0 {
+		buildOptions.BuildArgs["HTTP_PROXY"] = &httpProxy
+	}
+	httpsProxy := os.Getenv("HTTPS_PROXY")
+	if len(httpProxy) > 0 {
+		buildOptions.BuildArgs["https_proxy"] = &httpsProxy
+	}
+
+	// Print the actual file content from dockerFileTarReader
+	/*
+		data, err := ioutil.ReadAll(dockerFileTarReader)
+		if err != nil {
+			log.Printf("[ERROR] Failed reading Dockerfile TAR reader: %s", err)
+		} else {
+			log.Printf("[DEBUG] Dockerfile TAR reader content: %s", string(data))
+		}
+	*/
+
+	// Build the actual image
+	imageBuildResponse, err := client.ImageBuild(
+		ctx,
+		dockerFileTarReader,
+		buildOptions,
+	)
+
+	if err != nil {
+		return err
+	}
+
+	// Read the STDOUT from the build process
+	defer imageBuildResponse.Body.Close()
+	buildBuf := new(strings.Builder)
+	_, err = io.Copy(buildBuf, imageBuildResponse.Body)
+	if err != nil {
+		return err
+	} else {
+		if strings.Contains(buildBuf.String(), "errorDetail") {
+			log.Printf("[ERROR] Docker build:\n%s\nERROR ABOVE: Trying to pull tags from: %s", buildBuf.String(), strings.Join(tags, "\n"))
+			return errors.New(fmt.Sprintf("Failed building %s. Check backend logs for details. Most likely means you have an old version of Docker.", strings.Join(tags, ",")))
+		}
+	}
+
 	return nil
 }
 
@@ -604,11 +615,27 @@ func getDockerImage(resp http.ResponseWriter, request *http.Request) {
 	//	return
 	//}
 
-	body, err := ioutil.ReadAll(request.Body)
-	if err != nil {
-		resp.WriteHeader(401)
-		resp.Write([]byte(`{"success": false, "reason": "Failed reading body"}`))
-		return
+	var err error
+	body := []byte{}
+	//log.Printf("IMAGE REQUEST BODY: %#v", request.Body)
+	if request.Body == nil || request.Body == http.NoBody {
+		// Check for the image query, otherwise we skip everything
+		imageQuery := request.URL.Query().Get("image")
+		if len(imageQuery) == 0 {
+			resp.WriteHeader(400)
+			resp.Write([]byte(`{"success": false, "reason": "No image query found"}`))
+			return
+		}
+
+		body = []byte(fmt.Sprintf(`{"name": "%s"}`, imageQuery))
+
+	} else {
+		body, err = ioutil.ReadAll(request.Body)
+		if err != nil {
+			resp.WriteHeader(400)
+			resp.Write([]byte(`{"success": false, "reason": "Failed reading body"}`))
+			return
+		}
 	}
 
 	// This has to be done in a weird way because Datastore doesn't
@@ -630,28 +657,48 @@ func getDockerImage(resp http.ResponseWriter, request *http.Request) {
 		return
 	}
 
+	img := image.Summary{}
+	img2 := image.Summary{}
+	tagFound := ""
+	tagFound2 := ""
+
+	// Old way of doing it
+	//alternativeNameSplit := strings.Split(version.Name, "/")
+	//alternativeName := version.Name
+	//if len(alternativeNameSplit) == 3 {
+	//	alternativeName = strings.Join(alternativeNameSplit[1:3], "/")
+	//}
+
+	appname, baseAppname, appnameSplit2, err := shuffle.GetAppNameSplit(version)
+	if err != nil {
+		log.Printf("[ERROR] Failed getting appname split: %s", err)
+		resp.WriteHeader(500)
+		resp.Write([]byte(fmt.Sprintf(`{"success": false, "message": "Couldn't get the right docker image name"}`)))
+		return
+	}
+
+	if len(version.Name) == 0 {
+		log.Printf("[ERROR] No image name provided for download: %s", version.Name)
+		resp.WriteHeader(401)
+		resp.Write([]byte(fmt.Sprintf(`{"success": false, "message": "No image name"}`)))
+		return
+
+	}
+
+	log.Printf("[INFO] Trying to download image: '%s'. Appname: '%s'. BaseAppname: '%s', Split2: %s", version.Name, appname, baseAppname, appnameSplit2)
+
+	alternativeName := appname
 	ctx := context.Background()
 	images, err := dockercli.ImageList(ctx, image.ListOptions{
 		All: true,
 	})
 
-	img := image.Summary{}
-	tagFound := ""
-
-	img2 := image.Summary{}
-	tagFound2 := ""
-
-	alternativeNameSplit := strings.Split(version.Name, "/")
-	alternativeName := version.Name
-	if len(alternativeNameSplit) == 3 {
-		alternativeName = strings.Join(alternativeNameSplit[1:3], "/")
-	}
-
-	log.Printf("[INFO] Trying to download image: %s. Alt: %s", version.Name, alternativeName)
-
 	for _, image := range images {
 		for _, tag := range image.RepoTags {
-			//log.Printf("[DEBUG] Tag: %s", tag)
+			if strings.Contains(tag, "<none>") {
+				continue
+			}
+
 			if strings.ToLower(tag) == strings.ToLower(version.Name) {
 				img = image
 				tagFound = tag
@@ -834,7 +881,7 @@ func handleRemoteDownloadApp(resp http.ResponseWriter, ctx context.Context, user
 		type tmpapp struct {
 			Success bool   `json:"success"`
 			OpenAPI string `json:"openapi"`
-			App 	string `json:"app"`
+			App     string `json:"app"`
 		}
 
 		app := tmpapp{}
@@ -984,11 +1031,4 @@ func activateWorkflowAppDocker(resp http.ResponseWriter, request *http.Request)
 
 	log.Printf("[INFO] User %s (%s) is activating %s. Public: %t, Shared: %t", user.Username, user.Id, app.Name, app.Public, app.Sharing)
 	buildSwaggerApp(resp, []byte(openApiApp.Body), user, true)
-
-	//app.Active = true
-	//app.Generated = true
-	//app, err := shuffle.SetApp(ctx, app)
-
-	//resp.WriteHeader(200)
-	//resp.Write([]byte(`{"success": true}`))
 }
diff --git a/backend/go-app/go.mod b/backend/go-app/go.mod
index 6b3c8108..aeb3e7e0 100644
--- a/backend/go-app/go.mod
+++ b/backend/go-app/go.mod
@@ -1,91 +1,109 @@
 module shuffle
 
-go 1.22.2
+go 1.24.0
 
+toolchain go1.24.3
+
+//replace github.com/frikky/schemaless => ../../../schemaless
 //replace github.com/shuffle/shuffle-shared => ../../../shuffle-shared
 
+//replace github.com/frikky/kin-openapi => ../../../../git/kin-openapi
+
 require (
-	cloud.google.com/go/datastore v1.15.0
-	cloud.google.com/go/storage v1.40.0
+	cloud.google.com/go/datastore v1.20.0
+	cloud.google.com/go/storage v1.55.0
 	github.com/basgys/goxml2json v1.1.0
 	github.com/carlescere/scheduler v0.0.0-20170109141437-ee74d2f83d82
-	github.com/docker/docker v27.5.0+incompatible
+	github.com/docker/docker v28.2.2+incompatible
 	github.com/frikky/kin-openapi v0.42.0
-	github.com/fsouza/go-dockerclient v1.11.0
+	github.com/fsouza/go-dockerclient v1.12.1
 	github.com/ghodss/yaml v1.0.0
-	github.com/go-git/go-billy/v5 v5.6.0
-	github.com/go-git/go-git/v5 v5.13.0
+	github.com/go-git/go-billy/v5 v5.6.2
+	github.com/go-git/go-git/v5 v5.16.1
 	github.com/gorilla/mux v1.8.1
 	github.com/h2non/filetype v1.1.3
 	github.com/satori/go.uuid v1.2.0
-	github.com/shuffle/shuffle-shared v0.8.0
-	golang.org/x/crypto v0.31.0
-	google.golang.org/api v0.176.1
-	google.golang.org/grpc v1.68.1
-	gopkg.in/src-d/go-git.v4 v4.13.1
+	github.com/shuffle/shuffle-shared v0.8.84
+	golang.org/x/crypto v0.38.0
+	google.golang.org/api v0.236.0
+	google.golang.org/grpc v1.72.2
 	gopkg.in/yaml.v3 v3.0.1
-	k8s.io/api v0.30.2
-	k8s.io/apimachinery v0.30.2
-	k8s.io/client-go v0.30.2
+	k8s.io/api v0.33.1
+	k8s.io/apimachinery v0.33.1
+	k8s.io/client-go v0.33.1
 )
 
 require (
-	cloud.google.com/go v0.112.1 // indirect
-	cloud.google.com/go/auth v0.3.0 // indirect
-	cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
-	cloud.google.com/go/compute/metadata v0.5.0 // indirect
-	cloud.google.com/go/iam v1.1.7 // indirect
-	cloud.google.com/go/scheduler v1.10.6 // indirect
+	cel.dev/expr v0.20.0 // indirect
+	cloud.google.com/go v0.121.1 // indirect
+	cloud.google.com/go/auth v0.16.1 // indirect
+	cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
+	cloud.google.com/go/compute/metadata v0.7.0 // indirect
+	cloud.google.com/go/iam v1.5.2 // indirect
+	cloud.google.com/go/monitoring v1.24.2 // indirect
+	cloud.google.com/go/scheduler v1.11.7 // indirect
 	dario.cat/mergo v1.0.0 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect
 	github.com/Masterminds/semver v1.5.0 // indirect
-	github.com/Microsoft/go-winio v0.6.1 // indirect
-	github.com/ProtonMail/go-crypto v1.1.3 // indirect
-	github.com/adrg/strutil v0.2.3 // indirect
-	github.com/algolia/algoliasearch-client-go/v3 v3.18.1 // indirect
+	github.com/Microsoft/go-winio v0.6.2 // indirect
+	github.com/ProtonMail/go-crypto v1.1.6 // indirect
+	github.com/adrg/strutil v0.3.1 // indirect
+	github.com/algolia/algoliasearch-client-go/v3 v3.31.4 // indirect
 	github.com/bitly/go-simplejson v0.5.1 // indirect
-	github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874 // indirect
+	github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf // indirect
 	github.com/bradfitz/slice v0.0.0-20180809154707-2b758aa73013 // indirect
-	github.com/cloudflare/circl v1.3.7 // indirect
-	github.com/containerd/containerd v1.6.26 // indirect
+	github.com/cenkalti/backoff/v5 v5.0.2 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/cloudflare/circl v1.6.1 // indirect
+	github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 // indirect
+	github.com/containerd/errdefs v1.0.0 // indirect
+	github.com/containerd/errdefs/pkg v0.3.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
-	github.com/cyphar/filepath-securejoin v0.2.5 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/cyphar/filepath-securejoin v0.4.1 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/distribution/reference v0.6.0 // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
+	github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
+	github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/frikky/schemaless v0.0.13 // indirect
+	github.com/frikky/schemaless v0.0.16 // indirect
+	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
+	github.com/go-jose/go-jose/v4 v4.0.5 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/swag v0.22.3 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/gnostic-models v0.6.8 // indirect
+	github.com/google/gnostic-models v0.6.9 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/go-github/v28 v28.1.1 // indirect
-	github.com/google/go-querystring v1.0.0 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/s2a-go v0.1.7 // indirect
+	github.com/google/go-querystring v1.1.0 // indirect
+	github.com/google/s2a-go v0.1.9 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
-	github.com/googleapis/gax-go/v2 v2.12.3 // indirect
-	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
+	github.com/googleapis/gax-go/v2 v2.14.2 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
-	github.com/klauspost/compress v1.15.9 // indirect
+	github.com/klauspost/compress v1.18.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
+	github.com/moby/go-archive v0.1.0 // indirect
 	github.com/moby/patternmatcher v0.6.0 // indirect
-	github.com/moby/sys/sequential v0.5.0 // indirect
-	github.com/moby/sys/user v0.1.0 // indirect
+	github.com/moby/sys/sequential v0.6.0 // indirect
+	github.com/moby/sys/user v0.4.0 // indirect
 	github.com/moby/sys/userns v0.1.0 // indirect
 	github.com/moby/term v0.5.2 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -93,51 +111,58 @@ require (
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.1.0 // indirect
+	github.com/opencontainers/image-spec v1.1.1 // indirect
 	github.com/opensearch-project/opensearch-go v1.1.0 // indirect
 	github.com/opensearch-project/opensearch-go/v2 v2.3.0 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
-	github.com/pjbgf/sha1cd v0.3.0 // indirect
+	github.com/pjbgf/sha1cd v0.3.2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/sashabaranov/go-openai v1.19.2 // indirect
+	github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
+	github.com/sashabaranov/go-openai v1.40.1 // indirect
 	github.com/sendgrid/rest v2.6.9+incompatible // indirect
-	github.com/sendgrid/sendgrid-go v3.14.0+incompatible // indirect
+	github.com/sendgrid/sendgrid-go v3.16.1+incompatible // indirect
 	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/skeema/knownhosts v1.3.0 // indirect
+	github.com/skeema/knownhosts v1.3.1 // indirect
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/src-d/gcfg v1.4.0 // indirect
+	github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
+	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
-	go.opencensus.io v0.24.0 // indirect
+	github.com/zeebo/errs v1.4.0 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
-	go.opentelemetry.io/otel v1.33.0 // indirect
-	go.opentelemetry.io/otel/metric v1.33.0 // indirect
-	go.opentelemetry.io/otel/trace v1.33.0 // indirect
-	go4.org v0.0.0-20201209231011-d4a079459e60 // indirect
-	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/net v0.33.0 // indirect
-	golang.org/x/oauth2 v0.19.0 // indirect
-	golang.org/x/sync v0.10.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
-	golang.org/x/term v0.27.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
+	go.opentelemetry.io/contrib/detectors/gcp v1.36.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
+	go.opentelemetry.io/otel v1.36.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
+	go.opentelemetry.io/otel/metric v1.36.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.36.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
+	go.opentelemetry.io/otel/trace v1.36.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.5.0 // indirect
+	go4.org v0.0.0-20230225012048-214862532bf5 // indirect
+	golang.org/x/net v0.40.0 // indirect
+	golang.org/x/oauth2 v0.30.0 // indirect
+	golang.org/x/sync v0.14.0 // indirect
+	golang.org/x/sys v0.33.0 // indirect
+	golang.org/x/term v0.32.0 // indirect
+	golang.org/x/text v0.25.0 // indirect
+	golang.org/x/time v0.11.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
-	google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
-	google.golang.org/protobuf v1.35.2 // indirect
+	google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
+	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	k8s.io/klog/v2 v2.120.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
-	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
-	sigs.k8s.io/yaml v1.3.0 // indirect
+	k8s.io/klog/v2 v2.130.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
+	k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
+	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
+	sigs.k8s.io/randfill v1.0.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
 )
diff --git a/backend/go-app/go.sum b/backend/go-app/go.sum
index 334170e4..098db5c0 100644
--- a/backend/go-app/go.sum
+++ b/backend/go-app/go.sum
@@ -1,3 +1,5 @@
+cel.dev/expr v0.20.0 h1:OunBvVCfvpWlt4dN7zg3FM6TDkzOePe1+foGJ9AXeeI=
+cel.dev/expr v0.20.0/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
@@ -7,58 +9,65 @@ cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTj
 cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
 cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
 cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
-cloud.google.com/go v0.112.1 h1:uJSeirPke5UNZHIb4SxfZklVSiWWVqW4oXlETwZziwM=
-cloud.google.com/go v0.112.1/go.mod h1:+Vbu+Y1UU+I1rjmzeMOb/8RfkKJK2Gyxi1X6jJCZLo4=
-cloud.google.com/go/auth v0.3.0 h1:PRyzEpGfx/Z9e8+lHsbkoUVXD0gnu4MNmm7Gp8TQNIs=
-cloud.google.com/go/auth v0.3.0/go.mod h1:lBv6NKTWp8E3LPzmO1TbiiRKc4drLOfHsgmlH9ogv5w=
-cloud.google.com/go/auth/oauth2adapt v0.2.2 h1:+TTV8aXpjeChS9M+aTtN/TjdQnzJvmzKFt//oWu7HX4=
-cloud.google.com/go/auth/oauth2adapt v0.2.2/go.mod h1:wcYjgpZI9+Yu7LyYBg4pqSiaRkfEK3GQcpb7C/uyF1Q=
+cloud.google.com/go v0.121.1 h1:S3kTQSydxmu1JfLRLpKtxRPA7rSrYPRPEUmL/PavVUw=
+cloud.google.com/go v0.121.1/go.mod h1:nRFlrHq39MNVWu+zESP2PosMWA0ryJw8KUBZ2iZpxbw=
+cloud.google.com/go/auth v0.16.1 h1:XrXauHMd30LhQYVRHLGvJiYeczweKQXZxsTbV9TiguU=
+cloud.google.com/go/auth v0.16.1/go.mod h1:1howDHJ5IETh/LwYs3ZxvlkXF48aSqqJUM+5o02dNOI=
+cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc=
+cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
-cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc=
-cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
-cloud.google.com/go/compute/metadata v0.5.0 h1:Zr0eK8JbFv6+Wi4ilXAR8FJ3wyNdpxHKJNPos6LTZOY=
-cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY=
+cloud.google.com/go/compute/metadata v0.7.0 h1:PBWF+iiAerVNe8UCHxdOt6eHLVc3ydFeOCw78U8ytSU=
+cloud.google.com/go/compute/metadata v0.7.0/go.mod h1:j5MvL9PprKL39t166CoB1uVHfQMs4tFQZZcKwksXUjo=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
-cloud.google.com/go/datastore v1.15.0 h1:0P9WcsQeTWjuD1H14JIY7XQscIPQ4Laje8ti96IC5vg=
-cloud.google.com/go/datastore v1.15.0/go.mod h1:GAeStMBIt9bPS7jMJA85kgkpsMkvseWWXiaHya9Jes8=
-cloud.google.com/go/iam v1.1.7 h1:z4VHOhwKLF/+UYXAJDFwGtNF0b6gjsW1Pk9Ml0U/IoM=
-cloud.google.com/go/iam v1.1.7/go.mod h1:J4PMPg8TtyurAUvSmPj8FF3EDgY1SPRZxcUGrn7WXGA=
+cloud.google.com/go/datastore v1.20.0 h1:NNpXoyEqIJmZFc0ACcwBEaXnmscUpcG4NkKnbCePmiM=
+cloud.google.com/go/datastore v1.20.0/go.mod h1:uFo3e+aEpRfHgtp5pp0+6M0o147KoPaYNaPAKpfh8Ew=
+cloud.google.com/go/iam v1.5.2 h1:qgFRAGEmd8z6dJ/qyEchAuL9jpswyODjA2lS+w234g8=
+cloud.google.com/go/iam v1.5.2/go.mod h1:SE1vg0N81zQqLzQEwxL2WI6yhetBdbNQuTvIKCSkUHE=
+cloud.google.com/go/logging v1.13.0 h1:7j0HgAp0B94o1YRDqiqm26w4q1rDMH7XNRU34lJXHYc=
+cloud.google.com/go/logging v1.13.0/go.mod h1:36CoKh6KA/M0PbhPKMq6/qety2DCAErbhXT62TuXALA=
+cloud.google.com/go/longrunning v0.6.7 h1:IGtfDWHhQCgCjwQjV9iiLnUta9LBCo8R9QmAFsS/PrE=
+cloud.google.com/go/longrunning v0.6.7/go.mod h1:EAFV3IZAKmM56TyiE6VAP3VoTzhZzySwI/YI1s/nRsY=
+cloud.google.com/go/monitoring v1.24.2 h1:5OTsoJ1dXYIiMiuL+sYscLc9BumrL3CarVLL7dd7lHM=
+cloud.google.com/go/monitoring v1.24.2/go.mod h1:x7yzPWcgDRnPEv3sI+jJGBkwl5qINf+6qY4eq0I9B4U=
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
-cloud.google.com/go/scheduler v1.10.6 h1:5U8iXLoQ03qOB+ZXlAecU7fiE33+u3QiM9nh4cd0eTE=
-cloud.google.com/go/scheduler v1.10.6/go.mod h1:pe2pNCtJ+R01E06XCDOJs1XvAMbv28ZsQEbqknxGOuE=
+cloud.google.com/go/scheduler v1.11.7 h1:zkMEJ0UbEJ3O7NwEUlKLIp6eXYv1L7wHjbxyxznajKM=
+cloud.google.com/go/scheduler v1.11.7/go.mod h1:gqYs8ndLx2M5D0oMJh48aGS630YYvC432tHCnVWN13s=
 cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
 cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
-cloud.google.com/go/storage v1.40.0 h1:VEpDQV5CJxFmJ6ueWNsKxcr1QAYOXEgxDa+sBbJahPw=
-cloud.google.com/go/storage v1.40.0/go.mod h1:Rrj7/hKlG87BLqDJYtwR0fbPld8uJPbQ2ucUMY7Ir0g=
+cloud.google.com/go/storage v1.55.0 h1:NESjdAToN9u1tmhVqhXCaCwYBuvEhZLLv0gBr+2znf0=
+cloud.google.com/go/storage v1.55.0/go.mod h1:ztSmTTwzsdXe5syLVS0YsbFxXuvEmEyZj7v7zChEmuY=
+cloud.google.com/go/trace v1.11.6 h1:2O2zjPzqPYAHrn3OKl029qlqG6W8ZdYaOWRyr8NgMT4=
+cloud.google.com/go/trace v1.11.6/go.mod h1:GA855OeDEBiBMzcckLPE2kDunIpC72N+Pq8WFieFjnI=
 dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
 dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-github.com/AdaLogics/go-fuzz-headers v0.0.0-20210715213245-6c3934b029d8 h1:V8krnnfGj4pV65YLUm3C0/8bl7V5Nry2Pwvy3ru/wLc=
-github.com/AdaLogics/go-fuzz-headers v0.0.0-20210715213245-6c3934b029d8/go.mod h1:CzsSbkDixRphAF5hS6wbMKq0eI6ccJRb7/A0M6JBnwg=
-github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
-github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
+github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 h1:He8afgbRMd7mFxO99hRNu+6tazq8nFF9lIwo9JFroBk=
+github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
 github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEKWjV8V+WSxDXJ4NFATAsZjh8iIbsQIg=
 github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 h1:ErKg/3iS1AKcTkf3yixlZ54f9U1rljCkQyEXWUnIUxc=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0/go.mod h1:yAZHSGnqScoU556rBOVkwLze6WP5N+U11RHuWaGVxwY=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 h1:fYE9p3esPxA/C0rQ0AHhP0drtPXDRhaWiwg1DPqO7IU=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0/go.mod h1:BnBReJLvVYx2CS/UHOgVz2BXKXD9wsQPxZug20nZhd0=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.51.0 h1:OqVGm6Ei3x5+yZmSJG1Mh2NwHvpVmZ08CB5qJhT9Nuk=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.51.0/go.mod h1:SZiPHWGOOk3bl8tkevxkoiwPgsIl6CwrWcbwjfHZpdM=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 h1:6/0iUd0xrnX7qt+mLNRwg5c0PGv8wpE8K90ryANQwMI=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0/go.mod h1:otE2jQekW/PqXk1Awf5lmfokJx4uwuqcj1ab5SpGeW0=
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
 github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
-github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
-github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
-github.com/Microsoft/hcsshim v0.9.10 h1:TxXGNmcbQxBKVWvjvTocNb6jrPyeHlk5EiDhhgHgggs=
-github.com/Microsoft/hcsshim v0.9.10/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc=
-github.com/ProtonMail/go-crypto v1.1.3 h1:nRBOetoydLeUb4nHajyO2bKqMLfWQ/ZPwkXqXxPxCFk=
-github.com/ProtonMail/go-crypto v1.1.3/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
-github.com/adrg/strutil v0.2.3 h1:WZVn3ItPBovFmP4wMHHVXUr8luRaHrbyIuLlHt32GZQ=
-github.com/adrg/strutil v0.2.3/go.mod h1:+SNxbiH6t+O+5SZqIj5n/9i5yUjR+S3XXVrjEcN2mxg=
-github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs=
-github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
-github.com/algolia/algoliasearch-client-go/v3 v3.18.1 h1:FP2Xtqqs/sefR5Qluygp+jVV+juXzEdJaPrZTCDLhDQ=
-github.com/algolia/algoliasearch-client-go/v3 v3.18.1/go.mod h1:i7tLoP7TYDmHX3Q7vkIOL4syVse/k5VJ+k0i8WqFiJk=
-github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
+github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
+github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
+github.com/ProtonMail/go-crypto v1.1.6 h1:ZcV+Ropw6Qn0AX9brlQLAUXfqLBc7Bl+f/DmNxpLfdw=
+github.com/ProtonMail/go-crypto v1.1.6/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
+github.com/adrg/strutil v0.3.1 h1:OLvSS7CSJO8lBii4YmBt8jiK9QOtB9CzCzwl4Ic/Fz4=
+github.com/adrg/strutil v0.3.1/go.mod h1:8h90y18QLrs11IBffcGX3NW/GFBXCMcNg4M7H6MspPA=
+github.com/algolia/algoliasearch-client-go/v3 v3.31.4 h1:UJhx6AhZCYf0qZygDz2c1x1+1q2q2sfzsRaQM6yswWk=
+github.com/algolia/algoliasearch-client-go/v3 v3.31.4/go.mod h1:i7tLoP7TYDmHX3Q7vkIOL4syVse/k5VJ+k0i8WqFiJk=
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
@@ -81,107 +90,115 @@ github.com/basgys/goxml2json v1.1.0 h1:4ln5i4rseYfXNd86lGEB+Vi652IsIXIvggKM/BhUK
 github.com/basgys/goxml2json v1.1.0/go.mod h1:wH7a5Np/Q4QoECFIU8zTQlZwZkrilY0itPfecMw41Dw=
 github.com/bitly/go-simplejson v0.5.1 h1:xgwPbetQScXt1gh9BmoJ6j9JMr3TElvuIyjR8pgdoow=
 github.com/bitly/go-simplejson v0.5.1/go.mod h1:YOPVLzCfwK14b4Sff3oP1AmGhI9T9Vsg84etUnlyp+Q=
-github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874 h1:N7oVaKyGp8bttX0bfZGmcGkjz7DLQXhAn3DNd3T0ous=
-github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874/go.mod h1:r5xuitiExdLAJ09PR7vBVENGvp4ZuTBeWTGtxuX3K+c=
+github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf h1:TqhNAT4zKbTdLa62d2HDBFdvgSbIGB3eJE8HqhgiL9I=
+github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf/go.mod h1:r5xuitiExdLAJ09PR7vBVENGvp4ZuTBeWTGtxuX3K+c=
 github.com/bradfitz/slice v0.0.0-20180809154707-2b758aa73013 h1:/P9/RL0xgWE+ehnCUUN5h3RpG3dmoMCOONO1CCvq23Y=
 github.com/bradfitz/slice v0.0.0-20180809154707-2b758aa73013/go.mod h1:pccXHIvs3TV/TUqSNyEvF99sxjX2r4FFRIyw6TZY9+w=
 github.com/carlescere/scheduler v0.0.0-20170109141437-ee74d2f83d82 h1:9bAydALqAjBfPHd/eAiJBHnMZUYov8m2PkXVr+YGQeI=
 github.com/carlescere/scheduler v0.0.0-20170109141437-ee74d2f83d82/go.mod h1:tyA14J0sA3Hph4dt+AfCjPrYR13+vVodshQSM7km9qw=
-github.com/cenkalti/backoff/v4 v4.1.2 h1:6Yo7N8UP2K6LWZnW94DLVSSrbobcWdVzAYOisuDPIFo=
-github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
+github.com/cenkalti/backoff/v5 v5.0.2 h1:rIfFVxEf1QsI7E1ZHfp/B4DF/6QBAUhmgkxc0H7Zss8=
+github.com/cenkalti/backoff/v5 v5.0.2/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
+github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
-github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
-github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/containerd/containerd v1.6.26 h1:VVfrE6ZpyisvB1fzoY8Vkiq4sy+i5oF4uk7zu03RaHs=
-github.com/containerd/containerd v1.6.26/go.mod h1:I4TRdsdoo5MlKob5khDJS2EPT1l1oMNaE2MBm6FrwxM=
+github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
+github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
+github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 h1:Om6kYQYDUk5wWbT0t0q6pvyM49i9XZAv9dDrkDA7gjk=
+github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
+github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
+github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
+github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE=
+github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk=
 github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
 github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
-github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw=
-github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/cyphar/filepath-securejoin v0.2.5 h1:6iR5tXJ/e6tJZzzdMc1km3Sa7RRIVBKAK32O2s7AYfo=
-github.com/cyphar/filepath-securejoin v0.2.5/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
+github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
+github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
+github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s=
+github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
-github.com/docker/docker v26.1.5+incompatible h1:NEAxTwEjxV6VbBMBoGG3zPqbiJosIApZjxlbrG9q3/g=
-github.com/docker/docker v26.1.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-github.com/docker/docker v27.5.0+incompatible h1:um++2NcQtGRTz5eEgO6aJimo6/JxrTXC941hd05JO6U=
-github.com/docker/docker v27.5.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
-github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
+github.com/docker/docker v28.2.2+incompatible h1:CjwRSksz8Yo4+RmQ339Dp/D2tGO5JxwYeqtMOEe0LDw=
+github.com/docker/docker v28.2.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
 github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/elazarl/goproxy v1.2.1 h1:njjgvO6cRG9rIqN2ebkqy6cQz2Njkx7Fsfv/zIZqgug=
-github.com/elazarl/goproxy v1.2.1/go.mod h1:YfEbZtqP4AetfO6d40vWchF3znWX7C7Vd6ZMfdL8z64=
+github.com/elazarl/goproxy v1.7.2 h1:Y2o6urb7Eule09PjlhQRGNsqRfPmYI3KKQLFpCAV3+o=
+github.com/elazarl/goproxy v1.7.2/go.mod h1:82vkLNir0ALaW14Rc399OTTjyNREgmdL2cVoIbS6XaE=
 github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
 github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
-github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
 github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
-github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/go-control-plane v0.13.4 h1:zEqyPVyku6IvWCFwux4x9RxkLOMUL+1vC9xUFv5l2/M=
+github.com/envoyproxy/go-control-plane v0.13.4/go.mod h1:kDfuBlDVsSj2MjrLEtRWtHlsWIFcGyB2RMO44Dc5GZA=
+github.com/envoyproxy/go-control-plane/envoy v1.32.4 h1:jb83lalDRZSpPWW2Z7Mck/8kXZ5CQAFYVjQcdVIr83A=
+github.com/envoyproxy/go-control-plane/envoy v1.32.4/go.mod h1:Gzjc5k8JcJswLjAx1Zm+wSYE20UrLtt7JZMWiWQXQEw=
+github.com/envoyproxy/go-control-plane/ratelimit v0.1.0 h1:/G9QYbddjL25KvtKTv3an9lx6VBE2cnb8wp1vEGNYGI=
+github.com/envoyproxy/go-control-plane/ratelimit v0.1.0/go.mod h1:Wk+tMFAFbCXaJPzVVHnPgRKdUdwW/KdbRt94AzgRee4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/envoyproxy/protoc-gen-validate v1.2.1 h1:DEo3O99U8j4hBFwbJfrz9VtgcDfUKS7KJ7spH3d86P8=
+github.com/envoyproxy/protoc-gen-validate v1.2.1/go.mod h1:d/C80l/jxXLdfEIhX1W2TmLfsJ31lvEjwamM4DxlWXU=
 github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/frikky/kin-openapi v0.42.0 h1:d5Z6vnuQ6RnCCPIxZaDL+TH2ODLxT8abytOt+Zh+Kd0=
 github.com/frikky/kin-openapi v0.42.0/go.mod h1:ev9OZAw7Bv5p0w93j91++6a1ElPzGcCofst+kmrWsj4=
-github.com/frikky/schemaless v0.0.13 h1:ARiN9V7wr2VZXAr9JK5wvTbyPgpGrgeiL1VhR5MlgaQ=
-github.com/frikky/schemaless v0.0.13/go.mod h1:mooDxY+D6weHjhKvjy3+IE9S7P4g4cpNnidkdRv/cHQ=
-github.com/fsouza/go-dockerclient v1.11.0 h1:4ZAk6W7rPAtPXm7198EFqA5S68rwnNQORxlOA5OurCA=
-github.com/fsouza/go-dockerclient v1.11.0/go.mod h1:0I3TQCRseuPTzqlY4Y3ajfsg2VAdMQoazrkxJTiJg8s=
+github.com/frikky/schemaless v0.0.16 h1:4d2ZktB9xGsAusbbKliOI8TuriSrdIMzD/6ToY3wkz8=
+github.com/frikky/schemaless v0.0.16/go.mod h1:jT48kTcmr1q3o8i+8qe7g+eCsbwaz2Q9CjOJevQQzQs=
+github.com/fsouza/go-dockerclient v1.12.1 h1:FMoLq+Zhv9Oz/rFmu6JWkImfr6CBgZOPcL+bHW4gS0o=
+github.com/fsouza/go-dockerclient v1.12.1/go.mod h1:OqsgJJcpCwqyM3JED7TdfM9QVWS5O7jSYwXxYKmOooY=
+github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
+github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
 github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
 github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic=
-github.com/go-git/go-billy/v5 v5.6.0 h1:w2hPNtoehvJIxR00Vb4xX94qHQi/ApZfX+nBE2Cjio8=
-github.com/go-git/go-billy/v5 v5.6.0/go.mod h1:sFDq7xD3fn3E0GOwUSZqHo9lrkmx8xJhA0ZrfvjBRGM=
+github.com/go-git/go-billy/v5 v5.6.2 h1:6Q86EsPXMa7c3YZ3aLAQsMA0VlWmy43r6FHqa/UNbRM=
+github.com/go-git/go-billy/v5 v5.6.2/go.mod h1:rcFC2rAsp/erv7CMz9GczHcuD0D32fWzH+MJAU+jaUU=
 github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4=
 github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII=
-github.com/go-git/go-git/v5 v5.13.0 h1:vLn5wlGIh/X78El6r3Jr+30W16Blk0CTcxTYcYPWi5E=
-github.com/go-git/go-git/v5 v5.13.0/go.mod h1:Wjo7/JyVKtQgUNdXYXIepzWfJQkUEIGvkvVkiXRR/zw=
+github.com/go-git/go-git/v5 v5.16.1 h1:TuxMBWNL7R05tXsUGi0kh1vi4tq0WfXNLlIrAkXG1k8=
+github.com/go-git/go-git/v5 v5.16.1/go.mod h1:4Ge4alE/5gPs30F2H1esi2gPd69R0C39lolkucHBOp8=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-jose/go-jose/v4 v4.0.5 h1:M6T8+mKZl/+fNNuFHvGIzDz7BTLQPIounk/b9dw3AaE=
+github.com/go-jose/go-jose/v4 v4.0.5/go.mod h1:s3P1lRrkT8igV8D9OjyL4WRyHvjB6a4JSllnOrmmBOA=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
-github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
 github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
+github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
+github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
 github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
 github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g=
 github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
-github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
-github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
+github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
+github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
+github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
+github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=
+github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
@@ -190,74 +207,61 @@ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
-github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
+github.com/google/gnostic-models v0.6.9 h1:MU/8wDLif2qCXZmzncUQ/BOfxWfthHi63KqpoNbWqVw=
+github.com/google/gnostic-models v0.6.9/go.mod h1:CiWsm0s6BSQd1hRn8/QmxqB6BesYcbSZxsz9b0KuDBw=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/go-github/v28 v28.1.1 h1:kORf5ekX5qwXO2mGzXXOjMe/g6ap8ahVe0sBEulhSxo=
 github.com/google/go-github/v28 v28.1.1/go.mod h1:bsqJWQX05omyWVmc00nEUql9mhQyv38lDZ8kPZcQVoM=
-github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
+github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
+github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
-github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw=
-github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
+github.com/google/martian/v3 v3.3.3 h1:DIhPTQrbPkgs2yJYdXU/eNACCG5DVQjySNRNlflZ9Fc=
+github.com/google/martian/v3 v3.3.3/go.mod h1:iEPrYcgCF7jA9OtScMFQyAlZZ4YXTKEtJ1E6RWzmBA0=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec=
-github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo=
+github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o=
-github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw=
-github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=
+github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs=
-github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0=
+github.com/googleapis/enterprise-certificate-proxy v0.3.6 h1:GW/XbdyBFQ8Qe+YAmFU9uHLo7OnF5tL52HFAgMmyrf4=
+github.com/googleapis/enterprise-certificate-proxy v0.3.6/go.mod h1:MkHOF77EYAE7qfSuSS9PU6g4Nt4e11cnsDUowfwewLA=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/googleapis/gax-go/v2 v2.12.3 h1:5/zPPDvw8Q1SuXjrqrZslrqT7dL/uJT2CQii/cLCKqA=
-github.com/googleapis/gax-go/v2 v2.12.3/go.mod h1:AKloxT6GtNbaLm8QTNSidHUVsHYcBHwWRvkNFJUQcS4=
+github.com/googleapis/gax-go/v2 v2.14.2 h1:eBLnkZ9635krYIPD+ag1USrOAI0Nr0QYF3+/3GqO0k0=
+github.com/googleapis/gax-go/v2 v2.14.2/go.mod h1:ON64QhlJkhVtSqp4v1uaK92VyZ2gmvDQsweuyLV+8+w=
 github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
 github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
-github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
-github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 h1:5ZPtiqj0JL5oKWmcsq4VMaAW5ukBEgSGXEN89zeH1Jo=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3/go.mod h1:ndYquD05frm2vACXE1nsccT4oJzjhw2arTS2cpUD1PI=
 github.com/h2non/filetype v1.1.3 h1:FKkx9QbD7HR/zjK1Ia5XiBsq9zdLi5Kf3zGyFTAFkGg=
 github.com/h2non/filetype v1.1.3/go.mod h1:319b3zT68BvV+WRj7cwy856M2ehB3HqNOt6sy1HndBY=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
-github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
-github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
@@ -266,19 +270,17 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
-github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
 github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
 github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY=
-github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
+github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
+github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
@@ -286,19 +288,20 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
 github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
+github.com/moby/go-archive v0.1.0 h1:Kk/5rdW/g+H8NHdJW2gsXyZ7UnzvJNOy6VKJqueWdcQ=
+github.com/moby/go-archive v0.1.0/go.mod h1:G9B+YoujNohJmrIYFBpSd54GTUB4lt9S+xVQvsJyFuo=
 github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
 github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
-github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc=
-github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo=
-github.com/moby/sys/user v0.1.0 h1:WmZ93f5Ux6het5iituh9x2zAG7NFY9Aqi49jjE1PaQg=
-github.com/moby/sys/user v0.1.0/go.mod h1:fKJhFOnsCN6xZ5gSfbM6zaHGgDJMrqt9/reuj4T7MmU=
+github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw=
+github.com/moby/sys/atomicwriter v0.1.0/go.mod h1:Ul8oqv2ZMNHOceF643P6FKPXeCmYtlQMvpizfsSoaWs=
+github.com/moby/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU=
+github.com/moby/sys/sequential v0.6.0/go.mod h1:uyv8EUTrca5PnDsdMGXhZe6CCe8U/UiTWd+lL+7b/Ko=
+github.com/moby/sys/user v0.4.0 h1:jhcMKit7SA80hivmFJcbB1vqmw//wU61Zdui2eQXuMs=
+github.com/moby/sys/user v0.4.0/go.mod h1:bG+tYYYJgaMtRKgEmuueC0hJEAZWwtIbZTB+85uoHjs=
 github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g=
 github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28=
-github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 h1:dcztxKSvZ4Id8iPpHERQBbIJfabdt4wUm5qy3wOL2Zc=
-github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw=
 github.com/moby/term v0.5.2 h1:6qk3FJAFDs6i/q3W/pQ97SX192qKfZgGjCQqfCJkgzQ=
 github.com/moby/term v0.5.2/go.mod h1:d3djjFCrjnB+fl8NJux+EJzu0msscUP+f8it8hPkFLc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -310,59 +313,61 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
 github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY=
-github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM=
-github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
-github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
+github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM=
+github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
+github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
+github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
-github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b h1:YWuSjZCQAPM8UUBLkYUk1e+rZcvWHJmFb6i6rM44Xs8=
-github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ=
-github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
-github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
+github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
+github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
 github.com/opensearch-project/opensearch-go v1.1.0 h1:eG5sh3843bbU1itPRjA9QXbxcg8LaZ+DjEzQH9aLN3M=
 github.com/opensearch-project/opensearch-go v1.1.0/go.mod h1:+6/XHCuTH+fwsMJikZEWsucZ4eZMma3zNSeLrTtVGbo=
 github.com/opensearch-project/opensearch-go/v2 v2.3.0 h1:nQIEMr+A92CkhHrZgUhcfsrZjibvB3APXf2a1VwCmMQ=
 github.com/opensearch-project/opensearch-go/v2 v2.3.0/go.mod h1:8LDr9FCgUTVoT+5ESjc2+iaZuldqE+23Iq0r1XeNue8=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo=
-github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
-github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pjbgf/sha1cd v0.3.2 h1:a9wb0bp1oC2TGwStyn0Umc/IGKQnEgF0vVaZ8QF8eo4=
+github.com/pjbgf/sha1cd v0.3.2/go.mod h1:zQWigSxVmsHEZow5qaLtPYxpcKMMQpa09ixqBxuCS6A=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo=
+github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
-github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
+github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
+github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk=
-github.com/sashabaranov/go-openai v1.19.2 h1:+dkuCADSnwXV02YVJkdphY8XD9AyHLUWwk6V7LB6EL8=
-github.com/sashabaranov/go-openai v1.19.2/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=
+github.com/sashabaranov/go-openai v1.40.1 h1:bJ08Iwct5mHBVkuvG6FEcb9MDTfsXdTYPGjYLRdeTEU=
+github.com/sashabaranov/go-openai v1.40.1/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/sendgrid/rest v2.6.9+incompatible h1:1EyIcsNdn9KIisLW50MKwmSRSK+ekueiEMJ7NEoxJo0=
 github.com/sendgrid/rest v2.6.9+incompatible/go.mod h1:kXX7q3jZtJXK5c5qK83bSGMdV6tsOE70KbHoqJls4lE=
-github.com/sendgrid/sendgrid-go v3.14.0+incompatible h1:KDSasSTktAqMJCYClHVE94Fcif2i7P7wzISv1sU6DUA=
-github.com/sendgrid/sendgrid-go v3.14.0+incompatible/go.mod h1:QRQt+LX/NmgVEvmdRw0VT/QgUn499+iza2FnDca9fg8=
-github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
+github.com/sendgrid/sendgrid-go v3.16.1+incompatible h1:zWhTmB0Y8XCDzeWIm2/BIt1GjJohAA0p6hVEaDtHWWs=
+github.com/sendgrid/sendgrid-go v3.16.1+incompatible/go.mod h1:QRQt+LX/NmgVEvmdRw0VT/QgUn499+iza2FnDca9fg8=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
-github.com/skeema/knownhosts v1.3.0 h1:AM+y0rI04VksttfwjkSTNQorvGqmwATnvnAHpSgc0LY=
-github.com/skeema/knownhosts v1.3.0/go.mod h1:sPINvnADmT/qYH1kfv+ePMmOBTH6Tbl7b5LvTDjFK7M=
+github.com/shuffle/shuffle-shared v0.8.84 h1:ElIMQYjKBVOiadbiGkSzt/lPU5xqaQwRxQvk9wx/xYM=
+github.com/shuffle/shuffle-shared v0.8.84/go.mod h1:RdfNxqCPI+zU4jQKy3E/p4Io2injm7LpSKQUCDHNtLk=
+github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/skeema/knownhosts v1.3.1 h1:X2osQ+RAjK76shCbvhHHHVl3ZlgDm8apHEHFqRjnBY8=
+github.com/skeema/knownhosts v1.3.1/go.mod h1:r7KTdC8l4uxWRyK2TpQZ/1o5HaSzh06ePQNxPwTcfiY=
 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0=
 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M=
-github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4=
-github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI=
+github.com/spiffe/go-spiffe/v2 v2.5.0 h1:N2I01KCUkv1FAjZXJMwh95KK1ZIQLYbPfhaxw8WS0hE=
+github.com/spiffe/go-spiffe/v2 v2.5.0/go.mod h1:P+NxobPc6wXhVtINNtFjNWGBTreew1GBUCwT2wPmb7g=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
@@ -372,63 +377,59 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4=
+github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
+github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
 github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/zeebo/errs v1.4.0 h1:XNdoD/RRMKP7HD0UhJnIzUy74ISdGGxURlYG8HSWSfM=
+github.com/zeebo/errs v1.4.0/go.mod h1:sgbWHsvVuTPHcqJJGQ1WhI5KbWlHYz+2+2C/LSEtCw4=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
-go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
 go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
 go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 h1:yd02MEjBdJkG3uabWP9apV+OuWRIXGDuJEUJbOHmCFU=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0/go.mod h1:umTcuxiv1n/s/S6/c2AT/g2CQ7u5C59sHDNmfSwgz7Q=
-go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo=
-go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo=
-go.opentelemetry.io/otel v1.33.0 h1:/FerN9bax5LoK51X/sI0SVYrjSE0/yUL7DpxW4K3FWw=
-go.opentelemetry.io/otel v1.33.0/go.mod h1:SUUkR6csvUQl+yjReHu5uM3EtVV7MBm5FHKRlNx4I8I=
-go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0 h1:R/OBkMoGgfy2fLhs2QhkCI1w4HLEQX92GCcJB6SSdNk=
-go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0/go.mod h1:VpP4/RMn8bv8gNo9uK7/IMY4mtWLELsS+JIP0inH0h4=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.3.0 h1:giGm8w67Ja7amYNfYMdme7xSp2pIxThWopw8+QP51Yk=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.3.0/go.mod h1:hO1KLR7jcKaDDKDkvI9dP/FIhpmna5lkqPUQdEjFAM8=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.3.0 h1:Ydage/P0fRrSPpZeCVxzjqGcI6iVmG2xb43+IR8cjqM=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.3.0/go.mod h1:QNX1aly8ehqqX1LEa6YniTU7VY9I6R3X/oPxhGdTceE=
-go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI=
-go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco=
-go.opentelemetry.io/otel/metric v1.33.0 h1:r+JOocAyeRVXD8lZpjdQjzMadVZp2M4WmQ+5WtEnklQ=
-go.opentelemetry.io/otel/metric v1.33.0/go.mod h1:L9+Fyctbp6HFTddIxClbQkjtubW6O9QS3Ann/M82u6M=
-go.opentelemetry.io/otel/sdk v1.22.0 h1:6coWHw9xw7EfClIC/+O31R8IY3/+EiRFHevmHafB2Gw=
-go.opentelemetry.io/otel/sdk v1.22.0/go.mod h1:iu7luyVGYovrRpe2fmj3CVKouQNdTOkxtLzPvPz1DOc=
-go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI=
-go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU=
-go.opentelemetry.io/otel/trace v1.33.0 h1:cCJuF7LRjUFso9LPnEAHJDB2pqzp+hbO8eu1qqW2d/s=
-go.opentelemetry.io/otel/trace v1.33.0/go.mod h1:uIcdVUZMpTAmz0tI1z04GoVSezK37CbGV4fr1f2nBck=
-go.opentelemetry.io/proto/otlp v0.11.0 h1:cLDgIBTf4lLOlztkhzAEdQsJ4Lj+i5Wc9k6Nn0K1VyU=
-go.opentelemetry.io/proto/otlp v0.11.0/go.mod h1:QpEjXPrNQzrFDZgoTo49dgHR9RYRSrg3NAKnUGl9YpQ=
-go4.org v0.0.0-20201209231011-d4a079459e60 h1:iqAGo78tVOJXELHQFRjR6TMwItrvXH4hrGJ32I/NFF8=
-go4.org v0.0.0-20201209231011-d4a079459e60/go.mod h1:CIiUVy99QCPfoE13bO4EZaz5GZMZXMSBGhxRdsvzbkg=
-golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+go.opentelemetry.io/contrib/detectors/gcp v1.36.0 h1:F7q2tNlCaHY9nMKHR6XH9/qkp8FktLnIcy6jJNyOCQw=
+go.opentelemetry.io/contrib/detectors/gcp v1.36.0/go.mod h1:IbBN8uAIIx734PTonTPxAxnjc2pQTxWNkwfstZ+6H2k=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 h1:x7wzEgXfnzJcHDwStJT+mxOz4etr2EcexjqhBvmoakw=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0/go.mod h1:rg+RlpR5dKwaS95IyyZqj5Wd4E13lk/msnTS0Xl9lJM=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 h1:sbiXRNDSWJOTobXh5HyQKjq6wUC5tNybqjIqDpAY4CU=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ=
+go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg=
+go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 h1:1fTNlAIJZGWLP5FVu0fikVry1IsiUnXjf7QFvoNN3Xw=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0/go.mod h1:zjPK58DtkqQFn+YUMbx0M2XV3QgKU0gS9LeGohREyK4=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.36.0 h1:nRVXXvf78e00EwY6Wp0YII8ww2JVWshZ20HfTlE11AM=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.36.0/go.mod h1:r49hO7CgrxY9Voaj3Xe8pANWtr0Oq916d0XAmOoCZAQ=
+go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.36.0 h1:rixTyDGXFxRy1xzhKrotaHy3/KXdPhlWARrCgK+eqUY=
+go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.36.0/go.mod h1:dowW6UsM9MKbJq5JTz2AMVp3/5iW5I/TStsk8S+CfHw=
+go.opentelemetry.io/otel/metric v1.36.0 h1:MoWPKVhQvJ+eeXWHFBOPoBOi20jh6Iq2CcCREuTYufE=
+go.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs=
+go.opentelemetry.io/otel/sdk v1.36.0 h1:b6SYIuLRs88ztox4EyrvRti80uXIFy+Sqzoh9kFULbs=
+go.opentelemetry.io/otel/sdk v1.36.0/go.mod h1:+lC+mTgD+MUWfjJubi2vvXWcVxyr9rmlshZni72pXeY=
+go.opentelemetry.io/otel/sdk/metric v1.36.0 h1:r0ntwwGosWGaa0CrSt8cuNuTcccMXERFwHX4dThiPis=
+go.opentelemetry.io/otel/sdk/metric v1.36.0/go.mod h1:qTNOhFDfKRwX0yXOqJYegL5WRaW376QbB7P4Pb0qva4=
+go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w=
+go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA=
+go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4=
+go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4=
+go4.org v0.0.0-20230225012048-214862532bf5 h1:nifaUDeh+rPaBCMPMQHZmvJf+QdpLFnuQPwx+LxVmtc=
+go4.org v0.0.0-20230225012048-214862532bf5/go.mod h1:F57wTi5Lrj6WLyswp5EYV1ncrEbFGHD4hhz6S1ZYeaU=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
-golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
+golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
+golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -437,8 +438,6 @@ golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE
 golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
-golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
-golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -458,8 +457,6 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -473,27 +470,23 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
-golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
+golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.19.0 h1:9+E/EZBCbTLNrbN35fHv/a/d/mOBatymz1zbtQrXpIg=
-golang.org/x/oauth2 v0.19.0/go.mod h1:vYi7skDa1x015PmRRYZ7+s1cWyPgrPiSYRe4rnsexc8=
-golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
-golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
+golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -502,11 +495,10 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
+golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -518,7 +510,6 @@ golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -530,14 +521,14 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
+golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
-golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
+golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
+golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -548,12 +539,12 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
+golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
+golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
-golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
+golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -565,9 +556,7 @@ golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBn
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
 golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -583,14 +572,12 @@ golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapK
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
+golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
+golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU=
-golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
 google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
@@ -599,8 +586,8 @@ google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsb
 google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.176.1 h1:DJSXnV6An+NhJ1J+GWtoF2nHEuqB1VNoTfnIbjNvwD4=
-google.golang.org/api v0.176.1/go.mod h1:j2MaSDYcvYV1lkZ1+SMW4IeF90SrEyFA+tluDYWRrFg=
+google.golang.org/api v0.236.0 h1:CAiEiDVtO4D/Qja2IA9VzlFrgPnK3XVMmRoJZlSWbc0=
+google.golang.org/api v0.236.0/go.mod h1:X1WF9CU2oTc+Jml1tiIxGmWFK/UZezdqEu09gcxZAj4=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -621,95 +608,72 @@ google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvx
 google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de h1:F6qOa9AZTYJXOUEr4jDysRDLrm4PHePlge4v4TGAlxY=
-google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:VUhTRKeHn9wwcdrk73nvdC9gF178Tzhmt/qyaFcPLSo=
-google.golang.org/genproto/googleapis/api v0.0.0-20240314234333-6e1732d8331c h1:kaI7oewGK5YnVwj+Y+EJBO/YN1ht8iTL9XkFHtVZLsc=
-google.golang.org/genproto/googleapis/api v0.0.0-20240314234333-6e1732d8331c/go.mod h1:VQW3tUculP/D4B+xVCo+VgSq8As6wA9ZjHl//pmk+6s=
-google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 h1:CkkIfIt50+lT6NHAVoRYEyAvQGFM7xEwXUUywFvEb3Q=
-google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576/go.mod h1:1R3kvZ1dtP3+4p4d3G8uJ8rFk/fWlScl38vanWACI08=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be h1:LG9vZxsWGOmUKieR8wPAUR3u3MpnYFQZROPIMaXh7/A=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 h1:8ZmaLZE4XWrtU3MyClkYqqtl6Oegr3235h7jxsDyqCY=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU=
+google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 h1:1tXaIXCracvtsRxSBsYDiSBN0cuJvM7QYW+MrpIRY78=
+google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2/go.mod h1:49MsLSx0oWMOZqcpB3uL8ZOkAh1+TndpJ8ONoCBWiZk=
+google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 h1:Kog3KlB4xevJlAcbbbzPfRG0+X9fdoGM+UBRKVz6Wr0=
+google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237/go.mod h1:ezi0AVyMKDWy5xAncvjLWH7UcLBB5n7y2fQ8MzjJcto=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a h1:v2PbRU4K3llS09c7zodFpNePeamkAwG3mPrAery9VeE=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM=
-google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
-google.golang.org/grpc v1.68.1 h1:oI5oTa11+ng8r8XMMN7jAOmWfPZWbYpCFaMUTACxkM0=
-google.golang.org/grpc v1.68.1/go.mod h1:+q1XYFJjShcqn0QZHvCyeR4CXPA+llXIeUIfIe00waw=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+google.golang.org/grpc v1.72.2 h1:TdbGzwb82ty4OusHWepvFWGLgIbNo1/SUynEN0ssqv8=
+google.golang.org/grpc v1.72.2/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
-google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
-google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
-google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4=
+gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-gopkg.in/src-d/go-billy.v4 v4.3.2 h1:0SQA1pRztfTFx2miS8sA97XvooFeNOmvUenF4o0EcVg=
-gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98=
-gopkg.in/src-d/go-git-fixtures.v3 v3.5.0 h1:ivZFOIltbce2Mo8IjzUHAFoq/IylO9WHhNOAJK+LsJg=
-gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g=
-gopkg.in/src-d/go-git.v4 v4.13.1 h1:SRtFyV8Kxc0UP7aCHcijOMQGPxHSmMOPrzulQWolkYE=
-gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8=
 gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
 gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
-gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY=
-gotest.tools/v3 v3.5.0/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=
+gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q=
+gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-k8s.io/api v0.30.2 h1:+ZhRj+28QT4UOH+BKznu4CBgPWgkXO7XAvMcMl0qKvI=
-k8s.io/api v0.30.2/go.mod h1:ULg5g9JvOev2dG0u2hig4Z7tQ2hHIuS+m8MNZ+X6EmI=
-k8s.io/apimachinery v0.30.2 h1:fEMcnBj6qkzzPGSVsAZtQThU62SmQ4ZymlXRC5yFSCg=
-k8s.io/apimachinery v0.30.2/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
-k8s.io/client-go v0.30.2 h1:sBIVJdojUNPDU/jObC+18tXWcTJVcwyqS9diGdWHk50=
-k8s.io/client-go v0.30.2/go.mod h1:JglKSWULm9xlJLx4KCkfLLQ7XwtlbflV6uFFSHTMgVs=
-k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
-k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
-k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
-k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
-k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
-k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+k8s.io/api v0.33.1 h1:tA6Cf3bHnLIrUK4IqEgb2v++/GYUtqiu9sRVk3iBXyw=
+k8s.io/api v0.33.1/go.mod h1:87esjTn9DRSRTD4fWMXamiXxJhpOIREjWOSjsW1kEHw=
+k8s.io/apimachinery v0.33.1 h1:mzqXWV8tW9Rw4VeW9rEkqvnxj59k1ezDUl20tFK/oM4=
+k8s.io/apimachinery v0.33.1/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
+k8s.io/client-go v0.33.1 h1:ZZV/Ks2g92cyxWkRRnfUDsnhNn28eFpt26aGc8KbXF4=
+k8s.io/client-go v0.33.1/go.mod h1:JAsUrl1ArO7uRVFWfcj6kOomSlCv+JpvIsp6usAGefA=
+k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
+k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
+k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=
+k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
+k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
+k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
-sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
-sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
-sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
-sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
+sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
+sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
+sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
+sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
+sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
+sigs.k8s.io/structured-merge-diff/v4 v4.6.0 h1:IUA9nvMmnKWcj5jl84xn+T5MnlZKThmUW1TdblaLVAc=
+sigs.k8s.io/structured-merge-diff/v4 v4.6.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
+sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
+sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
diff --git a/backend/go-app/main.go b/backend/go-app/main.go
index 06412fb4..fdd9dc05 100755
--- a/backend/go-app/main.go
+++ b/backend/go-app/main.go
@@ -11,17 +11,18 @@ import (
 	"crypto/md5"
 	"strconv"
 
+	"os"
+	"io"
+	"log"
+	"fmt"
+	"errors"
+	"net/url"
+	"os/exec"
+	"net/http"
+	"io/ioutil"
+	"math/rand"
 	"encoding/hex"
 	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"net/url"
-	"os"
-	"os/exec"
 
 	"net/http/httptest"
 	"strings"
@@ -31,11 +32,12 @@ import (
 	"github.com/frikky/kin-openapi/openapi2conv"
 	"github.com/frikky/kin-openapi/openapi3"
 
-	//"github.com/go-git/go-billy/v5"
 	"github.com/go-git/go-billy/v5/memfs"
+
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
 	gitProxy "github.com/go-git/go-git/v5/plumbing/transport"
+	http2 "github.com/go-git/go-git/v5/plumbing/transport/http"
 	"github.com/go-git/go-git/v5/storage/memory"
 
 	// Random
@@ -46,7 +48,8 @@ import (
 
 	// Web
 	"github.com/gorilla/mux"
-	http2 "gopkg.in/src-d/go-git.v4/plumbing/transport/http"
+	//http2 "gopkg.in/src-d/go-git.v5/plumbing/transport/http"
+	//http2 "github.com/go-git/go-git/plumbing/transport/http"
 )
 
 // This is used to handle onprem vs offprem databases etc
@@ -59,6 +62,7 @@ var registryName = "registry.hub.docker.com"
 var runningEnvironment = "onprem"
 
 var syncUrl = "https://shuffler.io"
+//var syncUrl = "http://localhost:5002"
 
 type retStruct struct {
 	Success         bool                 `json:"success"`
@@ -445,7 +449,7 @@ func checkGitProxy(cloneOptions *git.CloneOptions) *git.CloneOptions {
 func createNewUser(username, password, role, apikey string, org shuffle.OrgMini) error {
 	// Returns false if there is an issue
 	// Use this for register
-	err := shuffle.CheckPasswordStrength(password)
+	err := shuffle.CheckPasswordStrength(username, password)
 	if err != nil {
 		log.Printf("[WARNING] Bad password strength: %s", err)
 		return err
@@ -458,8 +462,6 @@ func createNewUser(username, password, role, apikey string, org shuffle.OrgMini)
 	}
 
 	ctx := context.Background()
-	//users, err := FindUser(ctx context.Context, username string) ([]User, error) {
-
 	users, err := shuffle.FindUser(ctx, strings.ToLower(strings.TrimSpace(username)))
 	if err != nil && len(users) == 0 {
 		log.Printf("[WARNING] Failed getting user %s: %s", username, err)
@@ -484,7 +486,6 @@ func createNewUser(username, password, role, apikey string, org shuffle.OrgMini)
 	newUser.Active = true
 	newUser.Orgs = []string{org.Id}
 
-	// FIXME - Remove this later
 	if role == "admin" {
 		newUser.Role = "admin"
 		newUser.Roles = []string{"admin"}
@@ -637,7 +638,7 @@ func handleRegister(resp http.ResponseWriter, request *http.Request) {
 			} else {
 				log.Printf("[DEBUG] Successfully created the default org!")
 
-				defaultEnv := os.Getenv("ORG_ID")
+				defaultEnv := os.Getenv("ENVIRONMENT_NAME")
 				if len(defaultEnv) == 0 {
 					defaultEnv = "Shuffle"
 					log.Printf("[DEBUG] Setting default environment for org to %s", defaultEnv)
@@ -1022,6 +1023,11 @@ func handleInfo(resp http.ResponseWriter, request *http.Request) {
 		}
 	}
 
+	if parsedAdmin == "true" {
+		userInfo.Role = "admin"
+		userInfo.ActiveOrg.Role = "admin"
+	}
+
 	chatDisabled := false
 	if os.Getenv("SHUFFLE_CHAT_DISABLED") == "true" {
 		chatDisabled = true
@@ -1084,6 +1090,7 @@ func handleInfo(resp http.ResponseWriter, request *http.Request) {
 		Priorities: orgPriorities,
 		Licensed:   licensed,
 		ActiveApps: activatedAppIds,
+		Theme:      userInfo.Theme,
 	}
 
 	returnData, err := json.Marshal(returnValue)
@@ -1844,6 +1851,8 @@ func handleWebhookCallback(resp http.ResponseWriter, request *http.Request) {
 	//	return
 	//}
 
+	log.Printf("[DEBUG] HOOKS: webhook callback: %s", request.URL.String())
+
 	if request.Method != "POST" {
 		request.Method = "POST"
 	}
@@ -1855,6 +1864,7 @@ func handleWebhookCallback(resp http.ResponseWriter, request *http.Request) {
 
 	path := strings.Split(request.URL.String(), "/")
 	if len(path) < 4 {
+		log.Printf("[DEBUG] HOOKS: Invalid webhook path: %s", request.URL.String())
 		resp.WriteHeader(403)
 		resp.Write([]byte(`{"success": false}`))
 		return
@@ -1870,7 +1880,7 @@ func handleWebhookCallback(resp http.ResponseWriter, request *http.Request) {
 	if location[1] == "api" {
 		if len(location) <= 4 {
 			log.Printf("[INFO] Couldn't handle location. Too short in webhook: %d", len(location))
-			resp.WriteHeader(401)
+			resp.WriteHeader(400)
 			resp.Write([]byte(`{"success": false}`))
 			return
 		}
@@ -1887,6 +1897,8 @@ func handleWebhookCallback(resp http.ResponseWriter, request *http.Request) {
 		}
 	}
 
+	log.Printf("[DEBUG] HOOKS: Pre user agent check")
+
 	// Find user agent header
 	userAgent := request.Header.Get("User-Agent")
 	if strings.Contains(strings.ToLower(userAgent), "microsoftpreview") || strings.Contains(strings.ToLower(userAgent), "googlebot") {
@@ -1909,8 +1921,8 @@ func handleWebhookCallback(resp http.ResponseWriter, request *http.Request) {
 	//log.Printf("HookID: %s", hookId)
 	hook, err := shuffle.GetHook(ctx, hookId)
 	if err != nil {
-		log.Printf("[WARNING] Failed getting hook %s (callback): %s", hookId, err)
-		resp.WriteHeader(401)
+		log.Printf("[WARNING] HOOKS: Failed getting hook %s (callback): %s", hookId, err)
+		resp.WriteHeader(400)
 		resp.Write([]byte(`{"success": false}`))
 		return
 	}
@@ -1922,21 +1934,21 @@ func handleWebhookCallback(resp http.ResponseWriter, request *http.Request) {
 	//resp.WriteHeader(200)
 	//resp.Write([]byte(`{"success": true}`))
 	if hook.Status == "stopped" {
-		log.Printf("[WARNING] Not running %s because hook status is stopped", hook.Id)
-		resp.WriteHeader(401)
+		log.Printf("[WARNING] HOOKS: Not running %s because hook status is stopped", hook.Id)
+		resp.WriteHeader(400)
 		resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "The webhook isn't running. Is it running?"}`)))
 		return
 	}
 
 	if len(hook.Workflows) == 0 {
-		log.Printf("[DEBUG] Not running because hook isn't connected to any workflows")
-		resp.WriteHeader(401)
+		log.Printf("[DEBUG] HOOKS: Not running because hook isn't connected to any workflows")
+		resp.WriteHeader(400)
 		resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "No workflows are defined"}`)))
 		return
 	}
 
 	if hook.Environment == "cloud" {
-		log.Printf("[DEBUG] This should trigger in the cloud. Duplicate action allowed onprem.")
+		log.Printf("[DEBUG] HOOKS: This should trigger in the cloud. Duplicate action allowed onprem.")
 	}
 
 	// Check auth
@@ -1952,7 +1964,7 @@ func handleWebhookCallback(resp http.ResponseWriter, request *http.Request) {
 
 	body, err := ioutil.ReadAll(request.Body)
 	if err != nil {
-		log.Printf("[DEBUG] Body data error: %s", err)
+		log.Printf("[DEBUG] HOOKS: data read error: %s", err)
 		resp.WriteHeader(401)
 		resp.Write([]byte(`{"success": false}`))
 		return
@@ -1993,7 +2005,7 @@ func handleWebhookCallback(resp http.ResponseWriter, request *http.Request) {
 
 	b, err := json.Marshal(newBody)
 	if err != nil {
-		log.Printf("[ERROR] Failed newBody marshaling for webhook: %s", err)
+		log.Printf("[ERROR] HOOKS: Failed newBody marshaling for webhook: %s", err)
 		resp.WriteHeader(500)
 		resp.Write([]byte(`{"success": false}`))
 		return
@@ -2009,7 +2021,7 @@ func handleWebhookCallback(resp http.ResponseWriter, request *http.Request) {
 		}
 
 		if len(hook.Start) == 0 {
-			log.Printf("[WARNING] No start node for hook %s - running with workflow default.", hook.Id)
+			log.Printf("[ERROR] HOOKS: No start node for hook %s - running with workflow default.", hook.Id)
 			//bodyWrapper = string(parsedBody)
 		}
 
@@ -2021,7 +2033,6 @@ func handleWebhookCallback(resp http.ResponseWriter, request *http.Request) {
 
 		// OrgId: activeOrgs[0].Id,
 		workflowExecution, executionResp, err := handleExecution(item, workflow, newRequest, hook.OrgId)
-
 		if err == nil {
 			if hook.Version == "v2" {
 				timeout := 15
@@ -2056,6 +2067,7 @@ func handleWebhookCallback(resp http.ResponseWriter, request *http.Request) {
 			} else {
 				resp.Write([]byte(fmt.Sprintf(`{"success": true, "execution_id": "%s"}`, workflowExecution.ExecutionId)))
 			}
+
 			return
 		}
 
@@ -2063,6 +2075,10 @@ func handleWebhookCallback(resp http.ResponseWriter, request *http.Request) {
 		resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "%s"}`, executionResp)))
 	}
 
+	log.Printf("[ERROR] HOOKS: END OF FUNCTION FOR '%s'. IF this is reached, something went wrong.", hook.Id)
+	resp.WriteHeader(500)
+	resp.Write([]byte(`{"success": false, "reason": "Failed to run workflow. Check logs."}`))
+
 }
 
 func handlePipelineCallback(resp http.ResponseWriter, request *http.Request) {
@@ -3079,8 +3095,9 @@ func buildSwaggerApp(resp http.ResponseWriter, body []byte, user shuffle.User, s
 			return
 		}
 
-		// FIXME: Check whether it's in use.
-		if user.Id != app.Owner && user.Role != "admin" {
+		if user.Id == app.Owner || (user.Role == "admin" && user.ActiveOrg.Id == app.ReferenceOrg) || shuffle.ArrayContains(app.Contributors, user.Id) {
+			log.Printf("[DEBUG] Editing app %s with user %s (%s) in org %s", test.Id, user.Username, user.Id, user.ActiveOrg.Id)
+		} else {
 			log.Printf("[WARNING] Wrong user (%s) for app %s when verifying swagger", user.Username, app.Name)
 			resp.WriteHeader(403)
 			resp.Write([]byte(`{"success": false, "reason": "You don't have permissions to edit this app. Contact support@shuffler.io if this persists."}`))
@@ -3154,7 +3171,18 @@ func buildSwaggerApp(resp http.ResponseWriter, body []byte, user shuffle.User, s
 		}
 	}
 
-	api.Owner = user.Id
+	if api.Owner == "" {
+		api.Owner = user.Id
+	}
+
+	if len(api.ReferenceOrg) == 0 {
+		api.ReferenceOrg = user.ActiveOrg.Id
+	}
+
+	if len(test.Image) > 0 {
+		api.SmallImage = test.Image
+		api.LargeImage = test.Image
+	}
 
 	err = shuffle.DumpApi(basePath, api)
 	if err != nil {
@@ -3279,6 +3307,12 @@ func buildSwaggerApp(resp http.ResponseWriter, body []byte, user shuffle.User, s
 		Body: string(body),
 	}
 
+	if !shuffle.ArrayContains(api.Contributors, user.Id) {
+		api.Contributors = append(api.Contributors, user.Id)
+	}
+
+	shuffle.SetAppRevision(ctx, api)
+
 	log.Printf("[INFO] API LENGTH FOR %s: %d, ID: %s", api.Name, len(parsed.Body), newmd5)
 	// FIXME: Might cause versioning issues if we re-use the same!!
 	// FIXME: Need a way to track different versions of the same app properly.
@@ -3354,6 +3388,21 @@ func buildSwaggerApp(resp http.ResponseWriter, body []byte, user shuffle.User, s
 		resp.WriteHeader(200)
 		resp.Write([]byte(fmt.Sprintf(`{"success": true, "id": "%s"}`, api.ID)))
 	}
+
+	org, err := shuffle.GetOrg(ctx, user.ActiveOrg.Id)
+	if err != nil {
+		log.Printf("[ERROR] Failed getting org during image build (%s): %s", user.ActiveOrg.Id, err)
+	} else {
+		imagenames := []string{
+			fmt.Sprintf("%s_%s", api.Name, api.AppVersion),
+			fmt.Sprintf("%s_%s", api.Name, api.ID),
+		}
+
+		err = shuffle.DistributeAppToEnvironments(ctx, *org, imagenames)
+		if err != nil {
+			log.Printf("[ERROR] Failed distributing app to environments: %s", err)
+		}
+	}
 }
 
 // Creates an app from the app builder
@@ -3507,7 +3556,12 @@ func handleCloudJob(job shuffle.CloudSyncJob) error {
 				return err
 			}
 
-			redirectDomain := "localhost:5001"
+			backendPort := os.Getenv("BACKEND_PORT")
+			if backendPort == "" {
+				backendPort = "5001"
+			}
+
+			redirectDomain := fmt.Sprintf("localhost:%s", backendPort)
 			redirectUrl := fmt.Sprintf("http://%s/api/v1/triggers/outlook/register", redirectDomain)
 			outlookClient, _, err := shuffle.GetOutlookClient(ctx, "", hook.OauthToken, redirectUrl)
 			if err != nil {
@@ -3752,30 +3806,57 @@ func remoteOrgJobHandler(org shuffle.Org, interval int) error {
 		}
 	}
 
-	if org.SyncConfig.WorkflowBackup {
-		workflows, err := shuffle.GetAllWorkflowsByQuery(ctx, foundUser, 250, "")
-		if err != nil {
-			log.Printf("[ERROR] Failed getting backup workflows for org %s: %s", org.Id, err)
-		} else {
-			backupJob.Workflows = workflows
-		}
+	// Check if it's 1/20 times (600 seconds - 10 min on average)
+	// Only problem: May take time to sync the first time, which is annoying
+	// This is to ensure that we don't spam the shuffle cloud servers with a lot of data
+	shouldBackupData := false
+	randomNumber := rand.Intn(20)
+	if randomNumber == 0 {
+		shouldBackupData = true
 	}
 
-	if org.SyncConfig.AppBackup && len(org.Users) > 0 {
-
-		apps, err := shuffle.GetPrioritizedApps(ctx, foundUser)
-		if err != nil {
-			log.Printf("[ERROR] Failed getting backup apps for org %s: %s", org.Id, err)
-		} else {
-			backupJob.Apps = apps
+	// Just to prevent it from spamming large outbound requests
+	if shouldBackupData { 
+		if org.SyncConfig.WorkflowBackup {
+			workflows, err := shuffle.GetAllWorkflowsByQuery(ctx, foundUser, 250, "")
+			if err != nil {
+				log.Printf("[ERROR] Failed getting backup workflows for org %s: %s", org.Id, err)
+			} else {
+				backupJob.Workflows = workflows
+			}
 		}
-	}
 
-	info, err := shuffle.GetOrgStatistics(ctx, org.Id)
-	if err != nil {
-		log.Printf("[ERROR] Failed getting org statistics backup for org %s: %s", org.Id, err)
-	} else {
-		backupJob.Stats = *info
+		if org.SyncConfig.AppBackup && len(org.Users) > 0 {
+			foundUser.ActiveOrg.Id = org.Id
+			apps, err := shuffle.GetPrioritizedApps(ctx, foundUser)
+			if err != nil {
+				log.Printf("[ERROR] Failed getting backup apps for org %s: %s", org.Id, err)
+			} else {
+				parsedApps := []shuffle.WorkflowApp{}
+				for _, app := range apps {
+					if len(app.Actions) == 0 {
+						continue
+					}
+
+					if !app.Generated {
+						continue
+					}
+
+					parsedApps = append(parsedApps, app)
+				}
+
+				backupJob.Apps = parsedApps
+			}
+		}
+
+		// Send stats once every 10 times or so..?
+		// For now, just send every time 
+		info, err := shuffle.GetOrgStatistics(ctx, org.Id)
+		if err != nil {
+			log.Printf("[ERROR] Failed getting org statistics backup for org %s: %s", org.Id, err)
+		} else {
+			backupJob.Stats = *info
+		}
 	}
 
 	backupJobData, err := json.Marshal(backupJob)
@@ -3812,6 +3893,7 @@ func remoteOrgJobHandler(org shuffle.Org, interval int) error {
 		//log.Printf("[ERROR] Failed cloud sync job controller run for '%s': %s", respBody, err)
 		return err
 	}
+
 	return nil
 }
 
@@ -3843,7 +3925,7 @@ func runInitEs(ctx context.Context) {
 		log.Printf("[INFO] Running with HTTPS proxy %s (env: HTTPS_PROXY)", httpsProxy)
 	}
 
-	defaultEnv := os.Getenv("ORG_ID")
+	defaultEnv := os.Getenv("ENVIRONMENT_NAME")
 	if len(defaultEnv) == 0 {
 		defaultEnv = "Shuffle"
 		log.Printf("[DEBUG] Setting default environment for org to %s", defaultEnv)
@@ -3949,6 +4031,8 @@ func runInitEs(ctx context.Context) {
 		time.Sleep(30 * time.Second)
 	}
 
+	// FIXME: This should ONLY run on one backend instance
+
 	schedules, err := shuffle.GetAllSchedules(ctx, "ALL")
 	if err != nil {
 		log.Printf("[WARNING] Failed getting schedules during service init: %s", err)
@@ -4092,7 +4176,7 @@ func runInitEs(ctx context.Context) {
 		}
 
 		//interval := int(org.SyncConfig.Interval)
-		interval := 15
+		interval := 30 
 		if interval == 0 {
 			log.Printf("[WARNING] Skipping org %s because sync isn't set (0).", org.Id)
 			continue
@@ -4161,20 +4245,26 @@ func runInitEs(ctx context.Context) {
 
 		cleanupJob := func() func() {
 			return func() {
-				log.Printf("[INFO] Running schedule for cleaning up or re-running unfinished workflows in %d environments.", len(environments))
+				//log.Printf("[INFO] Running schedule for cleaning up or re-running unfinished workflows in %d environments.", len(environments))
+
+				backendPort := os.Getenv("BACKEND_PORT")
+				if backendPort == "" {
+					backendPort = "5001"
+				}
 
 				for _, environment := range environments {
 					// Allowed without PROXY management as it's localhost
 					// client := shuffle.GetExternalClient(syncUrl)
 
 					httpClient := &http.Client{}
-					url := fmt.Sprintf("http://localhost:5001/api/v1/environments/%s/stop", environment)
+					url := fmt.Sprintf("http://localhost:%s/api/v1/environments/%s/stop", backendPort, environment)
 					req, err := http.NewRequest(
 						"GET",
 						url,
 						nil,
 					)
 
+					// FIXME: This will stop working of the user rotates their key lol
 					req.Header.Add("Authorization", fmt.Sprintf(`Bearer %s`, parsedApikey))
 					if err != nil {
 						log.Printf("[ERROR] Failed CREATING environment request for %s: %s", environment, err)
@@ -4188,14 +4278,22 @@ func runInitEs(ctx context.Context) {
 						continue
 					}
 
+
 					respBody, err := ioutil.ReadAll(newresp.Body)
 					if err != nil {
-						log.Printf("[ERROR] Failed setting respbody %s", err)
+						log.Printf("[ERROR] Failed setting respbody %s for execution stop. Status: %d", err, newresp.StatusCode)
 						continue
 					}
-					log.Printf("[DEBUG] Successfully ran workflow cleanup request for %s. Body: %s", environment, string(respBody))
 
-					url = fmt.Sprintf("http://localhost:5001/api/v1/environments/%s/rerun", environment)
+					if newresp.StatusCode != 200 {
+						if !strings.Contains(string(respBody), "is active") {
+							log.Printf("[WARNING] Failed stopping runs in environment %s. Status code: %d. Body: %s", environment, newresp.StatusCode, string(respBody))
+						}
+
+						continue
+					}
+
+					url = fmt.Sprintf("http://localhost:%s/api/v1/environments/%s/rerun", backendPort, environment)
 					req, err = http.NewRequest(
 						"GET",
 						url,
@@ -4215,12 +4313,17 @@ func runInitEs(ctx context.Context) {
 						continue
 					}
 
-					respBody, err = ioutil.ReadAll(newresp.Body)
-					if err != nil {
-						log.Printf("[ERROR] Failed setting respbody %s", err)
-						continue
+					if newresp.StatusCode != 200 {
+						log.Printf("[WARNING] Failed rerunning environment %s. Status code: %d", environment, newresp.StatusCode)
 					}
-					log.Printf("[DEBUG] Successfully ran workflow RERUN request for %s. Body: %s", environment, string(respBody))
+
+					//respBody, err := ioutil.ReadAll(newresp.Body)
+					//if err != nil {
+					//	log.Printf("[ERROR] Failed setting respbody %s", err)
+					//	continue
+					//}
+
+					//log.Printf("[DEBUG] Ran workflow RERUN request for %s with the response. Body: %s", environment, string(respBody))
 				}
 			}
 		}
@@ -4313,45 +4416,16 @@ func runInitEs(ctx context.Context) {
 		log.Printf("[DEBUG] Skipping download of default apps as %d were found", len(workflowapps))
 	}
 
-	log.Printf("[INFO] Downloading OpenAPI data for search - EXTRA APPS")
-	apis := "https://github.com/shuffle/security-openapis"
-
-	// THis gets memory problems hahah
-	//apis := "https://github.com/APIs-guru/openapi-directory"
-	fs := memfs.New()
-	storer := memory.NewStorage()
-	cloneOptions := &git.CloneOptions{
-		URL: apis,
-	}
-
-	cloneOptions = checkGitProxy(cloneOptions)
-
-	_, err = git.Clone(storer, fs, cloneOptions)
-	if err != nil {
-		log.Printf("[ERROR] Failed loading repo %s into memory: %s", apis, err)
-	} else if err == nil && len(workflowapps) < 10 {
-		log.Printf("[INFO] Finished git clone. Looking for updates to the repo.")
-		dir, err := fs.ReadDir("")
-		if err != nil {
-			log.Printf("Failed reading folder: %s", err)
-		}
-
-		iterateOpenApiGithub(fs, dir, "", "")
-		log.Printf("[INFO] Finished downloading extra API samples")
-	} else {
-		log.Printf("[INFO] Skipping download of extra API samples as %d were found", len(workflowapps))
-	}
-
 	if os.Getenv("SHUFFLE_HEALTHCHECK_DISABLED") != "true" {
-		healthcheckInterval := 30
-		log.Printf("[INFO] Starting healthcheck job every %d minute. Stats available on /api/v1/health/stats. Disable with SHUFFLE_HEALTHCHECK_DISABLED=true", healthcheckInterval)
+		healthcheckInterval := 60
+		log.Printf("[INFO] Starting healthcheck job every %d minute. Stats available on /api/v1/health/stats, and dashboard on /health. Disable with SHUFFLE_HEALTHCHECK_DISABLED=true", healthcheckInterval)
 		job := func() {
 			// Prepare a fake http.responsewriter
 			resp := httptest.NewRecorder()
 
 			request := http.Request{}
 			// Add the "force=true" query to the fake request
-			request.URL, err = url.Parse("/api/v1/health/stats?force=true")
+			request.URL, err = url.Parse("/api/v1/health?force=true")
 			if err != nil {
 				log.Printf("[ERROR] Failed to parse test url for healthstats: %s", err)
 			}
@@ -4422,7 +4496,7 @@ func handleStopCloudSync(syncUrl string, org shuffle.Org) (*shuffle.Org, error)
 		return &org, errors.New(fmt.Sprintf("Couldn't find any sync key to disable org %s", org.Id))
 	}
 
-	log.Printf("[INFO] Should run cloud sync disable for org %s with URL %s and sync key %s", org.Id, syncUrl, org.SyncConfig.Apikey)
+	log.Printf("[INFO] Should run cloud sync disable for org %s with URL %s", org.Id, syncUrl)
 
 	client := shuffle.GetExternalClient(syncUrl)
 	req, err := http.NewRequest(
@@ -4635,7 +4709,7 @@ func handleCloudSetup(resp http.ResponseWriter, request *http.Request) {
 	// If you want to disable cloud sync, see previous section.
 	if org.CloudSync {
 		log.Printf("[WARNING] Org %s is already syncing. Skip", org.Id)
-		resp.WriteHeader(401)
+		resp.WriteHeader(400)
 		resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Your org is already syncing. Nothing to set up."}`)))
 		return
 	}
@@ -4712,6 +4786,9 @@ func handleCloudSetup(resp http.ResponseWriter, request *http.Request) {
 	org.SyncConfig = shuffle.SyncConfig{
 		Apikey:   responseData.SessionKey,
 		Interval: responseData.IntervalSeconds,
+
+		WorkflowBackup: true,
+		AppBackup: true, 
 	}
 
 	interval := int(responseData.IntervalSeconds)
@@ -5092,8 +5169,8 @@ func initHandlers() {
 	// Changed from workflows/streams to streams, as appengine was messing up
 	// This does not increase the API counter
 	// Used by frontend
-	r.HandleFunc("/api/v1/streams", handleWorkflowQueue).Methods("POST")
-	r.HandleFunc("/api/v1/streams/results", handleGetStreamResults).Methods("POST", "OPTIONS")
+	r.HandleFunc("/api/v1/streams", handleSetWorkflowExecution).Methods("POST")
+	r.HandleFunc("/api/v1/streams/results", handleGetWorkflowExecutionResult).Methods("POST", "OPTIONS")
 
 	// Used by orborus
 	r.HandleFunc("/api/v1/workflows/queue", handleGetWorkflowqueue).Methods("GET", "POST")
@@ -5104,7 +5181,7 @@ func initHandlers() {
 	r.HandleFunc("/api/v1/apps/{key}/execute", executeSingleAction).Methods("POST", "OPTIONS")
 	r.HandleFunc("/api/v1/apps/{key}/run", executeSingleAction).Methods("POST", "OPTIONS")
 	r.HandleFunc("/api/v1/apps/categories", shuffle.GetActiveCategories).Methods("GET", "OPTIONS")
-	r.HandleFunc("/api/v1/apps/categories/run", shuffle.RunCategoryAction).Methods("POST", "OPTIONS")
+	//r.HandleFunc("/api/v1/apps/categories/run", shuffle.RunCategoryAction).Methods("POST", "OPTIONS")
 	r.HandleFunc("/api/v1/apps/upload", handleAppZipUpload).Methods("POST", "OPTIONS")
 	r.HandleFunc("/api/v1/apps/{appId}/activate", activateWorkflowAppDocker).Methods("GET", "OPTIONS")
 	r.HandleFunc("/api/v1/apps/{appId}/deactivate", activateWorkflowAppDocker).Methods("GET", "OPTIONS")
@@ -5185,6 +5262,16 @@ func initHandlers() {
 	r.HandleFunc("/api/v1/hooks/{key}/delete", shuffle.HandleDeleteHook).Methods("DELETE", "OPTIONS")
 	r.HandleFunc("/api/v1/hooks/{key}", shuffle.HandleDeleteHook).Methods("DELETE", "OPTIONS")
 
+	// This structure is horrendous. Needs fixing after we got the prototype up
+	r.HandleFunc("/api/v1/detections", shuffle.HandleListDetectionCategories).Methods("GET", "OPTIONS")
+	r.HandleFunc("/api/v1/detections/{detectionType}/connect", shuffle.HandleDetectionAutoConnect).Methods("GET", "OPTIONS")
+	r.HandleFunc("/api/v1/detections/{detection_type}", shuffle.HandleGetDetectionRules).Methods("GET", "OPTIONS")
+	r.HandleFunc("/api/v1/detections/{detection_type}/selected_rules/{action}", shuffle.HandleFolderToggle).Methods("PUT", "OPTIONS")
+
+	r.HandleFunc("/api/v1/detections/{triggerId}/selected_rules", shuffle.HandleGetSelectedRules).Methods("GET", "OPTIONS")
+	r.HandleFunc("/api/v1/detections/{triggerId}/selected_rules/save", shuffle.HandleSaveSelectedRules).Methods("POST", "OPTIONS")
+	r.HandleFunc("/api/v1/detections/{detection_type}/{fileId}/{action}", shuffle.HandleToggleRule).Methods("PUT", "OPTIONS")
+
 	// OpenAPI configuration
 	r.HandleFunc("/api/v1/verify_swagger", verifySwagger).Methods("POST", "OPTIONS")
 	r.HandleFunc("/api/v1/verify_openapi", verifySwagger).Methods("POST", "OPTIONS")
@@ -5327,6 +5414,7 @@ func main() {
 	if innerPort == "" {
 		log.Printf("[DEBUG] Running on %s:5001", hostname)
 		log.Fatal(http.ListenAndServe(":5001", nil))
+		os.Setenv("BACKEND_PORT", "5001")
 	} else {
 		log.Printf("[DEBUG] Running on %s:%s", hostname, innerPort)
 		log.Fatal(http.ListenAndServe(fmt.Sprintf(":%s", innerPort), nil))
diff --git a/backend/go-app/walkoff.go b/backend/go-app/walkoff.go
index df7addb8..0f078dca 100755
--- a/backend/go-app/walkoff.go
+++ b/backend/go-app/walkoff.go
@@ -11,7 +11,7 @@ import (
 	"io"
 	"io/ioutil"
 	"log"
-	"math/rand"
+	//"math/rand"
 	"net/http"
 	"net/url"
 	"os"
@@ -22,9 +22,6 @@ import (
 
 	dockerclient "github.com/docker/docker/client"
 	"github.com/docker/docker/api/types/image"
-
-	//gyaml "github.com/ghodss/yaml"
-
 	"github.com/h2non/filetype"
 	uuid "github.com/satori/go.uuid"
 
@@ -33,15 +30,9 @@ import (
 	"github.com/go-git/go-billy/v5"
 	"github.com/go-git/go-billy/v5/memfs"
 	"github.com/go-git/go-git/v5"
-	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/go-git/go-git/v5/storage/memory"
-	http2 "gopkg.in/src-d/go-git.v4/plumbing/transport/http"
-
-	//"github.com/gorilla/websocket"
-	//"google.golang.org/appengine"
-	//"google.golang.org/appengine/memcache"
-	//"cloud.google.com/go/firestore"
-	// "google.golang.org/api/option"
+	"github.com/go-git/go-git/v5/plumbing"
+	http2 "github.com/go-git/go-git/v5/plumbing/transport/http"
 	gyaml "github.com/ghodss/yaml"
 )
 
@@ -206,7 +197,7 @@ func handleGetWorkflowqueueConfirm(resp http.ResponseWriter, request *http.Reque
 	}
 
 	// remove items from DB
-	parsedId := fmt.Sprintf("workflowqueue-%s", id)
+	parsedId := strings.ReplaceAll(fmt.Sprintf("workflowqueue-%s", id), " ", "-")
 	ids := []string{}
 	for _, execution := range removeExecutionRequests.Data {
 		ids = append(ids, execution.ExecutionId)
@@ -255,17 +246,17 @@ func handleGetWorkflowqueue(resp http.ResponseWriter, request *http.Request) {
 	}
 
 	// This is really the environment's name - NOT org-id
-	orgId := request.Header.Get("Org-Id")
-	if len(orgId) == 0 {
+	environment := request.Header.Get("Org-Id")
+	if len(environment) == 0 {
 		log.Printf("[AUDIT] No org-id header set")
 		resp.WriteHeader(401)
 		resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Specify the org-id header."}`)))
 		return
 	}
 
-	environment := request.Header.Get("org")
-	if len(environment) == 0 {
-		//log.Printf("[AUDIT] No 'org' header set (get workflow queue). ")
+	orgId := request.Header.Get("Org")
+	if len(orgId) == 0 {
+		log.Printf("[AUDIT] No 'org' header set (get workflow queue). ")
 		/*
 			resp.WriteHeader(403)
 			resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Specify the org header. This can be done by setting the 'ORG' environment variable for Orborus to your Org ID in Shuffle"}`)))
@@ -274,7 +265,8 @@ func handleGetWorkflowqueue(resp http.ResponseWriter, request *http.Request) {
 	}
 
 	orborusLabel := request.Header.Get("x-orborus-label")
-
+	_ = orborusLabel
+	
 	// This section is cloud custom for now
 	auth := request.Header.Get("Authorization")
 	if len(auth) == 0 {
@@ -289,211 +281,46 @@ func handleGetWorkflowqueue(resp http.ResponseWriter, request *http.Request) {
 	//log.Printf("[AUDIT] Get workflow queue for org %s, env %s, orborus label %s", orgId, environment, orborusLabel)
 
 	ctx := shuffle.GetContext(request)
-	env, err := shuffle.GetEnvironment(ctx, orgId, "")
-	timeNow := time.Now().Unix()
-	if err == nil && len(env.Id) > 0 && len(env.Name) > 0 && request.Method == "POST" { 
-		// Updates every 60 seconds~
-		if time.Now().Unix() > env.Edited+60 {
-			env.RunningIp = shuffle.GetRequestIp(request)
+	envs, err := shuffle.GetEnvironments(ctx, orgId)
+	if err != nil || len(envs) == 0 {
+		log.Printf("[WARNING] No env found matching %s - continuing without updating orborus anyway: %s", environment, err)
+	}
 
-			// Orborus label = custom label for Orborus
-			if len(orborusLabel) > 0 {
-				env.RunningIp = orborusLabel
-			}
-
-			// Set the checkin cache
-
-
-			body, err := ioutil.ReadAll(request.Body)
-			if err == nil {
-				var envData shuffle.OrborusStats
-				err = json.Unmarshal(body, &envData)
-				if err == nil {
-					envData.RunningIp = env.RunningIp
-
-					marshalled, err := json.Marshal(envData)
-					if err == nil {
-						cacheKey := fmt.Sprintf("queueconfig-%s-%s", env.Name, env.OrgId)
-						go shuffle.SetCache(context.Background(), cacheKey, marshalled, 2)
-					}
-
-
-
-					if envData.Swarm {
-						env.Licensed = true
-						env.RunType = "docker"
-					} 
-
-					if envData.Kubernetes {
-						env.RunType = "k8s"
-					}
-
-					envData.DataLake = env.DataLake
-				}
-			}
-
-			env.Checkin = timeNow
-			err = shuffle.SetEnvironment(ctx, env)
-			if err != nil {
-				log.Printf("[ERROR] Failed updating environment: %s", err)
-			}
+	var env *shuffle.Environment
+	found := false
+	for i := range envs {
+		if envs[i].Name == environment {
+			env = &envs[i]
+			found = true
+			break
 		}
 	}
 
+	if !found {
+		log.Printf("[ERROR] Failed to find environment(%s) for org(%s)", environment, orgId)
+		resp.WriteHeader(400)
+		resp.Write([]byte(`{"success":false,"reason":"environment not found"}`))
+		return
+	}
+
+	timeNow := time.Now().Unix()
+	err = shuffle.HandleOrborusFailover(ctx, request, resp, env)
+	if err != nil {
+		if !strings.Contains(err.Error(), "mismatch") {
+			log.Printf("[WARNING] Failed handling Orborus failover: %s", err)
+		}
+
+		log.Printf("[DEBUG] Issue with environment ID: %s", environment)
+
+		return
+	}
+
 	//log.Printf("Found env: %#v", env)
 	if len(env.OrgId) > 0 {
-		environment = env.OrgId
+		orgId = env.OrgId
 	}
 
-	// FIXME: Workflow stats disabled for now
-	// as it caused too many problems
-	// goal: track docker stuff once a minute and graph it
-	// For now: Disable this as it caused too many problems
-	if request.Method == "POST" && true == false {
-		//log.Printf("[DEBUG] POST to workflowqueue")
-		if rand.Intn(10) == 0 {
-			// Parse out body
-			body, err := ioutil.ReadAll(request.Body)
-			if err == nil {
-
-				// Parse out CPU, memory and disk.
-
-				var envData shuffle.OrborusStats
-				err = json.Unmarshal(body, &envData)
-				if err == nil && !envData.Swarm && !envData.Kubernetes && (envData.CPU > 0 || envData.Memory > 0 || envData.Disk > 0) {
-
-					// Set the input in memory
-					envData.OrgId = orgId
-					envData.Environment = environment
-					envData.OrborusLabel = orborusLabel
-					envData.Timestamp = time.Now().Unix()
-
-					if envData.CPU > 0 && envData.MaxCPU > 0 {
-						envData.CPUPercent = float64(envData.CPU) / float64(envData.MaxCPU)
-					}
-
-					if envData.Memory > 0 && envData.MaxMemory > 0 {
-						envData.MemoryPercent = float64(envData.Memory) / float64(envData.MaxMemory)
-					}
-
-					// Check if CPU percent constantly has stayed above X% for the last Y requests
-					percentageCheck := 90
-					concurrentChecks := 2
-
-					//if int(envData.CPUPercent) > percentageCheck {
-					// Get cached data
-					percentages := []float64{}
-					cacheKey := fmt.Sprintf("%s_%s_percent", orgId, strings.ToLower(environment))
-
-					// Marshal float list into []byte
-					cacheData := []byte{}
-					cache, err := shuffle.GetCache(ctx, cacheKey)
-					if err == nil {
-						// Unmarshal into percentages
-						cacheData := []byte(cache.([]uint8))
-						err = json.Unmarshal(cacheData, &percentages)
-						if err != nil {
-							log.Printf("[INFO] error in cache unmarshal for percentages: %s", err)
-						}
-
-						if len(percentages) > concurrentChecks {
-							percentages = percentages[:concurrentChecks]
-						}
-
-						percentages = append(percentages, envData.CPUPercent)
-						if len(percentages) > concurrentChecks {
-							//log.Printf("[INFO] Checking percentages: %v", percentages)
-
-							// percentageCheck := 1
-							sendAlert := true
-							for _, p := range percentages {
-								if int(p) < percentageCheck {
-									//log.Printf("[AUDIT] CPU percent is below %d: %d", percentageCheck, int(p))
-									sendAlert = false
-									break
-								}
-							}
-
-							if sendAlert {
-								log.Printf("[INFO] CPU percent has been above %d percent for the last 5 requests. Sending alert. Env: %s, org: %s", percentageCheck, environment, orgId)
-
-								// Set notification + alert for organization
-								err = shuffle.CreateOrgNotification(
-									ctx,
-									fmt.Sprintf("CPU percent has been above %d percent", percentageCheck),
-									fmt.Sprintf("A environment %s has been using more than %d\\% CPU for the last 5 requests.", environment, percentageCheck),
-									fmt.Sprintf("/admin?tab=environments"),
-									environment,
-									true,
-								)
-
-								if err != nil {
-									log.Printf("[ERROR] error creating notification: %s", err)
-								}
-
-								org, err := shuffle.GetOrg(ctx, environment)
-								if err == nil {
-									foundRecommendation := false
-									for _, recommendation := range org.Priorities {
-										if strings.Contains(recommendation.Name, "CPU") {
-											foundRecommendation = true
-											break
-										}
-									}
-
-									if !foundRecommendation {
-										// Add to start of org.Priorities
-										org, _ = shuffle.AddPriority(*org, shuffle.Priority{
-											Name:        fmt.Sprintf("High CPU in environment %s", orgId),
-											Description: fmt.Sprintf("The environment %s has been using more than %d percent CPU. This indicates you may need to look at scaling.", orgId, percentageCheck),
-											Type:        "scale",
-											Active:      true,
-											URL:         fmt.Sprintf("/admin?tab=environments"),
-											Severity:    1,
-										}, false)
-
-										//Make last item the first item
-										org.Priorities = append([]shuffle.Priority{org.Priorities[len(org.Priorities)-1]}, org.Priorities[:len(org.Priorities)-1]...)
-										err = shuffle.SetOrg(ctx, *org, org.Id)
-										if err != nil {
-											log.Printf("[ERROR] Problem setting org: %s", err)
-										}
-									}
-								}
-							}
-
-							if len(percentages) > 1 {
-								percentages = percentages[1:]
-							}
-						}
-
-						// Marshal float list into []byte
-					} else {
-						//log.Printf("[ERROR] Failed getting cache: %s", err)
-						percentages = append(percentages, envData.CPUPercent)
-					}
-
-					if len(percentages) > 0 {
-						//log.Printf("[DEBUG] Setting cache for %s: %#v", cacheKey, percentages)
-						cacheData, err = json.Marshal(percentages)
-						if err != nil {
-							log.Printf("[INFO] error in cache marshal: %s", err)
-						}
-
-						// Add the new data
-						go shuffle.SetCache(ctx, cacheKey, cacheData, 5)
-					}
-				}
-
-				//log.Printf("CPU percent: %f", envData.CPUPercent)
-				//log.Printf("Memory percent: %f", envData.MemoryPercent*100)
-
-				go shuffle.SetenvStats(ctx, envData)
-			}
-		}
-	}
-
-	executionRequests, err := shuffle.GetWorkflowQueue(ctx, orgId, 100)
+	executionRequests, err := shuffle.GetWorkflowQueue(ctx, environment, 100)
 	if err != nil {
 		// Skipping as this comes up over and over
 		//log.Printf("(2) Failed reading body for workflowqueue: %s", err)
@@ -521,10 +348,10 @@ func handleGetWorkflowqueue(resp http.ResponseWriter, request *http.Request) {
 				}
 			}
 
-			if len(orgId) > 0 {
-				env, err := shuffle.GetEnvironment(ctx, orgId, foundId)
+			if len(environment) > 0 {
+				env, err := shuffle.GetEnvironment(ctx, environment, foundId)
 				if err != nil {
-					log.Printf("[WARNING] No env found matching %s - continuing without updating orborus anyway: %s", orgId, err)
+					log.Printf("[WARNING] No env found matching %s - continuing without updating orborus anyway: %s", environment, err)
 					//resp.WriteHeader(401)
 					//resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "No env found matching %s"}`, id)))
 					//return
@@ -557,7 +384,7 @@ func handleGetWorkflowqueue(resp http.ResponseWriter, request *http.Request) {
 	resp.Write(newjson)
 }
 
-func handleGetStreamResults(resp http.ResponseWriter, request *http.Request) {
+func handleGetWorkflowExecutionResult(resp http.ResponseWriter, request *http.Request) {
 	cors := shuffle.HandleCors(resp, request)
 	if cors {
 		return
@@ -688,7 +515,7 @@ func handleGetStreamResults(resp http.ResponseWriter, request *http.Request) {
 
 }
 
-func handleWorkflowQueue(resp http.ResponseWriter, request *http.Request) {
+func handleSetWorkflowExecution(resp http.ResponseWriter, request *http.Request) {
 	cors := shuffle.HandleCors(resp, request)
 	if cors {
 		return
@@ -707,19 +534,26 @@ func handleWorkflowQueue(resp http.ResponseWriter, request *http.Request) {
 		return
 	}
 
-	//log.Printf("Actionresult unmarshal: %s", string(body))
-	//log.Printf("[DEBUG] Got workflow result from %s of length %d", request.RemoteAddr, len(body))
-	ctx := context.Background()
-	err = shuffle.ValidateNewWorkerExecution(ctx, body)
-	if err == nil {
-		resp.WriteHeader(200)
-		resp.Write([]byte(fmt.Sprintf(`{"success": true, "reason": "success"}`)))
-		return
-	} else {
-		log.Printf("[DEBUG] Handling other execution variant (subflow?): %s", err)
+	// Allows override of existing executions.
+	// This is a way to set them back to 0 results and rerun the
+	// exact same. Primarily in use for Worker testing of specific workflows.
+	shouldReset := false
+	resetString, ok := request.URL.Query()["reset"]
+	if ok && len(resetString) > 0 {
+		if resetString[0] == "true" {
+			shouldReset = true
+		}
 	}
 
-	//log.Printf("[DEBUG] Got workflow result from %s of length %d.", request.RemoteAddr, len(body))
+	ctx := context.Background()
+	err = shuffle.ValidateNewWorkerExecution(ctx, body, shouldReset)
+	if err == nil {
+		resp.WriteHeader(200)
+		resp.Write([]byte(fmt.Sprintf(`{"success": true, "reason": "Successfully updated the execution"}`)))
+		return
+	} else {
+		//log.Printf("[DEBUG] Handling other execution variant (subflow?): %s", err)
+	}
 
 	var actionResult shuffle.ActionResult
 	err = json.Unmarshal(body, &actionResult)
@@ -730,8 +564,6 @@ func handleWorkflowQueue(resp http.ResponseWriter, request *http.Request) {
 		//return
 	}
 
-	//log.Printf("Received action: %#v", actionResult)
-
 	// 1. Get the WorkflowExecution(ExecutionId) from the database
 	// 2. if ActionResult.Authentication != WorkflowExecution.Authentication -> exit
 	// 3. Add to and update actionResult in workflowExecution
@@ -788,7 +620,6 @@ func runWorkflowExecutionTransaction(ctx context.Context, attempts int64, workfl
 		return
 	}
 
-	//log.Printf("BASE LENGTH: %d", len(workflowExecution.Results))
 	workflowExecution, dbSave, err := shuffle.ParsedExecutionResult(ctx, *workflowExecution, actionResult, false, 0)
 	if err != nil {
 		b, suberr := json.Marshal(actionResult)
@@ -798,13 +629,12 @@ func runWorkflowExecutionTransaction(ctx context.Context, attempts int64, workfl
 			log.Printf("[ERROR] Failed running of parsedexecution: %s. Data: %s", err, string(b))
 		}
 
-		resp.WriteHeader(401)
+		resp.WriteHeader(400)
 		resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Failed updating execution"}`)))
 		return
 	}
 
 	_ = dbSave
-	//resultLength := len(workflowExecution.Results)
 	setExecution := true
 	if setExecution || workflowExecution.Status == "FINISHED" || workflowExecution.Status == "ABORTED" || workflowExecution.Status == "FAILURE" {
 		err = shuffle.SetWorkflowExecution(ctx, *workflowExecution, true)
@@ -983,7 +813,7 @@ func deleteWorkflow(resp http.ResponseWriter, request *http.Request) {
 		if err != nil {
 			log.Printf("[ERROR] Failed to list child workflows: %s", err)
 		} else { 
-			log.Printf("\n\n[DEBUG] Found %d child workflows for workflow %s\n\n", len(childWorkflows), workflow.ID)
+			//log.Printf("\n\n[DEBUG] Found %d child workflows for workflow %s\n\n", len(childWorkflows), workflow.ID)
 
 			// Find cookies and append them to request.Header to replicate current request as closely as possible
 			for _, childWorkflow := range childWorkflows {
@@ -1021,7 +851,7 @@ func deleteWorkflow(resp http.ResponseWriter, request *http.Request) {
 		}
 	}
 
-	log.Printf("[DEBUG] Attempting to delete the workflow %s from the database...", fileId)
+	//log.Printf("[DEBUG] Attempting to delete the workflow %s from the database...", fileId)
 	err = shuffle.DeleteKey(ctx, "workflow", fileId)
 	if err != nil {
 		log.Printf("[DEBUG] Failed deleting workflow key %s", fileId)
@@ -1032,10 +862,13 @@ func deleteWorkflow(resp http.ResponseWriter, request *http.Request) {
 
 	log.Printf("[INFO] Should have deleted workflow %s (%s)", workflow.Name, fileId)
 
-	cacheKey := fmt.Sprintf("%s_workflows", user.Id)
-	shuffle.DeleteCache(ctx, cacheKey)
+	shuffle.DeleteCache(ctx, fmt.Sprintf("%s_workflows", user.Id))
 	shuffle.DeleteCache(ctx, fmt.Sprintf("%s_workflows", user.ActiveOrg.Id))
-	log.Printf("[DEBUG] Cleared workflow cache for %s (%s)", user.Username, user.Id)
+	shuffle.DeleteCache(ctx, fmt.Sprintf("%s_%s", user.Username, fileId))
+	shuffle.DeleteCache(ctx, fmt.Sprintf("workflow_%s_childworkflows", workflow.ID))
+	if len(workflow.ParentWorkflowId) > 0 {
+		shuffle.DeleteCache(ctx, fmt.Sprintf("workflow_%s_childworkflows", workflow.ParentWorkflowId))
+	}
 
 	resp.WriteHeader(200)
 	resp.Write([]byte(`{"success": true}`))
@@ -1050,7 +883,7 @@ func handleExecution(id string, workflow shuffle.Workflow, request *http.Request
 
 	ctx := context.Background()
 	if workflow.ID == "" || workflow.ID != id {
-		tmpworkflow, err := shuffle.GetWorkflow(ctx, id)
+		tmpworkflow, err := shuffle.GetWorkflow(ctx, id, true)
 		if err != nil {
 			//log.Printf("[WARNING] Failed getting the workflow locally (execution setup): %s", err)
 			return shuffle.WorkflowExecution{}, "Failed getting workflow", err
@@ -1094,10 +927,12 @@ func handleExecution(id string, workflow shuffle.Workflow, request *http.Request
 		workflow.Errors = []string{}
 	}
 
+	/*
 	if !workflow.IsValid {
 		log.Printf("[ERROR] Stopped execution as workflow %s is not valid.", workflow.ID)
 		return shuffle.WorkflowExecution{}, fmt.Sprintf(`workflow %s is invalid`, workflow.ID), errors.New("Failed getting workflow")
 	}
+	*/
 
 	maxExecutionDepth := 10
 	if os.Getenv("SHUFFLE_MAX_EXECUTION_DEPTH") != "" {
@@ -1133,507 +968,6 @@ func handleExecution(id string, workflow shuffle.Workflow, request *http.Request
 		return shuffle.WorkflowExecution{}, "Failed unmarshal during execution", err
 	}
 
-	/*
-	makeNew := true
-	start, startok := request.URL.Query()["start"]
-	if request.Method == "POST" {
-		body, err := ioutil.ReadAll(request.Body)
-		if err != nil {
-			log.Printf("[ERROR] Failed request POST read: %s", err)
-			return shuffle.WorkflowExecution{}, "Failed getting body", err
-		}
-
-		// This one doesn't really matter.
-		log.Printf("[INFO] Running POST execution with body of length %d for workflow %s", len(string(body)), workflowExecution.Workflow.ID)
-
-		if len(body) >= 4 {
-			if body[0] == 34 && body[len(body)-1] == 34 {
-				body = body[1 : len(body)-1]
-			}
-			if body[0] == 34 && body[len(body)-1] == 34 {
-				body = body[1 : len(body)-1]
-			}
-		}
-
-		sourceAuth, sourceAuthOk := request.URL.Query()["source_auth"]
-		if sourceAuthOk {
-			//log.Printf("\n\n\nSETTING SOURCE WORKFLOW AUTH TO %s!!!\n\n\n", sourceAuth[0])
-			workflowExecution.ExecutionSourceAuth = sourceAuth[0]
-		} else {
-			//log.Printf("Did NOT get source workflow")
-		}
-
-		sourceNode, sourceNodeOk := request.URL.Query()["source_node"]
-		if sourceNodeOk {
-			//log.Printf("\n\n\nSETTING SOURCE WORKFLOW NODE TO %s!!!\n\n\n", sourceNode[0])
-			workflowExecution.ExecutionSourceNode = sourceNode[0]
-		} else {
-			//log.Printf("Did NOT get source workflow")
-		}
-
-		//workflowExecution.ExecutionSource = "default"
-		sourceWorkflow, sourceWorkflowOk := request.URL.Query()["source_workflow"]
-		if sourceWorkflowOk {
-			//log.Printf("Got source workflow %s", sourceWorkflow)
-			workflowExecution.ExecutionSource = sourceWorkflow[0]
-		} else {
-			//log.Printf("Did NOT get source workflow")
-		}
-
-		sourceExecution, sourceExecutionOk := request.URL.Query()["source_execution"]
-		if sourceExecutionOk {
-			//log.Printf("[INFO] Got source execution%s", sourceExecution)
-			workflowExecution.ExecutionParent = sourceExecution[0]
-		} else {
-			//log.Printf("Did NOT get source execution")
-		}
-
-		if len(string(body)) < 50 {
-			//log.Println(body)
-			// String in string
-			//log.Println(body)
-
-			//if string(body)[0] == "\"" && string(body)[string(body)
-			log.Printf("[DEBUG] Body: %s", string(body))
-		}
-
-		var execution shuffle.ExecutionRequest
-		err = json.Unmarshal(body, &execution)
-		if err != nil {
-			log.Printf("[WARNING] Failed execution POST unmarshalling for execution %s - continuing anyway: %s", execution.ExecutionId, err)
-			//return shuffle.WorkflowExecution{}, "", err
-		}
-
-		if execution.Start == "" && len(body) > 0 {
-			execution.ExecutionArgument = string(body)
-		}
-
-		// FIXME - this should have "execution_argument" from executeWorkflow frontend
-		//log.Printf("EXEC: %#v", execution)
-		if len(execution.ExecutionArgument) > 0 {
-			workflowExecution.ExecutionArgument = execution.ExecutionArgument
-		}
-
-		if len(execution.ExecutionSource) > 0 {
-			workflowExecution.ExecutionSource = execution.ExecutionSource
-		}
-
-		//log.Printf("Execution data: %#v", execution)
-		if len(execution.Start) == 36 && len(workflow.Actions) > 0 {
-			log.Printf("[INFO] Should start execution on node %s", execution.Start)
-			workflowExecution.Start = execution.Start
-
-			found := false
-			for _, action := range workflow.Actions {
-				if action.ID == execution.Start {
-					found = true
-					break
-				}
-			}
-
-			if !found {
-				log.Printf("[ERROR] Action %s was NOT found! Exiting execution.", execution.Start)
-				return shuffle.WorkflowExecution{}, fmt.Sprintf("Startnode %s was not found in actions", workflow.Start), errors.New(fmt.Sprintf("Startnode %s was not found in actions", workflow.Start))
-			}
-		} else if len(execution.Start) > 0 {
-			//log.Printf("[INFO] !")
-			//log.Printf("[ERROR] START ACTION %s IS WRONG ID LENGTH %d!", execution.Start, len(execution.Start))
-			//return shuffle.WorkflowExecution{}, fmt.Sprintf("Startnode %s was not found in actions", execution.Start), errors.New(fmt.Sprintf("Startnode %s was not found in actions", execution.Start))
-		}
-
-		if len(execution.ExecutionId) == 36 {
-			workflowExecution.ExecutionId = execution.ExecutionId
-		} else {
-			sessionToken := uuid.NewV4()
-			workflowExecution.ExecutionId = sessionToken.String()
-		}
-	} else {
-		// Check for parameters of start and ExecutionId
-		// This is mostly used for user input trigger
-
-		answer, answerok := request.URL.Query()["answer"]
-		referenceId, referenceok := request.URL.Query()["reference_execution"]
-		if answerok && referenceok && len(answer) > 0 && len(referenceId) > 0 {
-			// If answer is false, reference execution with result
-			log.Printf("[INFO] Answer is OK AND reference is OK!")
-			if answer[0] == "false" {
-				log.Printf("Should update reference and return, no need for further execution!")
-
-				// Get the reference execution
-				oldExecution, err := shuffle.GetWorkflowExecution(ctx, referenceId[0])
-				if err != nil {
-					log.Printf("Failed getting execution (execution) %s: %s", referenceId[0], err)
-					return shuffle.WorkflowExecution{}, fmt.Sprintf("Failed getting execution ID %s because it doesn't exist.", referenceId[0]), err
-				}
-
-				if oldExecution.Workflow.ID != id {
-					log.Println("Wrong workflowid!")
-					return shuffle.WorkflowExecution{}, fmt.Sprintf("Bad ID %s", referenceId), errors.New("Bad ID")
-				}
-
-				newResults := []shuffle.ActionResult{}
-				//log.Printf("%#v", oldExecution.Results)
-				for _, result := range oldExecution.Results {
-					log.Printf("%s - %s", result.Action.ID, start[0])
-					if result.Action.ID == start[0] {
-						note, noteok := request.URL.Query()["note"]
-						if noteok && len(note) > 0 {
-							result.Result = fmt.Sprintf("User note: %s", note[0])
-						} else {
-							result.Result = fmt.Sprintf("User clicked %s", answer[0])
-						}
-
-						// Stopping the whole thing
-						result.CompletedAt = int64(time.Now().Unix())
-						result.Status = "ABORTED"
-						oldExecution.Status = result.Status
-						oldExecution.Result = result.Result
-						oldExecution.LastNode = result.Action.ID
-					}
-
-					newResults = append(newResults, result)
-				}
-
-				oldExecution.Results = newResults
-				err = shuffle.SetWorkflowExecution(ctx, *oldExecution, true)
-				if err != nil {
-					log.Printf("Error saving workflow execution actionresult setting: %s", err)
-					return shuffle.WorkflowExecution{}, fmt.Sprintf("Failed setting workflowexecution actionresult in execution: %s", err), err
-				}
-
-				return shuffle.WorkflowExecution{}, "", nil
-			}
-		}
-
-		if referenceok {
-			log.Printf("Handling an old execution continuation!")
-			// Will use the old name, but still continue with NEW ID
-			oldExecution, err := shuffle.GetWorkflowExecution(ctx, referenceId[0])
-			if err != nil {
-				log.Printf("Failed getting execution (execution) %s: %s", referenceId[0], err)
-				return shuffle.WorkflowExecution{}, fmt.Sprintf("Failed getting execution ID %s because it doesn't exist.", referenceId[0]), err
-			}
-
-			workflowExecution = *oldExecution
-		}
-
-		if len(workflowExecution.ExecutionId) == 0 {
-			sessionToken := uuid.NewV4()
-			workflowExecution.ExecutionId = sessionToken.String()
-		} else {
-			log.Printf("Using the same executionId as before: %s", workflowExecution.ExecutionId)
-			makeNew = false
-		}
-
-		// Don't override workflow defaults
-	}
-
-	if startok {
-		//log.Printf("\n\n[INFO] Setting start to %s based on query!\n\n", start[0])
-		//workflowExecution.Workflow.Start = start[0]
-		workflowExecution.Start = start[0]
-	}
-
-	// FIXME - regex uuid, and check if already exists?
-	if len(workflowExecution.ExecutionId) != 36 {
-		log.Printf("Invalid uuid: %s", workflowExecution.ExecutionId)
-		return shuffle.WorkflowExecution{}, "Invalid uuid", err
-	}
-
-	// FIXME - find owner of workflow
-	// FIXME - get the actual workflow itself and build the request
-	// MAYBE: Don't send the workflow within the pubsub, as this requires more data to be sent
-	// Check if a worker already exists for company, else run one with:
-	// locations, project IDs and subscription names
-
-	// When app is executed:
-	// Should update with status execution (somewhere), which will trigger the next node
-	// IF action.type == internal, we need the internal watcher to be running and executing
-	// This essentially means the WORKER has to be the responsible party for new actions in the INTERNAL landscape
-	// Results are ALWAYS posted back to cloud@execution_id?
-	if makeNew {
-		workflowExecution.Type = "workflow"
-		//workflowExecution.Stream = "tmp"
-		//workflowExecution.WorkflowQueue = "tmp"
-		//workflowExecution.SubscriptionNameNodestream = "testcompany-nodestream"
-		//workflowExecution.Locations = []string{"europe-west2"}
-		workflowExecution.ProjectId = gceProject
-		workflowExecution.WorkflowId = workflow.ID
-		workflowExecution.StartedAt = int64(time.Now().Unix())
-		workflowExecution.CompletedAt = 0
-		workflowExecution.Authorization = uuid.NewV4().String()
-
-		// Status for the entire workflow.
-		workflowExecution.Status = "EXECUTING"
-	}
-
-	if len(workflowExecution.ExecutionSource) == 0 {
-		log.Printf("[INFO] No execution source (trigger) specified. Setting to default")
-		workflowExecution.ExecutionSource = "default"
-	} else {
-		log.Printf("[INFO] Execution source is %s for execution ID %s in workflow %s", workflowExecution.ExecutionSource, workflowExecution.ExecutionId, workflowExecution.Workflow.ID)
-	}
-
-	workflowExecution.ExecutionVariables = workflow.ExecutionVariables
-	if len(workflowExecution.Start) == 0 && len(workflowExecution.Workflow.Start) > 0 {
-		workflowExecution.Start = workflowExecution.Workflow.Start
-	}
-
-	startnodeFound := false
-	newStartnode := ""
-	for _, item := range workflowExecution.Workflow.Actions {
-		if item.ID == workflowExecution.Start {
-			startnodeFound = true
-		}
-
-		if item.IsStartNode {
-			newStartnode = item.ID
-		}
-	}
-
-	if !startnodeFound {
-		log.Printf("[INFO] Couldn't find startnode %s. Remapping to %#v", workflowExecution.Start, newStartnode)
-
-		if len(newStartnode) > 0 {
-			workflowExecution.Start = newStartnode
-		} else {
-			return shuffle.WorkflowExecution{}, fmt.Sprintf("Startnode couldn't be found"), errors.New("Startnode isn't defined in this workflow..")
-		}
-	}
-
-	childNodes := shuffle.FindChildNodes(workflowExecution.Workflow, workflowExecution.Start, []string{}, []string{})
-
-	startFound := false
-	newActions := []shuffle.Action{}
-	defaultResults := []shuffle.ActionResult{}
-
-	for _, action := range workflowExecution.Workflow.Actions {
-		//action.LargeImage = ""
-		if action.ID == workflowExecution.Start {
-			startFound = true
-		}
-		//log.Println(action.Environment)
-
-		if action.Environment == "" {
-			return shuffle.WorkflowExecution{}, fmt.Sprintf("Environment is not defined for %s", action.Name), errors.New("Environment not defined!")
-		}
-
-		action.LargeImage = ""
-		if len(action.Label) == 0 {
-			action.Label = action.ID
-		}
-		//log.Printf("LABEL: %s", action.Label)
-		newActions = append(newActions, action)
-
-		// If the node is NOT found, it's supposed to be set to SKIPPED,
-		// as it's not a childnode of the startnode
-		// This is a configuration item for the workflow itself.
-		if len(workflowExecution.Results) > 0 {
-			defaultResults = []shuffle.ActionResult{}
-			for _, result := range workflowExecution.Results {
-				if result.Status == "WAITING" {
-					result.Status = "FINISHED"
-					result.Result = "Continuing"
-				}
-
-				defaultResults = append(defaultResults, result)
-			}
-		} else if len(workflowExecution.Results) == 0 && !workflowExecution.Workflow.Configuration.StartFromTop {
-			found := false
-			for _, nodeId := range childNodes {
-				if nodeId == action.ID {
-					//log.Printf("Found %s", action.ID)
-					found = true
-				}
-			}
-
-			if !found {
-				if action.ID == workflowExecution.Start {
-					continue
-				}
-
-				//log.Printf("[WARNING] Set %s to SKIPPED as it's NOT a childnode of the startnode.", action.ID)
-				curaction := shuffle.Action{
-					AppName:    action.AppName,
-					AppVersion: action.AppVersion,
-					Label:      action.Label,
-					Name:       action.Name,
-					ID:         action.ID,
-				}
-				//action
-				//curaction.Parameters = []
-				defaultResults = append(defaultResults, shuffle.ActionResult{
-					Action:        curaction,
-					ExecutionId:   workflowExecution.ExecutionId,
-					Authorization: workflowExecution.Authorization,
-					Result:        "Skipped because it's not under the startnode",
-					StartedAt:     0,
-					CompletedAt:   0,
-					Status:        "SKIPPED",
-				})
-			}
-		}
-	}
-
-	removeTriggers := []string{}
-	for triggerIndex, trigger := range workflowExecution.Workflow.Triggers {
-		//log.Printf("[INFO] ID: %s vs %s", trigger.ID, workflowExecution.Start)
-		if trigger.ID == workflowExecution.Start {
-			if trigger.AppName == "User Input" {
-				startFound = true
-				break
-			}
-		}
-
-		if trigger.AppName == "User Input" || trigger.AppName == "Shuffle Workflow" {
-			found := false
-			for _, node := range childNodes {
-				if node == trigger.ID {
-					found = true
-					break
-				}
-			}
-
-			if !found {
-				//log.Printf("SHOULD SET TRIGGER %s TO BE SKIPPED", trigger.ID)
-
-				curaction := shuffle.Action{
-					AppName:    "shuffle-subflow",
-					AppVersion: trigger.AppVersion,
-					Label:      trigger.Label,
-					Name:       trigger.Name,
-					ID:         trigger.ID,
-				}
-
-				defaultResults = append(defaultResults, shuffle.ActionResult{
-					Action:        curaction,
-					ExecutionId:   workflowExecution.ExecutionId,
-					Authorization: workflowExecution.Authorization,
-					Result:        "Skipped because it's not under the startnode",
-					StartedAt:     0,
-					CompletedAt:   0,
-					Status:        "SKIPPED",
-				})
-			} else {
-				// Replaces trigger with the subflow
-				//if trigger.AppName == "Shuffle Workflow" {
-				//	replaceActions := false
-				//	workflowAction := ""
-				//	for _, param := range trigger.Parameters {
-				//		if param.Name == "argument" && !strings.Contains(param.Value, ".#") {
-				//			replaceActions = true
-				//		}
-
-				//		if param.Name == "startnode" {
-				//			workflowAction = param.Value
-				//		}
-				//	}
-
-				//	if replaceActions {
-				//		replacementNodes, newBranches, lastnode := shuffle.GetReplacementNodes(ctx, workflowExecution, trigger, trigger.Label)
-				//		log.Printf("REPLACEMENTS: %d, %d", len(replacementNodes), len(newBranches))
-				//		if len(replacementNodes) > 0 {
-				//			for _, action := range replacementNodes {
-				//				found := false
-
-				//				for subActionIndex, subaction := range newActions {
-				//					if subaction.ID == action.ID {
-				//						found = true
-				//						//newActions[subActionIndex].Name = action.Name
-				//						newActions[subActionIndex].Label = action.Label
-				//						break
-				//					}
-				//				}
-
-				//				if !found {
-				//					action.SubAction = true
-				//					newActions = append(newActions, action)
-				//				}
-
-				//				// Check if it's already set to have a value
-				//				for resultIndex, result := range defaultResults {
-				//					if result.Action.ID == action.ID {
-				//						defaultResults = append(defaultResults[:resultIndex], defaultResults[resultIndex+1:]...)
-				//						break
-				//					}
-				//				}
-				//			}
-
-				//			for _, branch := range newBranches {
-				//				workflowExecution.Workflow.Branches = append(workflowExecution.Workflow.Branches, branch)
-				//			}
-
-				//			// Append branches:
-				//			// parent -> new inner node (FIRST one)
-				//			for branchIndex, branch := range workflowExecution.Workflow.Branches {
-				//				if branch.DestinationID == trigger.ID {
-				//					log.Printf("REPLACE DESTINATION WITH %s!!", workflowAction)
-				//					workflowExecution.Workflow.Branches[branchIndex].DestinationID = workflowAction
-				//				}
-
-				//				if branch.SourceID == trigger.ID {
-				//					log.Printf("REPLACE SOURCE WITH LASTNODE %s!!", lastnode)
-				//					workflowExecution.Workflow.Branches[branchIndex].SourceID = lastnode
-				//				}
-				//			}
-
-				//			// Remove the trigger
-				//			removeTriggers = append(removeTriggers, workflowExecution.Workflow.Triggers[triggerIndex].ID)
-				//		}
-
-				//		log.Printf("NEW ACTION LENGTH %d, RESULT: %d, Triggers: %d, BRANCHES: %d", len(newActions), len(defaultResults), len(workflowExecution.Workflow.Triggers), len(workflowExecution.Workflow.Branches))
-				//	}
-				//}
-				_ = triggerIndex
-			}
-		}
-	}
-
-	//newTriggers := []shuffle.Trigger{}
-	//for _, trigger := range workflowExecution.Workflow.Triggers {
-	//	found := false
-	//	for _, triggerId := range removeTriggers {
-	//		if trigger.ID == triggerId {
-	//			found = true
-	//			break
-	//		}
-	//	}
-
-	//	if found {
-	//		log.Printf("[WARNING] Removed trigger %s during execution", trigger.ID)
-	//		continue
-	//	}
-
-	//	newTriggers = append(newTriggers, trigger)
-	//}
-	//workflowExecution.Workflow.Triggers = newTriggers
-
-	if !startFound {
-		if len(workflowExecution.Start) == 0 && len(workflowExecution.Workflow.Start) > 0 {
-			workflowExecution.Start = workflow.Start
-		} else if len(workflowExecution.Workflow.Actions) > 0 {
-			workflowExecution.Start = workflowExecution.Workflow.Actions[0].ID
-		} else {
-			log.Printf("[ERROR] Startnode %s doesn't exist!!", workflowExecution.Start)
-			return shuffle.WorkflowExecution{}, fmt.Sprintf("Workflow action %s doesn't exist in workflow", workflowExecution.Start), errors.New(fmt.Sprintf(`Workflow start node "%s" doesn't exist. Exiting!`, workflowExecution.Start))
-		}
-	}
-
-	//log.Printf("EXECUTION START: %s", workflowExecution.Start)
-
-	// Verification for execution environments
-	workflowExecution.Results = defaultResults
-	workflowExecution.Workflow.Actions = newActions
-	onpremExecution := true
-	_ = onpremExecution
-	environments := []string{}
-
-	if len(workflowExecution.ExecutionOrg) == 0 && len(workflow.ExecutingOrg.Id) > 0 {
-		workflowExecution.ExecutionOrg = workflow.ExecutingOrg.Id
-	}
-	*/
-
-	//workflowExecution, execInfo, _, workflowExecErr := shuffle.PrepareWorkflowExecution(ctx, workflow, request, int64(maxExecutionDepth))
 	err = shuffle.SetWorkflowExecution(ctx, workflowExecution, true)
 	if err != nil {
 		log.Printf("[ERROR] Failed setting workflow execution during init (2): %s", err)
@@ -1644,7 +978,6 @@ func handleExecution(id string, workflow shuffle.Workflow, request *http.Request
 	environments := execInfo.Environments
 	var allEnvs []shuffle.Environment
 	if len(workflowExecution.ExecutionOrg) > 0 {
-		//log.Printf("[INFO] Executing ORG: %s", workflowExecution.ExecutionOrg)
 
 		allEnvironments, err := shuffle.GetEnvironments(ctx, workflowExecution.ExecutionOrg)
 		if err != nil {
@@ -1897,7 +1230,7 @@ func executeWorkflow(resp http.ResponseWriter, request *http.Request) {
 
 	log.Printf("[INFO] Inside execute workflow for ID %s", fileId)
 	ctx := context.Background()
-	workflow, err := shuffle.GetWorkflow(ctx, fileId)
+	workflow, err := shuffle.GetWorkflow(ctx, fileId, true)
 	if err != nil && workflow.ID == "" {
 		log.Printf("[WARNING] Failed getting the workflow locally (execute workflow): %s", err)
 		resp.WriteHeader(401)
@@ -1954,6 +1287,20 @@ func executeWorkflow(resp http.ResponseWriter, request *http.Request) {
 		}
 
 		resp.WriteHeader(200)
+
+		// Check for "wait" query if it's true
+		wait, waitok := request.URL.Query()["wait"]
+		if waitok && wait[0] == "true" {
+			returnBody := shuffle.HandleRetValidation(ctx, workflowExecution, 1)
+			returnBytes, err := json.Marshal(returnBody)
+			if err != nil {
+				log.Printf("[ERROR] Failed to marshal retStruct in single execution: %s", err)
+			}
+
+			resp.Write(returnBytes)
+			return
+		}
+
 		resp.Write([]byte(fmt.Sprintf(`{"success": true, "execution_id": "%s", "authorization": "%s"}`, workflowExecution.ExecutionId, workflowExecution.Authorization)))
 		return
 	}
@@ -2394,8 +1741,8 @@ func scheduleWorkflow(resp http.ResponseWriter, request *http.Request) {
 
 		err = shuffle.SetSchedule(ctx, newSchedule)
 		if err != nil {
-			log.Printf("Failed setting cloud schedule: %s", err)
-			resp.WriteHeader(401)
+			log.Printf("[ERROR] Failed setting cloud schedule: %s", err)
+			resp.WriteHeader(400)
 			resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "%s"}`, err)))
 			return
 		}
@@ -2430,17 +1777,22 @@ func scheduleWorkflow(resp http.ResponseWriter, request *http.Request) {
 
 	// FIXME - real error message lol
 	if err != nil {
-		log.Printf("Failed creating schedule: %s", err)
-		resp.WriteHeader(401)
-		resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Invalid argument. Try cron */15 * * * *"}`)))
+		log.Printf("[ERROR] Failed creating schedule: %s", err)
+
+		resp.WriteHeader(400)
+		if schedule.Environment == "cloud" {
+			resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Invalid argument. For cloud schedules, try cron */15 * * * *"}`)))
+		} else {
+			resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Invalid argument. For onprem schedules, try 60 for 60 seconds"}`)))
+		}
 		return
 	}
 
 	//workflow.Schedules = append(workflow.Schedules, schedule)
 	err = shuffle.SetWorkflow(ctx, *workflow, workflow.ID)
 	if err != nil {
-		log.Printf("Failed setting workflow for schedule: %s", err)
-		resp.WriteHeader(401)
+		log.Printf("[ERROR] Failed setting workflow for schedule: %s", err)
+		resp.WriteHeader(400)
 		resp.Write([]byte(`{"success": false}`))
 		return
 	}
@@ -3432,19 +2784,63 @@ func executeSingleAction(resp http.ResponseWriter, request *http.Request) {
 		return
 	}
 
+	ctx := shuffle.GetContext(request)
 	user, err := shuffle.HandleApiAuthentication(resp, request)
 	if err != nil {
-		log.Printf("[WARNING] Api authentication failed in execute SINGLE workflow - CONTINUING ANYWAY: %s", err)
-		resp.WriteHeader(401)
-		resp.Write([]byte(`{"success": false, "reason": "You need to sign up to try it out}`))
-		return
-	}
+		// Look for org_id query as app may be private
+		// No validation is done here, as it's just running the app
+		// to find a user
+		orgId := request.URL.Query().Get("org_id")
+		if len(orgId) > 0 {
+			user.ActiveOrg.Id = orgId
+		} else {
+			executionId := request.URL.Query().Get("execution_id")
+			authorization := request.URL.Query().Get("authorization")
+			if len(executionId) == 0 || len(authorization) == 0 {
+				log.Printf("[WARNING] Bad execution id/auth in single action validate (1): %#v, %#v. Continuing with the 'public' org id", executionId, authorization)
+				err := shuffle.ValidateRequestOverload(resp, request)
+				if err != nil {
+					log.Printf("[INFO] Request overload for IP %s in single action execution", shuffle.GetRequestIp(request))
+					resp.WriteHeader(429)
+					resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Too many requests. Please try again in 30 seconds."}`)))
+					return
+				}
 
-	if user.Role == "org-reader" {
-		log.Printf("[WARNING] Org-reader doesn't have access to execute single action: %s (%s)", user.Username, user.Id)
-		resp.WriteHeader(403)
-		resp.Write([]byte(`{"success": false, "reason": "Read only user"}`))
-		return
+				user.Username = shuffle.GetRequestIp(request)
+				user.ActiveOrg.Name = shuffle.GetRequestIp(request)
+				user.ActiveOrg.Id = "public"
+			} else {
+				// Find the execution
+				exec, err := shuffle.GetWorkflowExecution(ctx, executionId)
+				if err != nil {
+					log.Printf("[WARNING] Bad execution id in single action validate (2): %s", err)
+					resp.WriteHeader(401)
+					resp.Write([]byte(`{"success": false, "reason": "Bad execution mapping (1)"}`))
+					return
+				}
+
+				if exec.Authorization != authorization {
+					log.Printf("[WARNING] Bad execution auth in single action validate (3): %#v, %#v", exec.Authorization, authorization)
+					resp.WriteHeader(403)
+					resp.Write([]byte(`{"success": false, "reason": "Bad execution mapping (2)"}`))
+					return
+				}
+
+				//log.Printf("[INFO] Found org_id from execution: %#v. Executionorg: %#v", exec.OrgId, exec.ExecutionOrg)
+				user.ActiveOrg.Id = exec.OrgId
+				if len(user.ActiveOrg.Id) == 0 {
+					user.ActiveOrg.Id = exec.ExecutionOrg
+				}
+
+				user.Username = fmt.Sprintf("org %s", user.ActiveOrg.Id)
+			}
+		}
+
+		if len(user.ActiveOrg.Id) == 0 {
+			resp.WriteHeader(401)
+			resp.Write([]byte(`{"success": false, "reason": "No org_id found to map back to"}`))
+			return
+		}
 	}
 
 	location := strings.Split(request.URL.String(), "/")
@@ -3459,93 +2855,117 @@ func executeSingleAction(resp http.ResponseWriter, request *http.Request) {
 		fileId = location[4]
 	}
 
+	//log.Printf("[AUDIT] User Authentication failed in execute SINGLE action - CONTINUING ANYWAY: %s. Found OrgID: %#v", err, user.ActiveOrg.Id)
+	log.Printf("[AUDIT] User %s (%s) in org %s (%s) is running SINGLE App run for App ID '%s'", user.Username, user.Id, user.ActiveOrg.Name, user.ActiveOrg.Id, fileId)
+
 	body, err := ioutil.ReadAll(request.Body)
 	if err != nil {
-		log.Printf("[INFO] Failed workflowrequest POST read: %s", err)
+		log.Printf("[INFO] Failed single execution POST body read: %s", err)
 		resp.WriteHeader(401)
 		resp.Write([]byte(`{"success": false}`))
 		return
 	}
 
-	ctx := context.Background()
-
+	// Look for the query parameter "validation=true" to find the correct action for the app to test
 	runValidationAction := false
 	query := request.URL.Query()
 	validation, ok := query["validation"]
-	if ok && validation[0] == "true" {
+	if ok && len(validation) > 0 && validation[0] == "true" {
 		runValidationAction = true
 	}
 
-	workflowExecution, err := shuffle.PrepareSingleAction(ctx, user, fileId, body, runValidationAction)
-	if err != nil {
-		log.Printf("[INFO] Failed workflowrequest POST read: %s", err)
-		resp.WriteHeader(401)
-		resp.Write([]byte(`{"success": false}`))
-		return
+	shouldRerun := false
+	rerun, rerunOk := query["rerun"]
+	if rerunOk && len(rerun) > 0 && rerun[0] == "true" {
+		shouldRerun = true
 	}
 
+	decisionId := ""
+	decision, decisionOk := query["decision_id"]
+	if decisionOk && len(decision) > 0 {
+		decisionId = decision[0]
+	}
+
+	workflowExecution, err := shuffle.PrepareSingleAction(ctx, user, fileId, body, runValidationAction, decisionId)
+
 	debugUrl := fmt.Sprintf("/workflows/%s?execution_id=%s", workflowExecution.Workflow.ID, workflowExecution.ExecutionId)
 	resp.Header().Add("X-Debug-Url", debugUrl)
 
-	workflowExecution.Priority = 11
-	environments, err := shuffle.GetEnvironments(ctx, user.ActiveOrg.Id)
-	environment := "Shuffle"
-	if len(environments) >= 1 {
-		// Find default one
-		environment = environments[0].Name
-
-		for _, env := range environments {
-			if env.Default {
-				environment = env.Name
-				break
-			}
+	if err != nil {
+		log.Printf("[INFO] Failed workflowrequest POST read in single action (4): %s", err)
+		returndata := shuffle.ResultChecker{
+			Success: false,
+			Reason:  fmt.Sprintf("%s", err),
 		}
 
-	} else {
-		log.Printf("[ERROR] No environments found for org %s. Exiting", user.ActiveOrg.Id)
-		resp.WriteHeader(401)
-		resp.Write([]byte(`{"success": false}`))
+		resp.WriteHeader(400)
+		respBytes, err := json.Marshal(returndata)
+		if err != nil {
+			resp.Write([]byte(`{"success": false}`))
+			return
+		}
+
+		resp.Write(respBytes)
 		return
 	}
 
-	// Enforcing same env for job + run to be default
-	// FIXME: Should use environment that is in the source workflow if it exists
-	for i, _ := range workflowExecution.Workflow.Actions {
-		workflowExecution.Workflow.Actions[i].Environment = environment
-		workflowExecution.Workflow.Actions[i].Label = "TMP"
+	workflowExecution.ProjectId = "" 
+	workflowExecution.Locations = []string{""}
+
+	foundEnv := ""
+	params := []string{}
+	for _, action := range workflowExecution.Workflow.Actions {
+		for _, param := range action.Parameters {
+			params = append(params, param.Name)
+		}
+
+		if len(action.Environment) > 0 {
+			foundEnv = action.Environment
+			break
+		}
 	}
-	shuffle.SetWorkflowExecution(ctx, workflowExecution, false)
-
-	log.Printf("[INFO] Execution (single action): %s should execute onprem with execution environment \"%s\". Workflow: %s", workflowExecution.ExecutionId, environment, workflowExecution.Workflow.ID)
 
+	go shuffle.IncrementCache(ctx, workflowExecution.OrgId, "workflow_executions")
 	executionRequest := shuffle.ExecutionRequest{
 		ExecutionId:   workflowExecution.ExecutionId,
 		WorkflowId:    workflowExecution.Workflow.ID,
 		Authorization: workflowExecution.Authorization,
-		Environments:  []string{environment},
-		Priority:      11,
+		Environments:  []string{foundEnv},
 	}
 
-	executionRequest.Priority = workflowExecution.Priority
-	err = shuffle.SetWorkflowQueue(ctx, executionRequest, environment)
+	parsedEnv := strings.ToLower(strings.ReplaceAll(strings.ReplaceAll(foundEnv, " ", "-"), "_", "-"))
+
+	log.Printf("[INFO] Adding new single-action job to env queue (4): %s", parsedEnv)
+	err = shuffle.SetWorkflowQueue(ctx, executionRequest, parsedEnv)
 	if err != nil {
-		log.Printf("[ERROR] Failed adding execution to db: %s", err)
-		resp.WriteHeader(401)
-		resp.Write([]byte(`{"success": false}`))
+		log.Printf("[WARNING] Failed adding %s to db (single action queue): %s", parsedEnv, err)
+	}
+
+	if shouldRerun {
+		//log.Printf("[DEBUG] Returning single action execution ID for rerun: %s", workflowExecution.ExecutionId)
+		resp.WriteHeader(200)
+		resp.Write([]byte(fmt.Sprintf(`{"success": true, "execution_id": "%s", "authorization": "%s"}`, workflowExecution.ExecutionId, workflowExecution.Authorization)))
 		return
 	}
 
-	time.Sleep(2 * time.Second)
-	log.Printf("[INFO] Starting validation of execution %s", workflowExecution.ExecutionId)
+	actionId := ""
+	if len(workflowExecution.Workflow.Actions) == 1 {
+		actionId = workflowExecution.Workflow.Actions[0].ID
+	}
 
-	returnBody := shuffle.HandleRetValidation(ctx, workflowExecution, 1)
+	returnBody := shuffle.HandleRetValidation(ctx, workflowExecution, 1, actionId)
 	returnBytes, err := json.Marshal(returnBody)
 	if err != nil {
 		log.Printf("[ERROR] Failed to marshal retStruct in single execution: %s", err)
 	}
 
-	// Deleting as this is a single action and doesn't need to be stored
-	shuffle.DeleteKey(ctx, "workflowexecution", executionRequest.ExecutionId)
+	// Look for delete=true query, and if it exists, delete the execution
+	if request.URL.Query().Get("delete") == "true" {
+		err = shuffle.DeleteKey(ctx, "workflowexecution", workflowExecution.ExecutionId)
+		if err != nil {
+			log.Printf("[ERROR] Failed to delete execution: %s", err)
+		}
+	}
 
 	resp.WriteHeader(200)
 	resp.Write([]byte(returnBytes))
diff --git a/docker-compose.yml b/docker-compose.yml
index 84b1f321..0ff2c29c 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   frontend:
-    image: ghcr.io/shuffle/shuffle-frontend:latest
+    image: ghcr.io/shuffle/shuffle-frontend:nightly
     container_name: shuffle-frontend
     hostname: shuffle-frontend
     ports:
@@ -14,7 +14,7 @@ services:
     depends_on:
       - backend
   backend:
-    image: ghcr.io/shuffle/shuffle-backend:latest
+    image: ghcr.io/shuffle/shuffle-backend:nightly
     container_name: shuffle-backend
     hostname: ${BACKEND_HOSTNAME}
     # Here for debugging:
@@ -33,7 +33,7 @@ services:
       - SHUFFLE_FILE_LOCATION=/shuffle-files
     restart: unless-stopped
   orborus:
-    image: ghcr.io/shuffle/shuffle-orborus:latest
+    image: ghcr.io/shuffle/shuffle-orborus:nightly
     container_name: shuffle-orborus
     hostname: shuffle-orborus
     networks:
@@ -53,15 +53,15 @@ services:
       - SHUFFLE_PASS_WORKER_PROXY=${SHUFFLE_PASS_WORKER_PROXY}
       - SHUFFLE_PASS_APP_PROXY=${SHUFFLE_PASS_APP_PROXY}
       - SHUFFLE_STATS_DISABLED=true
-      - SHUFFLE_WORKER_SCALE=run
       - SHUFFLE_LOGS_DISABLED=true
-      - SHUFFLE_WORKER_IMAGE=ghcr.io/shuffle/shuffle-worker:latest
+      - SHUFFLE_SWARM_CONFIG=run
+      - SHUFFLE_WORKER_IMAGE=ghcr.io/shuffle/shuffle-worker:nightly
     env_file: .env
     restart: unless-stopped
     security_opt:
       - seccomp:unconfined
   opensearch:
-    image: opensearchproject/opensearch:2.14.0
+    image: opensearchproject/opensearch:3.0.0
     hostname: shuffle-opensearch
     container_name: shuffle-opensearch
     environment:
diff --git a/frontend/frontend-testing.sh b/frontend/frontend-testing.sh
new file mode 100644
index 00000000..c25c3618
--- /dev/null
+++ b/frontend/frontend-testing.sh
@@ -0,0 +1,74 @@
+
+SERVER_URL="http://localhost:3000"
+
+declare -a Routes=($(grep -oP '(?<=path=")[^"]*' src/App.jsx | grep -E '^[a-zA-Z0-9/_:-]+$' | grep -vE '^/$'))
+
+for i in "${!Routes[@]}"; do
+  Routes[$i]="${Routes[$i]#/}"
+done
+
+# # Add all tab routes and unique routes here
+Routes+=(
+'workflows?tab=org_workflows'
+'workflows?tab=my_workflows'
+'workflows?tab=all_workflows'
+'apps/gmail'
+'apis/gmail'
+'apps?tab=my_apps'
+'apps?tab=all_apps'
+'search?tab=org_apps'
+'search?tab=my_apps'
+'search?tab=workflows'
+'search?tab=docs'
+'search?tab=creators'
+'search?tab=discord'
+"admin?tab=organization"
+"admin?tab=users"
+"admin?tab=app_auth"
+"admin?tab=datastore"
+"admin?tab=files"
+"admin?tab=triggers"
+"admin?tab=locations"
+"admin?tab=tenants"
+"admin?admin_tab=org_config"
+"admin?admin_tab=sso"
+"admin?admin_tab=notifications"
+"admin?admin_tab=billingstats"
+"admin?admin_tab=branding(beta)"
+)
+
+# Stop frontend container so it test unpushed changes
+docker stop shuffle-frontend
+
+# # Install all frontend dependencies
+yarn add selenium-webdriver --dev && yarn install
+echo "Starting frontend..."
+
+BROWSER=none yarn start &  
+SERVER_PID=$!
+echo "Frontend started with PID: $SERVER_PID"
+
+echo "Waiting for 1 minute to ensure the server is fully up..."
+sleep 60
+
+echo "Server is up! Starting Selenium tests..."
+
+echo "Starting frontend tests..."
+node selenium-test.js "$SERVER_URL" "${Routes[@]}"
+
+TEST_EXIT_CODE=$?
+
+if [[ $TEST_EXIT_CODE -ne 0 ]]; then
+echo "Selenium tests failed. Exiting..."
+kill $SERVER_PID
+exit 1
+fi
+
+kill $SERVER_PID
+echo "Testing complete. See above logs for errors if any."
+
+# Starting shuffle-frontend container
+echo "Starting shuffle-frontend container..."
+docker start shuffle-frontend
+echo "shuffle-frontend started successfully."
+exit 0
diff --git a/frontend/package.json b/frontend/package.json
old mode 100755
new mode 100644
index 7426ee23..db88fae3
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -21,7 +21,7 @@
     "@uiw/codemirror-themes": "^4.21.9",
     "@uiw/react-codemirror": "^4.21.21",
     "algoliasearch": "^4.8.3",
-    "class-transformer": "^0.2.0",
+    "class-transformer": "^0.5.1",
     "codemirror": "^6.0.1",
     "cpx": "^1.5.0",
     "create-react-app": "^5.0.1",
@@ -128,6 +128,7 @@
     "babel-preset-es2015": "^6.24.1",
     "postcss": "^8.4.38",
     "promise-window": "^1.2.1",
+    "selenium-webdriver": "^4.29.0",
     "webpack-cli": "^5.1.4"
   }
 }
diff --git a/frontend/public/images/ProfessionalServices.svg b/frontend/public/images/ProfessionalServices.svg
new file mode 100644
index 00000000..164b6917
--- /dev/null
+++ b/frontend/public/images/ProfessionalServices.svg
@@ -0,0 +1,6 @@
+<svg width="45" height="56" viewBox="0 0 45 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.866 31.366L22.2583 37.366L13.3454 52.8036L11.2901 46.9667C10.9625 46.0363 10.0053 45.4837 9.03569 45.6651L2.95314 46.8036L11.866 31.366Z" stroke="#2BC07E" stroke-width="2"/>
+<path d="M33.759 31.366L23.3667 37.366L32.2796 52.8036L34.3349 46.9667C34.6625 46.0363 35.6197 45.4837 36.5893 45.6651L42.6719 46.8036L33.759 31.366Z" stroke="#2BC07E" stroke-width="2"/>
+<path d="M18.6381 6.27038C20.6383 3.8382 24.3617 3.8382 26.3619 6.27038L26.7961 6.79841C28.1024 8.38685 30.0411 9.32049 32.0974 9.35141L32.781 9.36168C35.9296 9.40902 38.2511 12.3201 37.5966 15.4003L37.4546 16.069C37.0271 18.0807 37.5059 20.1786 38.7639 21.8056L39.182 22.3464C41.1082 24.8376 40.2796 28.4677 37.4634 29.8765L36.852 30.1823C35.0127 31.1024 33.671 32.7847 33.1833 34.7826L33.0212 35.4468C32.2744 38.5059 28.9197 40.1215 26.0624 38.798L25.442 38.5106C23.5759 37.6463 21.4241 37.6463 19.558 38.5106L18.9376 38.798C16.0803 40.1215 12.7256 38.5059 11.9788 35.4468L11.8167 34.7826C11.329 32.7847 9.98734 31.1024 8.14805 30.1823L7.53663 29.8765C4.72036 28.4677 3.89182 24.8376 5.81795 22.3464L6.23611 21.8056C7.49405 20.1786 7.97288 18.0807 7.54544 16.069L7.40335 15.4003C6.74887 12.3201 9.07037 9.40902 12.219 9.36168L12.9026 9.35141C14.9589 9.32049 16.8976 8.38685 18.2039 6.79841L17.4316 6.16323L18.2039 6.79841L18.6381 6.27038Z" fill="#2F2F2F" stroke="#2BC07E" stroke-width="2"/>
+<path d="M30.5 18.5L21 28L16 23" stroke="#2BC07E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/frontend/public/images/SecurityConsultation.svg b/frontend/public/images/SecurityConsultation.svg
new file mode 100644
index 00000000..05614a4d
--- /dev/null
+++ b/frontend/public/images/SecurityConsultation.svg
@@ -0,0 +1,5 @@
+<svg width="54" height="52" viewBox="0 0 54 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M37.9999 31.4723C38.007 34.1853 37.3731 36.8617 36.1499 39.2834C34.6996 42.1853 32.47 44.6261 29.7108 46.3324C26.9517 48.0387 23.7719 48.9432 20.5277 48.9444C17.9537 48.9512 15.4126 48.3809 13.0908 47.2778C12.8499 47.1634 12.5744 47.1419 12.3214 47.2262L2.89737 50.3675C2.11561 50.6281 1.37187 49.8844 1.63246 49.1026L4.77381 39.6786C4.85812 39.4256 4.83665 39.1501 4.72223 38.9092C3.6191 36.5874 3.04884 34.0463 3.05555 31.4723C3.05681 28.2281 3.96125 25.0483 5.66758 22.2892C7.37391 19.53 9.81473 17.3004 12.7166 15.8501C15.1383 14.6269 17.8147 13.993 20.5277 14.0001H21.5555C25.84 14.2364 29.8868 16.0448 32.921 19.079C35.9552 22.1132 37.7636 26.16 37.9999 30.4445V31.4723Z" stroke="#4FB1E8" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M39 32L38.0926 33.7823C38.6627 34.0726 39.3373 34.0726 39.9074 33.7823L39 32ZM39 32C39.9074 33.7823 39.9079 33.782 39.9085 33.7817L39.91 33.781L39.9136 33.7791L39.9239 33.7739L39.9562 33.7571C39.9829 33.7432 40.0199 33.7237 40.0664 33.6989C40.1593 33.6492 40.2906 33.5778 40.4547 33.4853C40.7826 33.3004 41.2432 33.0306 41.7925 32.6811C42.8869 31.9846 44.3541 30.9586 45.8304 29.6433C48.7043 27.083 52 23.078 52 18V8.2C52 7.37067 51.4882 6.62739 50.7134 6.33156L39.7134 2.13156C39.254 1.95615 38.746 1.95615 38.2866 2.13156L27.2866 6.33156C26.5118 6.62739 26 7.37067 26 8.2V18C26 23.078 29.2957 27.083 32.1696 29.6433C33.6459 30.9586 35.1131 31.9846 36.2075 32.6811C36.7568 33.0306 37.2174 33.3004 37.5453 33.4853C37.7094 33.5778 37.8407 33.6492 37.9336 33.6989C37.9801 33.7237 38.0171 33.7432 38.0438 33.7571L38.0761 33.7739L38.0864 33.7791L38.09 33.781L38.0915 33.7817C38.0921 33.782 38.0926 33.7823 39 32Z" fill="#2F2F2F" stroke="#2F2F2F" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M40.1819 30.1501C39.6936 30.4608 39.2864 30.6997 39 30.8615C38.7136 30.6997 38.3064 30.4608 37.8181 30.1501C36.8185 29.5139 35.4896 28.5832 34.1652 27.4033C31.4771 25.0085 29 21.761 29 18V8.8886L39 5.07041L49 8.8886V18C49 21.761 46.5229 25.0085 43.8348 27.4033C42.5104 28.5832 41.1815 29.5139 40.1819 30.1501Z" stroke="#4FB1E8" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/frontend/public/images/Support.svg b/frontend/public/images/Support.svg
new file mode 100644
index 00000000..83a18f00
--- /dev/null
+++ b/frontend/public/images/Support.svg
@@ -0,0 +1,3 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M19.2326 41.4787H19.2326L19.2326 41.47C19.2313 40.1671 19.6607 38.9 20.4546 37.865C21.2485 36.8301 22.3625 36.0851 23.6242 35.7458C24.8858 35.4065 26.2244 35.4919 27.4325 35.9887C28.6405 36.4855 29.6503 37.3659 30.3056 38.4931L30.5302 38.8796L30.9393 38.6995C33.4578 37.591 35.237 36.1436 36.3734 34.1074C37.5026 32.084 37.9652 29.5351 37.9652 26.2827V19.274C37.9652 14.5199 36.6216 10.455 34.1879 7.56945C31.7474 4.6759 28.2394 3.00436 24.0012 3.00436C19.7629 3.00436 16.2549 4.67653 13.8145 7.57034C11.3808 10.4561 10.0371 14.521 10.0371 19.274V27.4501C10.0367 27.7819 9.90438 28.1002 9.66889 28.3351C9.43337 28.5701 9.11382 28.7025 8.78025 28.703H6.43988C4.86506 28.7013 3.35543 28.0765 2.242 26.966C1.1287 25.8556 0.502381 24.3503 0.5 22.7803V20.4447C0.501784 18.874 1.12781 17.3678 2.24116 16.2566C3.35447 15.1454 4.86421 14.5199 6.43943 14.5174C6.43964 14.5174 6.43985 14.5174 6.44006 14.5174L7.55861 14.5174H7.96354L8.04769 14.1213C9.77814 5.97693 15.6661 0.5 24.0012 0.5C32.3361 0.5 38.2218 5.97684 39.9523 14.1213L40.0365 14.5174H40.4414L41.5599 14.5174C41.5602 14.5174 41.5604 14.5174 41.5606 14.5174C43.1354 14.5199 44.6448 15.1451 45.7581 16.2558C46.8714 17.3667 47.4977 18.8724 47.5 20.4428V22.7778C47.4983 24.3483 46.8722 25.8543 45.7588 26.9652C44.6453 28.0762 43.1353 28.7013 41.5601 28.703H40.8371H40.3532L40.3374 29.1866C40.2503 31.8522 39.354 34.4287 37.7668 36.5749C36.1796 38.7212 33.9764 40.3361 31.4486 41.2057L31.1171 41.3197L31.1114 41.6704C31.0859 43.2413 30.436 44.7381 29.3042 45.8313C28.1724 46.9246 26.6514 47.5247 25.0758 47.4992C23.5002 47.4738 21.9995 46.8249 20.9038 45.6957C19.8081 44.5666 19.2071 43.0496 19.2326 41.4787ZM21.745 41.4701V41.4705C21.745 42.1473 21.9461 42.8087 22.3228 43.3712C22.6995 43.9337 23.2348 44.3719 23.8609 44.6306C24.4869 44.8894 25.1758 44.9571 25.8403 44.8252C26.5049 44.6933 27.1154 44.3677 27.5948 43.8895C28.0741 43.4112 28.4007 42.8017 28.533 42.138C28.6654 41.4743 28.5974 40.7864 28.3379 40.1613C28.0784 39.5362 27.639 39.0021 27.0754 38.6264C26.5119 38.2507 25.8495 38.0502 25.172 38.0502H25.1716C24.2634 38.051 23.3923 38.4112 22.7498 39.0523C22.1072 39.6934 21.7457 40.563 21.745 41.4701ZM40.4776 25.7009V26.2009H40.9776H41.5607C42.4693 26.2009 43.341 25.841 43.9842 25.1999C44.6273 24.5587 44.9892 23.6887 44.99 22.781V22.7806V20.4444C44.99 19.5368 44.6288 18.6665 43.9861 18.0248C43.3435 17.3831 42.4721 17.0225 41.5634 17.0218H41.563H40.9776H40.4776V17.5218V25.7009ZM3.01237 22.7806L3.01237 22.7815C3.01382 23.6881 3.37566 24.557 4.01816 25.1975L4.37117 24.8434L4.01816 25.1975C4.66062 25.838 5.53122 26.1979 6.43894 26.1986H6.43934H7.02473H7.52473V25.6986V17.5218V17.0218H7.02473H6.43934H6.43894C5.53027 17.0225 4.65884 17.3831 4.01622 18.0248C3.37357 18.6665 3.01237 19.5368 3.01237 20.4444L3.01237 22.7806Z" fill="#FF8544" stroke="#2F2F2F"/>
+</svg>
diff --git a/frontend/public/images/Training.svg b/frontend/public/images/Training.svg
new file mode 100644
index 00000000..b01a9901
--- /dev/null
+++ b/frontend/public/images/Training.svg
@@ -0,0 +1,6 @@
+<svg width="65" height="45" viewBox="0 0 65 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M28.5445 38.9971V36.0579C28.5445 34.4989 27.9252 33.0037 26.8228 31.9013C25.7204 30.7989 24.2253 30.1796 22.6662 30.1796H10.9096C9.35055 30.1796 7.85537 30.7989 6.75297 31.9013C5.65057 33.0037 5.03125 34.4989 5.03125 36.0579V38.9971" stroke="#806BFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M16.7885 25.8205C20.035 25.8205 22.6668 23.1887 22.6668 19.9422C22.6668 16.6957 20.035 14.0638 16.7885 14.0638C13.542 14.0638 10.9102 16.6957 10.9102 19.9422C10.9102 23.1887 13.542 25.8205 16.7885 25.8205Z" stroke="#806BFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M1 43.9362H32.575" stroke="#806BFF" stroke-width="2" stroke-linecap="round"/>
+<path d="M16.5742 8.16418V5C16.5742 2.79086 18.3651 1 20.5742 1H59.5742C61.7834 1 63.5742 2.79086 63.5742 5V29C63.5742 31.2091 61.7834 33 59.5742 33H33.3907" stroke="#806BFF" stroke-width="2" stroke-linecap="round"/>
+</svg>
diff --git a/frontend/public/images/icons/API.svg b/frontend/public/images/icons/API.svg
new file mode 100644
index 00000000..447b94de
--- /dev/null
+++ b/frontend/public/images/icons/API.svg
@@ -0,0 +1,3 @@
+<svg width="66" height="28" viewBox="0 0 66 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.25391 27.1562C5.13411 27.0521 3.82552 27 2.32812 27H0.785156L9.28125 3.19141C9.65885 2.1237 9.84766 1.50521 9.84766 1.33594C9.84766 1.15365 9.84115 1.04297 9.82812 1.00391L9.84766 0.964844C10.694 1.00391 11.5924 1.02344 12.543 1.02344C13.3242 1.02344 14.2617 1.01042 15.3555 0.984375L15.375 1.02344C15.349 1.07552 15.3359 1.14714 15.3359 1.23828C15.3359 1.48568 15.5312 2.14323 15.9219 3.21094L24.5938 27.0586C24.3333 27.0456 24.0273 27.0391 23.6758 27.0391C23.6758 27.0391 23.3372 27.026 22.6602 27C22.3346 27 22.0417 27 21.7812 27H18.7539L16.918 21.375H8.08984L6.25391 27.1562ZM15.3945 16.6875L12.4453 7.60547L9.57422 16.6875H15.3945ZM27.3867 0.886719C29.1966 0.652344 31.0521 0.535156 32.9531 0.535156C36.4948 0.535156 39.1836 1.36849 41.0195 3.03516C42.8685 4.6888 43.793 7.16927 43.793 10.4766C43.793 13.4323 42.7839 15.7695 40.7656 17.4883C38.8776 19.1029 36.4492 19.9102 33.4805 19.9102C33.1419 19.9102 32.7708 19.8906 32.3672 19.8516V27H27.3867V0.886719ZM33.5391 5.24219C33.1484 5.24219 32.7578 5.25521 32.3672 5.28125V15.5547C32.7839 15.6068 33.2917 15.6328 33.8906 15.6328C34.4896 15.6328 35.1146 15.5091 35.7656 15.2617C36.4167 15.0013 36.9635 14.6432 37.4062 14.1875C38.3307 13.237 38.793 11.987 38.793 10.4375C38.793 6.97396 37.0417 5.24219 33.5391 5.24219ZM48.4023 0.945312C49.7044 0.997396 50.4922 1.02344 50.7656 1.02344H52.1719C52.862 1.02344 53.4154 0.971354 53.832 0.867188L53.8125 27H48.4023V0.945312ZM59.9258 27C60.043 26.2057 60.1016 25.5026 60.1016 24.8906C60.1016 24.2786 60.0951 23.862 60.082 23.6406C60.082 23.4062 60.0755 23.1784 60.0625 22.957C60.0495 22.7357 60.0365 22.5273 60.0234 22.332L59.9648 21.8438H65.6289C65.5898 22.3385 65.5703 22.7422 65.5703 23.0547L65.5312 23.875C65.5312 24.1224 65.5312 24.5911 65.5312 25.2812C65.5312 25.9583 65.5638 26.5312 65.6289 27H59.9258Z" fill="#2BC07E"/>
+</svg>
diff --git a/frontend/public/images/icons/about_us.svg b/frontend/public/images/icons/about_us.svg
new file mode 100644
index 00000000..c77e7e8e
--- /dev/null
+++ b/frontend/public/images/icons/about_us.svg
@@ -0,0 +1,6 @@
+<svg width="22" height="16" viewBox="0 0 22 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.9263 14.5851V13.0757C8.9263 12.275 9.24436 11.5071 9.81052 10.941C10.3767 10.3748 11.1445 10.0568 11.9452 10.0568H17.983C18.7837 10.0568 19.5516 10.3748 20.1177 10.941C20.6839 11.5071 21.002 12.275 21.002 13.0757V14.5851" stroke="#9E9E9E" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14.9635 7.03783C13.2962 7.03783 11.9446 5.68621 11.9446 4.01891C11.9446 2.35161 13.2962 1 14.9635 1C16.6308 1 17.9824 2.35161 17.9824 4.01891C17.9824 5.68621 16.6308 7.03783 14.9635 7.03783Z" stroke="#9E9E9E" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M0.99923 12.887V11.6292C0.99923 10.9619 1.26428 10.3221 1.73608 9.85025C2.20788 9.37846 2.84777 9.1134 3.51499 9.1134L7.98047 9.1134" stroke="#9E9E9E" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.03111 6.59763C4.6417 6.59763 3.51535 5.47128 3.51535 4.08186C3.51535 2.69245 4.6417 1.5661 6.03111 1.5661C7.42053 1.5661 8.54688 2.69245 8.54688 4.08186C8.54688 5.47128 7.42053 6.59763 6.03111 6.59763Z" stroke="#9E9E9E" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/frontend/public/images/icons/about_us_hover.svg b/frontend/public/images/icons/about_us_hover.svg
new file mode 100644
index 00000000..2c693ca9
--- /dev/null
+++ b/frontend/public/images/icons/about_us_hover.svg
@@ -0,0 +1,6 @@
+<svg width="22" height="16" viewBox="0 0 22 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.9263 14.5851V13.0757C8.9263 12.275 9.24436 11.5071 9.81052 10.941C10.3767 10.3748 11.1445 10.0568 11.9452 10.0568H17.983C18.7837 10.0568 19.5516 10.3748 20.1177 10.941C20.6839 11.5071 21.002 12.275 21.002 13.0757V14.5851" stroke="#FF8544" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14.9635 7.03783C13.2962 7.03783 11.9446 5.68621 11.9446 4.01891C11.9446 2.35161 13.2962 1 14.9635 1C16.6308 1 17.9824 2.35161 17.9824 4.01891C17.9824 5.68621 16.6308 7.03783 14.9635 7.03783Z" stroke="#FF8544" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M0.99923 12.887V11.6292C0.99923 10.9619 1.26428 10.3221 1.73608 9.85025C2.20788 9.37846 2.84777 9.1134 3.51499 9.1134L7.98047 9.1134" stroke="#FF8544" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.03111 6.59763C4.6417 6.59763 3.51535 5.47128 3.51535 4.08186C3.51535 2.69245 4.6417 1.5661 6.03111 1.5661C7.42053 1.5661 8.54688 2.69245 8.54688 4.08186C8.54688 5.47128 7.42053 6.59763 6.03111 6.59763Z" stroke="#FF8544" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/frontend/public/images/icons/articles.svg b/frontend/public/images/icons/articles.svg
new file mode 100644
index 00000000..763d960f
--- /dev/null
+++ b/frontend/public/images/icons/articles.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="20" viewBox="0 0 16 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.3214 5H11.4351H12.5488" stroke="#9E9E9E" stroke-linecap="round" stroke-linejoin="round"/>
+<rect x="0.501953" y="0.5" width="15" height="19" rx="1.5" stroke="#9E9E9E"/>
+<path d="M3.63903 12H12.5488" stroke="#9E9E9E" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.63903 15.6666H12.5488" stroke="#9E9E9E" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.3214 8.33331H11.4351H12.5488" stroke="#9E9E9E" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/frontend/public/images/icons/articles_hover.svg b/frontend/public/images/icons/articles_hover.svg
new file mode 100644
index 00000000..6b51f294
--- /dev/null
+++ b/frontend/public/images/icons/articles_hover.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="20" viewBox="0 0 16 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.3214 5H11.4351H12.5488" stroke="#FF8544" stroke-linecap="round" stroke-linejoin="round"/>
+<rect x="0.501953" y="0.5" width="15" height="19" rx="1.5" stroke="#FF8544"/>
+<path d="M3.63903 12H12.5488" stroke="#FF8544" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.63903 15.6666H12.5488" stroke="#FF8544" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.3214 8.33331H11.4351H12.5488" stroke="#FF8544" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/frontend/public/images/icons/contact_us.svg b/frontend/public/images/icons/contact_us.svg
new file mode 100644
index 00000000..5fbc3568
--- /dev/null
+++ b/frontend/public/images/icons/contact_us.svg
@@ -0,0 +1,3 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.502 8.50003L17.502 8.50133C17.5052 9.74245 17.2152 10.9668 16.6557 12.0746L16.6547 12.0765C15.9906 13.4052 14.9698 14.5228 13.7064 15.3041C12.4431 16.0853 10.9872 16.4995 9.50176 16.5L9.50065 16.5C8.25953 16.5033 7.0352 16.2133 5.92738 15.6537C5.80838 15.5936 5.67031 15.5835 5.54384 15.6257L0.792523 17.2095L2.37629 12.4581C2.41845 12.3317 2.40836 12.1936 2.34825 12.0746C1.78869 10.9668 1.49872 9.74245 1.50195 8.50133L1.50195 8.50022C1.50253 7.01482 1.91665 5.55891 2.69792 4.29556C3.4792 3.03222 4.59678 2.01134 5.92548 1.34728L5.92548 1.34728L5.92738 1.34633C7.0352 0.786764 8.25953 0.496791 9.50065 0.500028H9.50195H9.98796C11.9444 0.611298 13.7917 1.43858 15.1775 2.82444C16.5634 4.21031 17.3907 6.05759 17.502 8.01402L17.502 8.50003Z" stroke="#9E9E9E" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/frontend/public/images/icons/contact_us_hover.svg b/frontend/public/images/icons/contact_us_hover.svg
new file mode 100644
index 00000000..0da02b7c
--- /dev/null
+++ b/frontend/public/images/icons/contact_us_hover.svg
@@ -0,0 +1,3 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.502 8.50003L17.502 8.50133C17.5052 9.74245 17.2152 10.9668 16.6557 12.0746L16.6547 12.0765C15.9906 13.4052 14.9698 14.5228 13.7064 15.3041C12.4431 16.0853 10.9872 16.4995 9.50176 16.5L9.50065 16.5C8.25953 16.5033 7.0352 16.2133 5.92738 15.6537C5.80838 15.5936 5.67031 15.5835 5.54384 15.6257L0.792523 17.2095L2.37629 12.4581C2.41845 12.3317 2.40836 12.1936 2.34825 12.0746C1.78869 10.9668 1.49872 9.74245 1.50195 8.50133L1.50195 8.50022C1.50253 7.01482 1.91665 5.55891 2.69792 4.29556C3.4792 3.03222 4.59678 2.01134 5.92548 1.34728L5.92548 1.34728L5.92738 1.34633C7.0352 0.786764 8.25953 0.496791 9.50065 0.500028H9.50195H9.98796C11.9444 0.611298 13.7917 1.43858 15.1775 2.82444C16.5634 4.21031 17.3907 6.05759 17.502 8.01402L17.502 8.50003Z" stroke="#FF8544" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/frontend/public/images/icons/discord.svg b/frontend/public/images/icons/discord.svg
new file mode 100644
index 00000000..b982260b
--- /dev/null
+++ b/frontend/public/images/icons/discord.svg
@@ -0,0 +1,10 @@
+<svg width="56" height="56" viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<rect width="56" height="56" rx="4" fill="#5865F2"/>
+<rect x="6" y="6" width="44" height="44" rx="4" fill="url(#pattern0_3970_2548)"/>
+<defs>
+<pattern id="pattern0_3970_2548" patternContentUnits="objectBoundingBox" width="1" height="1">
+<use xlink:href="#image0_3970_2548" transform="scale(0.0025)"/>
+</pattern>
+<image id="image0_3970_2548" width="400" height="400" xlink:href="data:image/png;base64,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"/>
+</defs>
+</svg>
diff --git a/frontend/public/images/icons/docs.svg b/frontend/public/images/icons/docs.svg
new file mode 100644
index 00000000..a568538d
--- /dev/null
+++ b/frontend/public/images/icons/docs.svg
@@ -0,0 +1,4 @@
+<svg width="18" height="22" viewBox="0 0 18 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.002 1H3.00195C2.47152 1 1.96281 1.21071 1.58774 1.58579C1.21267 1.96086 1.00195 2.46957 1.00195 3V19C1.00195 19.5304 1.21267 20.0391 1.58774 20.4142C1.96281 20.7893 2.47152 21 3.00195 21H15.002C15.5324 21 16.0411 20.7893 16.4162 20.4142C16.7912 20.0391 17.002 19.5304 17.002 19V8L10.002 1Z" stroke="#9E9E9E" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.002 1V8H17.002" stroke="#9E9E9E" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/frontend/public/images/icons/docs_hover.svg b/frontend/public/images/icons/docs_hover.svg
new file mode 100644
index 00000000..a711ba59
--- /dev/null
+++ b/frontend/public/images/icons/docs_hover.svg
@@ -0,0 +1,4 @@
+<svg width="18" height="22" viewBox="0 0 18 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.002 1H3.00195C2.47152 1 1.96281 1.21071 1.58774 1.58579C1.21267 1.96086 1.00195 2.46957 1.00195 3V19C1.00195 19.5304 1.21267 20.0391 1.58774 20.4142C1.96281 20.7893 2.47152 21 3.00195 21H15.002C15.5324 21 16.0411 20.7893 16.4162 20.4142C16.7912 20.0391 17.002 19.5304 17.002 19V8L10.002 1Z" stroke="#FF8544" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.002 1V8H17.002" stroke="#FF8544" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/frontend/public/images/icons/faq.svg b/frontend/public/images/icons/faq.svg
new file mode 100644
index 00000000..7345040f
--- /dev/null
+++ b/frontend/public/images/icons/faq.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.002 19C14.9725 19 19.002 14.9706 19.002 10C19.002 5.02944 14.9725 1 10.002 1C5.03139 1 1.00195 5.02944 1.00195 10C1.00195 14.9706 5.03139 19 10.002 19Z" stroke="#9E9E9E" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.38281 7.3C7.59441 6.6985 8.01205 6.1913 8.56177 5.86822C9.11149 5.54514 9.75782 5.42704 10.3863 5.53484C11.0147 5.64264 11.5847 5.96937 11.9954 6.45718C12.406 6.94498 12.6308 7.56237 12.6298 8.2C12.6298 10 9.92981 10.9 9.92981 10.9" stroke="#9E9E9E" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.002 14.5H10.011" stroke="#9E9E9E" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/frontend/public/images/icons/faq_hover.svg b/frontend/public/images/icons/faq_hover.svg
new file mode 100644
index 00000000..4d29215a
--- /dev/null
+++ b/frontend/public/images/icons/faq_hover.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.002 19C14.9725 19 19.002 14.9706 19.002 10C19.002 5.02944 14.9725 1 10.002 1C5.03139 1 1.00195 5.02944 1.00195 10C1.00195 14.9706 5.03139 19 10.002 19Z" stroke="#FF8544" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.38281 7.3C7.59441 6.6985 8.01205 6.1913 8.56177 5.86822C9.11149 5.54514 9.75782 5.42704 10.3863 5.53484C11.0147 5.64264 11.5847 5.96937 11.9954 6.45718C12.406 6.94498 12.6308 7.56237 12.6298 8.2C12.6298 10 9.92981 10.9 9.92981 10.9" stroke="#FF8544" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.002 14.5H10.011" stroke="#FF8544" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/frontend/public/images/icons/github.svg b/frontend/public/images/icons/github.svg
new file mode 100644
index 00000000..de6c0200
--- /dev/null
+++ b/frontend/public/images/icons/github.svg
@@ -0,0 +1,11 @@
+<svg width="56" height="56" viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="56" height="56" rx="4" fill="#2F2F2F"/>
+<g clip-path="url(#clip0_3970_2549)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M28 12C19.16 12 12 19.16 12 28C12 35.08 16.58 41.06 22.94 43.18C23.74 43.32 24.04 42.84 24.04 42.42C24.04 42.04 24.02 40.78 24.02 39.44C20 40.18 18.96 38.46 18.64 37.56C18.46 37.1 17.68 35.68 17 35.3C16.44 35 15.64 34.26 16.98 34.24C18.24 34.22 19.14 35.4 19.44 35.88C20.88 38.3 23.18 37.62 24.1 37.2C24.24 36.16 24.66 35.46 25.12 35.06C21.56 34.66 17.84 33.28 17.84 27.16C17.84 25.42 18.46 23.98 19.48 22.86C19.32 22.46 18.76 20.82 19.64 18.62C19.64 18.62 20.98 18.2 24.04 20.26C25.32 19.9 26.68 19.72 28.04 19.72C29.4 19.72 30.76 19.9 32.04 20.26C35.1 18.18 36.44 18.62 36.44 18.62C37.32 20.82 36.76 22.46 36.6 22.86C37.62 23.98 38.24 25.4 38.24 27.16C38.24 33.3 34.5 34.66 30.94 35.06C31.52 35.56 32.02 36.52 32.02 38.02C32.02 40.16 32 41.88 32 42.42C32 42.84 32.3 43.34 33.1 43.18C39.42 41.06 44 35.06 44 28C44 19.16 36.84 12 28 12Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_3970_2549">
+<rect width="32" height="32" fill="white" transform="translate(12 12)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/frontend/public/images/icons/linkedIn.svg b/frontend/public/images/icons/linkedIn.svg
new file mode 100644
index 00000000..605e7804
--- /dev/null
+++ b/frontend/public/images/icons/linkedIn.svg
@@ -0,0 +1,10 @@
+<svg width="56" height="56" viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<rect width="56" height="56" rx="4" fill="#007EBB"/>
+<rect x="12" y="12" width="32" height="32" fill="url(#pattern0_3970_2551)"/>
+<defs>
+<pattern id="pattern0_3970_2551" patternContentUnits="objectBoundingBox" width="1" height="1">
+<use xlink:href="#image0_3970_2551" transform="scale(0.000488281)"/>
+</pattern>
+<image id="image0_3970_2551" width="2048" height="2048" xlink:href="data:image/png;base64,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AQaOG1AAUABggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCggQGb2GATNV+ON19kJjMGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGOhmQAFAAYABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggIEGBmxig03s1krxfTStGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAgeMGFAAUABhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGhgwCY22ETNl+PNF5nJjAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGuhlQAFAAYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhgoIEBm9hgE7u1UnwfTSsGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGDguAEFAAUABhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGhiwiQ02UfPlePNFZjJjgAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggIFuBhQAFAAYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhoYMAmNtjEbq0U30fTigEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGDhuQAFAAYABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggIEGBmxig03UfDnefJGZzBhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhgoJsBBQAFAAYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhoYsIkNNrFbK8X30bRigAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGjhtQAFAAYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhgoIEBm9hgEzVfjjdfZCYzBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhjoZkABQAGAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYICBBgZsYoNN7NZK8X00rRhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggIHjBhQAFAAYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhoYMAmNthEzZfjzReZyYwBBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBroZUABQAGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYKCBAZvYYBO7tVJ8H00rBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhg4LgBBQAFAAYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhoYsIkNNlHz5XjzRWYyY4ABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYICBbgYUABQAGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYaGDAJjbYxG6tFN9H04oBBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhg4bkABQAGAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYICBBgZsYoNN1Hw53nyRmcwYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYKCbAQUABQAGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYaGLCJDTaxWyvF99G0YoABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBo4bUABQAGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYKCBAZvYYBM1X443X2QmMwYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYY6GZAAUABgAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAgQYGbGKDTezWSvF9NK0YYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYICB4wYUABQAGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYaGDAJjbYRM2X480XmcmMAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQa6GVAAUABggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCggQGb2GATu7VSfB9NKwYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYOC4AQUABQAGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYaGLCJDTZR8+V480VmMmOAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAgW4GFAAUABhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGhgwCY22MRurRTfR9OKAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYOG7gcnX380oASgAMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwUNvDw7v9yffszNrHwJmq9HG+9yExmDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDQz8DPXi7Xd/9TAUABgAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAgcIGrm7/9+VydfeTNrHwJvZrpWga2VMGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGDgqIGr25++XK5u/7MCgAIAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADlQ3cfuFyub7/rE2svInWzi8DDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDCwvIGr+88//K8A+HfLB3H0H53gf94/boMBBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhgIJWB2594KAD8GwUAbRgGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYqG7j/7OVydf8Zm1h5E62dXwYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYICBux95+CcA/AtB+C8DAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADlQ3c/vDl8vTun9rEypto7fwywAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADyxu4uvv05fL09sXyQVz7LwMDDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAOFDVzdPn8oAHyfTSy8icoLb/PLLwMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMLG/g6Yt/cLlcv/jbywfhJbqX6AwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADlQ08u/2uhwLAX1IA0IZhgAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCgsIFnd99xuTx9/q02sfAmVm6gWLsGFQMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMPA4Bp7cfeRyubr9EwoACgAMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwUNvDk+R+7XK7f+mabWHgTtWEepw0jRzkywAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwEBlAzef/D2Xyxv336AAoADAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMBAYQM3n/qtl8vN/a+3iYU3sXIDxdo1qBhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggIHHMfD0rV93udy8+UsVABQAGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYKGzg2+6+5nK5uXn/5er252xk4Y3UiHmcRowc5cgAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAxUNXN198XJ5+32Xl/+6vvucAoACAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwUNXN391+3l/8P/+/r2R21iwU2s2DyxZo0pBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhg4LEN/Mg7BYCrF7cKAAoADDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMFDTw9O6T7xQAnt39LZtYcBO1Yh67FePfjykGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGKho4GPvFACe3r+hAKAAwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAQEEDT24/+k4B4Mkn/4hNLLiJmjcVmzfWzC0DDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDyugau7P/xOAeCN+29QAFAAYIABBhhggAEGGGCAAXDHUGIAACAASURBVAYYYIABBhhggAEGGGCAAQYYYIABBhhgoKCBv3D/W94pANx84mttYsFN1Ip53FaMPOXJAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMVDdz8wC97pwBweft9l+vb/6UEoATAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMBAIQNXtz/9/7z8/7//n9e3P2oTC21ixdaJNWtLMcAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAA49s4PbfvrsAcPXiLQUABQAGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYKGbi6/8fvLgBc333MJhbaRK2YR27F2Hv//WeAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAgZIG/tq7CwBPbj9qM0tuphfhyhAMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMDAqgae3H/LuwsA189/nwKAAgADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAOFDNzcf9O7CwA397/WJhbaxFXbK7635hYDDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDwjoFnd1//7gLA5e33Xa5vv6AEoATAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMBACQM/dXl41/9l/3X94p/bxBKb+E6bQ7NFFgwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwMCaBq7uPv1l3/2//D98dvtdCgAKAAwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDFQwcP839gsAT+7/rE2ssInWyCkDDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDCwvIGnt396vwDwxvMPLh+QfzTGmv9oDPtu3xlggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhgoJqBN+6/Yb8A8G13X3O5uvt5JQBNGQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhIbeHi3f/O9X71fAHj4v7m6+zGbmHgTqzVOrFdLigEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGHgVBv7j///l/8P/7dO7H1AAUABggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGAgsYGnd//oKxcAnt3/RZuYeBM1Y15FM8a/J1cMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMFDMwPNv/8oFgJsXf0gBQAGAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYICBxAZu7v7AeygAfP+vtImJN1HrpljrhiXnCQMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMvAIDH3n+dV+5APDwP3F9/1kb8Ao2wMt7L+8ZYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBk4buP337+3l/8P/1LP7jysAKAAwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDCQ0cCL737vBYAnz/+MTcy4idbEJQMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMLC8gad3f/K9FwCu7n7j8oGd/kcu+C8dQwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADr8DAzVu/4b0XAG5u3n+5vvspG/EKNkKxwP8+DwYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYICBqIGr+89fHt7pH/rX07tPKgAoADDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMJDIwNXdPzn07v/l//CTF09tYqJNjLY/PKc5xAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDPQx8PT+jeMFgOvn36gAoADAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMBAIgNvPP/g8QLAn/+eX3y5uvuijUy0kVo5fVo59tJeMsAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMDAUQMP7/BvfuAXHS8APDxxffsvFQAUABhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGEhg4Or2n8Ve/r8sALy4sYkJNvFo68P/vKYQAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwww0M/AkxdP4wWAm7vfrgCgAMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwEACAzef+M0nCgA3779c3f43G5lgI7Vz+rVz7Kk9ZYABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYICB92rg4d39zc374wWAl/9rAG7/vgKAAgADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMzDdx+z7mX/w9PXz3/4zZx5ib6z+aPAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYWN7A1d0fPV8A+HNv/vLL9e2Xlg/zvf5jF/zP+Ud0MMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAww8qoHbL11u/uGvOF8AePlPAbj/jAKARg0DDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMTDFzd/tDjvPx/+Hd5dvcdNnHCJj5qI8T6GWaAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQZqGnhx83gFgDduf0fNEOC1bwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADxQ288Ynf9ngFgA+/+YHL9e1/h6I4Cv9EAf97RhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggIFqBj53eXhn/6j/enb/cQUABQAGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQZep4EX3/2o7/5f/ptdv/XNNvF1bqL/LN4YYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBj71occvANy8+Qv9rwHwXy7/5WKAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYeE0Gru4/f3l4V/9K/vXs/u/ZyNe0kf73blT737thvcwywAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwMDjGnh2/3deybv/l/+m15/6kAKAAgADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAOvw8CL3/nqCgB/6jO/4HJ195M28nVspP8MzhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggIGFDXzucnPzVa+uAPDw73z94u8uHPDj/uMa/OMv5MkAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwww8OUMPLv9rlf78v/h3/3m9ncpAGjZMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwww8CoNPP/G11AAuPmqy/XtT9jIV7mR/r35YoABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhY28F8uH37zA6++APDwn3D94m8uHLR//MSX+8dP+D/jggEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGHgcA89u//rrefn/sgDw/BsVALRtGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYeAUG3nj+wddXALi8/b7L1d1/sJGvYCM1Yh6nESNHOTLAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAQEUDD+/iH97Jv9Z/Pb17ogCgAMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwMAjGnhy+9HX+u7/5X/YzSe+9nJ190Ub+YgbWbF9Ys1aUwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwMBjGfjZy0eef93rLwA8/Cc+vf1+BQAFAAYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBh7BwNPb75vz8v/hP/Xm/pts4iNsojbMY7Vh/PuwxAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADdQ3c3P/ueQWAD7/5gcv13Y8rASgBMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwcMLA1e1/ujy8g5/6r+vn324TT2yi9k3d9o29s3cMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMPBYBp48v5767v/lf/i3vPg1l6vbn1MCUAJggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGAgYuD2S5dnd18/vwDwsIKr2+c2MbKJnuGGAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYWN7A09tP5Hj5/7CK6+d/cPkNeax/rIN/H/+IEAYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYGAtAzcvfn+eAsDNzVddru9+XAlAM4cBBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggIEDBq7ufuzy8M491b+ePv9Wm3hgEzV21mrs2G/7zQADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADX87Ak7uPpHr3/3IxH/3+X3K5uvsfSgBKAAwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDLwXA7dfuNx871fnKwA8rOjZi++0ie9lE/3PcMIAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwsb+DZ3V/O+fL/YVVPPvWrLte3P7P8Jn25f2yD/zP/OA8GGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAgWHg6u6Ll5u3fnXeAsDLfwrA/ccVADR1GGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQb+T3t3G2NZXd8B/LeLgA+tXSwo1VjAatW2YilifQGxMSTNKlRrszXRxLYvyptmQwsKu879n/mnmpQXNuluHyyvaIivJsZxmZ2He/5naWy1lWYBnyhRsJpahSJiVllNWXa3ubMw7MI+3Jm9s3vvOZ9JyM7DnZlzvv/P/1yS33fOZeAkBqabO8Z7+D84urx4eaRyyEKeZCGfbXT4V7uHAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYY6KaBNPfW8S8ADI4w1Y0CgAIAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADxzHQK4uTMfwfHGW1Z7NFPM4iau50s7lj3a07AwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwcbSA3105OAWD5LgDNl5UAlAAYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhg4xsBXIg5vmKwCwFTzIYt4zCJqtBzdaPE+DwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwww0EUDU80HJmv4PzjanDdGKl9VAlACYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhgYGCg/tryLH3yGgARUdVbLKKNzAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAQDkcuf++iZz9Hznowxuiqu+3kDYzAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwEDHDdwbcXjDBBcABncBWHpvxxfR63Z08XU7nDP3DDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDBwtIG8+O7JHv4/e/RV/x4lAG0eBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggIFOGkjlPyb/r/9XCgB7NndyEY9uc3hfu4cBBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhjopoHcXPvs+Lwd/1bN55UAtHkYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBjpm4F/bMfQ/+izywrs6tojdbK5oLFl3BhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhg4DkD2xfeefTovD3vp3K3EoA2DwMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMBAJwykft2egf/zzyQtXBFVfbATC6nR8lyjRRayYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYICBzhmoD0bqX/n8sXm7Pp5u7lAA0OZhgAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGi1gelye7uG/cc7m4/telVU9b5WL2TnmisuTDwzwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADKwZS+XHk+YuPNzJv3+d6zfaVEzcsd6sPBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggIE2Gegt3dy+Qf+JzijPnBep/qYSgAYMAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwECrDKTycGzeef6JxuXt/Hwu72/VIrapjeJctKsYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYICBtRnIzXXtHPKf6qxSv1YC0OZhgAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGiFgVQ3pxqTt/fr6e5fj6ocaMVCar+srf0iN7kxwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwEA7DByIvPs32jvgH+bMpsvtCgDaPAwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADE25g5zAj8nY/ZuvMRVHVP5zwhdTIaUcjxzpaRwYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYWL2BVD8WeeYV7R7uD3t2vfInCgDaPAwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADE2kglQ8OOx7vxuNSv57IhdR+WX37RWYyY4ABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYICBthjolcVuDPVXc5Z59tJI9ZNKABo9DDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAOTYaDeH7l53WpG4915bK//0clYRJvNOjHAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAOdN9BburE7A/3VnumWmXMiNXs7j6Qtt7pwHm7bwgADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADrTXQvycGM25vJ0kgL14eqTylBKAtxAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDAwpgYORK5/8ySTb19aSaBqbhvTRdTOaW07x4XTnmOAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAgWENLP3lynzbO6dIYPPO86OqH4RrWFwexwoDDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDBwhgx8I/IdLz7F1NuXj0kgL/5OVPXBM7RA/rLfX/YzwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDJzCQH0wti9dc8xs2wdDJlA1n1QA0NJhgAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGBgLA9Plr4acdnvYCxI48lIA94/FQmq6nKLp4oLDKQMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMtNrAvZFnznvBXNsnVpHALeXNUdX7bZRWbxTlAgUTBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhgYYwP1/sj9N61i0u2hJ0ygV/+ZAoACAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMDAWTHQK396wnm2L6w2gcMbIjV3nZWF1LIZ45aNi5s9wQADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAAD62ygV2ZXO+H2+FMlsHXmoqjKI/CuM16FB4UHBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhg4BkD9fciz114qnG2r68lgar8bqRySAlACYABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhgYF0NLM+m92xey2jb9wybQFV2rusiarJoMzHAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMVM0nhx1je9xaE9gy85JI5atKANo8DDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAPrYiCV+2LzzvPXOtb2fatJIO96fVTlR+uykJo8mjwMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMBAdw2k5onIzetWM8L22NNNIDfXRVUfVALQ6GGAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYGI2BwQx6z+bTHWf7/rUkMF0+PppFtBnkyAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDHTewFS/t5bRte8ZRQI5b4xePd95hG4/0t3bj1h7a88AAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMDAaAz0ylwMZtDezmIC23ZfEKk8rASgjcQAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwsDYD9UORZzedxcm3X72SQF68PKp6/9oW0gaQGwMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMNBZA6n8NNLCFSvzZ++MQQJTzYc6C9ItPUZzSw85ypEBBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYICB7hmYav5oDCbeDuEFCUyXv1cC0ExigAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGBjOQPM3L5g7+8SYJJBnzote+efhFhJ4OTHAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAOdNZDqJm7Ye+6YTLsdxnETyJ9+eVT11zqL1C1JundLEmtuzRlggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhYrYEHIs9uOu7M2SfHLIE8e2mk8qgSgLYSAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwMDzDDwSN89fMmZTbodz0gTy/Nsi1U8+byFX2/rweE0hBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhgoC0GUvlpbJ//7ZPOmn1xTBPIzXWR6qeVADR6GGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAga4bqA9G7r9vTKfbDmuoBKaam2zkrm9k528PMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMNB5A73+1qFmzB405glUZWfnMbfllhzOw+1lGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGBgtQaml/56zKfaDm/oBHLeGL0yqwSg1cQAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwx0zECvzMWWmXOGni974AQk8JE7Xxap/pLN3LHNvNrmj8drizHAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDQIgP9L0aee+kETLQd4qoTuLX8QlTlXiUAJQAGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCg5QZS8+XYtvuCVc+VfcMEJbB15qKoygM2c8s3s1ZWi1pZrLpeMcAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMrNrAN+Jju141QZNsh7rmBKb2vCaq8i2bZNWbxFBZsYABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBsbbQCoPR9716jXPk33jBCYwXX45UvmOEoASAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMNAWA/3vRu+uyyZwgu2QTzuBj869IaryiM3cls3sPFhmgAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhgoLMGUv1Y3FLefNpzZD9gghPIi5dHVf+ws5vA7UnG+/Yk1sf6MMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMDCMgR9FWrhigifXDn1kCeQ9b49UfqwEoA3FAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMTJqBel9sa64a2fzYD2pBAtuXrlECmLSN7Hg9+TDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDQbQP1vpguV7dgYu0URp5A6l8ZqTze7Q3iAmn9GWCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGBgAgyk5onI5R0jnxv7gS1KIC/8WqT6+zb0BGxor3UyzGudeAwnDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAAD7TOQyqOR5t7aokm1U1m3BG65+41R9b+rBKAEwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDIyZgVT/d+TmV9dtXuwHtzCBm+cviap+yGYeoXV5AQAAER9JREFUs82sndW+dpY1taYMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAANDG2i+Hb2FX2nhhNoprXsCef7iqOqvKQEoATDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAANn20D9YEztec26z4n9ghYnkD/7yqjq+23ms72Z/X4GGWCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGOisgVTui60zF7V4Mu3UzlgC23ZfEKn+Umc309C323DBZYQBBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBkZtoP/FyLObzth82C/qQAIfufNl0at32ayj3qx+HlMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMHACA70yG3nupR2YSDvFM57AlplzYrq/w+Y7weZzp4DDbLDBAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAwIgMDGazOW8843Nhv7BjCfSWboyqPmjjjmjjKg4oDjDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAwLMGUv109PpbOzaFdrpnNYHcf19U9X4lACUABhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhgYEQGUv1k5MXfO6uzYL+8owlsa66KVB61mUe0mZ9t9PhXu4sBBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYICBLhp4JPL82zo6fXbaY5FA767LItX/qQSgBMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwys0UDqfz1unr9kLGbADqLjCWzbfUGkcrfNvMbNrL3VxfaWc+aeAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGDgiIFUN5FnN3V86uz0xyqBnF8UVXObEoASAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMDCkgelye+SZ88Zq9utgJLCSwFTzoajq/Tb0kBtaq0mzjQEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggIEuGvhZpPqPV+as3pHA2CaQ5t4aVfmWEoASAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMPB8A/VDkRcvH9t5rwOTwAsSyJ9+efTKrM38/M3sYyYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYY6KyBVHbHtt0XvGC+6hMSGP8EDm+I3tKtUdUHO7uB3a6li7drcc7cM8AAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMHGsglUNRNbdFzhvHf87rCCVwsgTy4rsjNU8oAWhyMcAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMBA9wzU+6Jaeu/JRqq+JoHJSiDven1U5Svd28wu4NacAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAgc4aSOW+6N112WQNdx2tBIZJIN/x4uXbWnhJgGNv9+H2J/JggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhgoF0GBrf8n+7viM07zx9mlOoxEpjcBHJzbVT19zrb8nHxbtfF23paTwYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAgaMNpPJoDF4m3ZsEOpPA1pmLolfvUgJwuxcGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGiNgV6ZjTx3YWfmvk5UAsckkJY+HKl+sjUb+uhmj/c1vRhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhjohoFUfhq9pRuPmYX6QAKdTCD33xRVuVcJQLOLAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYmzkBq9sYtd7+xk7NeJy2B4yZww95zo+rnqOqDE7ehtba60dqyztaZAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGDgaAOpHIrp/o7IM+cddwbqkxLofALbF94ZVfmGEoBmFwMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMjK+B+sHYvnRN5+e7ApDAKRPId7z4mbsB/N/4bmgXW2vDAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAQAcNHIiquS0GM01vEpDAKhJI5S1R9e/p4EXDrVOOvnWK93lggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhgYBwOp3Bd5z2+tYuLpoRKQwDEJ5LwxUnNDVOUnigAaZAwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwcOYN1Pujt3RrbJk555hZpg8kIIE1JtC767Lo1f0zv5ldQGXOAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAQGcN9Mpi3Dx/yRqnnL5NAhI4aQJVvSWq8oPOXmDG4dYmjsEtdhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBtpuIDVPLN+p/KTDS1+UgAROP4E8d2FM15+KVD+tCKBtxgADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADIzRwIKbrv40884rTH2z6CRKQwPAJ5P6bIvUXRriZNbXa3tRyfowzwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwycyECv2ROpvGX4gaVHSkACo0+gWrg+UnlYEUCziwEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGVm+gfigGL0XuTQISGJMEbth7bvSWboyq3rf6De0iKDMGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggAEGOmjgJ1H1c2zeef6YTD0dhgQkcEwCee7CmO7viFQ/3cELlNu1nOh2LT7PBgMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAwIqB+mBU9Z3xsV2vOmbW6AMJSGBME0j9KyOVu5UANNUYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYGDFQOrXkRauGNMpp8OSgAROmsB0uVoRwAV95YK+0uqSiUwYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAgW4Z6H8x8sK7Tjpb9EUJSGBCEsjNtVH17+nWRcyTlvVmgAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhjouoH636NauH5CppoOUwISWFUCgyJAava60Hf9Qu/87QEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhgoNUGUvlqVPWWiMMbVjVP9GAJSGDSEji8YbnlU9X3t/qi5nb3h62v/3FhgAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBjpmIPW/bvA/afNbxyuBUSSQ88ZI5YOx3P7p2IVPOUA5gAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhgoE0GUvPlmGo+EIMZoDcJSKDjCUyXq6NX5iKVQ1pgyhAMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMTIiBVH9h+e7fbvXf8YGv05fA8RLIi5fHdLk9qvIzF/UJuai3qZnmXDQtGWCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggIFTG0jlqaiamdjWXHW8kZ/PSUACEjg2gTx/cVT9HKl5QhFAEYABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYICBcTBQ74vp/o64qf/aY4d7PpKABCQwTAJ55ueit3RjpPIdF/VxuKg7Bg4ZYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAgc4ZGMzqeku3Rp7dNMyIz2MkIAEJnDyBnF8Uubw/Un8hqvpg5y6qbjVz6lvNyEhGDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwMDoDKT66ejV81HVvx+DWZ03CUhAAuuSQN716uWGUdV8WxFAw44BBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYICBERpI5X+iam6LPHvpusz6/FAJSEACx00g542Rm2ujamYiladc2Ed4YdeOG107TpayZIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAgXE3sPzX/qVEVW/x1/7HnUz6pAQkcEYTyPMXH7krQP2QIoAiAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDDDAAANDGEj1N6Pq57ip/9ozOtvzyyQgAQkMl8DhDbF94Z1RlX+Iqv5fF/YhLuzj3jhzfFqRDDDAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwMDoDKTyaFTN38X2pWsiDm8YbgbnURKQgATOdgKDlwiYLlfHdH9HLF/IDMMVIhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBrpooP5hVPWdUS1c7xb/Z3uI6fdLQAKnn8CWmXOeKwPUj3li6+ITm3PmngEGGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBjpl4EcrQ/8b9p57+gM3P0ECEpDAOCaQZ86Lqrxn+YKXyuOe6Dr1RDe62+O41ZAsGWCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhgYPwM/CCq/j9FXnx3GPqP46TSMUlAAuuawOBlAlL/yugt3Rq9UqIqBxQCFAIYYIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYmw0B9MFKzN6rmtsjNtYb+6zpZ9MMlIIGJS2B784tR1VtiutweVf29ybiwewK2TgwwwAADDDDAAAMMMMAAAwwwwAADDDDAAAMMMMBAhwz8IKpmJlJzQ/z50i9N3DzOAUtAAhI4KwkM7g6wrbkqppaqSOXfIpWnOvTE4ZY943fLHmtiTRhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYY6KKBwYwq1V+IqX4v8vzbYjDD8iYBCUhAAqeZQJ57aUyXq6O3dOORVlV5XCFAm5ABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYGCkBlL58ZGXru7n5dv6b5l5yWlOuXy7BCQgAQkMlUBuXhdp6cNHXjKgPBCpHBrpBb6LLTbnrL3JAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADXTKQ6u8v//Hp4I9QU/9Kf+E/1JTOgyQgAQmcgQQGr7NSLf1BVP1PRK/eFan+L4UArT8GGGCAAQYYYIABBhhggAEGGGCAAQYYYIABBhhggIHlPyQdzI5S+VxMl49HLu+PPH/xGZhg+RUSkIAEJDCyBG7Z9fPLba3lOwX0dyzfsiXVj3mi90TPAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwwAADDLTVQL0vUrM3qvrO5ZeXzs21kecuHNn8yQ+SgAQkIIExSyDPXhrVwvUx1dwUVdkZvTIXqf/1qOr9nuzb+mTvvNhmgAEGGGCAAQYYYIABBhhggAEGGGCAAQYYYKA1BlL95PJsZzDjGcx6BjOf3FwXN89fMmZTKYcjAQlIQAJnNYH82VdG3vP2mGo+EL2lW2O6/lSkeimq8kCk8mhU5UBrnhy79Bo+ztVrVjHAAAMMMMAAAwwwwAADDDDAAAMMMMAAAwwwMCkGDjwzk3kgemVxeVYzVd8Sqfzh8gxn68xFZ3WW5JdLQAISkEDLEsizm+Kjc2+IXN4RVXlPDF5ioNf/i6j6n4iq/4+RymeOvNxA+ZdnbjHzYFTlW5HK45GaJ577rxxSJtC2ZIABBhhggAEGGGCAAQYYYIABBhhggAEGGGCAgYk3kMqh5+Yfg1lIeXx5NlLVDx6ZlTSff2Z28pnlgf5gpjKYrQxmLINZy2Dmsjx7md3UsqmS05HAGUvg/wHy91HSrxuTigAAAABJRU5ErkJggg=="/>
+</defs>
+</svg>
diff --git a/frontend/public/images/icons/shuffleLogo.svg b/frontend/public/images/icons/shuffleLogo.svg
new file mode 100755
index 00000000..1024dd6a
--- /dev/null
+++ b/frontend/public/images/icons/shuffleLogo.svg
@@ -0,0 +1,5 @@
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 0L-1.48522e-08 13.3913L4.40052 13.3913L4.40052 4.46465L22 4.46465L22 2.44001e-08L0 0Z" fill="#FF8444"/>
+<path d="M17.5995 8.60864L17.5995 17.5353L-9.90052e-09 17.5353L-1.48522e-08 22L22 22L22 8.60864L17.5995 8.60864Z" fill="#FF8444"/>
+<path d="M13.3915 8.60864L8.60889 8.60864L8.60889 13.3913L13.3915 13.3913L13.3915 8.60864Z" fill="#FF8444"/>
+</svg>
diff --git a/frontend/public/images/icons/usecases.svg b/frontend/public/images/icons/usecases.svg
new file mode 100644
index 00000000..cc96e086
--- /dev/null
+++ b/frontend/public/images/icons/usecases.svg
@@ -0,0 +1,6 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.22417 1H1.00195V7.22222H7.22417V1Z" stroke="#9E9E9E" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M17.0015 1H10.7793V7.22222H17.0015V1Z" stroke="#9E9E9E" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M17.0015 10.7778H10.7793V17H17.0015V10.7778Z" stroke="#9E9E9E" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.22417 10.7778H1.00195V17H7.22417V10.7778Z" stroke="#9E9E9E" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/frontend/public/images/icons/usecases_hover.svg b/frontend/public/images/icons/usecases_hover.svg
new file mode 100644
index 00000000..6841b21e
--- /dev/null
+++ b/frontend/public/images/icons/usecases_hover.svg
@@ -0,0 +1,6 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.22417 1H1.00195V7.22222H7.22417V1Z" stroke="#FF8544" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M17.0015 1H10.7793V7.22222H17.0015V1Z" stroke="#FF8544" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M17.0015 10.7778H10.7793V17H17.0015V10.7778Z" stroke="#FF8544" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.22417 10.7778H1.00195V17H7.22417V10.7778Z" stroke="#FF8544" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/frontend/public/images/icons/x.svg b/frontend/public/images/icons/x.svg
new file mode 100644
index 00000000..815e4e30
--- /dev/null
+++ b/frontend/public/images/icons/x.svg
@@ -0,0 +1,10 @@
+<svg width="56" height="56" viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<rect width="56" height="56" rx="4" fill="black"/>
+<rect x="8.5" y="8.5" width="39" height="39" fill="url(#pattern0_3970_2550)" stroke="black"/>
+<defs>
+<pattern id="pattern0_3970_2550" patternContentUnits="objectBoundingBox" width="1" height="1">
+<use xlink:href="#image0_3970_2550" transform="scale(0.00159744)"/>
+</pattern>
+<image id="image0_3970_2550" width="626" height="626" xlink:href="data:image/png;base64,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"/>
+</defs>
+</svg>
diff --git a/frontend/public/images/logos/singul.svg b/frontend/public/images/logos/singul.svg
new file mode 100644
index 00000000..5f27d7a3
--- /dev/null
+++ b/frontend/public/images/logos/singul.svg
@@ -0,0 +1,22 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_4467_7657)">
+<path d="M6.54065 20.7133C6.54065 18.9072 5.07648 17.443 3.27033 17.443C1.46417 17.443 0 18.9072 0 20.7133C0 22.5195 1.46417 23.9837 3.27033 23.9837C5.07648 23.9837 6.54065 22.5195 6.54065 20.7133Z" fill="#17BCAF"/>
+<path d="M23.9838 16.3516C23.9838 16.7226 23.958 17.0851 23.9062 17.441C23.3841 21.0997 20.2648 23.9213 16.4767 23.9817C16.4358 23.9817 16.3948 23.9817 16.3538 23.9817H11.994C10.1884 23.9817 8.72378 22.5169 8.72378 20.7113C8.72378 19.8075 9.09048 18.9921 9.68154 18.3988C10.2748 17.8056 11.0902 17.441 11.994 17.441H16.3171C16.8974 17.441 17.4043 17.0031 17.4432 16.4228C17.4841 15.808 17.0118 15.2924 16.4121 15.2622C16.3948 15.2622 16.3754 15.2622 16.3559 15.2622H7.63439C3.78805 15.2622 0.606175 12.419 0.0798164 8.72161C0.0258865 8.36564 0 8.00109 0 7.63222C0 7.26331 0.0258865 6.89875 0.0776594 6.5428C0.60186 2.88203 3.72118 0.062559 7.50708 0C7.54807 0 7.58907 0 7.63006 0H11.9897C13.7975 0 15.2622 1.46475 15.2622 3.27033C15.2622 4.1742 14.8955 4.98961 14.3044 5.58285C13.7112 6.17608 12.8958 6.54065 11.9919 6.54065H7.66889C7.08858 6.54065 6.58163 6.97856 6.5428 7.55888C6.50182 8.17364 6.97424 8.68919 7.57394 8.71945C7.59123 8.71945 7.61061 8.71945 7.63006 8.71945H16.3516C20.1958 8.71945 23.3755 11.5626 23.904 15.26C23.9558 15.616 23.9817 15.9806 23.9817 16.3494L23.9838 16.3516Z" fill="#18FFCD"/>
+<path d="M23.984 3.27033C23.984 1.46417 22.5199 0 20.7137 0C18.9076 0 17.4434 1.46417 17.4434 3.27033C17.4434 5.07648 18.9076 6.54065 20.7137 6.54065C22.5199 6.54065 23.984 5.07648 23.984 3.27033Z" fill="#17BCAF"/>
+<path d="M20.6855 19.622C20.6855 21.9884 18.8002 23.917 16.4488 23.9817C16.4078 23.9817 16.3669 23.9817 16.3259 23.9817H11.9661C10.1605 23.9817 8.6958 22.517 8.6958 20.7114C8.6958 19.8075 9.06251 18.9921 9.65357 18.3989C10.2469 17.8057 11.0623 17.441 11.9661 17.441H16.2892C16.8694 17.441 17.3764 17.0031 17.4153 16.4229C17.4562 15.8081 16.9838 15.2925 16.3841 15.2623C18.7657 15.2904 20.6898 17.2318 20.6898 19.622H20.6855Z" fill="url(#paint0_linear_4467_7657)"/>
+<path d="M3.27237 4.35971C3.27237 1.99326 5.15778 0.0668734 7.50916 0C7.55015 0 7.59107 0 7.63206 0H11.9918C13.7974 0 15.2621 1.46475 15.2621 3.27032C15.2621 4.1742 14.8954 4.98961 14.3044 5.58285C13.7111 6.17608 12.8957 6.54065 11.9918 6.54065H7.66874C7.08847 6.54065 6.58154 6.97856 6.5427 7.55888C6.50172 8.17364 6.97414 8.68919 7.57385 8.71945C5.19229 8.69135 3.26807 6.7499 3.26807 4.35971H3.27237Z" fill="url(#paint1_linear_4467_7657)"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_4467_7657" x1="8.72017" y1="15.2623" x2="20.7103" y2="15.2623" gradientUnits="userSpaceOnUse">
+<stop stop-color="#18C2B0"/>
+<stop offset="1" stop-color="#0B5C53"/>
+</linearGradient>
+<linearGradient id="paint1_linear_4467_7657" x1="15.2601" y1="0" x2="3.26995" y2="0" gradientUnits="userSpaceOnUse">
+<stop stop-color="#18C2B0"/>
+<stop offset="1" stop-color="#0B5C53"/>
+</linearGradient>
+<clipPath id="clip0_4467_7657">
+<rect width="24" height="24" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/frontend/public/images/singul_green.png b/frontend/public/images/singul_green.png
new file mode 100644
index 00000000..796ad6ef
Binary files /dev/null and b/frontend/public/images/singul_green.png differ
diff --git a/frontend/selenium-test.js b/frontend/selenium-test.js
new file mode 100644
index 00000000..42b6b801
--- /dev/null
+++ b/frontend/selenium-test.js
@@ -0,0 +1,253 @@
+const { Builder, By, until } = require('selenium-webdriver');
+const chrome = require('selenium-webdriver/chrome');
+const fs = require('fs');
+const path = require('path');
+
+console.log('Starting Selenium script for testing pages...');
+
+(async () => {
+    const userDataDir = path.join(__dirname, 'chrome-user-data', `${Date.now()}-${Math.random().toString(36).substring(2, 8)}`);
+    fs.mkdirSync(userDataDir, { recursive: true });
+
+    let options = new chrome.Options();
+    options.addArguments('--no-sandbox');
+    options.addArguments('--headless');
+
+    let driver = await new Builder()
+        .forBrowser('chrome')
+        .setChromeOptions(options)
+        .build();
+
+    const SuccessfullyLoadedPath = [];
+    const FailedToLoadPath = [];
+
+    try {
+        await driver.manage().window().setRect({ width: 1600, height: 1200 });
+        await driver.manage().window().maximize()
+        await driver.manage().setTimeouts({ implicit: 15000 });
+
+        const frontendURL = process.argv[2];
+        const routes = process.argv.slice(3);
+
+        console.log('Frontend URL:', frontendURL);
+        const isCloud = frontendURL === 'http://localhost:3002' || frontendURL === 'https://sandbox.shuffler.io' || frontendURL === 'https://shuffler.io';
+       
+        if (isCloud) {
+            // Login Credentials
+            const LOGIN_URL = `${frontendURL}/login`;
+            // put your login credentials here
+            const USERNAME = '';
+            const PASSWORD = '';
+
+            console.log('Logging in...');
+            await driver.get(LOGIN_URL);
+
+            try {
+                await driver.wait(until.elementLocated(By.css('#emailfield')), 10000);
+                await driver.findElement(By.css('#emailfield')).sendKeys(USERNAME);
+
+                await driver.wait(until.elementLocated(By.css('#outlined-password-input')), 10000);
+                await driver.findElement(By.css('#outlined-password-input')).sendKeys(PASSWORD);
+
+                await driver.wait(until.elementLocated(By.css('#loginButton')), 10000);
+                await driver.findElement(By.css('#loginButton')).click();
+
+                // Ensure login success by checking URL change
+                await driver.wait(async () => {
+                    const url = await driver.getCurrentUrl();
+                    return url.includes('welcome');
+                }, 20000);
+
+                console.log('Successfully logged in!');
+            } catch (error) {
+                console.error('Login failed:', error.message);
+                FailedToLoadPath.push(LOGIN_URL);
+                await driver.quit();
+                process.exit(1);
+            }
+        }else {
+            // Steps for onprem testing
+            // 1. Login
+            // 2. Create new workflow
+
+            // Write your own login credentials here if you are testing onprem locally
+            const USERNAME = 'demo@demo.io';
+            const PASSWORD = 'supercoolpassword';
+            const WORKFLOW_URL = `${frontendURL}/workflows`;
+
+            try {
+                // Login
+            console.log('Logging in...');
+            await driver.get(`${frontendURL}/login`);
+
+            await driver.wait(until.elementLocated(By.css('#emailfield')), 10000);
+            await driver.findElement(By.css('#emailfield')).sendKeys(USERNAME);
+
+            await driver.wait(until.elementLocated(By.css('#outlined-password-input')), 10000);
+            await driver.findElement(By.css('#outlined-password-input')).sendKeys(PASSWORD);
+
+            const loginButton = await driver.findElement(By.css('#loginButton'));
+            await driver.executeScript("arguments[0].scrollIntoView(true);", loginButton);
+            await loginButton.click();
+
+
+
+             // Ensure signup success by checking URL change
+             await driver.wait(async () => {
+                const url = await driver.getCurrentUrl();
+                return url.includes('welcome') || url.includes('workflows');
+            }, 20000);
+
+
+            const isParentPresent = await driver.wait(async () => {
+                return await driver.executeScript(
+                    "return document.querySelector('.parent-component') !== null;"
+                );
+            }, 5000).catch(() => false);
+    
+            if (!isParentPresent) {
+                const logs = await driver.manage().logs().get('browser');
+                const severeErrors = logs.filter(log => log.level.name === 'SEVERE');
+                if (severeErrors.length > 0) {
+                    const crashCausingErrors = severeErrors.filter(err => {
+                        return  !err.message.includes('Warning:') &&
+                            !err.message.includes('MUI:') 
+                    });
+
+                    console.error(`Page (${frontendURL}/login) did not load correctly:`, crashCausingErrors);
+                    FailedToLoadPath.push(`${frontendURL}/login`);
+                }
+            }
+
+            console.log('Successfully logged in!');
+
+        } catch (error) {
+            console.error('Failed to login:', error.message);
+            FailedToLoadPath.push(WORKFLOW_URL);
+            await driver.quit();
+            process.exit(1);
+        }
+
+        try {
+            // Create new workflow
+            console.log('Creating new workflow...');
+            await driver.get(WORKFLOW_URL);
+            
+            await driver.sleep(1000);
+        
+            await driver.wait(until.elementLocated(By.css('#create_workflow_button')), 10000);
+            const create_workflow_button = await driver.findElement(By.css('#create_workflow_button'));
+            
+            await driver.sleep(1000);
+            await create_workflow_button.click();
+        
+            await driver.sleep(1500);
+        
+            await driver.wait(until.elementLocated(By.css('#Enter-Workflow-Name')), 10000);
+            const enter_workflow_name_field = await driver.findElement(By.css('#Enter-Workflow-Name'));
+        
+            await driver.sleep(1000);
+            await enter_workflow_name_field.sendKeys("Test Workflow");
+        
+            // Wait before saving
+            await driver.sleep(1500);
+        
+            await driver.wait(until.elementLocated(By.css('#save_workflow_button')), 10000);
+            const save_workflow_button = await driver.findElement(By.css('#save_workflow_button'));
+        
+            await driver.sleep(1000); // Delay before clicking
+            await save_workflow_button.click();
+        
+            // Wait for the parent component to appear
+            await driver.sleep(2000);
+        
+            const isParentPresent = await driver.wait(async () => {
+                return await driver.executeScript(
+                    "return document.querySelector('.parent-component') !== null;"
+                );
+            }, 5000).catch(() => false);
+        
+            if (!isParentPresent) {
+                const logs = await driver.manage().logs().get('browser');
+                const severeErrors = logs.filter(log => log.level.name === 'SEVERE');
+                if (severeErrors.length > 0) {
+                    const crashCausingErrors = severeErrors.filter(err => {
+                        return !err.message.includes('Warning:') &&
+                               !err.message.includes('MUI:');
+                    });
+        
+                    console.error(`Page (${WORKFLOW_URL}) did not load correctly:`, crashCausingErrors);
+                    FailedToLoadPath.push(`${WORKFLOW_URL}`);
+                }
+            }
+        
+        } catch (error) {
+            console.error('Failed to create new workflow:', error.message);
+            FailedToLoadPath.push(WORKFLOW_URL);
+            await driver.quit();
+            process.exit(1);
+        }            
+        }
+
+        // Get routes from command line arguments
+        if (routes.length === 0) {
+            console.error('No routes found to test.');
+            await driver.quit();
+            process.exit(1);
+        }
+        console.log(`Found ${routes.length} routes to test.`);
+
+        for (const route of routes) {
+            const url = `${frontendURL}/${route}`;
+            console.log(`Testing route: ${url}`);
+        
+            try {
+                await driver.get(url);
+                await driver.sleep(3000);
+        
+                // Wait for document readiness
+                await driver.wait(async () => {
+                    return await driver.executeScript('return document.readyState') === 'complete';
+                }, 10000);
+        
+                const isParentPresent = await driver.wait(async () => {
+                    return await driver.executeScript(
+                        "return document.querySelector('.parent-component') !== null;"
+                    );
+                }, 5000).catch(() => false);
+        
+                if (!isParentPresent) {
+                    const logs = await driver.manage().logs().get('browser');
+                    const severeErrors = logs.filter(log => log.level.name === 'SEVERE');
+                    if (severeErrors.length > 0) {
+                        const crashCausingErrors = severeErrors.filter(err => {
+                            return  !err.message.includes('Warning:') &&
+                                !err.message.includes('MUI:') 
+                        });
+
+                        console.error(`Page (${url}) did not load correctly:`, crashCausingErrors);
+                        FailedToLoadPath.push(url);
+                    }
+                    continue;
+                }
+        
+                console.log(`Successfully loaded: ${url}`);
+                SuccessfullyLoadedPath.push(url);
+            } catch (error) {
+                console.error(`Failed to load ${url}:`, error.message);
+            }
+        }            
+    } finally {
+        console.log("Total pages tested: ", SuccessfullyLoadedPath.length + FailedToLoadPath.length);
+        console.log("Successfully loaded pages: ", SuccessfullyLoadedPath.length);
+        if (FailedToLoadPath.length > 0) {
+            console.log("Failed to load pages: ", FailedToLoadPath.length);
+            console.log("Failed to load pages paths: ", FailedToLoadPath);
+            process.exit(1);
+        }else {
+            console.log("No pages failed to load. Congrats!");
+        }
+        await driver.quit();
+        fs.rmSync(userDataDir, { recursive: true, force: true });
+    }
+})();
\ No newline at end of file
diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx
index 8c0e8870..13289352 100755
--- a/frontend/src/App.jsx
+++ b/frontend/src/App.jsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from "react";
+import React, { useState, useEffect, useContext } from "react";
 
 import { Link, Route, Routes, BrowserRouter, useNavigate } from "react-router-dom";
 import { CookiesProvider } from "react-cookie";
@@ -12,12 +12,16 @@ import Header from "./components/NewHeader.jsx";
 import HealthPage from "./components/HealthPage.jsx";
 
 //import Header from "./components/Header.jsx";
-import theme from "./theme.jsx";
+import theme, { getTheme } from "./theme.jsx";
 import Apps from "./views/Apps.jsx";
 import Apps2 from "./views/Apps2.jsx";
 import AppCreator from "./views/AppCreator.jsx";
 import DetectionDashBoard from "./views/DetectionDashboard.jsx";
 
+// LLM related tests
+import ChatBot from "./components/ChatBot.jsx";
+import AgentUI from "./views/AgentUI.jsx";
+
 import Welcome from "./views/Welcome.jsx";
 import Dashboard from "./views/Dashboard.jsx";
 import DashboardView from "./views/DashboardViews.jsx";
@@ -25,6 +29,7 @@ import AdminSetup from "./views/AdminSetup.jsx";
 import Admin from "./views/Admin.jsx";
 import Docs from "./views/Docs.jsx";
 import Usecases2 from "./views/Usecases2.jsx";
+import DashboardViews from "./views/DashboardViews.jsx";
 //import Introduction from "./views/Introduction";
 import SetAuthentication from "./views/SetAuthentication.jsx";
 import SetAuthenticationSSO from "./views/SetAuthenticationSSO.jsx";
@@ -33,9 +38,10 @@ import RunWorkflow from "./views/RunWorkflow.jsx";
 import Admin2 from "./views/Admin2.jsx";
 
 import LoginPage from "./views/LoginPage.jsx";
+import LoginPageOld from "./views/LoginPageOld.jsx";
+
 import SettingsPage from "./views/SettingsPage.jsx";
 import KeepAlive from "./views/KeepAlive.jsx";
-
 import { ThemeProvider } from "@mui/material/styles";
 import CssBaseline from '@mui/material/CssBaseline';
 
@@ -57,7 +63,8 @@ import 'react-toastify/dist/ReactToastify.css';
 
 import Drift from "react-driftjs";
 
-import { AppContext } from './context/ContextApi.jsx';
+import { Context } from './context/ContextApi.jsx';
+import Navbar from "./components/Navbar.jsx";
 import Workflows2 from "./views/Workflows2.jsx";
 import AppExplorer from "./views/AppExplorer.jsx";
 
@@ -85,7 +92,10 @@ const App = (message, props) => {
   const [dataset, setDataset] = useState(false)
   const [isLoaded, setIsLoaded] = useState(false)
   const [curpath, setCurpath] = useState(typeof window === "undefined" || window.location === undefined ? "" : window.location.pathname)
-
+  const { themeMode, handleThemeChange, setBrandColor, brandColor,setThemeMode} = useContext(Context);
+  const currentTheme = getTheme(themeMode, brandColor);
+  const mainColor = currentTheme?.palette?.backgroundColor
+  const [isPreviousThemeLight, setIsPreviousThemeLight] = useState(false)
 
   useEffect(() => {
     if (dataset === false) {
@@ -95,6 +105,29 @@ const App = (message, props) => {
     }
   }, []);
 
+  useEffect(() => {
+		const isDarkPath = curpath === "/" || curpath === "/pricing" || curpath === "/partners" || curpath === "/faq" || curpath === "/professional-services" || curpath === "/contact" || curpath === "/training";
+		if (curpath && isDarkPath) {
+			if (themeMode === "light") {
+				setIsPreviousThemeLight(true)
+			}
+			handleThemeChange("dark")
+		}else if ( !isDarkPath && isPreviousThemeLight && userdata?.active_org?.branding?.theme === "light") {
+			handleThemeChange("light")
+			setIsPreviousThemeLight(false)
+		}
+
+		if (isDarkPath && userdata && userdata?.active_org?.branding?.brand_color !== "#ff8544") {
+			setBrandColor("#ff8544")
+		}else if(!isDarkPath && userdata && userdata?.active_org?.branding?.brand_color !== "#ff8544" && userdata?.active_org?.branding?.brand_color?.length > 0) {
+			const brandColor = localStorage.getItem("brandColor")
+			if (brandColor !== null && brandColor !== undefined && brandColor.length > 0) {
+				setBrandColor(brandColor)
+			}
+		}
+
+	}, [themeMode, curpath, userdata])
+
   if (
     isLoaded &&
     !isLoggedIn &&
@@ -159,7 +192,16 @@ const App = (message, props) => {
               { path: "/" }
             );
           }
-        }
+		  if (responseJson?.theme?.length > 0) {
+			handleThemeChange(responseJson.theme)
+		  }else{
+			handleThemeChange("dark")
+		  }
+        }else {
+			handleThemeChange("dark")
+			setThemeMode("dark")
+			localStorage.removeItem("theme");
+		}
 
         // Handling Ethereum update
 
@@ -182,10 +224,11 @@ const App = (message, props) => {
   const includedData =
       <div
         style={{
-          backgroundColor: theme.palette.backgroundColor,
+          backgroundColor: mainColor,
           color: "rgba(255, 255, 255, 0.65)",
           minHeight: "100vh",
         }}
+		className='parent-component'
       >
         <ScrollToTop
           getUserNotifications={getUserNotifications}
@@ -211,7 +254,20 @@ const App = (message, props) => {
 		
 					{ window?.location?.pathname === "/"  || window?.location?.pathname === "/training" || !(isLoggedIn && isLoaded) ? (
 						<div style={{ minHeight: 68, maxHeight: 68 }}>
-						<Header
+						{/* <Header
+						notifications={notifications}
+						setNotifications={setNotifications}
+						userdata={userdata}
+						cookies={cookies}
+						removeCookie={removeCookie}
+						isLoaded={isLoaded}
+						globalUrl={globalUrl}
+						setIsLoggedIn={setIsLoggedIn}
+						isLoggedIn={isLoggedIn}
+						curpath={curpath}
+						{...props}
+						/> */}
+						<Navbar
 						notifications={notifications}
 						setNotifications={setNotifications}
 						userdata={userdata}
@@ -235,6 +291,7 @@ const App = (message, props) => {
         <div style={{ height: 60 }} />
 				*/}
 				<Routes>
+
         	<Route
         	  exact
         	  path="/login"
@@ -242,7 +299,8 @@ const App = (message, props) => {
         	    <LoginPage
         	      isLoggedIn={isLoggedIn}
         	      setIsLoggedIn={setIsLoggedIn}
-        	      register={true}
+        	      register={false}
+        	      inregister={false}
         	      isLoaded={isLoaded}
         	      globalUrl={globalUrl}
         	      setCookie={setCookie}
@@ -252,6 +310,63 @@ const App = (message, props) => {
         	    />
         	  }
         	/>
+
+        	<Route
+        	  exact
+        	  path="/login2"
+        	  element={
+        	    <LoginPageOld
+        	      isLoggedIn={isLoggedIn}
+        	      setIsLoggedIn={setIsLoggedIn}
+        	      register={false}
+        	      inregister={false}
+        	      isLoaded={isLoaded}
+        	      globalUrl={globalUrl}
+        	      setCookie={setCookie}
+        	      cookies={cookies}
+        	      checkLogin={checkLogin}
+        	      {...props}
+        	    />
+        	  }
+        	/>
+
+        	<Route
+        	  exact
+        	  path="/loginsetup"
+        	  element={
+        	    <LoginPageOld
+        	      isLoggedIn={isLoggedIn}
+        	      setIsLoggedIn={setIsLoggedIn}
+        	      register={false}
+        	      inregister={false}
+        	      isLoaded={isLoaded}
+        	      globalUrl={globalUrl}
+        	      setCookie={setCookie}
+        	      cookies={cookies}
+        	      checkLogin={checkLogin}
+        	      {...props}
+        	    />
+        	  }
+        	/>
+
+        	<Route
+        	  exact
+        	  path="/register"
+        	  element={
+        	    <LoginPage
+        	      isLoggedIn={isLoggedIn}
+        	      setIsLoggedIn={setIsLoggedIn}
+        	      inregister={true}
+        	      isLoaded={isLoaded}
+        	      globalUrl={globalUrl}
+        	      setCookie={setCookie}
+        	      cookies={cookies}
+        	      checkLogin={checkLogin}
+        	      {...props}
+        	    />
+        	  }
+        	/>
+
         	<Route
         	  exact
         	  path="/admin2"
@@ -289,13 +404,14 @@ const App = (message, props) => {
 						/>
 					}
 				/>
-					<Route exact path="/search" element={<Search serverside={false} isLoaded={isLoaded} userdata={userdata} globalUrl={globalUrl} surfaceColor={theme.palette.surfaceColor} inputColor={theme.palette.inputColor} {...props} /> } />
+					<Route exact path="/search" element={<Search serverside={false} isLoaded={isLoaded} userdata={userdata} globalUrl={globalUrl} surfaceColor={currentTheme.palette.surfaceColor} inputColor={currentTheme.palette.inputColor} {...props} /> } />
         	<Route
         	  exact
         	  path="/admin/:key"
         	  element={
         	    <Admin
         	      isLoggedIn={isLoggedIn}
+				  userdata={userdata}
         	      setIsLoggedIn={setIsLoggedIn}
         	      register={true}
         	      isLoaded={isLoaded}
@@ -353,9 +469,10 @@ const App = (message, props) => {
         	    }
         	  />
         	) : null}
+
         	<Route
         	  exact
-        	  path="/AdminSetup"
+        	  path="/adminsetup"
         	  element={
         	    <AdminSetup
         	      isLoaded={isLoaded}
@@ -365,6 +482,7 @@ const App = (message, props) => {
         	    />
         	  }
         	/>
+
         	<Route
         	  exact
         	  path="/detectionframework"
@@ -458,8 +576,8 @@ const App = (message, props) => {
 					checkLogin={checkLogin}
 					userdata={userdata} 
 					globalUrl={globalUrl} 
-					surfaceColor={theme.palette.surfaceColor} 
-					inputColor={theme.palette.inputColor} 
+					surfaceColor={currentTheme.palette.surfaceColor} 
+					inputColor={currentTheme.palette.inputColor} 
 					{...props} 
 				/>
         	  }
@@ -476,8 +594,8 @@ const App = (message, props) => {
         	    />
         	  }
         	/>
-			<Route exact path="/apps/:appid" element={<AppExplorer userdata={userdata} isLoggedIn={isLoggedIn} isLoaded={isLoaded}  globalUrl={globalUrl} surfaceColor={theme.palette.surfaceColor} inputColor={theme.palette.inputColor} checkLogin={checkLogin} {...props} />} />
-			<Route exact path="/apis/:appid" element={<ApiExplorerWrapper serverside={false} userdata={userdata} isLoggedIn={isLoggedIn} isMobile={false} selectedApp={undefined} isLoaded={isLoaded}globalUrl={globalUrl} surfaceColor={theme.palette.surfaceColor} inputColor={theme.palette.inputColor} checkLogin={checkLogin} {...props} />} />
+			<Route exact path="/apps/:appid" element={<AppExplorer userdata={userdata} isLoggedIn={isLoggedIn} isLoaded={isLoaded}  globalUrl={globalUrl} surfaceColor={currentTheme.palette.surfaceColor} inputColor={currentTheme.palette.inputColor} checkLogin={checkLogin} {...props} />} />
+			<Route exact path="/apis/:appid" element={<ApiExplorerWrapper serverside={false} userdata={userdata} isLoggedIn={isLoggedIn} isMobile={false} selectedApp={undefined} isLoaded={isLoaded}globalUrl={globalUrl} surfaceColor={currentTheme.palette.surfaceColor} inputColor={currentTheme.palette.inputColor} checkLogin={checkLogin} {...props} />} />
 			<Route
 				exact
 				path="/detections/sigma"
@@ -549,14 +667,40 @@ const App = (message, props) => {
         	    />
         	  }
         	/>
-			<Route exact path="/workflows/:key/code" element={<CodeWorkflow serverside={false} userdata={userdata} globalUrl={globalUrl} isLoaded={isLoaded} isLoggedIn={isLoggedIn} surfaceColor={theme.palette.surfaceColor} inputColor={theme.palette.inputColor}{...props} />} />
-			<Route exact path="/workflows/:key/run" element={<RunWorkflow  userdata={userdata} globalUrl={globalUrl} isLoaded={isLoaded} isLoggedIn={isLoggedIn} surfaceColor={theme.palette.surfaceColor} inputColor={theme.palette.inputColor}{...props} /> } />
-			<Route exact path="/workflows/:key/execute" element={<RunWorkflow  userdata={userdata} globalUrl={globalUrl} isLoaded={isLoaded} isLoggedIn={isLoggedIn} surfaceColor={theme.palette.surfaceColor} inputColor={theme.palette.inputColor}{...props} /> } />
+			<Route exact path="/workflows/:key/code" element={<CodeWorkflow serverside={false} userdata={userdata} globalUrl={globalUrl} isLoaded={isLoaded} isLoggedIn={isLoggedIn} surfaceColor={currentTheme.palette.surfaceColor} inputColor={currentTheme.palette.inputColor}{...props} />} />
+			<Route exact path="/workflows/:key/run" element={<RunWorkflow  userdata={userdata} globalUrl={globalUrl} isLoaded={isLoaded} isLoggedIn={isLoggedIn} surfaceColor={currentTheme.palette.surfaceColor} inputColor={currentTheme.palette.inputColor}{...props} /> } />
+			<Route exact path="/workflows/:key/execute" element={<RunWorkflow  userdata={userdata} globalUrl={globalUrl} isLoaded={isLoaded} isLoggedIn={isLoggedIn} surfaceColor={currentTheme.palette.surfaceColor} inputColor={currentTheme.palette.inputColor}{...props} /> } />
 
-			<Route exact path="/forms" element={<RunWorkflow serverside={false} userdata={userdata} globalUrl={globalUrl} isLoaded={isLoaded} isLoggedIn={isLoggedIn} surfaceColor={theme.palette.surfaceColor} inputColor={theme.palette.inputColor}{...props} />} />
-			<Route exact path="/forms/:key/run" element={<RunWorkflow serverside={false} userdata={userdata} globalUrl={globalUrl} isLoaded={isLoaded} isLoggedIn={isLoggedIn} surfaceColor={theme.palette.surfaceColor} inputColor={theme.palette.inputColor}{...props} />} />
-			<Route exact path="/forms/:key" element={<RunWorkflow serverside={false} userdata={userdata} globalUrl={globalUrl} isLoaded={isLoaded} isLoggedIn={isLoggedIn} surfaceColor={theme.palette.surfaceColor} inputColor={theme.palette.inputColor}{...props} />} />
+			<Route exact path="/forms" element={<RunWorkflow serverside={false} userdata={userdata} globalUrl={globalUrl} isLoaded={isLoaded} isLoggedIn={isLoggedIn} surfaceColor={currentTheme.palette.surfaceColor} inputColor={currentTheme.palette.inputColor}{...props} />} />
+			<Route exact path="/forms/:key/run" element={<RunWorkflow serverside={false} userdata={userdata} globalUrl={globalUrl} isLoaded={isLoaded} isLoggedIn={isLoggedIn} surfaceColor={currentTheme.palette.surfaceColor} inputColor={currentTheme.palette.inputColor}{...props} />} />
+			<Route exact path="/forms/:key" element={<RunWorkflow serverside={false} userdata={userdata} globalUrl={globalUrl} isLoaded={isLoaded} isLoggedIn={isLoggedIn} surfaceColor={currentTheme.palette.surfaceColor} inputColor={currentTheme.palette.inputColor}{...props} />} />
 
+        	<Route
+        	  exact
+        	  path="/legal/:key"
+        	  element={
+        	    <Docs
+        	      isMobile={isMobile}
+        	      isLoaded={isLoaded}
+        	      globalUrl={globalUrl}
+				  isLoggedIn={isLoggedIn}
+        	      {...props}
+        	    />
+        	  }
+        	/>
+        	<Route
+        	  exact
+        	  path="/legal"
+        	  element={
+        	    <Docs
+        	      isMobile={isMobile}
+        	      isLoaded={isLoaded}
+        	      globalUrl={globalUrl}
+				  isLoggedIn={isLoggedIn}
+        	      {...props}
+        	    />
+        	  }
+        	/>
         	<Route
         	  exact
         	  path="/docs/:key"
@@ -574,7 +718,6 @@ const App = (message, props) => {
         	  exact
         	  path="/docs"
         	  element={
-							//navigate(`/docs/about`)
         	    <Docs
         	      isMobile={isMobile}
         	      isLoaded={isLoaded}
@@ -614,7 +757,7 @@ const App = (message, props) => {
         	    />
         	  }
         	/>
-			<Route exact path="/login/:key/mfa-setup" element={<MFASetUp setCookie={setCookie} serverside={false} mainColor={theme.palette.backgroundColor} userdata={userdata} stripeKey={undefined} globalUrl={globalUrl} inputColor={theme.palette.inputColor} isLoaded={isLoaded} {...props} />} />
+			<Route exact path="/login/:key/mfa-setup" element={<MFASetUp setCookie={setCookie} serverside={false} mainColor={currentTheme.palette.backgroundColor} userdata={userdata} stripeKey={undefined} globalUrl={globalUrl} inputColor={currentTheme.palette.inputColor} isLoaded={isLoaded} {...props} />} />
         	<Route
         	  exact
         	  path="/login_sso"
@@ -648,18 +791,92 @@ const App = (message, props) => {
         	    />
         	  }
         	/>
-        	<Route
-        	  exact
-        	  path="/dashboards"
-        	  element={
-        	    <DashboardView
-        	      isLoaded={isLoaded}
-        	      isLoggedIn={isLoggedIn}
-        	      globalUrl={globalUrl}
-        	      {...props}
-        	    />
-        	  }
-        	/>
+			<Route
+				exact
+				path="/dashboard"
+				element={
+					<DashboardViews
+						serverside={false}
+						isLoaded={isLoaded}
+						isLoggedIn={isLoggedIn}
+						globalUrl={globalUrl}
+						wut={userdata}
+					/>
+				}
+			/>
+			<Route
+				exact
+				path="/dashboards"
+				element={
+					<DashboardViews
+						serverside={false}
+						isLoaded={isLoaded}
+						isLoggedIn={isLoggedIn}
+						globalUrl={globalUrl}
+						wut={userdata}
+					/>
+				}
+			/>
+			<Route
+				exact
+				path="/dashboard/:key"
+				element={
+					<DashboardViews
+						serverside={false}
+						isLoaded={isLoaded}
+						isLoggedIn={isLoggedIn}
+						globalUrl={globalUrl}
+						wut={userdata}
+					/>
+				}
+			/>
+			<Route
+				exact
+				path="/chat"
+				element={
+					<ChatBot
+						serverside={false}
+						cookies={cookies}
+						removeCookie={removeCookie}
+						isLoaded={isLoaded}
+						isLoggedIn={isLoggedIn}
+						globalUrl={globalUrl}
+						cookies={cookies}
+						userdata={userdata}
+						{...props}
+					/>
+				}
+			/>
+			<Route
+				exact
+				path="/conversation"
+				element={
+					<ChatBot
+						serverside={false}
+						cookies={cookies}
+						removeCookie={removeCookie}
+						isLoaded={isLoaded}
+						isLoggedIn={isLoggedIn}
+						globalUrl={globalUrl}
+						cookies={cookies}
+						userdata={userdata}
+						{...props}
+					/>
+				}
+			/>
+			<Route
+				exact
+				path="/dashboards/:key"
+				element={
+					<DashboardViews
+						serverside={false}
+						isLoaded={isLoaded}
+						isLoggedIn={isLoggedIn}
+						globalUrl={globalUrl}
+						wut={userdata}
+					/>
+				}
+			/>
 			<Route
 				exact
 				path="/welcome"
@@ -677,6 +894,22 @@ const App = (message, props) => {
 					/>
 				}
 			/>
+
+			<Route
+				exact
+				path="/agents"
+				element={
+					<AgentUI
+						serverside={false}
+						isLoaded={isLoaded}
+						isLoggedIn={isLoggedIn}
+						globalUrl={globalUrl}
+						userdata={userdata}
+						{...props}
+					/>
+				}
+				/>
+
         	<Route
         	  exact
         	  path="/"
@@ -705,8 +938,7 @@ const App = (message, props) => {
       </div>
 
   return (
-	<AppContext>
-		<ThemeProvider theme={theme}>
+		<ThemeProvider theme={currentTheme} defaultMode="dark">
 		  <CssBaseline />
 		  <CookiesProvider>
 			<BrowserRouter>
@@ -722,11 +954,10 @@ const App = (message, props) => {
 				pauseOnFocusLoss
 				draggable
 				pauseOnHover
-				theme="dark"
+				theme={themeMode}
 			/>
 		  </CookiesProvider>
 		</ThemeProvider>
-	  </AppContext>
   );
 };
 
diff --git a/frontend/src/components/AdminNavBar.jsx b/frontend/src/components/AdminNavBar.jsx
index c6f70357..2a480c95 100644
--- a/frontend/src/components/AdminNavBar.jsx
+++ b/frontend/src/components/AdminNavBar.jsx
@@ -1,6 +1,7 @@
 import React, { useState, useEffect, useContext, memo } from 'react';
 import { useNavigate, useLocation } from 'react-router-dom';
 import OrganizationTab from '../components/OrganizationTab.jsx';
+import PartnerTab from '../components/PartnerTab.jsx';
 import UserManagmentTab from '../components/UserManagmentTab.jsx';
 import CacheView from "../components/CacheView.jsx";
 import Files from "../components/Files.jsx";
@@ -19,24 +20,124 @@ import {
     FmdGoodOutlined as FmdGoodOutlinedIcon,
     GroupOutlined as GroupOutlinedIcon
 } from '@mui/icons-material';
-import theme from '../theme.jsx';
-import { Button, Tooltip } from '@mui/material';
+import theme, { getTheme } from '../theme.jsx';
+import { Button, Skeleton, Tooltip } from '@mui/material';
 import { Index } from 'react-instantsearch-dom';
 import { Context } from '../context/ContextApi.jsx';
+import { toast } from 'react-toastify';
+
+const PartnerIcon = ({ strokeColor, fillColor = 'transparent', width = 22, height = 22 }) => (
+    <svg
+      width={width}
+      height={height}
+      viewBox="0 0 18 16"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M14.5327 4.49465C14.0102 4.60513 13.5779 4.90684 13.2905 5.31071L12.382 1L1.7665 3.23791C1.24516 3.34838 0.911462 3.86034 1.02072 4.38181L3.25807 15L7.57601 14.0901C7.16749 13.8026 6.85992 13.3679 6.74948 12.8393C6.51672 11.7334 7.22331 10.6477 8.32892 10.4149C9.43453 10.1821 10.52 10.8889 10.7527 11.9947C10.8643 12.5221 10.7587 13.0448 10.501 13.4724L14.8189 12.5625L13.9104 8.25182C14.3368 8.50484 14.8533 8.60699 15.3759 8.49652C16.4815 8.2637 17.1893 7.17801 16.9553 6.07212C16.7225 4.96623 15.6371 4.25827 14.5315 4.49228L14.5327 4.49465Z"
+        fill={fillColor}
+        stroke={strokeColor}
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+    </svg>
+);
 
 const AdminNavBar = (props) => {
     const location = useLocation();
-    const { globalUrl, userdata, isCloud, isLoaded,removeCookie,  handleStatusChange, selectedStatus, setSelectedStatus, handleEditOrg, serverside, notifications, handleGetOrg, orgId, checkLogin, setNotifications, stripeKey, setSelectedOrganization, selectedOrganization } = props;
+    const { globalUrl, userdata, isCloud,isOrgLoaded, isLoaded,removeCookie,  handleStatusChange, selectedStatus, setSelectedStatus, handleEditOrg, serverside, notifications, handleGetOrg, orgId, checkLogin, setNotifications, stripeKey, setSelectedOrganization, selectedOrganization } = props;
     const [selectedItem, setSelectedItem] = useState("Organization");
     const [isSelectedFiles, setIsSelectedFiles] = useState(true);
     const [isSelectedDataStore, setIsSelectedDataStore] = useState(true);
+    const [isIntegrationPartner, setIsIntegrationPartner] = useState(false);
+    const [isChildOrg, setIsChildOrg] = useState(false);
+    const [isGlobalUser, setIsGlobalUser] = useState(false);
+    const [visibleItems, setVisibleItems] = useState([]);
+    const [isUserDataLoaded, setIsUserDataLoaded] = useState(false);
+
+
+    useEffect(() => {
+        if (userdata && userdata?.active_org?.id?.length > 0) {
+            setIsUserDataLoaded(true);
+        }
+    }, [userdata]);
+
+
+    
+    const { themeMode, brandColor } = React.useContext(Context);
+    const theme = getTheme(themeMode, brandColor);
+
+    const HandlePartnerChange = () => {
+        if (userdata?.id?.length > 0) {
+            const isIntegrationPartner = userdata?.org_status?.includes("integration_partner") || false;
+            setIsIntegrationPartner(isIntegrationPartner);
+            const isChildOrg = userdata?.org_status?.includes("sub_org") || false;
+            setIsChildOrg(isChildOrg);
+            const isGlobalUser = userdata?.active_org?.branding?.global_user || false;
+            setIsGlobalUser(isGlobalUser);
+        } else {
+            setIsIntegrationPartner(false);
+            setIsChildOrg(false);
+            setIsGlobalUser(false);
+        }
+    }
+
+    useEffect(() => {
+        if (userdata && userdata?.id?.length > 0) {
+            HandlePartnerChange();
+        }
+    }, [userdata]);
+
+    const HandleVisibleTabs = () => {
+        if (userdata?.id?.length > 0) {
+            if (userdata?.active_org?.role === "admin" || userdata?.support) {
+                setVisibleItems(items);
+            }else {
+                const filteredItems = items.filter(item => item.text !== "Users" && item.text !== "Files" && item.text !== "Datastore" && item.text !== "Triggers" && item.text !== "Locations");
+                setVisibleItems(filteredItems);
+            }
+        }
+    }
+
+    useEffect(() => {
+        if (isIntegrationPartner && isChildOrg && !isGlobalUser) {
+            // Filter out Users and Tenants tabs
+            if (userdata?.active_org?.role === "admin" || userdata?.support) {
+                const filteredItems = items.filter(item => 
+                    item.text !== "Users" && item.text !== "Tenants"
+                );
+                setVisibleItems(filteredItems);
+            }else {
+                const filteredItems = items.filter(item => 
+                    item.text !== "Users" && item.text !== "Tenants" && item.text !== "Files" && item.text !== "Datastore" && item.text !== "Triggers" && item.text !== "Locations"
+                );
+                setVisibleItems(filteredItems);
+            }
+        } else {
+            HandleVisibleTabs();
+        }
+    }, [isIntegrationPartner, isChildOrg, isGlobalUser, selectedOrganization, userdata]);
 
     const navigate = useNavigate();
 
+	//const leadinfo = selectedOrganization.lead_info === undefined || selectedOrganization.lead_info === null || selectedOrganization.lead_info === "" ? "" : JSON.stringify(selectedOrganization.lead_info)
+	//const isPartner = leadinfo.includes("partner")
+
     useEffect(() => {
         const queryParams = new URLSearchParams(location.search);
         const tabName = queryParams.get('tab');
-    
+        const partnerTab = queryParams.get('partner_tab');
+
+        // if(!isCloud){
+        //     if(tabName === "partner" || partnerTab !== null) {
+        //         setSelectedItem("Organization");
+        //         navigate(`?tab=organization`, { replace: true });
+        //     }
+        // }
+        if (partnerTab) {
+            setSelectedItem("Partner");
+        }
         if (tabName === "environments") {
             setSelectedItem("Locations");
         } else if (tabName === "suborgs") {
@@ -45,14 +146,15 @@ const AdminNavBar = (props) => {
             setSelectedItem("Datastore");
         }else if (tabName) {
             setSelectedItem(tabName.charAt(0).toUpperCase() + tabName.slice(1));
-        } else {
-            setSelectedItem("Organization");
+        }else if (tabName === "partner") {
+            setSelectedItem("Partner");
         }
+
     }, [location.search]);
-    
 
     const items = [
-        { iconSrc: <BusinessIcon />, alt: "Organization Icon", text: "Organization", component: OrganizationTab, props: { globalUrl,removeCookie,  selectedStatus, isLoaded, setSelectedStatus, handleStatusChange, handleEditOrg, handleGetOrg, userdata, isCloud, serverside, notifications, checkLogin, setNotifications, stripeKey, setSelectedOrganization, selectedOrganization } },
+        { iconSrc: <BusinessIcon />, alt: "Organization Icon", text: "Organization", component: OrganizationTab, props: { isIntegrationPartner, isChildOrg, isGlobalUser,globalUrl,removeCookie,  selectedStatus, isLoaded, setSelectedStatus, handleStatusChange, handleEditOrg, handleGetOrg, userdata, isCloud, serverside, notifications, checkLogin, setNotifications, stripeKey, setSelectedOrganization, selectedOrganization } },
+        { iconSrc: undefined, alt: "Partner Icon", text: "Partner", component: PartnerTab, props: { globalUrl,removeCookie, isLoaded, handleGetOrg, userdata, isCloud, serverside, checkLogin, setSelectedOrganization, selectedOrganization } },
         { iconSrc: <PermIdentityIcon />, alt: "Users Icon", text: "Users", component: UserManagmentTab, props: { globalUrl, userdata, serverside, isCloud, selectedOrganization, setSelectedOrganization, handleEditOrg } },
         { iconSrc: <HttpsOutlinedIcon />, alt: "App Auth Icon", text: "App_auth", component: AppAuthTab, props: { globalUrl, userdata, isCloud, selectedOrganization } },
         { iconSrc: <StorageOutlinedIcon />, alt: "Datastore Icon", text: "Datastore", component: CacheView, props: { globalUrl, userdata, selectedOrganization, serverside, isSelectedDataStore, orgId , isCloud} },
@@ -60,7 +162,7 @@ const AdminNavBar = (props) => {
         { iconSrc: <AccessTimeOutlinedIcon />, alt: "Trigger Icon", text: "Triggers", component: SchedulesTab, props: { globalUrl, userdata, isCloud, serverside } },
         { iconSrc: <FmdGoodOutlinedIcon />, alt: "Environments Icon", text: "Locations", component: EnvironmentTab, props: { globalUrl, userdata, isCloud, selectedOrganization } },
         { iconSrc: <GroupOutlinedIcon />, alt: "Tenants Icon", text: "Tenants", component: TenantsTab, props: {isCloud, globalUrl, userdata, serverside, selectedOrganization, setSelectedOrganization, checkLogin } }
-    ];
+    ].filter(Boolean);
 
     const setConfig = (newValue) => {
         setSelectedItem(newValue);
@@ -73,19 +175,80 @@ const AdminNavBar = (props) => {
         }
     };
 
+    useEffect(() => {
+        if (isIntegrationPartner && isChildOrg && !isGlobalUser && isOrgLoaded && isUserDataLoaded) {
+            const queryParams = new URLSearchParams(location.search);
+            const tabName = queryParams?.get('admin_tab')?.toLowerCase();
+            if (tabName === "sso" || tabName === "branding") {
+                toast.info("You are not allowed to access this tab. Please contact your admin for more information. Redirecting to Organization Configuration tab.");
+                setTimeout(() => {
+                    setSelectedItem("Organization");
+                    navigate(`?admin_tab=org_config`, { replace: true });
+                    window.location.reload();
+                }
+                , 3000);
+            }
+
+            const params = new URLSearchParams(location.search);
+            const tab = params?.get('tab')?.toLowerCase();
+            if (tab === "users" || tab === "tenants") {
+                toast.info("You are not allowed to access this tab. Please contact your admin for more information. Redirecting to Organization Configuration tab.");
+                setTimeout(() => {
+                    setSelectedItem("Organization");
+                    navigate(`?admin_tab=org_config`, { replace: true });
+                    window.location.reload();
+                }
+                , 3000);
+            }
+        } else if (userdata && isOrgLoaded && isUserDataLoaded && userdata?.active_org?.role !== "admin" && !userdata?.support) {
+            const queryParams = new URLSearchParams(location.search);
+            const tabName = queryParams?.get('admin_tab')?.toLowerCase();
+            if (tabName === "sso") {
+                toast.info("You are not allowed to access this tab. Please contact your admin for more information. Redirecting to Organization Configuration tab.");
+                setTimeout(() => {
+                    setSelectedItem("Organization");
+                    navigate(`?admin_tab=org_config`, { replace: true });
+                    window.location.reload();
+                }
+                , 3000);
+            }
+
+            const params = new URLSearchParams(location.search);
+            const tab = params?.get('tab')?.toLowerCase();
+            if (tab === "users" || tab === "locations" || tab === "environments" || tab === "files" || tab === "datastore" || tab === "triggers") {
+                toast.info("You are not allowed to access this tab. Please contact your admin for more information. Redirecting to Organization Configuration tab.");
+                setTimeout(() => {
+                    setSelectedItem("Organization");
+                    navigate(`?admin_tab=org_config`, { replace: true });
+                    window.location.reload();
+                }
+                , 3000);
+            }
+        }
+    }, [isIntegrationPartner, isChildOrg, isGlobalUser, location.search, userdata, isOrgLoaded, isUserDataLoaded]); 
+
+
     const renderComponent = () => {
-        const selectedItemData = items.find(item => item.text === selectedItem);
+        const selectedItemData = visibleItems.find(item => item.text === selectedItem);
         if (!selectedItemData) {
             setSelectedItem("Organization");
             // If no tab is specified, default to "Organization" tab
-            return <OrganizationTab globalUrl={globalUrl} removeCookie={removeCookie} selectedStatus={selectedStatus} isLoaded={isLoaded} setSelectedStatus={setSelectedStatus} handleStatusChange={handleStatusChange} handleEditOrg={handleEditOrg} handleGetOrg={handleGetOrg} userdata={userdata} isCloud={isCloud} serverside={serverside} notifications={notifications} checkLogin={checkLogin} setNotifications={setNotifications} stripeKey={stripeKey} setSelectedOrganization={setSelectedOrganization} selectedOrganization={selectedOrganization}/>;
+            return <OrganizationTab isIntegrationPartner={isIntegrationPartner} isChildOrg={isChildOrg} isGlobalUser={isGlobalUser} globalUrl={globalUrl} removeCookie={removeCookie} selectedStatus={selectedStatus} isLoaded={isLoaded} setSelectedStatus={setSelectedStatus} handleStatusChange={handleStatusChange} handleEditOrg={handleEditOrg} handleGetOrg={handleGetOrg} userdata={userdata} isCloud={isCloud} serverside={serverside} notifications={notifications} checkLogin={checkLogin} setNotifications={setNotifications} stripeKey={stripeKey} setSelectedOrganization={setSelectedOrganization} selectedOrganization={selectedOrganization}/>;
         };
 
         const ComponentToRender = selectedItemData.component;
         const componentProps = selectedItemData.props;
 
-        return <ComponentToRender {...componentProps} />;
-    };
+		const updatedProps = {
+			...componentProps,
+			notifications: notifications,
+			setNotifications: setNotifications, 
+			userdata: userdata, 
+			selectedOrganization: selectedOrganization
+		};
+
+		return <ComponentToRender {...updatedProps} />;
+	};
 
     const defaultImage = "/images/logos/orange_logo.svg"
     const imageData =
@@ -94,15 +257,16 @@ const AdminNavBar = (props) => {
             : selectedOrganization?.image;
 
     return (
+        !isOrgLoaded && !isUserDataLoaded ? <Loader /> :
         <Wrapper>
             <div style={{ flexDirection: 'column', width: 220, }}>
-                <nav style={{ padding: '25px 25px 3px 25px', height: isCloud ? "calc(100% - 60px)" : "calc(100% - 30px)" , fontSize: '16px', borderTopLeftRadius: 8, borderBottomLeftRadius: 8, background: '#212121', color: '#9CA3AF' }}>
+                <nav style={{ padding: '25px 25px 3px 25px', height: isCloud ? "calc(100% - 60px)" : "calc(100% - 30px)" , fontSize: '16px', borderTopLeftRadius: 8, borderBottomLeftRadius: 8, background: theme.palette.platformColor, color: '#9CA3AF' }}>
                     <div style={{ display: 'flex', alignItems: 'center', }}>
                         <img loading="lazy" src={imageData} alt="Logo" style={{ width: '30px', borderRadius: 8, height: '30px', marginRight: '8px' }} />
                         <div style={{
                             fontFamily: theme?.typography?.fontFamily,
                             fontSize: '16px',
-                            color: "#FFFFFF",
+                            color: theme.palette.text.primary,
                             fontWeight: 400,
                             overflow: 'hidden',
                             textOverflow: 'ellipsis',
@@ -111,8 +275,8 @@ const AdminNavBar = (props) => {
 							marginLeft: 5, 
                         }}>{selectedOrganization?.name}</div>
                     </div>
-                    <div style={{ borderTop: '1px solid #494949', marginTop: 23 }} />
-                    {items.map((item, index) => (
+                    <div style={{ borderTop: theme.palette.defaultBorder, marginTop: 23 }} />
+                    {visibleItems.map((item, index) => (
                         <Tooltip
                             key={index}
                             title={
@@ -129,11 +293,10 @@ const AdminNavBar = (props) => {
                                 color="primary"
                                 sx={{
                                 gap: 1,
-                                "&:hover": {
-                                    backgroundColor: "#323232 !important",
-                                },
                                 "&.MuiButton-root": {
-                                    color: selectedItem === item.text ? "#FFFFFF" : "#9E9E9E",
+                                    color: selectedItem === item.text 
+                                        ? theme.palette.text.primary 
+                                        : theme.palette.text.secondary,
                                     fontSize: 16,
                                     backgroundColor: "transparent",
                                     textTransform: "none",
@@ -146,13 +309,16 @@ const AdminNavBar = (props) => {
                                     justifyContent: "flex-start",
                                     borderLeft:
                                     selectedItem === item.text
-                                        ? "3px solid rgba(255, 132, 68, 1)"
+                                        ? `3px solid ${theme.palette.primary.main}`
                                         : "none",
                                     borderTopLeftRadius: selectedItem === item.text ? "2.5px" : null,
                                     borderBottomLeftRadius: selectedItem === item.text ? "2.5px" : null,
                                     paddingLeft: selectedItem === item.text ? "15px" : "10px",
                                     fontWeight: selectedItem === item.text ? 200 : "normal",
                                     flex: 1,
+                                    "&:hover": {
+                                    backgroundColor: theme.palette.hoverColor,
+                                },
                                 },
                                 "&.Mui-disabled": {
                                     color: "#6F6F6F",
@@ -161,7 +327,7 @@ const AdminNavBar = (props) => {
                                 disabled={
                                 ((item.text === "Users") || (item.text === "Files") || (item.text === "Triggers") || (item.text === "Locations")) && !(userdata?.support || userdata?.active_org?.role === "admin")
                                 }
-                                startIcon={item.iconSrc}
+                                startIcon={item?.iconSrc === undefined ? <PartnerIcon strokeColor={selectedItem === item.text ? theme.palette.text.primary : theme.palette.text.secondary} /> : item?.iconSrc}
                                 onClick={() => setConfig(item.text)}
                             >
                                 {item.text.replace(/_/g, " ")}
@@ -173,17 +339,132 @@ const AdminNavBar = (props) => {
 
                 </nav>
             </div>
-            <Wrapper2>{renderComponent()}</Wrapper2>
+
+            <Wrapper2>
+				{renderComponent()}
+			</Wrapper2>
         </Wrapper>
     );
 };
 
 export default AdminNavBar;
 
+const Loader = () => {
+  const dummyItems = Array.from({ length: 6 });
+  const dummyNavItems = Array.from({ length: 6 });
+  const dummyTabItems = ['Org Configuration', 'SSO', 'Notifications', 'Billing & Stats', 'Branding'];
+  const { leftSideBarOpenByClick, windowWidth, themeMode } = useContext(Context);
+  const theme = getTheme(themeMode);
+  return (
+    <div style={{ 
+      display: 'flex', 
+      width: '100%', 
+      height: '100%',
+      minHeight: '100vh',
+      maxWidth: '1200px',
+      fontFamily: 'Arial, sans-serif',
+      paddingLeft: leftSideBarOpenByClick ? windowWidth <= 1300 ? 220 : 200 : 80,
+        transition: "padding-left 0.3s ease",
+    }}>
+
+      <div style={{ 
+        width: '220px', 
+        backgroundColor: theme.palette.platformColor,
+        borderTopLeftRadius: '8px', 
+        borderBottomLeftRadius: '8px',
+        padding: '25px 25px 3px 25px',
+        display: 'flex',
+        flexDirection: 'column'
+      }}>
+        <div style={{ display: 'flex', alignItems: 'center', marginBottom: '20px' }}>
+          <Skeleton 
+            width="30px" 
+            height="30px" 
+            sx={{ borderRadius: '8px', marginRight: '8px', }} 
+          />
+          <Skeleton width="120px" height="24px" />
+        </div>
+        
+        {/* Divider */}
+        <Skeleton 
+          width="100%" 
+          height="1px" 
+          sx={{ marginBottom: '15px' }} 
+        />
+        
+        {/* Nav Items */}
+        <div style={{ display: 'flex', flexDirection: 'column', gap: '5px', width: '100%' }}>
+          {dummyNavItems.map((_, index) => (
+            <div key={index} style={{ display: 'flex', alignItems: 'center', padding: '5px 0' }}>
+              <Skeleton 
+                width="18px" 
+                height="18px" 
+                sx={{ marginRight: '10px' }} 
+              />
+              <Skeleton width={`${100 + Math.random() * 40}px`} height="36px" />
+            </div>
+          ))}
+        </div>
+      </div>
+      <div style={{ 
+        flex: 1, 
+        backgroundColor: theme.palette.platformColor,
+        borderTopRightRadius: '8px', 
+        borderBottomRightRadius: '8px',
+        borderLeft: theme.palette.defaultBorder,
+        display: 'flex',
+        flexDirection: 'column'
+      }}>
+        <div style={{ 
+          display: 'flex', 
+          borderBottom: theme.palette.defaultBorder,
+          padding: '0 16px'
+        }}>
+          {dummyTabItems.map((_, index) => (
+            <div 
+              key={index} 
+              style={{ 
+                flex: 1, 
+                display: 'flex', 
+                justifyContent: 'center', 
+                alignItems: 'center',
+                padding: '28px 0',
+                borderBottom: index === 0 ? '2px solid #FF8444' : 'none'
+              }}
+            >
+              <Skeleton width={`${80 + Math.random() * 30}px`} height="24px" />
+            </div>
+          ))}
+        </div>
+        <div style={{ flex: 1, padding: '24px' }}>
+          <div style={{ display: 'flex', flexDirection: 'column', width: '100%', margin: '0 auto', alignItems: 'flex-start' }}>
+            <Skeleton variant='square' width="200px" height="200px" sx={{ marginBottom: '20px' }} />
+
+            <div style={{ display: 'flex', flexDirection: 'column', gap: '10px', width: '100%', marginTop: '50px' }}>
+                {dummyItems.map((_, index) => (
+                    <div key={index} style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
+                    <Skeleton width={'400px'} height="36px" />
+                    </div>
+                ))}
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+  
+
 const PaddingWrapper2 = memo(({ children }) => {
 
     return (
-        <div div style={{marginBottom: 30, width: "75%" , maxWidth: 1200, height: "100%", boxSizing: 'border-box'}}>
+        <div style={{
+			marginBottom: 30, 
+			width: "75%" , 
+			maxWidth: 1200, 
+			height: "100%", 
+			boxSizing: 'border-box',
+		}}>
             {children}
         </div>
     )
diff --git a/frontend/src/components/AnalyticsTab.jsx b/frontend/src/components/AnalyticsTab.jsx
index 8938262e..c97560ed 100644
--- a/frontend/src/components/AnalyticsTab.jsx
+++ b/frontend/src/components/AnalyticsTab.jsx
@@ -1,275 +1,278 @@
-import React, { useEffect, useState } from 'react';
-import Switch from '@mui/material/Switch';
-import { Typography, Button } from '@mui/material';
-import { useNavigate, Link, useParams } from "react-router-dom";
-import { Bar } from 'react-chartjs-2';
-import Grid from '@mui/material/Grid';
-import SearchIcon from '@mui/icons-material/Search';
-import NewReleasesIcon from '@mui/icons-material/NewReleases';
-import MailOutlineIcon from '@mui/icons-material/MailOutline';
+// import React, { useEffect, useState } from 'react';
+// import Switch from '@mui/material/Switch';
+// import { Typography, Button } from '@mui/material';
+// import { useNavigate, Link, useParams } from "react-router-dom";
+// import { Bar } from 'react-chartjs-2';
+// import Grid from '@mui/material/Grid';
+// import SearchIcon from '@mui/icons-material/Search';
+// import NewReleasesIcon from '@mui/icons-material/NewReleases';
+// import MailOutlineIcon from '@mui/icons-material/MailOutline';
 
 const AnalyticsTab = (props) => {
     const { userdata, globalUrl, serverside } = props;
-    const [checked, setChecked] = useState(false);
-    const [selectedOption, setSelectedOption] = useState('all');
-    const [expand, setExpand] = useState(false)
-    const isCloud = (window.location.host === "localhost:3002" || window.location.host === "shuffler.io") ? true : (process.env.IS_SSR === "true");
+
+    console.log("if you need this, work without react-rechartjs-2")
+
+    // const [checked, setChecked] = useState(false);
+    // const [selectedOption, setSelectedOption] = useState('all');
+    // const [expand, setExpand] = useState(false)
+    // const isCloud = (window.location.host === "localhost:3002" || window.location.host === "shuffler.io") ? true : (process.env.IS_SSR === "true");
     
-    const handleOptionChange = (option) => {
-        setSelectedOption(option);
-        // You can perform actions based on the selected option, such as filtering data
-    };
+    // const handleOptionChange = (option) => {
+    //     setSelectedOption(option);
+    //     // You can perform actions based on the selected option, such as filtering data
+    // };
 
-    const handleChange = (event) => {
-        setChecked(event.target.checked);
-    };
+    // const handleChange = (event) => {
+    //     setChecked(event.target.checked);
+    // };
 
-    const allData = {
-        labels: ['Email analysis', 'Email Management', 'EDR to Ticket', 'Ticket Analysis'],
-        datasets: [
-            {
-                label: 'Revisions',
-                data: [12, 19, 3, 5], // Data for revisions
-                backgroundColor: '#FF8444',
-                borderWidth: 1,
-                // borderRadius: 60,
-                barPercentage: 0.7,
-                categoryPercentage: 0.5,
-            },
-            {
-                label: 'Runs',
-                data: [8, 15, 5, 8], // Data for runs
-                backgroundColor: '#9747FF',
-                borderWidth: 1,
-                // borderRadius: 60,
-                barPercentage: 0.7,
-                categoryPercentage: 0.5
-            }
-        ]
-    };
+    // const allData = {
+    //     labels: ['Email analysis', 'Email Management', 'EDR to Ticket', 'Ticket Analysis'],
+    //     datasets: [
+    //         {
+    //             label: 'Revisions',
+    //             data: [12, 19, 3, 5], // Data for revisions
+    //             backgroundColor: '#FF8444',
+    //             borderWidth: 1,
+    //             // borderRadius: 60,
+    //             barPercentage: 0.7,
+    //             categoryPercentage: 0.5,
+    //         },
+    //         {
+    //             label: 'Runs',
+    //             data: [8, 15, 5, 8], // Data for runs
+    //             backgroundColor: '#9747FF',
+    //             borderWidth: 1,
+    //             // borderRadius: 60,
+    //             barPercentage: 0.7,
+    //             categoryPercentage: 0.5
+    //         }
+    //     ]
+    // };
 
-    let data;
-    if (selectedOption === 'all') {
-        data = allData;
-    } else if (selectedOption === 'revisions') {
-        data = {
-            labels: allData.labels,
-            datasets: [allData.datasets[0]] // Show only revisions data
-        };
-    } else if (selectedOption === 'run') {
-        data = {
-            labels: allData.labels,
-            datasets: [allData.datasets[1]] // Show only runs data
-        };
-    }
+    // let data;
+    // if (selectedOption === 'all') {
+    //     data = allData;
+    // } else if (selectedOption === 'revisions') {
+    //     data = {
+    //         labels: allData.labels,
+    //         datasets: [allData.datasets[0]] // Show only revisions data
+    //     };
+    // } else if (selectedOption === 'run') {
+    //     data = {
+    //         labels: allData.labels,
+    //         datasets: [allData.datasets[1]] // Show only runs data
+    //     };
+    // }
 
-    // Options for the chart
-    const options = {
-        scales: {
-            yAxes: [
-                {
-                    ticks: {
-                        beginAtZero: true
-                    }
-                }
-            ]
-        },
-    };
-    return (
-        <div style={{ width: 1030, marginLeft: 20, marginTop:10, paddingRight: 17, paddingLeft: 17}}>
-            <div style={{ width: 985, display: 'flex', alignItems: 'start', paddingTop: 16, paddingBottom: '48px', fontSize: '16px', color: '#ffffff', backgroundColor: '#1A1A1A', borderRadius: '16px', }}>
-                <div style={{ marginLeft: 18 }}>Timeline</div>
-            </div>
-            <div style={{ display: "flex", width: "100%", marginTop: 16 }}>
-                <div>
-                    <div style={{ width: 595, alignItems: 'start', paddingTop: 16, paddingBottom: checked ? 28 : 20, marginRight: 20, fontSize: '16px', color: '#ffffff', backgroundColor: '#1A1A1A', borderRadius: '16px', }}>
-                        <div style={{ display: "flex", alignItems: "center" }}>
-                            <div style={{ marginLeft: 18, marginRight: 310 }}>Apps</div>
-                            <Switch checked={checked}
-                                onChange={handleChange} /> Category
-                            <div style={{ marginLeft: 16, borderLeft: "1px solid #D9D9D9", width: 10, height: 15 }} />
-                            <Link onClick={() => { setExpand(prevExpand => !prevExpand); }} style={{ color: "#FF8444" }}>Expand</Link>
-                        </div>
-                        {expand ? null :
-                            <div style={{ marginTop: 8, display: "flex" }}>
-                                <div style={{ marginLeft: 19, }}>
-                                    <Typography style={{ fontSize: 13, color: "#9E9E9E", textAlign: "start" }}>Onboarding</Typography>
-                                    <Grid container spacing={2} style={{ marginTop: 1 }} >
-                                        <Grid item xs={4}>
-                                            <div style={{ position: 'relative' }}>
-                                                <img src="/images/adminpage/app1.svg" style={{ margin: 'auto' }} />
-                                                {checked ?
-                                                    <div style={{
-                                                        position: 'absolute',
-                                                        bottom: 0,
-                                                        left: '50%',
-                                                        top: 30,
-                                                        transform: 'translateX(-50%)',
-                                                        backgroundColor: '#2f2f2f',
-                                                        borderRadius: '50%',
-                                                        height: 24,
-                                                        width: 24,
-                                                        transition: 'transform 0.5s ease',
-                                                    }}><SearchIcon style={{ width: 16, height: 16, marginTop: 5 }} /></div> :
-                                                    null
-                                                }
-                                            </div>
-                                        </Grid>
-                                        <Grid item xs={4}>
-                                            <div style={{ position: 'relative' }}>
-                                                <img src="/images/adminpage/app1.svg" style={{ margin: 'auto' }} />
-                                                {checked ?
-                                                    <div style={{
-                                                        position: 'absolute',
-                                                        bottom: 0,
-                                                        left: '50%',
-                                                        top: 30,
-                                                        transform: 'translateX(-50%)',
-                                                        backgroundColor: '#2f2f2f',
-                                                        borderRadius: '50%',
-                                                        height: 24,
-                                                        width: 24,
-                                                        transition: 'transform 0.5s ease',
-                                                    }}><MailOutlineIcon style={{ width: 16, height: 16, marginTop: 5 }} /></div> :
-                                                    null
-                                                }
-                                            </div>
-                                        </Grid>
-                                        <Grid item xs={4}>
-                                            <div style={{ position: 'relative' }}>
-                                                <img src="/images/adminpage/app1.svg" style={{ margin: 'auto' }} />
-                                                {checked ?
-                                                    <div style={{
-                                                        position: 'absolute',
-                                                        bottom: 0,
-                                                        left: '50%',
-                                                        top: 30,
-                                                        transform: 'translateX(-50%)',
-                                                        backgroundColor: '#2f2f2f',
-                                                        borderRadius: '50%',
-                                                        height: 24,
-                                                        width: 24,
-                                                        transition: 'transform 0.5s ease',
-                                                    }}><NewReleasesIcon style={{ width: 16, height: 16, marginTop: 5 }} /></div> :
-                                                    null
-                                                }
-                                            </div>
-                                        </Grid>
-                                    </Grid>
-                                </div>
-                                <div style={{ borderLeft: "1px solid #494949", justifyContent: "center", alignItems: "center", marginTop: 40, marginLeft: 20, marginRight: 20, height: 40 }}></div>
-                                <div style={{}}>
-                                    <Typography style={{ fontSize: 13, color: "#9E9E9E", textAlign: "start" }}>Other</Typography>
-                                    <Grid container spacing={2} style={{ marginTop: 1 }} >
-                                        <Grid item xs={4}>
-                                            <div style={{ position: 'relative' }}>
-                                                <img src="/images/adminpage/app1.svg" style={{ margin: 'auto' }} />
-                                                {checked ?
-                                                    <div style={{
-                                                        position: 'absolute',
-                                                        bottom: 0,
-                                                        left: '50%',
-                                                        top: 30,
-                                                        transform: 'translateX(-50%)',
-                                                        backgroundColor: '#2f2f2f',
-                                                        borderRadius: '50%',
-                                                        height: 24,
-                                                        width: 24,
-                                                        transition: 'transform 0.5s ease',
-                                                    }}><SearchIcon style={{ width: 16, height: 16, marginTop: 5 }} /></div> :
-                                                    null
-                                                }
-                                            </div>
-                                        </Grid>
-                                        <Grid item xs={4}>
-                                            <div style={{ position: 'relative' }}>
-                                                <img src="/images/adminpage/app1.svg" style={{ margin: 'auto' }} />
-                                                {checked ?
-                                                    <div style={{
-                                                        position: 'absolute',
-                                                        bottom: 0,
-                                                        left: '50%',
-                                                        top: 30,
-                                                        transform: 'translateX(-50%)',
-                                                        backgroundColor: '#2f2f2f',
-                                                        borderRadius: '50%',
-                                                        height: 24,
-                                                        width: 24,
-                                                        transition: 'transform 10s ease-in-out',
-                                                    }}><NewReleasesIcon style={{ width: 16, height: 16, marginTop: 5 }} /></div> :
-                                                    null
-                                                }
-                                            </div>
-                                        </Grid>
-                                        <Grid item xs={4}>
-                                            <div style={{ position: 'relative' }}>
-                                                <img src="/images/adminpage/app1.svg" style={{ margin: 'auto' }} />
-                                                {checked ?
-                                                    <div style={{
-                                                        position: 'absolute',
-                                                        bottom: 0,
-                                                        left: '50%',
-                                                        top: 30,
-                                                        transform: 'translateX(-50%)',
-                                                        backgroundColor: '#2f2f2f',
-                                                        borderRadius: '50%',
-                                                        height: 24,
-                                                        width: 24,
-                                                        transition: 'transform 10s ease-in-out',
-                                                    }}><MailOutlineIcon style={{ width: 16, height: 16, marginTop: 5 }} /></div> :
-                                                    null
-                                                }
-                                            </div>
-                                        </Grid>
-                                    </Grid>
-                                </div>
-                            </div>}
-                    </div>
-                    <div style={{ width: 595, height: 322, marginTop: 16, paddingTop: 16, paddingBottom: '48px', fontSize: '16px', color: '#ffffff', backgroundColor: '#1A1A1A', borderRadius: '16px', }}>
-                        <div style={{ marginLeft: 18, textAlign: "start" }}>Workflows</div>
-                        <div style={{textAlign:"center"}}>
-                            <Button style={{ textTransform: "capitalize", background: selectedOption === 'all' ? "#494949" : "#1A1A1A", borderRadius: selectedOption === 'all' ? 15 : null, color: "#FFFFFF" }} onClick={() => handleOptionChange('all')}>All</Button>
-                            <Button style={{ textTransform: "capitalize", background: selectedOption === 'revisions' ? "#494949" : "#1A1A1A", borderRadius: selectedOption === 'revisions' ? 15 : null, color: "#FFFFFF" }} onClick={() => handleOptionChange('revisions')}>Revisions</Button>
-                            <Button style={{ textTransform: "capitalize", background: selectedOption === 'run' ? "#494949" : "#1A1A1A", borderRadius: selectedOption === 'run' ? 15 : null, color: "#FFFFFF" }} onClick={() => handleOptionChange('run')}>Runs</Button>
-                        </div>
-                        <Bar data={data} options={options} style={{ width: 400, marginLeft: 25, padding:20,marginTop: 10 }} />
-                    </div>
-                </div>
-                <div style={{ width: 375, height: 440, display: 'flex', alignItems: 'start', paddingTop: '16px', paddingBottom: '48px', fontSize: '16px', color: '#ffffff', backgroundColor: '#1A1A1A', borderRadius: '16px', }}>
-                    <div style={{ marginLeft: 18 }}>Insights</div>
-                </div>
-            </div>
-            <div style={{ width: 985, paddingTop: 16, marginTop: 16, paddingBottom: '48px', fontSize: '16px', color: '#ffffff', backgroundColor: '#1A1A1A', borderRadius: '16px', }}>
-                <div style={{ marginLeft: 18, textAlign: 'start', marginBottom: 16 }}>Sessions Overview</div>
-                <div style={{ display: "flex", width: "100%", justifyContent: "center" }}>
-                    <div style={{ fontSize: '16px',width: "30%", borderRadius: 8, background: '#212121', color: '#9CA3AF' }}>
-                        <div style={{ marginTop: 21, color: "#ffffff",  marginLeft:20,fontSize: 16, fontWeight: "bold", }}>
-                            2.8 Hours
-                        </div>
-                        <div style={{ marginTop: 13, marginBottom: 16, marginLeft:20, }}>
-                            Avg. Activity per session
-                        </div>
-                    </div>
-                    <div style={{ marginLeft: 16, fontSize: '16px', width: "30%", borderRadius: 8, background: '#212121', color: '#9CA3AF' }}>
-                        <div style={{ marginTop: 21, marginLeft:20, color: "#ffffff", fontSize: 16, fontWeight: "bold", }}>
-                            /usercases/edr to ticket
-                        </div>
-                        <div style={{ marginTop: 13, marginLeft:20, marginBottom: 16, }}>
-                            Last visited page
-                        </div>
-                    </div>
-                    <div style={{ marginLeft: 16, fontSize: '16px', width: "30%", borderRadius: 8, background: '#212121', color: '#9CA3AF' }}>
-                        <div style={{ marginTop: 21,  marginLeft:20,color: "#ffffff", fontSize: 16, fontWeight: "bold", }}>
-                            /workflow/email management
-                        </div>
-                        <div style={{ marginTop: 13, marginLeft:20, marginBottom: 16, }}>
-                            Most visited page
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    );
+    // // Options for the chart
+    // const options = {
+    //     scales: {
+    //         yAxes: [
+    //             {
+    //                 ticks: {
+    //                     beginAtZero: true
+    //                 }
+    //             }
+    //         ]
+    //     },
+    // };
+    // return (
+    //     <div style={{ width: 1030, marginLeft: 20, marginTop:10, paddingRight: 17, paddingLeft: 17}}>
+    //         <div style={{ width: 985, display: 'flex', alignItems: 'start', paddingTop: 16, paddingBottom: '48px', fontSize: '16px', color: '#ffffff', backgroundColor: '#1A1A1A', borderRadius: '16px', }}>
+    //             <div style={{ marginLeft: 18 }}>Timeline</div>
+    //         </div>
+    //         <div style={{ display: "flex", width: "100%", marginTop: 16 }}>
+    //             <div>
+    //                 <div style={{ width: 595, alignItems: 'start', paddingTop: 16, paddingBottom: checked ? 28 : 20, marginRight: 20, fontSize: '16px', color: '#ffffff', backgroundColor: '#1A1A1A', borderRadius: '16px', }}>
+    //                     <div style={{ display: "flex", alignItems: "center" }}>
+    //                         <div style={{ marginLeft: 18, marginRight: 310 }}>Apps</div>
+    //                         <Switch checked={checked}
+    //                             onChange={handleChange} /> Category
+    //                         <div style={{ marginLeft: 16, borderLeft: "1px solid #D9D9D9", width: 10, height: 15 }} />
+    //                         <Link onClick={() => { setExpand(prevExpand => !prevExpand); }} style={{ color: "#FF8444" }}>Expand</Link>
+    //                     </div>
+    //                     {expand ? null :
+    //                         <div style={{ marginTop: 8, display: "flex" }}>
+    //                             <div style={{ marginLeft: 19, }}>
+    //                                 <Typography style={{ fontSize: 13, color: "#9E9E9E", textAlign: "start" }}>Onboarding</Typography>
+    //                                 <Grid container spacing={2} style={{ marginTop: 1 }} >
+    //                                     <Grid item xs={4}>
+    //                                         <div style={{ position: 'relative' }}>
+    //                                             <img src="/images/adminpage/app1.svg" style={{ margin: 'auto' }} />
+    //                                             {checked ?
+    //                                                 <div style={{
+    //                                                     position: 'absolute',
+    //                                                     bottom: 0,
+    //                                                     left: '50%',
+    //                                                     top: 30,
+    //                                                     transform: 'translateX(-50%)',
+    //                                                     backgroundColor: '#2f2f2f',
+    //                                                     borderRadius: '50%',
+    //                                                     height: 24,
+    //                                                     width: 24,
+    //                                                     transition: 'transform 0.5s ease',
+    //                                                 }}><SearchIcon style={{ width: 16, height: 16, marginTop: 5 }} /></div> :
+    //                                                 null
+    //                                             }
+    //                                         </div>
+    //                                     </Grid>
+    //                                     <Grid item xs={4}>
+    //                                         <div style={{ position: 'relative' }}>
+    //                                             <img src="/images/adminpage/app1.svg" style={{ margin: 'auto' }} />
+    //                                             {checked ?
+    //                                                 <div style={{
+    //                                                     position: 'absolute',
+    //                                                     bottom: 0,
+    //                                                     left: '50%',
+    //                                                     top: 30,
+    //                                                     transform: 'translateX(-50%)',
+    //                                                     backgroundColor: '#2f2f2f',
+    //                                                     borderRadius: '50%',
+    //                                                     height: 24,
+    //                                                     width: 24,
+    //                                                     transition: 'transform 0.5s ease',
+    //                                                 }}><MailOutlineIcon style={{ width: 16, height: 16, marginTop: 5 }} /></div> :
+    //                                                 null
+    //                                             }
+    //                                         </div>
+    //                                     </Grid>
+    //                                     <Grid item xs={4}>
+    //                                         <div style={{ position: 'relative' }}>
+    //                                             <img src="/images/adminpage/app1.svg" style={{ margin: 'auto' }} />
+    //                                             {checked ?
+    //                                                 <div style={{
+    //                                                     position: 'absolute',
+    //                                                     bottom: 0,
+    //                                                     left: '50%',
+    //                                                     top: 30,
+    //                                                     transform: 'translateX(-50%)',
+    //                                                     backgroundColor: '#2f2f2f',
+    //                                                     borderRadius: '50%',
+    //                                                     height: 24,
+    //                                                     width: 24,
+    //                                                     transition: 'transform 0.5s ease',
+    //                                                 }}><NewReleasesIcon style={{ width: 16, height: 16, marginTop: 5 }} /></div> :
+    //                                                 null
+    //                                             }
+    //                                         </div>
+    //                                     </Grid>
+    //                                 </Grid>
+    //                             </div>
+    //                             <div style={{ borderLeft: "1px solid #494949", justifyContent: "center", alignItems: "center", marginTop: 40, marginLeft: 20, marginRight: 20, height: 40 }}></div>
+    //                             <div style={{}}>
+    //                                 <Typography style={{ fontSize: 13, color: "#9E9E9E", textAlign: "start" }}>Other</Typography>
+    //                                 <Grid container spacing={2} style={{ marginTop: 1 }} >
+    //                                     <Grid item xs={4}>
+    //                                         <div style={{ position: 'relative' }}>
+    //                                             <img src="/images/adminpage/app1.svg" style={{ margin: 'auto' }} />
+    //                                             {checked ?
+    //                                                 <div style={{
+    //                                                     position: 'absolute',
+    //                                                     bottom: 0,
+    //                                                     left: '50%',
+    //                                                     top: 30,
+    //                                                     transform: 'translateX(-50%)',
+    //                                                     backgroundColor: '#2f2f2f',
+    //                                                     borderRadius: '50%',
+    //                                                     height: 24,
+    //                                                     width: 24,
+    //                                                     transition: 'transform 0.5s ease',
+    //                                                 }}><SearchIcon style={{ width: 16, height: 16, marginTop: 5 }} /></div> :
+    //                                                 null
+    //                                             }
+    //                                         </div>
+    //                                     </Grid>
+    //                                     <Grid item xs={4}>
+    //                                         <div style={{ position: 'relative' }}>
+    //                                             <img src="/images/adminpage/app1.svg" style={{ margin: 'auto' }} />
+    //                                             {checked ?
+    //                                                 <div style={{
+    //                                                     position: 'absolute',
+    //                                                     bottom: 0,
+    //                                                     left: '50%',
+    //                                                     top: 30,
+    //                                                     transform: 'translateX(-50%)',
+    //                                                     backgroundColor: '#2f2f2f',
+    //                                                     borderRadius: '50%',
+    //                                                     height: 24,
+    //                                                     width: 24,
+    //                                                     transition: 'transform 10s ease-in-out',
+    //                                                 }}><NewReleasesIcon style={{ width: 16, height: 16, marginTop: 5 }} /></div> :
+    //                                                 null
+    //                                             }
+    //                                         </div>
+    //                                     </Grid>
+    //                                     <Grid item xs={4}>
+    //                                         <div style={{ position: 'relative' }}>
+    //                                             <img src="/images/adminpage/app1.svg" style={{ margin: 'auto' }} />
+    //                                             {checked ?
+    //                                                 <div style={{
+    //                                                     position: 'absolute',
+    //                                                     bottom: 0,
+    //                                                     left: '50%',
+    //                                                     top: 30,
+    //                                                     transform: 'translateX(-50%)',
+    //                                                     backgroundColor: '#2f2f2f',
+    //                                                     borderRadius: '50%',
+    //                                                     height: 24,
+    //                                                     width: 24,
+    //                                                     transition: 'transform 10s ease-in-out',
+    //                                                 }}><MailOutlineIcon style={{ width: 16, height: 16, marginTop: 5 }} /></div> :
+    //                                                 null
+    //                                             }
+    //                                         </div>
+    //                                     </Grid>
+    //                                 </Grid>
+    //                             </div>
+    //                         </div>}
+    //                 </div>
+    //                 <div style={{ width: 595, height: 322, marginTop: 16, paddingTop: 16, paddingBottom: '48px', fontSize: '16px', color: '#ffffff', backgroundColor: '#1A1A1A', borderRadius: '16px', }}>
+    //                     <div style={{ marginLeft: 18, textAlign: "start" }}>Workflows</div>
+    //                     <div style={{textAlign:"center"}}>
+    //                         <Button style={{ textTransform: "capitalize", background: selectedOption === 'all' ? "#494949" : "#1A1A1A", borderRadius: selectedOption === 'all' ? 15 : null, color: "#FFFFFF" }} onClick={() => handleOptionChange('all')}>All</Button>
+    //                         <Button style={{ textTransform: "capitalize", background: selectedOption === 'revisions' ? "#494949" : "#1A1A1A", borderRadius: selectedOption === 'revisions' ? 15 : null, color: "#FFFFFF" }} onClick={() => handleOptionChange('revisions')}>Revisions</Button>
+    //                         <Button style={{ textTransform: "capitalize", background: selectedOption === 'run' ? "#494949" : "#1A1A1A", borderRadius: selectedOption === 'run' ? 15 : null, color: "#FFFFFF" }} onClick={() => handleOptionChange('run')}>Runs</Button>
+    //                     </div>
+    //                     <Bar data={data} options={options} style={{ width: 400, marginLeft: 25, padding:20,marginTop: 10 }} />
+    //                 </div>
+    //             </div>
+    //             <div style={{ width: 375, height: 440, display: 'flex', alignItems: 'start', paddingTop: '16px', paddingBottom: '48px', fontSize: '16px', color: '#ffffff', backgroundColor: '#1A1A1A', borderRadius: '16px', }}>
+    //                 <div style={{ marginLeft: 18 }}>Insights</div>
+    //             </div>
+    //         </div>
+    //         <div style={{ width: 985, paddingTop: 16, marginTop: 16, paddingBottom: '48px', fontSize: '16px', color: '#ffffff', backgroundColor: '#1A1A1A', borderRadius: '16px', }}>
+    //             <div style={{ marginLeft: 18, textAlign: 'start', marginBottom: 16 }}>Sessions Overview</div>
+    //             <div style={{ display: "flex", width: "100%", justifyContent: "center" }}>
+    //                 <div style={{ fontSize: '16px',width: "30%", borderRadius: 8, background: '#212121', color: '#9CA3AF' }}>
+    //                     <div style={{ marginTop: 21, color: "#ffffff",  marginLeft:20,fontSize: 16, fontWeight: "bold", }}>
+    //                         2.8 Hours
+    //                     </div>
+    //                     <div style={{ marginTop: 13, marginBottom: 16, marginLeft:20, }}>
+    //                         Avg. Activity per session
+    //                     </div>
+    //                 </div>
+    //                 <div style={{ marginLeft: 16, fontSize: '16px', width: "30%", borderRadius: 8, background: '#212121', color: '#9CA3AF' }}>
+    //                     <div style={{ marginTop: 21, marginLeft:20, color: "#ffffff", fontSize: 16, fontWeight: "bold", }}>
+    //                         /usercases/edr to ticket
+    //                     </div>
+    //                     <div style={{ marginTop: 13, marginLeft:20, marginBottom: 16, }}>
+    //                         Last visited page
+    //                     </div>
+    //                 </div>
+    //                 <div style={{ marginLeft: 16, fontSize: '16px', width: "30%", borderRadius: 8, background: '#212121', color: '#9CA3AF' }}>
+    //                     <div style={{ marginTop: 21,  marginLeft:20,color: "#ffffff", fontSize: 16, fontWeight: "bold", }}>
+    //                         /workflow/email management
+    //                     </div>
+    //                     <div style={{ marginTop: 13, marginLeft:20, marginBottom: 16, }}>
+    //                         Most visited page
+    //                     </div>
+    //                 </div>
+    //             </div>
+    //         </div>
+    //     </div>
+    // );
 };
 
 export default AnalyticsTab;
diff --git a/frontend/src/components/ApiExplorer.jsx b/frontend/src/components/ApiExplorer.jsx
index e6080301..d1321220 100644
--- a/frontend/src/components/ApiExplorer.jsx
+++ b/frontend/src/components/ApiExplorer.jsx
@@ -29,7 +29,7 @@ import {
   Tooltip,
 } from "@mui/material";
 import throttle from "lodash/throttle";
-import theme from "../theme.jsx";
+import {getTheme} from "../theme.jsx";
 import { validateJson, collapseField, } from "../views/Workflows.jsx";
 
 import DeleteIcon from "@mui/icons-material/Delete";
@@ -37,6 +37,8 @@ import { Context } from "../context/ContextApi.jsx";
 
 function CustomTabPanel(props) {
   const { children, value, index, ...other } = props;
+  const {themeMode} = useContext(Context);
+  const theme = getTheme(themeMode)
 
   return (
     <div
@@ -47,7 +49,7 @@ function CustomTabPanel(props) {
       {...other}
     >
       {value === index && (
-        <Box sx={{ p: 3, padding: 0, backgroundColor: "#1a1a1a" }}>
+        <Box sx={{ p: 3, padding: 0, backgroundColor: theme.palette.backgroundColor}}>
           {children}
         </Box>
       )}
@@ -100,6 +102,8 @@ const ApiExplorer = memo(({ openapi, globalUrl, userdata, HandleApiExecution, se
   const [selectedActionIndex, setSelectedActionIndex] = useState(0);
   const [ExampleBody, setExampleBody] = useState({});
   const [filteredActions, setFilteredActions] = useState([]);
+  const {themeMode} = useContext(Context);
+  const theme = getTheme(themeMode)
 
   const [firstSendDone, setFirstSendDone] = useState(false)
 
@@ -1391,6 +1395,8 @@ const ActionsList = memo(({
 
   const [searchQuery, setSearchQuery] = useState("");
   const [visibleActions, setVisibleActions] = useState([]);
+  const {themeMode} = useContext(Context);
+  const theme = getTheme(themeMode);
   
 
   useEffect(() => {
@@ -1457,13 +1463,13 @@ const ActionsList = memo(({
 						<Tooltip title="Go to app" placement="right">
 							<div style={{ display: "flex", alignItems: "center" }}>
 								<img
-									src={openapi?.info["x-logo"]}
+									src={openapi?.info["x-logo"]?.length > 0 ? openapi?.info["x-logo"] : theme?.palette?.defaultImage}
 									width={48}
 									height={48}
 									alt="app logo"
 									style={{ marginLeft: 20, borderRadius: 8 }}
 								/>
-								<Typography style={{ fontSize: 24, fontWeight: 'bold', marginLeft: 20, overflow: 'hidden', color: '#F1F1F1'
+								<Typography style={{ fontSize: 24, fontWeight: 'bold', marginLeft: 20, overflow: 'hidden', color: theme.palette.textColor
 								}}> 
 									{info.title}
 								</Typography>
@@ -1471,7 +1477,7 @@ const ActionsList = memo(({
 						</Tooltip>
 					</a>
                 ) : (
-                  <Typography style={{ fontSize: 24, fontWeight: 'bold', marginLeft: 20, overflow: 'hidden', color: '#F1F1F1'
+                  <Typography style={{ fontSize: 24, fontWeight: 'bold', marginLeft: 20, overflow: 'hidden', color: theme.palette.textColor
                   }}> 
                       Api Explorer
                   </Typography>
@@ -1504,7 +1510,7 @@ const ActionsList = memo(({
         style={{
           marginLeft: 20,
           marginTop: 15,
-          backgroundColor: "#1a1a1a",
+          backgroundColor: theme.palette.backgroundColor,
           overflowY: "auto",
           height: (isLoaded && isLoggedIn) ? "calc(100vh - 190px)" : "calc(100vh - 260px)",
           paddingRight: 5,
@@ -1522,7 +1528,7 @@ const ActionsList = memo(({
                 textTransform: "none",
                 backgroundColor:
                   selectedActionIndex === actionIndex
-                    ? "#3f3f3f"
+                    ? theme.palette.hoverColor
                     : "transparent",
                 border: "none",
                 justifyContent: "flex-start",
@@ -1535,7 +1541,7 @@ const ActionsList = memo(({
                 textWrap: "nowrap",
                 textOverflow: "ellipsis",
                 "&:hover": {
-                  backgroundColor: "#2f2f2f",
+                  backgroundColor: theme.palette.hoverColor,
                 },
               }}
               onClick={() => handleActionClick(actionIndex, action)}
@@ -1554,7 +1560,7 @@ const ActionsList = memo(({
               </span>
               <span
                 style={{
-                  color: "white",
+                  color: theme.palette.textColor,
                   textOverflow: "ellipsis",
                   overflow: "hidden",
                 }}
@@ -1564,7 +1570,7 @@ const ActionsList = memo(({
             </Button>
           ))
         ) : (
-          <div style={{ padding: "15px", color: "white", textAlign: "center" }}>
+          <div style={{ padding: "15px", color: theme.palette.textColor, textAlign: "center" }}>
             No actions found
           </div>
         )}
@@ -1602,6 +1608,8 @@ const Action = memo((
         const [disableExecuteButton, setDisableExecuteButton] = useState(false);
         const [showResponseLoader, setShowResponseLoader] = useState(false);
         const [appAuthentication, setAppAuthentication] = useState([])
+        const {themeMode} = useContext(Context);
+        const theme = getTheme(themeMode);
         const parseHeaders = (headersString) => {
           if (headersString?.length > 0) {
             const headersArray = headersString.split("\n");
@@ -2082,7 +2090,7 @@ const Action = memo((
                       fontWeight: 700,
                       marginLeft: 40,
                       marginBottom: 5,
-                      color: "rgba(241, 241, 241, 1)",
+                      color: theme.palette.textColor
                     }}
                   >
                     {actionname}
@@ -2095,7 +2103,7 @@ const Action = memo((
                   borderRadius: 6,
                   marginLeft: "40px",
                   marginTop: 2,
-                  backgroundColor: "#212121",
+                  backgroundColor: theme.palette.textFieldStyle.backgroundColor,
                   height: 51,
                   alignItems: 'center',
                 }}
@@ -2109,7 +2117,7 @@ const Action = memo((
                     backgroundColor: "transparent",
                     "& .MuiSelect-select": {
                       color: RequestMethods.find((method) => method.value === selectedMethod)
-                        ?.color || "#212121",
+                        ?.color || theme.palette.textFieldStyle.backgroundColor,
                     },
                   }}
                   MenuProps={{
@@ -2117,14 +2125,14 @@ const Action = memo((
                       sx: {
                         padding: 0,
                         margin: 0,
-                        backgroundColor: "#212121",
+                        backgroundColor: theme.palette.textFieldStyle.backgroundColor,
                       },
                     },
                     MenuListProps: {
                       sx: {
                         padding: 0,
                         margin: 0,
-                        backgroundColor: "#212121",
+                        backgroundColor: theme.palette.textFieldStyle.backgroundColor,
                       },
                     },
                   }}
@@ -2135,20 +2143,20 @@ const Action = memo((
                       value={method.value}
                       sx={{
                         color: method.color,
-                        backgroundColor: "#212121",
+                        backgroundColor: theme.palette.textFieldStyle.backgroundColor,
                         border: "none",
                         marginBottom: 0.25,
                         "&:hover": {
                           backgroundColor: method.color,
-                          color: "#f9fcf5", 
+                          color: theme.palette.textFieldStyle.color, 
                         },
                         "&.Mui-selected": {
                           backgroundColor: method.color,
-                          color: "#f9fcf5",
+                          color: theme.palette.textFieldStyle.color,
                           border: "none",
                           "&:hover": {
                             backgroundColor: method.color,
-                            color: "#f9fcf5",
+                            color: theme.palette.textFieldStyle.color,
                           },
                         },
                         "&.Mui-focusVisible": {
@@ -2167,9 +2175,8 @@ const Action = memo((
                   inputProps={{
                     style: {
                       margin: "auto",
-                      backgroundColor: "transparent",
                       border: "none",
-                      color: "rgba(241, 241, 241, 1)",
+                      color: theme.palette.textFieldStyle.color,
                       display: 'flex',
                       height: '100%',
                       alignItems: 'center',
@@ -2331,7 +2338,7 @@ const Action = memo((
                   style={{
                     display: "flex",
                     justifyContent: "center",
-                    background: "rgba(26, 26, 26, 1)",
+                    background: theme.palette.backgroundColor,
                   }}
                 >
                   <Tabs
@@ -2386,7 +2393,7 @@ const Action = memo((
                   <TableContainer
                     style={{
                       minWidth: 696,
-                      backgroundColor: "#212121",
+                      backgroundColor: theme.palette.platformColor,
                       borderRadius: 6,
                       border: "1px solid rgba(73, 73, 73, 1)",
                     }}
@@ -2436,7 +2443,7 @@ const Action = memo((
                                 }
                                 inputProps={{
                                   style: {
-                                    backgroundColor: "rgba(33, 33, 33, 1)",
+                                    backgroundColor: theme.palette.platformColor,
                                     padding: "4px 8px",
                                   },
                                 }}
@@ -2494,7 +2501,7 @@ const Action = memo((
                                     </InputAdornment>
                                   ),
                                   style: {
-                                    backgroundColor: "rgba(33, 33, 33, 1)",
+                                    backgroundColor: theme.palette.platformColor,
                                     padding: "4px 8px",
                                   },
                                 }}
@@ -2600,7 +2607,7 @@ const Action = memo((
                   <TableContainer
                     style={{
                       minWidth: 696,
-                      backgroundColor: "#212121",
+                      backgroundColor: theme.palette.platformColor,
                       borderRadius: 6,
                       border: "1px solid rgba(73, 73, 73, 1)",
                     }}
@@ -2640,7 +2647,7 @@ const Action = memo((
                                 type="text"
                                 inputProps={{
                                   style: {
-                                    backgroundColor: "rgba(33, 33, 33, 1)",
+                                    backgroundColor: theme.palette.platformColor ,
                                     padding: "4px 8px",
                                   },
                                 }}
@@ -2694,7 +2701,7 @@ const Action = memo((
                                 value={row.value}
                                 inputProps={{
                                   style: {
-                                    backgroundColor: "rgba(33, 33, 33, 1)",
+                                    backgroundColor: theme.palette.platformColor,
                                     padding: "4px 8px",
                                   },
                                 }}
@@ -2794,10 +2801,10 @@ const Action = memo((
                   marginLeft: 10
                 }}
               >
-                  <span style={{ fontSize: 16, fontWeight: 600 }}>
+                  <span style={{ fontSize: 16, fontWeight: 600, color: theme.palette.textColor }}>
                     {action.name.replaceAll("_", " ")}
                   </span>
-                  <p >
+                  <p style={{color: theme.palette.textColor}}>
                     {action.description
                       ? action.description
                       : ""}
@@ -2813,6 +2820,8 @@ const ActionResponse = memo(({ apiResponse, ExampleBody, isLoggedIn, isLoaded })
   const [responseTabIndex, setResponseTabIndex] = useState(0)
   const [oldResponse, setOldResponse] = useState(apiResponse)
   const [highlight, setHighlight] = useState(false)
+  const {themeMode } = useContext(Context)
+  const theme = getTheme(themeMode)
 
   const MIN_HEIGHT = 50
 
@@ -2934,7 +2943,7 @@ const ActionResponse = memo(({ apiResponse, ExampleBody, isLoggedIn, isLoaded })
         style={{
           width: '100%',
           height: height,
-          backgroundColor: '#1a1a1a',
+          backgroundColor: theme.palette.backgroundColor,
           display: 'flex',
           flexDirection: 'column',
           borderTop: '1px solid rgba(255,255,255,0.2)',
@@ -2988,7 +2997,7 @@ const ActionResponse = memo(({ apiResponse, ExampleBody, isLoggedIn, isLoaded })
             <ReactJson
               src={formData(ExampleBody)}
               theme={theme.palette.jsonTheme}
-              style={{ backgroundColor: '#1a1a1a', padding: 5 }}
+              style={{...theme.palette.reactJsonStyle, border: "none"}}
               collapsed={false}
               iconStyle={theme.palette.jsonIconStyle}
               collapseStringsAfterLength={theme.palette.jsonCollapseStringsAfterLength}
@@ -3005,6 +3014,10 @@ const ActionResponse = memo(({ apiResponse, ExampleBody, isLoggedIn, isLoaded })
 });
 
 const ResponseTabWrapper = memo(({ apiResponse }) => {
+
+  const {themeMode } = useContext(Context)
+  const theme = getTheme(themeMode)
+
   const handleReactJsonClipboard = (copy) => {
     const elementName = "copy_element_shuffle";
     let copyText = document.getElementById(elementName);
@@ -3036,7 +3049,7 @@ const ResponseTabWrapper = memo(({ apiResponse }) => {
     <ReactJson
           src={apiResponse}
           theme={theme.palette.jsonTheme}
-          style={{ backgroundColor: "#1a1a1a", padding: 5 }}
+          style={{...theme.palette.reactJsonStyle, border: "none"}}
 		  shouldCollapse={(jsonField) => {
 			return collapseField(jsonField)
 		  }}
@@ -3049,7 +3062,8 @@ const ResponseTabWrapper = memo(({ apiResponse }) => {
   )})
 
 const PaddingWrapper = memo(({ isLoggedIn, isLoaded, children }) => {
-  const { leftSideBarOpenByClick, windowWidth } = useContext(Context);
+  const { leftSideBarOpenByClick, windowWidth, themeMode } = useContext(Context);
+  const theme = getTheme(themeMode)
   return (
     <div
       style={{
@@ -3058,7 +3072,7 @@ const PaddingWrapper = memo(({ isLoggedIn, isLoaded, children }) => {
             ? windowWidth >= 1920  ? "calc(100% - 630px)" : "calc(100% - 570px)"
             : windowWidth >= 1920 ? "calc(100vw - 460px)": "calc(100% - 410px)"
           : windowWidth >= 1920 ? "calc(100% - 370px)" : "calc(100% - 320px)",
-        backgroundColor: "#1a1a1a",
+        backgroundColor: theme.palette.backgroundColor,
         position: "fixed",
         bottom: 0,
         right: 0,
diff --git a/frontend/src/components/AppAuthTab.jsx b/frontend/src/components/AppAuthTab.jsx
index fb2af4ff..8c65366e 100644
--- a/frontend/src/components/AppAuthTab.jsx
+++ b/frontend/src/components/AppAuthTab.jsx
@@ -13,7 +13,7 @@ import {
 } from "@mui/icons-material";
 import { useNavigate } from "react-router-dom";
 import { toast } from "react-toastify";
-import theme from "../theme.jsx";
+import {getTheme} from "../theme.jsx";
 import Markdown from "react-markdown";
 import AuthenticationOauth2 from "../components/Oauth2Auth.jsx";
 import { isMobile } from "react-device-detect"
@@ -66,7 +66,7 @@ import { Context } from '../context/ContextApi.jsx';
 
 const searchClient = algoliasearch(
   "JNSS5CFDZZ",
-  "db08e40265e2941b9a7d8f644b6e5240"
+  "c8f882473ff42d41158430be09ec2b4e"
 )
 
 const AppAuthTab = memo((props) => {
@@ -83,16 +83,17 @@ const AppAuthTab = memo((props) => {
     const [appAuthenticationGroupId, setAppAuthenticationGroupId] = React.useState("");
     const [appAuthenticationGroups, setAppAuthenticationGroups] = React.useState([]);
     const [appAuthenticationGroupName, setAppAuthenticationGroupName] = React.useState("");
+    const [selectedSubOrg, setSelectedSubOrg] = useState([]);
     const [appAuthenticationGroupDescription, setAppAuthenticationGroupDescription] = React.useState("");
     const [appsForAppAuthGroup, setAppsForAppAuthGroup] = React.useState([]);
     const [searchQuery, setSearchQuery] = React.useState("");
     const [showAppModal, setShowAppModal] = useState(false)
+    const [selectedAuthId, setSelectedAuthId] = useState("");
+    const [showDistributionPopup, setShowDistributionPopup] = useState(false);
     const [showAuthenticationLoader, setShowAuthenticationLoader] = useState(true)
-    const [showAppAuthGroupLoader, setShowAppAuthGroupLoader] = useState(true)
-    const changeDistribution = (data) => {
-        //changeDistributed(data, !isDistributed)
-        editAuthenticationConfig(data.id, "suborg_distribute")
-    }
+  const [showAppAuthGroupLoader, setShowAppAuthGroupLoader] = useState(true)
+  const { themeMode, supportEmail, brandColor } = useContext(Context)
+  const theme = getTheme(themeMode, brandColor)
     
     useEffect(() => {
         getAppAuthentication();
@@ -212,11 +213,39 @@ const AppAuthTab = memo((props) => {
             });
     };
 
-    const editAuthenticationConfig = (id, parentAction) => {
+    const handleSelectSubOrg = (id, action) => {
+        if (action === "all") {
+            const childOrgs = userdata.orgs.filter(
+                (data) => data.creator_org === userdata.active_org.id
+            );
+            setSelectedSubOrg((prev) => {
+                if (prev.length === childOrgs.length) {
+                    // If all child orgs are already selected, clear the selection
+                    return [];
+                } else {
+                    // Otherwise, select all child org IDs
+                    return childOrgs.map((data) => data.id);
+                }
+            });
+        } else if (action === "none") {
+            setSelectedSubOrg([]);
+        } else {
+            setSelectedSubOrg((prev) => {
+                if (prev.includes(id)) {
+                    return prev.filter((data) => data !== id);
+                } else {
+                    return [...prev, id];
+                }
+            });
+        }
+    };
+
+    const editAuthenticationConfig = (id, parentAction, selectedSuborgs) => {
         const data = {
             id: id,
             action: parentAction !== undefined && parentAction !== null ? parentAction : "assign_everywhere",
-        }
+            selected_suborgs: selectedSuborgs !== undefined && selectedSuborgs !== null ? selectedSuborgs : [],
+          }
 
         const url = globalUrl + "/api/v1/apps/authentication/" + id + "/config";
 
@@ -238,6 +267,7 @@ const AppAuthTab = memo((props) => {
                     } else {
                         toast("Successfully updated auth!");
                         setSelectedUserModalOpen(false);
+                        setShowDistributionPopup(false);
                         setTimeout(() => {
                             getAppAuthentication();
                         }, 1000);
@@ -249,6 +279,106 @@ const AppAuthTab = memo((props) => {
             });
     };
 
+
+    const changeDistribution = (id, selectedSubOrg) => {	
+    
+        editAuthenticationConfig(id, "suborg_distribute", [...new Set(selectedSubOrg)])
+      }
+  
+  
+      const cacheDistributionModal = showDistributionPopup ? (
+          <Dialog
+      open={showDistributionPopup}
+      onClose={() => {setShowDistributionPopup(false);setSelectedAuthId("")}}
+      PaperProps={{
+        sx: {
+          borderRadius: theme?.palette?.DialogStyle?.borderRadius,
+          border: theme?.palette?.DialogStyle?.border,
+          fontFamily: theme?.typography?.fontFamily,
+          backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+          zIndex: 1000,
+          minWidth: "600px",
+          minHeight: "320px",
+          overflow: "auto",
+          '& .MuiDialogContent-root': {
+            backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+          },
+          '& .MuiDialogTitle-root': {
+            backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+          },
+          '& .MuiDialogActions-root': {
+            backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+          },
+        },
+      }}
+    >
+      <DialogTitle>
+        <Typography variant="h5" color="textPrimary">
+          Select sub-org to distribute Datastore key
+        </Typography>
+      </DialogTitle>
+      <DialogContent style={{ color: "rgba(255,255,255,0.65)" }}>
+        <MenuItem value="none" onClick={()=> {handleSelectSubOrg(null, "none")}}>None</MenuItem>
+        <MenuItem value="all" onClick={()=> {handleSelectSubOrg(null, "all")}}>All</MenuItem>
+        {userdata.orgs.map((data, index) => {
+          if (data.creator_org !== userdata.active_org.id) {
+            return null;
+          }
+  
+          const imagesize = 22;
+          const imageStyle = {
+            width: imagesize,
+            height: imagesize,
+            pointerEvents: "none",
+            marginRight: 10,
+            marginLeft: data.id === userdata.active_org.id ? 0 : 20,
+          };
+  
+          const image = data.image === "" ? (
+            <img alt={data.name} src={theme.palette.defaultImage} style={imageStyle} />
+          ) : (
+            <img alt={data.name} src={data.image} style={imageStyle} />
+          );
+
+          return (
+            <MenuItem
+              key={index}
+              value={data.id}
+              onClick={() => handleSelectSubOrg(data.id)}
+              style={{ display: "flex", alignItems: "center" }}
+            >
+              <Checkbox
+                checked={selectedSubOrg.includes(data.id)}
+              />
+              {image}
+              <span style={{ marginLeft: 8 }}>{data.name}</span>
+            </MenuItem>
+          );
+        })}
+  
+        <div style={{ display: "flex", marginTop: 20 }}>
+          <Button
+            style={{ borderRadius: "2px", textTransform: 'none', fontSize:16, color: theme.palette.primary.main  }}
+            onClick={() => {setShowDistributionPopup(false); setSelectedAuthId("")}}
+            color="primary"
+          >
+            Cancel
+          </Button>
+          <Button
+            variant="contained"
+            style={{ borderRadius: "2px", textTransform: 'none', fontSize:16, marginLeft: 10 }}
+            onClick={() => {
+              changeDistribution(selectedAuthId, selectedSubOrg);
+            }}
+            color="primary"
+          >
+            Submit
+          </Button>
+        </div>
+      </DialogContent>
+      </Dialog>
+      ) : null;
+
     const editAuthenticationModal = selectedAuthenticationModalOpen ? (
         <Dialog
             open={selectedAuthenticationModalOpen}
@@ -277,7 +407,7 @@ const AppAuthTab = memo((props) => {
             }}
         >
             <DialogTitle>
-                <span style={{ color: "white" }}>
+                <span style={{ color: theme.palette.textColor }}>
                     Edit authentication for {selectedAuthentication.app.name.replaceAll("_", " ")} (
                     {selectedAuthentication.label})
                 </span>
@@ -297,7 +427,7 @@ const AppAuthTab = memo((props) => {
                     InputProps={{
                         style: {
                             height: 50,
-                            color: "white",
+                            color: theme.palette.textColor,
                         },
                     }}
                     color="primary"
@@ -349,7 +479,7 @@ const AppAuthTab = memo((props) => {
                                 InputProps={{
                                     style: {
                                         height: 50,
-                                        color: "white",
+                                        color: theme.palette.textColor,
                                     },
                                 }}
                                 color="primary"
@@ -568,7 +698,7 @@ const AppAuthTab = memo((props) => {
           })
           .then((responseJson) => {
             if (responseJson.success === false) {
-                toast("Failed to create. Please try again, or contact support@shuffler.io")
+                toast(`Failed to create. Please try again, or contact ${supportEmail}`)
             } else {
                 // Close the modal
                 setAppAuthenticationGroupModalOpen(false)
@@ -660,7 +790,7 @@ const AppAuthTab = memo((props) => {
               }}
             >
               <DialogTitle>
-                <span style={{ color: "white" }}>App Authentication Groups</span>
+                <span style={{ color: theme.palette.textColor }}>App Authentication Groups</span>
               </DialogTitle>
     
               <DialogContent style={{marginLeft: 0, paddingLeft: 0, }}>
@@ -677,7 +807,7 @@ const AppAuthTab = memo((props) => {
                         InputProps={{
                           style: {
                             height: "50px",
-                            color: "white",
+                            color: theme.palette.textColor,
                             fontSize: "1em",
                           },
                         }}
@@ -842,7 +972,7 @@ const AppAuthTab = memo((props) => {
               hitsPerPage={5}
               searchQuery={searchQuery}
               globalUrl={globalUrl}
-              isCloud={isCloud}
+              isCloud={isCloud !== true}
               userdata={userdata}
               getAppAuthentication={getAppAuthentication}
             />
@@ -853,35 +983,40 @@ const AppAuthTab = memo((props) => {
     ) : null;    
     
     return (
-        <div style={{width: "100%", minHeight: 1100, maxHeight: 1700, overflowY: "auto", scrollbarColor: '#494949 transparent', scrollbarWidth: 'thin',boxSizing: 'border-box', padding: "27px 10px 19px 27px", height:"100%", backgroundColor: '#212121',borderTopRightRadius: '8px', borderBottomRightRadius: 8, borderLeft: "1px solid #494949", }}>
+        <div style={{width: "100%", minHeight: 1100, maxHeight: 1700, overflowY: "auto", scrollbarColor: theme.palette.scrollbarColorTransparent, scrollbarWidth: 'thin',boxSizing: 'border-box', padding: "27px 10px 19px 27px", height:"100%", backgroundColor: theme.palette.platformColor,borderTopRightRadius: '8px', borderBottomRightRadius: 8, borderLeft: theme.palette.defaultBorder, }}>
           {appModal}
-            <div style={{ height: "100%", width: "calc(100% - 20px)", scrollbarColor: '#494949 transparent', scrollbarWidth: 'thin'}}>
+          {cacheDistributionModal}
+            <div style={{ height: "100%", width: "calc(100% - 20px)", scrollbarColor: theme.palette.scrollbarColorTransparent, scrollbarWidth: 'thin'}}>
             <div style={{ width: 'auto', display:'flex',}}>
                 <div style={{display: 'flex', flexDirection: 'column'}}>
-                  <h2 style={{ marginBottom: 8, marginTop: 0, color: "#FFFFFF" }}>App Authentication</h2>
-                   <div>
-                    <span style={{}}>
+                  <Typography variant='h5' style={{ marginBottom: 8, marginTop: 0, }}>App Authentication</Typography>
+              <div style={{display: 'flex', flexDirection: 'row', alignItems: 'center', }}>
+                    <Typography variant='body2' color="textSecondary">
                       Control the authentication options for individual apps.
-                      </span>
+                      </Typography>
                       &nbsp;
                       <a
                           target="_blank"
                           rel="noopener noreferrer"
                           href="/docs/organizations#app_authentication"
-                          style={{ color: "#FF8444" }}
+                          style={{ color: theme.palette.linkColor }}
                       >
                           Learn more about App Authentication
                       </a>
                    </div>
                 </div>
-                <Button
-                    style={{ color: '#1a1a1a', textTransform: 'none', backgroundColor: "#FF8444", marginLeft:"auto", borderRadius: 4,fontSize: 16, minWidth: 162, height: 40, boxShadow:'none', }}
-                    variant="contained"
-                    color="primary"
-                    onClick={() => setShowAppModal(true)}
-                >
-                    Add App Auth
-                </Button>
+
+				{isCloud ? 
+					<Button
+						style={{ textTransform: 'none', marginLeft:"auto", borderRadius: 4,fontSize: 16, minWidth: 162, height: 40, boxShadow:'none', }}
+						variant="contained"
+						color="primary"
+						disabled={!isCloud}
+						onClick={() => setShowAppModal(true)}
+					>
+						Add App Auth
+					</Button>
+				: null}
             </div>
             {/* <Divider
                 style={{
@@ -895,7 +1030,7 @@ const AppAuthTab = memo((props) => {
               style={{
               borderRadius: 4,
               marginTop: 24,
-              border: "1px solid #494949",
+              border: theme.palette.defaultBorder,
               width: "100%",
               overflowX: "auto", 
               paddingBottom: 0,
@@ -913,7 +1048,7 @@ const AppAuthTab = memo((props) => {
             }}>
                 
                 
-                <ListItem style={{ width: "100%", paddingTop: 10, paddingBottom: 10, paddingRight: 10,  borderBottom: "1px solid #494949", display: 'table-row'}}>
+                <ListItem style={{ width: "100%", paddingTop: 10, paddingBottom: 10, paddingRight: 10,  borderBottom: theme.palette.defaultBorder, display: 'table-row'}}>
                     
                 {["Valid", "Label", "App Name", "Workflows", "Fields", "Edited", "Actions", "Distribution"].map((header, index) => (
                         <ListItemText
@@ -924,7 +1059,7 @@ const AppAuthTab = memo((props) => {
                               padding: index === 0 ? "0px 8px 8px 15px": "0px 8px 8px 8px",
                               whiteSpace: "nowrap",
                               textOverflow: "ellipsis",
-                              borderBottom: "1px solid #494949",
+                              borderBottom: theme.palette.defaultBorder,
                               position: "sticky",
                             }}
                         />
@@ -938,7 +1073,7 @@ const AppAuthTab = memo((props) => {
                           key={rowIndex}
                           style={{
                               display: "table-row",
-                              backgroundColor: "#212121",
+                              backgroundColor: theme.palette.platformColor,
                           }}
                       >
                           {Array(8)
@@ -955,7 +1090,7 @@ const AppAuthTab = memo((props) => {
                                           variant="text"
                                           animation="wave"
                                           sx={{
-                                              backgroundColor: "#1a1a1a",
+                                              backgroundColor: theme.palette.loaderColor,
                                               height: "20px",
                                               borderRadius: "4px",
                                           }}
@@ -966,14 +1101,14 @@ const AppAuthTab = memo((props) => {
                   ))
                     : authentication?.length === 0 ? (
                         <div style={{ textAlign: 'center'}}>
-                          <Typography style={{ color: "#FFFFFF", textAlign: 'center', padding: 20}}>
+                          <Typography color="textPrimary" style={{ textAlign: 'center', padding: 20}}>
                           No authentication found. 
                       </Typography>
                         </div>
                     ):authentication.map((data, index) => {
-                      var bgColor = "#212121";
+                      var bgColor = themeMode === "dark" ? "#212121" : "#FFFFFF";
                       if (index % 2 === 0) {
-                          bgColor = "#1A1A1A";
+                          bgColor = themeMode === "dark" ? "#1A1A1A" :  "#EAEAEA";
                       }
 
                       //console.log("Auth data: ", data)
@@ -998,7 +1133,7 @@ const AppAuthTab = memo((props) => {
                           ];
                       }
 
-                      const isDistributed = data.suborg_distributed === true ? true : false;
+                      const isDistributed = data?.suborg_distribution?.length > 0 || data?.suborg_distributed ? true : false;
                       var validIcon = <CheckCircleIcon style={{ color: "green" }} />
                       if (data.validation !== null && data.validation !== undefined && data.validation.valid === false) {
 
@@ -1055,7 +1190,7 @@ const AppAuthTab = memo((props) => {
                               <ListItemText
                                   primary={
 									  <Tooltip title={"Try the app in our API explorer"} placement="top">
-										  <a href={`/apis/${data.app.id}`} style={{ color: "#FF8444", textDecoration: "none", cursor: "pointer", }} target="_blank" rel="noopener noreferrer">
+										  <a href={`/apis/${data.app.id}`} style={{ color: theme.palette.linkColor, textDecoration: "none", cursor: "pointer", }} target="_blank" rel="noopener noreferrer">
 											  {data?.app?.name?.replaceAll("_", " ")}
 										  </a>
 									  </Tooltip>
@@ -1108,14 +1243,14 @@ const AppAuthTab = memo((props) => {
                                   style={{
                                       overflow: "hidden",
                                       display: "table-cell",
-                                      verticalAlign: 'middle'
+                              verticalAlign: 'middle',
                                   }}
                                   primaryTypographyProps={{
                                     style: {
                                       padding: 8
                                     }
                                   }}
-                                  primary={new Date(data.edited * 1000).toISOString()}
+                            primary={new Date(data.edited * 1000).toISOString()}
                               />
                               <ListItemText
                                 style={{
@@ -1125,13 +1260,24 @@ const AppAuthTab = memo((props) => {
                                 primaryTypographyProps={{ style: { display: "flex", flexDirection: 'row', padding: 8 } }}
                               >
                                 <IconButton
-                                  onClick={() => {
-                                    updateAppAuthentication(data);
-                                  }}
-                                  disabled={data.org_id !== selectedOrganization.id}
-                                >
-                                  <img src="/icons/editIcon.svg" alt="Edit icon" color="secondary" />
-                                </IconButton>
+                                    onClick={() => updateAppAuthentication(data)}
+                                    disabled={data.org_id !== selectedOrganization.id}
+                                  >
+                                    <svg
+                                      width="24"
+                                      height="24"
+                                      viewBox="0 0 24 24"
+                                      fill="none"
+                                      xmlns="http://www.w3.org/2000/svg"
+                                    >
+                                      <path
+                                        d="M16.1038 4.66848C16.3158 4.45654 16.5674 4.28843 16.8443 4.17373C17.1212 4.05903 17.418 4 17.7177 4C18.0174 4 18.3142 4.05903 18.5911 4.17373C18.868 4.28843 19.1196 4.45654 19.3315 4.66848C19.5435 4.88041 19.7116 5.13201 19.8263 5.40891C19.941 5.68582 20 5.9826 20 6.28232C20 6.58204 19.941 6.87882 19.8263 7.15573C19.7116 7.43263 19.5435 7.68423 19.3315 7.89617L8.43807 18.7896L4 20L5.21038 15.5619L16.1038 4.66848Z"
+                                        stroke={themeMode=== "dark" ? "#F1F1F1" : "#333"}
+                                        strokeLinecap="round"
+                                        strokeLinejoin="round"
+                                      />
+                                    </svg>
+                                  </IconButton>
                                 {data.defined ? (
                                   <Tooltip
                                     color="primary"
@@ -1147,7 +1293,7 @@ const AppAuthTab = memo((props) => {
                                         editAuthenticationConfig(data.id);
                                       }}
                                     >
-                                      <SelectAllIcon color="secondary" />
+                                      <SelectAllIcon color="textSecondary" />
                                     </IconButton>
                                   </Tooltip>
                                 ) : (
@@ -1164,6 +1310,47 @@ const AppAuthTab = memo((props) => {
                                     </IconButton>
                                   </Tooltip>
                                 )}
+                                <Tooltip
+                                    title={"Copy Auth ID"}
+                                    style={{}}
+                                    aria-label={"copy"}
+                                  >
+                                    <IconButton
+                                      style = {{padding: "6px"}}
+                                      onClick={() => {
+                                          navigator.clipboard.writeText(data.id);
+                                          document.execCommand("copy");
+            
+                                          toast(data.id + " copied to clipboard");
+                                      }}
+                                    >
+                                      <svg
+                                        width="24"
+                                        height="24"
+                                        viewBox="0 0 24 24"
+                                        fill="none"
+                                        xmlns="http://www.w3.org/2000/svg"
+                                        >
+                                        <rect
+                                          width="24"
+                                          height="24"
+                                          fillOpacity="1"
+                                        />
+                                        <path
+                                          d="M14 4H7.6C7.17565 4 6.76869 4.16857 6.46863 4.46863C6.16857 4.76869 6 5.17565 6 5.6V18.4C6 18.8243 6.16857 19.2313 6.46863 19.5314C6.76869 19.8314 7.17565 20 7.6 20H17.2C17.6243 20 18.0313 19.8314 18.3314 19.5314C18.6314 19.2313 18.8 18.8243 18.8 18.4V8.8L14 4Z"
+                                          stroke={themeMode === "dark" ? "#F1F1F1" : "#333"}
+                                          strokeLinecap="round"
+                                          strokeLinejoin="round"
+                                        />
+                                        <path
+                                          d="M14 4V8.8H18.8"
+                                          stroke={themeMode === "dark" ? "#F1F1F1" : "#333"}
+                                          strokeLinecap="round"
+                                          strokeLinejoin="round"
+                                        />
+                                        </svg>
+                                    </IconButton>
+                                  </Tooltip>
                                 <IconButton
                                   style={{ }}
                                   disabled={data.org_id !== selectedOrganization.id}
@@ -1202,7 +1389,23 @@ const AppAuthTab = memo((props) => {
                                               style={{ }}
                                               color="secondary"
                                               onClick={() => {
-                                                  changeDistribution(data, !isDistributed)
+                                                  setShowDistributionPopup(true)
+                                                  if(data?.suborg_distribution?.length > 0){
+                                                    setSelectedSubOrg(data.suborg_distribution)
+                                                  }else{
+                                                    setSelectedSubOrg([])
+                                                  }
+                                                  setSelectedAuthId(data.id)
+                                                  if (data?.suborg_distributed) {
+                                                    const allSuborg = userdata?.orgs?.map((data, index) => {
+                                                      if (data.creator_org !== userdata.active_org.id) {
+                                                        return null;
+                                                      }
+                                                      return data.id;
+                                                    })
+                                                    setSelectedSubOrg(allSuborg.filter((data) => data !== null))
+                                                  }
+
                                               }}
                                           />
                                       </Tooltip>
@@ -1216,6 +1419,8 @@ const AppAuthTab = memo((props) => {
             {editAuthenticationModal}
             {authenticationView}
             <div style={{marginTop: 50, }}>
+
+		{/*
         <div style={{ marginTop: 150, marginBottom: 20 }}>
           <h2 style={{ color: "#FFFFFF" }}>App Authentication Groups</h2>
           <span style={{ marginLeft: 0 }}>
@@ -1414,13 +1619,14 @@ const AppAuthTab = memo((props) => {
               );
             }
           )}
-          </List>
-          </div>
-        
-        </div>
-      </div> 
-            </div>
-        </div>
+          		</List>
+			  </div>
+			
+			</div>
+			*/}
+		  </div> 
+		</div>
+	  </div>
     );
 });
 
@@ -1432,6 +1638,9 @@ const SearchBox = ({ currentRefinement, refine, isSearchStalled, searchQuery, se
     refine(searchQuery.trim());
   };
 
+  const { themeMode, supportEmail } = useContext(Context);
+  const theme = getTheme(themeMode);
+
   return (
     <form noValidate action="" role="search">
       <TextField
@@ -1445,7 +1654,7 @@ const SearchBox = ({ currentRefinement, refine, isSearchStalled, searchQuery, se
         }}
         InputProps={{
           style: {
-            color: "white",
+            color: theme.palette.textFieldStyle.color,
             fontSize: "1em",
             height: 50,
             borderRadius: 4,
@@ -1461,7 +1670,7 @@ const SearchBox = ({ currentRefinement, refine, isSearchStalled, searchQuery, se
               {searchQuery?.length > 0 && (
                 <ClearIcon
                   style={{
-                    color: "white",
+                    color: theme.palette.textColor,
                     cursor: "pointer",
                     marginRight: 10
                   }}
@@ -1478,7 +1687,7 @@ const SearchBox = ({ currentRefinement, refine, isSearchStalled, searchQuery, se
                 style={{
                   backgroundImage:
                     "linear-gradient(to right, rgb(248, 106, 62), rgb(243, 64, 121))",
-                  color: "white",
+                  color: theme.palette.textColor,
                   border: "none",
                   padding: "10px 20px",
                   width: 100,
@@ -1516,8 +1725,6 @@ const SearchBox = ({ currentRefinement, refine, isSearchStalled, searchQuery, se
 
 const Hits = ({
   hits,
-  insights,
-  setIsAnyAppActivated,
   searchQuery,
   isCloud,
   globalUrl,
@@ -1541,6 +1748,8 @@ const Hits = ({
     }
   )
   const navigate = useNavigate();
+  const { themeMode, supportEmail } = useContext(Context);
+  const theme = getTheme(themeMode);
 
   const normalizedString = (name) => {
     if (typeof name === 'string') {
@@ -1725,7 +1934,7 @@ const Hits = ({
     })
       .then((response) => {
         if (response.status !== 200) {
-          toast.error("Failed to get app data or App doesn't. Please contact support@shuffler.io");
+          toast.error(`Failed to get app data or App doesn't. Please contact ${supportEmail}`);
           return;
         }
         return response.json();
@@ -1943,7 +2152,7 @@ const Hits = ({
     return (
       <div>
         <DialogTitle id="draggable-dialog-title" style={{ cursor: "move", }}>
-          <div style={{ color: "white" }}>
+          <div style={{ color: theme.palette.textColor }}>
             Authentication for {selectedApp.name.replaceAll("_", " ", -1)}
           </div>
         </DialogTitle>
@@ -2013,7 +2222,7 @@ const Hits = ({
                     }}
                     style={{
                       backgroundColor: theme.palette.surfaceColor,
-                      color: "white",
+                      color: theme.palette.textColor,
                       height: 50,
                     }}
                   >
@@ -2021,7 +2230,7 @@ const Hits = ({
                       key={"false"}
                       style={{
                         backgroundColor: theme.palette.inputColor,
-                        color: "white",
+                        color: theme.palette.textColor,
                       }}
                       value={"false"}
                     >
@@ -2031,7 +2240,7 @@ const Hits = ({
                       key={"true"}
                       style={{
                         backgroundColor: theme.palette.inputColor,
-                        color: "white",
+                        color: theme.palette.textColor,
                       }}
                       value={"true"}
                     >
@@ -2110,7 +2319,7 @@ const Hits = ({
       PaperProps={{
         style: {
           pointerEvents: "auto",
-          color: "white",
+          color: theme.palette.textColor,
           minWidth: 1100,
           minHeight: 700,
           maxHeight: 700,
@@ -2392,7 +2601,7 @@ const Hits = ({
                 href={selectedMeta.link}
                 style={{ textDecoration: "none", color: "#f85a3e" }}
               >
-                <Button style={{ color: "white", }} variant="outlined" color="secondary">
+                <Button style={{ color: theme.palette.textColor, }} variant="outlined" color="secondary">
                   <EditIcon /> &nbsp;&nbsp;Edit
                 </Button>
               </a>
@@ -2403,7 +2612,7 @@ const Hits = ({
               style={{
                 height: "100%",
                 width: 1,
-                backgroundColor: "white",
+                backgroundColor: theme.palette.textColor,
                 marginLeft: 50,
                 marginRight: 50,
               }}
@@ -2498,7 +2707,7 @@ const Hits = ({
               height: 480,
               overflowY: "auto",
               scrollbarWidth: "thin",
-              scrollbarColor: "#494949 #2f2f2f",
+              scrollbarColor: theme.palette.scrollbarColor,
               width: "100%",
             }}
           >
@@ -2529,7 +2738,7 @@ const Hits = ({
                         elevation={0}
                         style={{
                           ...paperStyle,
-                          backgroundColor: mouseHoverIndex === index ? "#2F2F2F" : "rgba(26, 26, 26, 1)",
+                          backgroundColor: mouseHoverIndex === index ? theme.palette.cardHoverColor : theme.palette.cardBackgroundColor,
                           width: "100%",
                         }}
                         onMouseEnter={() => setMouseHoverIndex(index)}
@@ -2588,7 +2797,7 @@ const Hits = ({
                                 gap: 8,
                                 textOverflow: "ellipsis",
                                 whiteSpace: "nowrap",
-                                color: "#F1F1F1",
+                                color: theme.palette.textColor,
                               }}
                             >
                               {normalizedString(data.name)}
@@ -2631,7 +2840,7 @@ const Hits = ({
                                     ))}
                                   </div>
                               </div>
-                              	<Button style={{position: 'relative', borderRadius: 6, bottom: 10, marginRight: 10, fontSize: 16, backgroundColor: '#ff8544', color: "#1a1a1a", textTransform:'none', marginLeft: 'auto'}} onClick={(e)=> {e.preventDefault();e.stopPropagation();handleAppAuthenticationNew(data)()}}>
+                              	<Button variant='contained' color='primary' style={{position: 'relative', borderRadius: 6, bottom: 10, marginRight: 10, fontSize: 16, textTransform:'none', marginLeft: 'auto'}} onClick={(e)=> {e.preventDefault();e.stopPropagation();handleAppAuthenticationNew(data)()}}>
 				  					Authenticate app
 				  				</Button>
                             </div>
diff --git a/frontend/src/components/AppCreationModal.jsx b/frontend/src/components/AppCreationModal.jsx
index f5a25169..28dea461 100644
--- a/frontend/src/components/AppCreationModal.jsx
+++ b/frontend/src/components/AppCreationModal.jsx
@@ -22,7 +22,6 @@ import CreateIcon from '@mui/icons-material/Create'
 import { toast } from 'react-toastify'
 import YAML from "yaml";
 
-
 const AppCreationModal = ({ open, onClose, theme, globalUrl, isCloud }) => {
     const [openApiModal, setOpenApiModal] = useState(false)
     const [generateAppModal, setGenerateAppModal] = useState(false)
@@ -43,9 +42,8 @@ const AppCreationModal = ({ open, onClose, theme, globalUrl, isCloud }) => {
 
         const parsedStyle = {
             flex: 1,
-            padding: 20,
+            padding: "30px 20px 20px",
             margin: 12,
-            paddingTop: 30,
             backgroundColor: hover && !makeFancy ? theme.palette.surfaceColor : "transparent",
             cursor: hover ? "pointer" : "default",
             textAlign: "center",
@@ -59,6 +57,7 @@ const AppCreationModal = ({ open, onClose, theme, globalUrl, isCloud }) => {
                     : "1px solid rgba(255,255,255,0.3)",
             borderImage: makeFancy ? "linear-gradient(to right, #ff8544 0%, #ec517c 50%, #9c5af2 100%) 1" : "none",
             transition: 'all 0.2s ease-in-out',
+			paddingBottom: isCloud ? 0 : 175, 
         }
 
         return (
@@ -256,26 +255,27 @@ const AppCreationModal = ({ open, onClose, theme, globalUrl, isCloud }) => {
             body: openApidata,
             credentials: "include",
         })
-            .then((response) => {
+		.then((response) => {
 
-                setValidation(false);
-                return response.json();
-            })
-            .then((responseJson) => {
-                if (responseJson.success) {
-                    setAppValidation(responseJson.id);
-                } else {
-                    if (responseJson.reason !== undefined) {
-                        setOpenApiError(responseJson.reason);
-                    }
-                    toast("An error occurred in the response");
-                }
-            })
-            .catch((error) => {
-                setValidation(false);
-                toast(error.toString());
-                setOpenApiError(error.toString());
-            });
+			setValidation(false);
+			return response.json();
+		})
+		.then((responseJson) => {
+			if (responseJson?.success === true) {
+				setAppValidation(responseJson?.id)
+				navigate(`/apps/new?id=${responseJson?.id}`)
+			} else {
+				if (responseJson.reason !== undefined) {
+					setOpenApiError(responseJson.reason)
+				}
+				toast("An error occurred in the response");
+			}
+		})
+		.catch((error) => {
+			setValidation(false);
+			toast(error.toString());
+			setOpenApiError(error.toString());
+		});
     };
 
     const redirectOpenApi = () => {
@@ -345,23 +345,23 @@ const AppCreationModal = ({ open, onClose, theme, globalUrl, isCloud }) => {
     // Common dialog styles
     const dialogStyle = {
         borderRadius: 2,
-        border: "1px solid #494949",
+        border: theme.palette.DialogStyle.border,
         minWidth: '500px',
         fontFamily: theme?.typography?.fontFamily,
-        backgroundColor: "#1A1A1A",
+        backgroundColor: theme.palette.DialogStyle.backgroundColor,
         zIndex: 1000,
         '& .MuiDialogContent-root': {
-            backgroundColor: "#1A1A1A",
+            backgroundColor: theme.palette.DialogStyle.backgroundColor,
             padding: '24px',
             fontFamily: theme?.typography?.fontFamily,
         },
         '& .MuiDialogTitle-root': {
-            backgroundColor: "#1A1A1A",
+            backgroundColor: theme.palette.DialogStyle.backgroundColor,
             padding: '24px',
             fontFamily: theme?.typography?.fontFamily,
         },
         '& .MuiDialogActions-root': {
-            backgroundColor: "#1A1A1A",
+            backgroundColor: theme.palette.DialogStyle.backgroundColor,
             padding: '16px 24px',
             fontFamily: theme?.typography?.fontFamily,
         },
@@ -396,7 +396,7 @@ const AppCreationModal = ({ open, onClose, theme, globalUrl, isCloud }) => {
                     pl: 4,
                     pr: 3,
                 }}>
-                    <Typography variant="h5" sx={{ fontWeight: 500, color: "#F1F1F1" }}>
+                    <Typography variant="h5"color="textPrimary" sx={{ fontWeight: 500, }}>
                         Create New App
                     </Typography>
                     <IconButton
@@ -408,15 +408,15 @@ const AppCreationModal = ({ open, onClose, theme, globalUrl, isCloud }) => {
                             onClose()
                         }}
                         sx={{
-                            color: 'rgba(255, 255, 255, 0.7)',
-                            '&:hover': { bgcolor: 'rgba(255, 255, 255, 0.1)' }
+                            color: theme.palette.text.primary,
+                            '&:hover': { bgcolor: theme.palette.hoverColor },
                         }}
                     >
                         <CloseIcon />
                     </IconButton>
                 </DialogTitle>
                 <DialogContent sx={{ p: 3 }}>
-                    <div style={{ display: "flex", gap: '16px' }}>
+                    <div style={{ display: "flex", gap: 16, }}>
                         <AppCreateButton
                             text="Upload OpenAPI or Swagger"
                             func={() => {
@@ -476,7 +476,7 @@ const AppCreationModal = ({ open, onClose, theme, globalUrl, isCloud }) => {
                     px: 4,
                 }}>
                     <Typography variant="h6" sx={{
-                        color: '#F1F1F1',
+                        color: theme.palette.text.primary,
                         fontWeight: 500,
                         fontFamily: theme?.typography?.fontFamily
                     }}>
@@ -501,7 +501,7 @@ const AppCreationModal = ({ open, onClose, theme, globalUrl, isCloud }) => {
                 </DialogTitle>
                 <DialogContent sx={{ px: 4, py: 3 }}>
                     <div style={{ display: "flex", fontSize: '14px', gap: '5px', alignItems: 'center', marginBottom: '10px', fontFamily: theme?.typography?.fontFamily, marginTop: '15px' }}>
-                        <Typography sx={{ color: 'rgba(255,255,255,0.85)', fontSize: '16px' }}>
+                        <Typography sx={{ color: theme.palette.text.primary, fontSize: '16px' }}>
                             Paste in the URI for the OpenAPI or find out
                         </Typography>
                         <Link style={{
@@ -582,6 +582,7 @@ const AppCreationModal = ({ open, onClose, theme, globalUrl, isCloud }) => {
                             py: 1,
                             '&:hover': {
                                 borderColor: '#FF8544',
+                                color: '#FF8544',
                                 bgcolor: 'rgba(255,133,68,0.1)'
                             },
                             textTransform: 'none',
@@ -664,7 +665,7 @@ const AppCreationModal = ({ open, onClose, theme, globalUrl, isCloud }) => {
                     px: 4,
                 }}>
                     <Typography variant="h6" sx={{
-                        color: '#F1F1F1',
+                        color: theme.palette.text.primary,
                         fontWeight: 500,
                         fontFamily: theme?.typography?.fontFamily,
                     }}>
@@ -680,8 +681,8 @@ const AppCreationModal = ({ open, onClose, theme, globalUrl, isCloud }) => {
                             setValidation(false)
                         }}
                         sx={{
-                            color: 'rgba(255,255,255,0.7)',
-                            '&:hover': { bgcolor: 'rgba(255,255,255,0.1)' }
+                            color: theme.palette.text.primary,
+                            '&:hover': { bgcolor: theme.palette.hoverColor }
                         }}
                     >
                         <CloseIcon />
@@ -689,7 +690,7 @@ const AppCreationModal = ({ open, onClose, theme, globalUrl, isCloud }) => {
                 </DialogTitle>
                 <DialogContent sx={{ px: 4, py: 3, pt: 0 }}>
                     <Typography sx={{
-                        color: 'rgba(255,255,255,0.85)',
+                        color: theme.palette.text.primary,
                         mb: 2,
                         fontSize: '14px',
                         mt: 2,
@@ -705,10 +706,10 @@ const AppCreationModal = ({ open, onClose, theme, globalUrl, isCloud }) => {
                             variant="outlined"
                             placeholder="API Documentation URL"
                             sx={{
-                                bgcolor: theme.palette.platformColor,
+                                bgcolor: theme.palette.textFieldStyle.backgroundColor,
                                 '& .MuiOutlinedInput-root': {
                                     height: '40px',
-                                    color: 'white',
+                                    color: theme.palette.text.primary,
                                     '& fieldset': {
                                         borderWidth: '1px',
                                         borderImage: "linear-gradient(to right, #ff8544 0%, #ec517c 50%, #9c5af2 100%) 1",
@@ -756,7 +757,7 @@ const AppCreationModal = ({ open, onClose, theme, globalUrl, isCloud }) => {
                     {circularLoader}
                     {
                         !validation &&
-                        <Typography sx={{ color: '#c5c5c5', fontSize: '14px', fontFamily: theme?.typography?.fontFamily, }}>
+                        <Typography color="textSecondary" sx={{ fontSize: '14px', fontFamily: theme?.typography?.fontFamily, }}>
                             This may take multiple minutes based on the size of the documentation.
                         </Typography>
                     }
diff --git a/frontend/src/components/AppFramework.jsx b/frontend/src/components/AppFramework.jsx
index c65cf1cf..d6fc1f42 100644
--- a/frontend/src/components/AppFramework.jsx
+++ b/frontend/src/components/AppFramework.jsx
@@ -198,7 +198,7 @@ export const findSpecificApp = (framework, inputcategory) => {
 		  id: "",
 	  } 
   } else {
-	  console.log("findSpecificApp: unknown category: ", category)
+	  //console.log("findSpecificApp: unknown category: ", category)
   }
 
   return null
diff --git a/frontend/src/components/AppGrid.jsx b/frontend/src/components/AppGrid.jsx
index 8a5d9a18..e647085b 100644
--- a/frontend/src/components/AppGrid.jsx
+++ b/frontend/src/components/AppGrid.jsx
@@ -53,7 +53,7 @@ import {
 
 const searchClient = algoliasearch(
   "JNSS5CFDZZ",
-  "db08e40265e2941b9a7d8f644b6e5240"
+  "c8f882473ff42d41158430be09ec2b4e"
 );
 //const searchClient = algoliasearch("L55H18ZINA", "a19be455e7e75ee8f20a93d26b9fc6d6")
 
diff --git a/frontend/src/components/AppModal.jsx b/frontend/src/components/AppModal.jsx
index c3deb1ae..38c8581f 100644
--- a/frontend/src/components/AppModal.jsx
+++ b/frontend/src/components/AppModal.jsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { memo, useCallback, useEffect, useState, useContext } from 'react';
 import { useNavigate } from 'react-router';
 
 import {
@@ -25,12 +25,20 @@ import LaunchIcon from '@mui/icons-material/Launch';
 import CheckCircleIcon from '@mui/icons-material/CheckCircle';
 import { CloudDownloadOutlined, Delete } from '@mui/icons-material';
 import { findSpecificApp } from '../components/AppFramework.jsx';
-import theme from "../theme.jsx";
+import {getTheme} from "../theme.jsx";
 import YAML from 'yaml';
 import { toast } from 'react-toastify';
 import { Link } from 'react-router-dom';
+import { InstantSearch, connectHits, connectSearchBox } from 'react-instantsearch-dom';
+import algoliasearch from "algoliasearch/lite";
+import { Context } from '../context/ContextApi.jsx';
 
-const AppModal = ({ open, onClose, app, globalUrl, getApps }) => {
+const searchClient = algoliasearch(
+  "JNSS5CFDZZ",
+  "c8f882473ff42d41158430be09ec2b4e"
+);;
+
+const AppModal = ({ open, onClose, app, globalUrl, getApps}) => {
 
   const [frameworkData, setFrameworkData] = useState({})
   const [userdata, setUserdata] = useState({})
@@ -44,6 +52,9 @@ const AppModal = ({ open, onClose, app, globalUrl, getApps }) => {
   const [deleteModalOpen, setDeleteModalOpen] = useState(false)
   const [sharingConfiguration, setSharingConfiguration] = React.useState("you");
   const navigate = useNavigate();
+  const {themeMode} = useContext(Context);
+  const theme = getTheme(themeMode);
+
   const parseUsecase = (subcase) => {
     const srcdata = findSpecificApp(frameworkData, subcase.type)
     const dstdata = findSpecificApp(frameworkData, subcase.last)
@@ -79,8 +90,7 @@ const AppModal = ({ open, onClose, app, globalUrl, getApps }) => {
       });
   }, [app]);
 
-
-  const getFramework = () => {
+    const getFramework = () => {
     fetch(globalUrl + "/api/v1/apps/frameworkConfiguration", {
       method: "GET",
       headers: {
@@ -295,8 +305,6 @@ const AppModal = ({ open, onClose, app, globalUrl, getApps }) => {
       })
   }
 
-
-
   useEffect(() => {
     setUsecaseLoading(true)
     getAvailableWorkflows()
@@ -329,6 +337,7 @@ const AppModal = ({ open, onClose, app, globalUrl, getApps }) => {
               //delete apps from local storage
               localStorage.removeItem("apps");
               getApps();
+              onClose();
             }, 1000);
           } else {
             toast("Failed deleting app. Does it still exist?");
@@ -511,12 +520,12 @@ const AppModal = ({ open, onClose, app, globalUrl, getApps }) => {
           border: "1px solid #494949",
           minWidth: '440px',
           fontFamily: theme?.typography?.fontFamily,
-          backgroundColor: "#212121",
+          backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
           '& .MuiDialogContent-root': {
-            backgroundColor: "#212121",
+            backgroundColor: theme.palette.DialogStyle.backgroundColor,
           },
           '& .MuiDialogTitle-root': {
-            backgroundColor: "#212121",
+            backgroundColor: theme.palette.DialogStyle.backgroundColor,
           },
           '& .MuiTypography-root': {
             fontFamily: theme?.typography?.fontFamily,
@@ -548,7 +557,7 @@ const AppModal = ({ open, onClose, app, globalUrl, getApps }) => {
         <IconButton
           onClick={onClose}
           sx={{
-            color: 'rgba(255, 255, 255, 0.7)',
+            color: theme.palette.textColor,
             '&:hover': { bgcolor: 'rgba(255, 255, 255, 0.1)' }
           }}
 	  	  style={{
@@ -628,16 +637,14 @@ const AppModal = ({ open, onClose, app, globalUrl, getApps }) => {
               >
                 <Button
                   variant="contained"
+                  color="secondary"
                   sx={{
-                    bgcolor: '#494949',
-                    '&:hover': { bgcolor: '#494949' },
                     textTransform: 'none',
                     borderRadius: 1,
                     minWidth: '45px',
                     width: '45px',
                     height: '40px',
                     padding: 2,
-                    color: "#fff",
                     fontFamily: theme?.typography?.fontFamily
                   }}
                   onClick={(event) => {
@@ -653,19 +660,16 @@ const AppModal = ({ open, onClose, app, globalUrl, getApps }) => {
             {(userdata?.id === app?.owner)? (
               <Tooltip title={"Delete app (confirm box will show)"}> 
               <Button
-                variant="outlined"
+                variant="contained"
                 component="label"
-                color="primary"
+                color="secondary"
                 sx={{
-                  bgcolor: '#494949',
-                  '&:hover': { bgcolor: '#494949', border: 'none' },
                   textTransform: 'none',
                   borderRadius: 1,
                   minWidth: '45px',
                   width: '45px',
                   height: '40px',
                   padding: 2,
-                  color: "#fff",
                   fontFamily: theme?.typography?.fontFamily,
                   border: 'none'
                 }}
@@ -682,15 +686,13 @@ const AppModal = ({ open, onClose, app, globalUrl, getApps }) => {
             {(canEditApp && app?.generated) && (
             <Button
               variant="contained"
+              color="secondary"
               sx={{
-                bgcolor: "#494949",
-                '&:hover': { bgcolor: '#494949' },
                 textTransform: 'none',
                 borderRadius: 1,
                 py: 1,
                 px: 3,
                 height: '40px',
-                color: "#fff",
                 fontFamily: theme?.typography?.fontFamily
               }}
               startIcon={canEditApp ? <EditIcon /> : <ForkRightIcon />}
@@ -720,22 +722,11 @@ const AppModal = ({ open, onClose, app, globalUrl, getApps }) => {
             textAlign: "start",
             flex: 1,
           }}>
-            <Typography
-              variant="h6"
-              sx={{
-                fontFamily: theme?.typography?.fontFamily,
-                fontSize: '24px',
-                fontWeight: 600,
-                mb: 0.3,
-                color: '#fff'
-              }}
-            >
-              20
-            </Typography>
+            <WorkflowCard app={app}/>
             <Typography
               variant="body2"
               sx={{
-                color: 'rgba(255, 255, 255, 0.7)',
+                color: theme.palette.textColor,
                 fontFamily: theme?.typography?.fontFamily,
                 fontSize: '14px'
               }}
@@ -746,7 +737,7 @@ const AppModal = ({ open, onClose, app, globalUrl, getApps }) => {
           <div style={{
             flex: 1,
             textAlign: "start",
-            borderLeft: "1px solid rgba(255, 255, 255, 0.12)",
+            borderLeft: theme.palette.defaultBorder,
             paddingLeft: "10px",
             height: "100%",
           }}>
@@ -758,7 +749,7 @@ const AppModal = ({ open, onClose, app, globalUrl, getApps }) => {
               }}>
               {Array.isArray(app?.actions) ? app.actions.length : app?.actions}
             </Typography>
-            <Typography variant="body2" sx={{ color: 'rgba(255, 255, 255, 0.7)' }}>
+            <Typography variant="body2" sx={{ color: theme.palette.textColor }}>
               Actions
             </Typography>
           </div>
@@ -768,14 +759,14 @@ const AppModal = ({ open, onClose, app, globalUrl, getApps }) => {
             paddingLeft: "10px",
             paddingTop: "5px"
           }}>
-            <div style={{ display: 'flex', alignItems: 'center', gap: '4px', marginBottom: "5px", fontFamily: theme?.typography?.fontFamily, fontSize: "14px", fontWeight: 600, color: 'white' }}>
+            <div style={{ display: 'flex', alignItems: 'center', gap: '4px', marginBottom: "5px", fontFamily: theme?.typography?.fontFamily, fontSize: "14px", fontWeight: 600, color: theme.palette.text.primary }}>
               {
                 app?.collection ? (
                   <>
                     <CheckCircleIcon sx={{ color: '#4CAF50' }} />
                     <Typography variant="body1" sx={{
                       fontWeight: 500,
-                      color: '#fff',
+                      color: theme.palette.textColor,
                       marginTop: "1px",
                       fontFamily: theme?.typography?.fontFamily,
                       fontSize: "16px"
@@ -789,7 +780,7 @@ const AppModal = ({ open, onClose, app, globalUrl, getApps }) => {
                     fontSize: "16px",
                     fontWeight: 500,
                     marginTop: "1px",
-                    color: 'rgba(255, 255, 255, 0.7)',
+                    color: theme.palette.textColor,
                     fontFamily: theme?.typography?.fontFamily
                   }}>
                     No collection yet
@@ -838,7 +829,7 @@ const AppModal = ({ open, onClose, app, globalUrl, getApps }) => {
           )}
 
           <Box sx={{
-            bgcolor: '#2F2F2F',
+            bgcolor: themeMode === "dark" ? "#1E1E1E" : "#F5F5F5",
             p: 2,
             borderRadius: 2,
             display: 'flex',
@@ -901,16 +892,14 @@ const AppModal = ({ open, onClose, app, globalUrl, getApps }) => {
         <div style={{ display: "flex", justifyContent: "center", fontFamily: theme?.typography?.fontFamily }}>
           <Button
             variant="contained"
+            color="primary"
             sx={{
-              bgcolor: '#FF8544',
-              '&:hover': { bgcolor: '#FF8544' },
               textTransform: 'none',
               borderRadius: "4px",
               py: 1,
               px: 7,
               fontSize: "14px",
               letterSpacing: "0.5px",
-              color: "black",
               fontFamily: theme?.typography?.fontFamily,
               minWidth: '200px'
             }}
@@ -930,3 +919,55 @@ const AppModal = ({ open, onClose, app, globalUrl, getApps }) => {
 };
 
 export default AppModal;
+
+
+const WorkflowCard = memo(({ app }) => {
+  const [name, setName] = useState("");
+  const [relatedWorkflows, setRelatedWorkflows] = useState(0);
+
+  const WorkflowHits = ({ hits }) => {
+    useEffect(() => {
+      setRelatedWorkflows(hits?.length || 0);
+    }, [hits]);
+
+    return null;
+  };
+
+  const CustomWorkflowHits = connectHits(WorkflowHits);
+
+  const SearchBox = ({ refine, currentRefinement }) => {
+    useEffect(() => {
+      if (name.length > 0 && currentRefinement !== name) {
+        refine(name?.split(" ")[0]);
+      }
+    }, [name, refine, currentRefinement]);
+
+    return null;
+  };
+
+  const CustomSearchBox = connectSearchBox(SearchBox);
+
+  useEffect(() => {
+    if (app?.name && app.name.trim().length > 0 && name !== app.name) {
+      const formattedName = app.name
+        .charAt(0)
+        .toUpperCase() + app.name.substring(1)
+        .replaceAll("_", " ");
+      setName(formattedName);
+    }
+  }, [app?.name]);
+
+  return (
+    <Typography variant="h4">
+      {name.length > 0 ? (
+        <InstantSearch key={name} searchClient={searchClient} indexName="workflows">
+          <CustomSearchBox defaultRefinement={name?.split(" ")[0]}/>
+          <CustomWorkflowHits />
+          {relatedWorkflows}
+        </InstantSearch>
+      ) : (
+        relatedWorkflows
+      )}
+    </Typography>
+  );
+});
diff --git a/frontend/src/components/AppSearch1.jsx b/frontend/src/components/AppSearch1.jsx
index 3947f640..449ad925 100644
--- a/frontend/src/components/AppSearch1.jsx
+++ b/frontend/src/components/AppSearch1.jsx
@@ -13,7 +13,7 @@ import {
     InputAdornment,
     Typography,
 } from '@mui/material';
-const searchClient = algoliasearch("JNSS5CFDZZ", "db08e40265e2941b9a7d8f644b6e5240")
+const searchClient = algoliasearch("JNSS5CFDZZ", "c8f882473ff42d41158430be09ec2b4e")
 const Appsearch = props => {
     const { maxRows, showName, showSuggestion, isMobile, globalUrl, parsedXs, newSelectedApp, setNewSelectedApp, defaultSearch, showSearch, ConfiguredHits, userdata, cy, isCreatorPage, actionImageList, setActionImageList, setUserSpecialzedApp, placeholder,
 
diff --git a/frontend/src/components/AppSearchButtons.jsx b/frontend/src/components/AppSearchButtons.jsx
index 81274ee0..6cfd1404 100644
--- a/frontend/src/components/AppSearchButtons.jsx
+++ b/frontend/src/components/AppSearchButtons.jsx
@@ -1,5 +1,5 @@
-import React, { useState, useEffect, useRef } from "react";
-import theme from '../theme.jsx';
+import React, { useState, useEffect, useRef, useContext } from "react";
+import {getTheme} from '../theme.jsx';
 import ReactGA from 'react-ga4';
 import { useNavigate, Link } from 'react-router-dom';
 import { isMobile } from 'react-device-detect';
@@ -36,9 +36,12 @@ import {
     IconButton,
 } from '@mui/material';
 
+import { Context } from "../context/ContextApi.jsx";
+
 const AppSearchButtons = (props) => {
     const { userdata, globalUrl, appFramework, moreButton, finishedApps, appType, totalApps, index, onNodeSelect, setDiscoveryData, appName, AppImage, setDefaultSearch, discoveryData, checkLogin, setMissing, getAppFramework, } = props
-
+    const { themeMode } = useContext(Context);
+    const theme = getTheme(themeMode);
     const ref = useRef()
     let navigate = useNavigate();
 
@@ -88,7 +91,7 @@ const AppSearchButtons = (props) => {
 
     const foundApp = findSpecificApp(appFramework, appType)
     if (foundApp === undefined || foundApp === null) {
-        console.log("AppSearchButtons: App not found in appFramework: " + appType)
+        //console.log("AppSearchButtons: App not found in appFramework: " + appType)
         return null
     }
 
@@ -195,13 +198,13 @@ const AppSearchButtons = (props) => {
                         zIndex: 100,
                         borderRadius: 6,
                         border: "1px solid var(--Container-Stroke, #494949)",
-                        background: "var(--Container, #212121)",
+                        background: theme.palette.platformColor,
                         boxShadow: "8px 8px 32px 24px rgba(0, 0, 0, 0.16)",
                     }}
                 >
                     <div style={{ display: "flex" }}>
                         <div style={{ display: "flex", textAlign: "center", textTransform: "capitalize" }}>
-                            <Typography style={{ padding: 16, color: "#FFFFFF", textTransform: "capitalize" }}> {discoveryData} </Typography>
+                            <Typography color="textPrimary" style={{ padding: 16, textTransform: "capitalize" }}> {discoveryData} </Typography>
                         </div>
                         <div style={{ display: "flex" }}>
                             <Tooltip
@@ -288,17 +291,17 @@ const AppSearchButtons = (props) => {
                 </div>
             ) : null}
             <div style={{
-                display: "flex", height: 70, border: isHover ? "1px solid #f85a3e" : "var(--Container, #212121)", borderRadius: 8, background: isHover ? "var(--Container, #212121)" : "var(--Container, #212121)",
+                display: "flex", height: 70, border: isHover ? "1px solid #f85a3e" : "var(--Container, #212121)", borderRadius: 4, background: isHover ? "var(--Container, #212121)" : "var(--Container, #212121)",
                 alignItems: "center", justifyContent: "center",
             }}
             >
                 <Button
                     fullWidth
-                    color="secondary"
                     style={{
                         height: "100%",
                         width: "100%",
-                        display: "grid"
+                        display: "grid",
+                        backgroundColor: themeMode === "dark" ? "#212121" : "#F5F5F5",
                     }}
                     onClick={(event) => {
                         if (onNodeSelect !== undefined) {
diff --git a/frontend/src/components/AppStats.jsx b/frontend/src/components/AppStats.jsx
index d23d0833..ec873283 100644
--- a/frontend/src/components/AppStats.jsx
+++ b/frontend/src/components/AppStats.jsx
@@ -1,7 +1,7 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useContext } from 'react';
 
 import classNames from "classnames";
-import theme from '../theme.jsx';
+import {getTheme} from '../theme.jsx';
 
 import {
 	Tooltip,
@@ -14,6 +14,7 @@ import {
 	Chip,
 	Checkbox,
 } from "@mui/material";
+import { Context } from '../context/ContextApi.jsx';
 
 import { 
 	BarChart,
@@ -73,6 +74,8 @@ const inputdata = {
 
 const LineChartWrapper = ({keys, inputname, height, width}) => {
   const [hovered, setHovered] = useState("");
+  const {themeMode} = useContext(Context);
+	const theme = getTheme(themeMode)
 
 	//console.log("Date: ", new Date("2019-11-14T08:00:00.000Z"))
 	//var inputdata = keys.data
@@ -166,6 +169,8 @@ const AppStats = (defaultprops) => {
   const [searches, setSearches] = useState([]);
   const [clickData, setClickData] = useState(undefined);
   const [conversionData, setConversionData] = useState(undefined);
+  const {themeMode} = useContext(Context);
+	const theme = getTheme(themeMode)
 
 	const handleDataSetting = (inputdata, grouping) => {
 		var newlist = [] 
@@ -292,7 +297,7 @@ const AppStats = (defaultprops) => {
 		textAlign: "center", 
 		padding: 40, 
 		margin: 5, 
-		backgroundColor: theme.palette.inputColor,
+		backgroundColor: theme.palette.surfaceColor,
 	}
 
 	console.log("Widget: ", widgetData)
diff --git a/frontend/src/components/Appsearch.jsx b/frontend/src/components/Appsearch.jsx
index 732a8a18..8fbb7e38 100644
--- a/frontend/src/components/Appsearch.jsx
+++ b/frontend/src/components/Appsearch.jsx
@@ -1,10 +1,10 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useContext } from 'react';
 import ReactGA from 'react-ga4';
-import theme from '../theme.jsx';
+import {getTheme} from '../theme.jsx';
 import {Link} from 'react-router-dom';
 import { Search as SearchIcon, CloudQueue as CloudQueueIcon, Code as CodeIcon } from '@mui/icons-material';
 import { toast } from 'react-toastify';
-
+import { Context } from '../context/ContextApi.jsx';
 //import algoliasearch from 'algoliasearch/lite';
 import algoliasearch from 'algoliasearch';
 import { InstantSearch, connectSearchBox, connectHits } from 'react-instantsearch-dom';
@@ -20,10 +20,11 @@ import {
 } from '@mui/material';
 
 import aa from 'search-insights'
-const searchClient = algoliasearch("JNSS5CFDZZ", "db08e40265e2941b9a7d8f644b6e5240")
+const searchClient = algoliasearch("JNSS5CFDZZ", "c8f882473ff42d41158430be09ec2b4e")
 const Appsearch = props => {
 	const { maxRows, showName, showSuggestion, isMobile, globalUrl, parsedXs, newSelectedApp, setNewSelectedApp, defaultSearch, showSearch, ConfiguredHits, userdata, cy, isCreatorPage, actionImageList, setActionImageList, setUserSpecialzedApp }  = props
-
+	const { themeMode } = useContext(Context)
+	const theme = getTheme(themeMode)
     const isCloud = (window.location.host === "localhost:3002" || window.location.host === "shuffler.io") ? true : (process.env.IS_SSR === "true");
 	const rowHandler = maxRows === undefined || maxRows === null ? 50 : maxRows
 	const xs = parsedXs === undefined || parsedXs === null ? 12 : parsedXs
@@ -54,10 +55,10 @@ const Appsearch = props => {
 					autoComplete="off"
 					autocomplete="off"
 					fullWidth
-					style={{backgroundColor: "#2F2F2F", borderRadius: borderRadius, width: "100%",}} 
+					style={{backgroundColor: theme.palette.textFieldStyle.backgroundColor, borderRadius: borderRadius, width: "100%",}} 
 					InputProps={{
 						style:{
-							color: "white",
+							color: theme.palette.textFieldStyle.color,
 							fontSize: "1em",
 							height: 50,
 						},
@@ -93,7 +94,7 @@ const Appsearch = props => {
 			<Grid container spacing={0} style={{border: "1px solid rgba(255,255,255,0.2)", maxHeight: 250, minHeight: 250, overflowY: "auto", overflowX: "hidden", }}>
 				{hits.map((data, index) => {
 					const paperStyle = {
-						backgroundColor: index === mouseHoverIndex ? "rgba(255,255,255,0.8)" : "#2F2F2F",
+						backgroundColor: index === mouseHoverIndex ? theme.palette.hoverColor : theme.palette.textFieldStyle.backgroundColor,
 						color: index === mouseHoverIndex ? theme.palette.inputColor : "rgba(255,255,255,0.8)", 
 						// border: newSelectedApp.objectID !== data.objectID ? `1px solid rgba(255,255,255,0.2)` : "2px solid #f86a3e", 
 						textAlign: "left",
diff --git a/frontend/src/components/Billing.jsx b/frontend/src/components/Billing.jsx
index 577d249c..0b9daa6f 100644
--- a/frontend/src/components/Billing.jsx
+++ b/frontend/src/components/Billing.jsx
@@ -1,8 +1,8 @@
-import React, { useState, useEffect, useContext, memo, useMemo } from "react";
+import React, { useState, useEffect, memo, useMemo, useContext } from "react";
 import ReactGA from 'react-ga4';
-
-import theme from "../theme.jsx";
+import { getTheme } from "../theme.jsx";
 import countries from "../components/Countries.jsx";
+
 import {
 	Box,
 	Paper,
@@ -26,7 +26,10 @@ import {
 	DialogContentText,
 	DialogActions,
 	LinearProgress,
-	Slider
+	Slider,
+	Tabs,
+	Tab,
+	CircularProgress,
 } from "@mui/material";
 
 import { useNavigate, Link, json } from "react-router-dom";
@@ -43,20 +46,27 @@ import {
 	Cloud,
 	CheckCircle,
 	Padding,
+	Edit,
+	Search as SearchIcon
 } from "@mui/icons-material";
 
 //import { useAlert 
 import { typecost, typecost_single, } from "../views/HandlePaymentNew.jsx";
-import BillingStats from "./BillingStats.jsx";
+import BillingStats from "../components/BillingStats.jsx";
+import LicencePopup from "../components/LicencePopup.jsx";
 import { handlePayasyougo } from "../views/HandlePaymentNew.jsx"
-import DeleteIcon from '@mui/icons-material/Delete';
+
 import { Context } from "../context/ContextApi.jsx";
-import LicencePopup from "./LicencePopup.jsx";
+
+import DeleteIcon from '@mui/icons-material/Delete';
+import { DataGrid } from "@mui/x-data-grid";
 
 const Billing = memo((props) => {
 	const { globalUrl, userdata, serverside, billingInfo, stripeKey,isLoaded, selectedOrganization, handleGetOrg, clickedFromOrgTab, removeCookie} = props;
 	//const alert = useAlert();
 	let navigate = useNavigate();
+	const { themeMode, brandColor,supportEmail } = useContext(Context);
+	const theme = getTheme(themeMode, brandColor);
 	const [isLoggedIn, setIsLoggedIn] = useState(false)
 	const [selectedDealModalOpen, setSelectedDealModalOpen] = React.useState(false);
 	const [dealList, setDealList] = React.useState([]);
@@ -77,12 +87,18 @@ const Billing = memo((props) => {
 	const [currentIndex, setCurrentIndex] = useState(0);
 	const [deleteAlertIndex, setDeleteAlertIndex] = useState(-1);
 	const [deleteAlertVerification, setDeleteAlertVerification] = useState(false);
+	const [isScale, setIsScale] = useState(false);
+	const [currentTab, setCurrentTab] = useState(0)
+	const [allChildOrgs, setAllChildOrgs] = useState([])
+	const [allChildOrgsStats, setAllChildOrgsStats] = useState([])
+
 	useEffect(() => {
 		if (userdata.app_execution_limit !== undefined && userdata.app_execution_usage !== undefined) {
 			const percentage = (userdata.app_execution_usage / userdata.app_execution_limit) * 100;
 			setCurrentAppRunsInPercentage(Math.round(percentage));
 			setCurrentAppRunsInNumber(userdata.app_execution_limit - userdata.app_execution_usage);
 		}
+
 		if (userdata?.id?.length > 0 && isLoggedIn === false){
 			setIsLoggedIn(true)
 		}
@@ -90,6 +106,17 @@ const Billing = memo((props) => {
 
 	const [BillingEmail, setBillingEmail] = useState(selectedOrganization?.Billing?.Email);
 
+	useEffect(() => {
+		const urlIncludesProfessionalServices = window.location.href.includes("professional-services");
+		if (props?.isCloud && urlIncludesProfessionalServices) {
+			const professionalServicesSection =
+			document.getElementById("professional-services");
+			if (professionalServicesSection) {
+				professionalServicesSection.scrollIntoView({ behavior: "smooth" });
+			}
+		}
+	}, []);
+
 	useEffect(() => {
 		if (BillingEmail !== selectedOrganization?.Billing?.Email) {
 			setBillingEmail(selectedOrganization?.Billing?.Email);
@@ -176,11 +203,10 @@ const Billing = memo((props) => {
 		padding: 20,
 		// maxWidth: 400,
 		width: 340,
-		height: 480,
+		height: 'auto',
 		// width: "100%",
-		backgroundColor: theme.palette.backgroundColor,
-		borderRadius: theme.palette?.borderRadius * 2,
-		border: "1px solid rgba(255,255,255,0.3)",
+		backgroundColor: "#1e1e1e",
+		borderRadius: 10,
 		marginRight: 10,
 		marginTop: 15,
 	}
@@ -336,6 +362,7 @@ const Billing = memo((props) => {
 		const [tosChecked, setTosChecked] = React.useState(subscription.eula_signed)
 		const [hovered, setHovered] = React.useState(false)
 		const [newBillingEmail, setNewBillingEmail] = useState('');
+		const {supportEmail} = useContext(Context);
 
 		var top_text = "Base Cloud Access"
 		if (subscription.limit === undefined && subscription.level === undefined || subscription.level === null || subscription.level === 0) {
@@ -361,7 +388,7 @@ const Billing = memo((props) => {
 		var showSupport = false
 		if (subscription.name.includes("default")) {
 			top_text = "Custom Contract"
-			newPaperstyle.border = "1px solid rgba(255,255,255,0.3)"
+			// newPaperstyle.border = "1px solid rgba(255,255,255,0.3)"
 			showSupport = true
 		}
 
@@ -377,16 +404,17 @@ const Billing = memo((props) => {
 
 		if (subscription.name.includes("Scale")) {
 			top_text = "Scale access"
+			setIsScale(true)
 		}
 
 		if (highlight === true) {
 			// Add an "Upgrade now" button
-			newPaperstyle.border = "1px solid rgba(255,255,255,0.3)"
+			// newPaperstyle.border = "1px solid rgba(255,255,255,0.3)"
 		}
 
-		if (hovered) {
-			newPaperstyle.backgroundColor = "#2b2b2b"
-		}
+		// if (hovered) {
+		// 	newPaperstyle.backgroundColor = "#2b2b2b"
+		// }
 
 		const handleClickOpen = () => {
 			setOpenChangeEmailBox(true);
@@ -535,7 +563,7 @@ const Billing = memo((props) => {
 							Accept
 						</Typography>
 						<Typography variant="body2" style={{ display: "inline-block", marginLeft: 10, }} color="textSecondary">
-							By clicking the “accept” button, you are signing the document, electronically agreeing that it has the same legal validity and effects as a handwritten signature, and that you have the competent authority to represent and sign on behalf an entity. Need support or have questions? Contact us at support@shuffler.io.
+							By clicking the “accept” button, you are signing the document, electronically agreeing that it has the same legal validity and effects as a handwritten signature, and that you have the competent authority to represent and sign on behalf an entity. Need support or have questions? Contact us at {supportEmail}
 						</Typography>
 
 						<div style={{ display: "flex", marginTop: 25, }}>
@@ -556,6 +584,7 @@ const Billing = memo((props) => {
 						</div>
 					</DialogContent>
 				</Dialog>
+				<Button style={{ backgroundColor: '#2F2F2F', color: "white", textTransform: "capitalize", borderRadius: 200, boxShadow: 'none', width: 144, height: 40 }}>Current Plan</Button>
 				<div style={{ display: "flex", width: 340 }}>
 					{top_text === "Base Cloud Access" && userdata.has_card_available === true ?
 						<Chip
@@ -659,8 +688,8 @@ const Billing = memo((props) => {
 											<TextField
 												value={feature.split("Worker License: ")[1]}
 												style={{
-													backgroundColor: theme.palette.inputColor,
-													borderRadius: theme.palette?.borderRadius,
+													backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+													borderRadius: theme.palette?.textFieldStyle.borderRadius,
 												}}
 												id={fieldId}
 												onClick={() => { }}
@@ -857,6 +886,7 @@ const Billing = memo((props) => {
 								"Add Card Details"
 							}
 						</Button>
+
 						{userdata.has_card_available === true ?
 							<Button
 								fullWidth
@@ -885,8 +915,9 @@ const Billing = memo((props) => {
 							: null}
 
 					</span>
-					: null}
-				{showSupport ?
+				: null}
+
+				{/* {showSupport ?
 					<Button variant="outlined" color="primary" style={{ marginTop: 20, marginBottom: 10, }} onClick={() => {
 						if (window.drift !== undefined) {
 							//window.drift.api.startInteraction({ interactionId: 340045 })
@@ -897,7 +928,7 @@ const Billing = memo((props) => {
 					}}>
 						Get Support
 					</Button>
-					: null}
+					: null} */}
 			</div>
 		)
 	}
@@ -1061,12 +1092,12 @@ const Billing = memo((props) => {
 				padding: 20,
 				// maxWidth: 400,
 				width: "100%",
-				height: 480,
-				backgroundColor: hovered ? "#2b2b2b" : "#1e1e1e",
+				height: 500,
+				backgroundColor: hovered ? theme.palette.cardHoverColor : theme.palette.cardBackgroundColor,
 				borderRadius: theme.palette?.borderRadius * 2,
 				border: "1px solid rgba(255,255,255,0.3)",
 				marginRight: 10,
-				marginTop: 15,
+					marginTop: 15,
 			}}
 				onMouseEnter={() => setHovered(true)}
 				onMouseLeave={() => setHovered(false)}>
@@ -1133,12 +1164,12 @@ const Billing = memo((props) => {
 						Features
 					</Typography>
 					<ul>
-						<li>
+						<li style={{color : theme.palette.text.primary}}>
 							<Typography variant="body2" color="textPrimary" style={{}}>
 								Build custom apps, integrations, and worklows for your specific use cases or applications
 							</Typography>
 						</li>
-						<li>
+						<li style={{color : theme.palette.text.primary}}>
 							<Typography variant="body2" color="textPrimary" style={{}}>
 								Help solve / debug / update / add features and capabilities of the platform
 							</Typography>
@@ -1149,15 +1180,13 @@ const Billing = memo((props) => {
 					<Button
 						fullWidth
 						disabled={false}
-						variant="outlined"
+						variant="contained"
 						color="primary"
 						style={{
-							marginTop: userdata.support ? 0 : 10,
+							marginTop: userdata.support ? 3 : 15,
 							borderRadius: 4,
 							height: 40,
 							fontSize: 16,
-							color: "#1A1A1A",
-							backgroundColor: "#FF8544",
 							textTransform: 'none',
 						}}
 						onClick={() => {
@@ -1201,12 +1230,13 @@ const Billing = memo((props) => {
 										ReactGA.event({
 											category: "Billing",
 											action: "Buy_consultation_hours",
-										});
+										})
 									}
+
 									const url = userdata.licensed === true
-										? "https://book.stripe.com/6oEeY23fw2T84M06oq"
-										: "https://book.stripe.com/00g6rw3fw9hwguI289";
-									window.open(url, "_blank");
+										? "https://buy.stripe.com/aEU3fk17o0L092g5kt"
+										: "https://buy.stripe.com/aEU3fk17o0L092g5kt"
+									window.open(url, "_blank")
 								}}
 							>
 								Book Professional Service Hours
@@ -1222,7 +1252,7 @@ const Billing = memo((props) => {
 								variant="outlined"
 								color="primary"
 								style={{
-									marginTop: userdata.support ? 5 : 10,
+									marginTop: userdata.support ? 10 : 15,
 									borderRadius: 4,
 									height: 40,
 									fontSize: 16,
@@ -1348,7 +1378,7 @@ const Billing = memo((props) => {
 					toast.success("Your request for private training has been submitted successfully. We will get back to you soon.")
 					setOpenPrivateTraining(false)
 				} else {
-					toast.error("Failed sending request for private training. Please try again later or contact support@shuffler.io for help.")
+					toast.error(`Failed sending request for private training. Please try again later or contact support@shuffler.io for help.`)
 				}
 			})
 		}
@@ -1357,10 +1387,10 @@ const Billing = memo((props) => {
 			<div
 				style={{
 					padding: 20,
-					height: 480,
+					height: 500,
 					// maxWidth: 400,
 					width: "100%",
-					backgroundColor: hovered ? "#2b2b2b" : "#1e1e1e",
+					backgroundColor: hovered ? theme.palette.cardHoverColor : theme.palette.cardBackgroundColor,
 					borderRadius: theme.palette?.borderRadius * 2,
 					border: "1px solid rgba(255,255,255,0.3)",
 					marginRight: 10,
@@ -1381,12 +1411,12 @@ const Billing = memo((props) => {
 						Public Training
 					</Typography>
 					<ul>
-						<li>
+						<li style={{color : theme.palette.text.primary}}>
 							<Typography variant="body2" color="textPrimary">
 								Public course on Automation for Security Professionals
 							</Typography>
 						</li>
-						<li>
+						<li style={{color : theme.palette.text.primary}}>
 							<Typography variant="body2" color="textPrimary">
 								Covers Shuffle Platform, Apps, Workflows, Usecases, JSON, Liquid Formatting, and more.
 							</Typography>
@@ -1396,12 +1426,12 @@ const Billing = memo((props) => {
 						Private Training
 					</Typography>
 					<ul>
-						<li>
+						<li style={{color : theme.palette.text.primary}}>
 							<Typography variant="body2" color="textPrimary">
 								Everything from Public Training
 							</Typography>
 						</li>
-						<li>
+						<li style={{color : theme.palette.text.primary}}>
 							<Typography variant="body2" color="textPrimary" >
 								Customized for your team’s usecases, date and time, location, and more.
 							</Typography>
@@ -1419,9 +1449,7 @@ const Billing = memo((props) => {
 							borderRadius: 4,
 							height: 40,
 							fontSize: 16,
-							color: "#1A1A1A",
 							textTransform: 'none',
-							backgroundColor: "#FF8544",
 							width: "100%",
 						}}
 						onClick={() => {
@@ -1965,16 +1993,18 @@ const Billing = memo((props) => {
 				<div style={{ width: "100%",}}>
 				{addDealModal}
 			{clickedFromOrgTab ?
-				<Typography style={{fontSize: 24, fontWeight: "bold", marginBottom: 8, marginTop: 0, color: "#ffffff" }}>Billing & Licensing</Typography> :
+				<Typography variant="h5" style={{fontSize: 24, fontWeight: 500, marginBottom: 8, marginTop: 0, }}>Billing & Licensing</Typography> :
 				<Typography variant="h4" style={{ marginTop: 20, marginBottom: 10 }}>
 					Billing	& Licensing
 				</Typography>}
-			{clickedFromOrgTab ?
-				<span style={{ color: "#9E9E9E", fontSize: 16 }}>{isCloud ?
+			{userdata?.org_status?.includes("integration_partner") && userdata?.org_status?.includes("sub_org") ? null : 
+			<>
+				{clickedFromOrgTab ?
+				<Typography variant="body2" color="textSecondary" style={{ fontSize: 16 }}>{isCloud ?
 					"Get more out of Shuffle by adding your credit card, such as no App Run limitations, and priority support from our team. We use Stripe to manage subscriptions and do not store any of your billing information. You can manage your subscription and billing information below."
 					:
 					"Shuffle is an Open Source automation platform, and no license is required. We do however offer a Scale license with HA guarantees, along with support hours. By buying a license on https://shuffler.io, you can get access to the license immediately, and if Cloud Syncronisation is enabled, the UI in your local instance will also update."
-				}</span> :
+				}</Typography> :
 				<Typography variant="body1" color="textSecondary" style={{ marginTop: 0, marginBottom: 10, fontSize: 16 }}>
 					{isCloud ?
 						"Get more out of Shuffle by adding your credit card, such as no App Run limitations, and priority support from our team. We use Stripe to manage subscriptions and do not store any of your billing information. You can manage your subscription and billing information below."
@@ -1982,9 +2012,10 @@ const Billing = memo((props) => {
 						"Shuffle is an Open Source automation platform, and no license is required. We do however offer a Scale license with HA guarantees, along with support hours. By buying a license on https://shuffler.io, you can get access to the license immediately, and if Cloud Syncronisation is enabled, the UI in your local instance will also update."
 					}
 				</Typography>}
+			</>  }
 
 			{userdata.support === true ?
-				<div style={{ marginBottom: 10, marginTop: clickedFromOrgTab ? 16 : null, color: clickedFromOrgTab ? "#F1F1F1" : null }}>
+				<Typography style={{ marginBottom: 10, marginTop: clickedFromOrgTab ? 16 : null, color: clickedFromOrgTab ? theme.palette.text.primary : null }}>
 					For sales: Create&nbsp;
 					<a href={"https://docs.google.com/document/d/1N-ZJNn8lWaqiXITrqYcnTt53oXGLNYFEzc5PU-tdAps/copy"} target="_blank" rel="noopener noreferrer" style={{ textDecoration: "none", color: "#FF8444" }}>
 						EU contract
@@ -2001,7 +2032,7 @@ const Billing = memo((props) => {
 					<a href={"https://github.com/Shuffle/Shuffle-docs/tree/master/handbook/Sales"} target="_blank" rel="noopener noreferrer" style={{ textDecoration: "none", color: "#FF8444" }}>
 						Sales Process (old)
 					</a>
-				</div>
+				</Typography>
 				:
 				null
 			}
@@ -2009,11 +2040,37 @@ const Billing = memo((props) => {
 
 			{isChildOrg ?
 				<Typography variant="h6" style={{ marginBottom: 50, }}>
-					Licensing is handled by your parent organisation. Reach out to support@shuffler.io if you have questions about this.
+					Licensing is handled by your parent organisation. Reach out to {supportEmail} if you have questions about this.
 				</Typography>
 				: null}
 
-			<div style={{ display: "flex", width: clickedFromOrgTab ? "100%" : "auto", overflowX: 'auto', overflowY: 'hidden', scrollbarWidth: 'thin', scrollbarColor: '#494949 #2f2f2f', height: isChildOrg ? 0 : "100%", maxWidth: 860, marginTop: 20}} >
+			<div style={{ display: "flex", width: clickedFromOrgTab ? "100%" : "auto", overflowX: 'auto', overflowY: 'hidden', scrollbarWidth: 'thin', scrollbarColor: theme.palette.scrollbarColor, height: isChildOrg ? 0 : "100%", marginTop: 20}} >
+				<div style={{ display: "flex", flexDirection: "column", width: "100%",  }}>
+				{/* {isCloud &&
+					selectedOrganization.subscriptions !== undefined &&
+					selectedOrganization.subscriptions !== null &&
+					selectedOrganization.subscriptions.length > 0 &&
+					!isChildOrg ?
+					selectedOrganization.subscriptions
+						.reverse()
+						.map((sub, index) => {
+							return (
+									<SubscriptionObject
+									index={index + 1}
+									globalUrl={globalUrl}
+									userdata={userdata}
+									serverside={serverside}
+									billingInfo={billingInfo}
+									stripeKey={stripeKey}
+									selectedOrganization={selectedOrganization}
+									subscription={sub}
+									highlight={true}
+								/>
+							)
+						})
+					: null} */}
+				
+				<div style={{ display: "flex", flexDirection: "row", width: "100%", marginTop: 20, marginBottom: 20, maxWidth: 860, }}>
 				{isCloud && billingInfo.subscription !== undefined && billingInfo.subscription !== null ? isChildOrg ? null :
 					<LicencePopup
 					serverside={serverside}
@@ -2026,6 +2083,8 @@ const Billing = memo((props) => {
 					isCloud={isCloud}
 					userdata={userdata}
 					stripeKey={stripeKey}
+					isScale={isScale}
+					features={selectedOrganization?.sync_features}
 					{...props}
 					/>
 					: !isCloud ?
@@ -2060,7 +2119,9 @@ const Billing = memo((props) => {
 								billingInfo={billingInfo}
 								isCloud={isCloud}
 								userdata={userdata}
+								features={selectedOrganization?.sync_features}
 								stripeKey={stripeKey}
+								isScale={isScale}
 							/>	
 
 							{/* <SubscriptionObject
@@ -2084,30 +2145,9 @@ const Billing = memo((props) => {
 							/> */}
 						</span>
 						: null}
+						</div>
+				</div>
 
-				{isCloud &&
-					selectedOrganization.subscriptions !== undefined &&
-					selectedOrganization.subscriptions !== null &&
-					selectedOrganization.subscriptions.length > 0 &&
-					!isChildOrg ?
-					selectedOrganization.subscriptions
-						.reverse()
-						.map((sub, index) => {
-							return (
-								<SubscriptionObject
-									index={index + 1}
-									globalUrl={globalUrl}
-									userdata={userdata}
-									serverside={serverside}
-									billingInfo={billingInfo}
-									stripeKey={stripeKey}
-									selectedOrganization={selectedOrganization}
-									subscription={sub}
-									highlight={true}
-								/>
-							)
-						})
-					: null}
 				{/*
 									<Grid item key={index} xs={12/selectedOrganization.subscriptions.length}>
 										<Card
@@ -2153,7 +2193,6 @@ const Billing = memo((props) => {
 									*/}
 			</div>
 
-
 			{/*isCloud &&
 						selectedOrganization.partner_info !== undefined &&
 						selectedOrganization.partner_info.reseller === true ? (
@@ -2340,13 +2379,13 @@ const Billing = memo((props) => {
 			  </div>
             ) : null*/}
 			{!isChildOrg && isCloud && (
-				<div style={{ display: 'flex', flexDirection: 'column', marginTop: 50, maxWidth: 860 }}>
-					<Typography style={{ marginBottom: 5, fontSize: 24, fontWeight: "bold" }}>
+				<div style={{ display: 'flex', flexDirection: 'column', marginTop: 50, maxWidth: 860 }} id="professional-services">
+					<Typography variant="h6" style={{ marginBottom: 5, fontSize: 24, fontWeight: 500 }}>
 						Professional Services
 					</Typography>
-					<Typography color="textSecondary" style={{fontSize: 16,}}>
-						We offer priority support through consultations and training to help you make the most of our product. If you have any questions, please reach out to us at support@shuffler.io.
-					</Typography>
+					<Typography variant="body2" color="textSecondary" style={{fontSize: 16,}}>
+						We offer priority support through consultations and training to help you make the most of our product. If you have any questions, please reach out to us at {supportEmail}.
+					</Typography>We offer priority support through consultations and training to help you make the most of our product. If you have any questions, please reach out to us at
 					<div style={{ display: 'flex', flexDirection: 'row', marginTop: 5, }}>
 						{billingInfo.subscription !== undefined && billingInfo.subscription !== null ? (
 							isChildOrg ? null : (
@@ -2412,14 +2451,16 @@ const Billing = memo((props) => {
 							 <TextField
 								style={{
 								marginTop: 10,
-								backgroundColor: "#212121",
+								backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+										color: theme.palette.textFieldStyle.color,
+								borderRadius: theme.palette.textFieldStyle.borderRadius,
 								width: 250,
 								height: 50,
 								}}
 								InputProps={{
 								style: {
 									height: 50,
-									color: 'white',
+									color: theme.palette.textFieldStyle.color,
 								},
 								endAdornment: '%',
 								}}
@@ -2442,14 +2483,16 @@ const Billing = memo((props) => {
 									style={{
 									marginTop: 10,
 									height: 50,
-									backgroundColor: "#212121",
+										backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+									color: theme.palette.textFieldStyle.color,
 									width: 250,
-									marginLeft: 15,
+										marginLeft: 15,
+									borderRadius: theme.palette.textFieldStyle.borderRadius,
 									}}
 									InputProps={{
 									style: {
 										height: 50,
-										color: 'white',
+										color: theme.palette.textFieldStyle.color,
 									},
 									}}
 									InputLabelProps={{
@@ -2491,7 +2534,7 @@ const Billing = memo((props) => {
 								  setDeleteAlertIndex(index);
 								}}
 							  >
-								<DeleteIcon sx={{ color: theme.palette.secondary.main }} />
+								<DeleteIcon sx={{ color: themeMode === "dark" ? "rgba(255,255,255,0.7)" : "#666666" }} />
 							  </Button>
 							)}
 							<Dialog
@@ -2511,8 +2554,9 @@ const Billing = memo((props) => {
 								  Cancel
 								</Button>
 								<Button
-								  style={{ textTransform: 'none', fontSize: 16 }}
-								  color="secondary"
+								style={{ textTransform: 'none', fontSize: 16 }}
+								variant="outlined"
+								  color="primary"
 								  onClick={() => {
 									handleDeleteAlertThreshold(deleteAlertIndex);
 									setDeleteAlertVerification(false);
@@ -2555,13 +2599,87 @@ const Billing = memo((props) => {
 					Utilization & Stats
 				</Typography>
 			</div>
-			<BillingStats
-				isCloud={isCloud}
-				clickedFromOrgTab={clickedFromOrgTab}
-				globalUrl={globalUrl}
-				selectedOrganization={selectedOrganization}
-				userdata={userdata}
-			/>	
+				<span>
+					<Tabs
+					value={currentTab}
+					onChange={(event, newValue) => {
+						setCurrentTab(-1)
+
+						// Force re-render
+						setTimeout(() => {
+							setCurrentTab(newValue)
+						}, 100);
+					}}
+					style={{ marginTop: 20 }}
+					TabIndicatorProps={{
+						style: {
+							height: 3,
+							backgroundColor: theme.palette.primary.main,
+							marginLeft: 12,
+							marginRight: 12,
+						}
+					}}
+					>
+						<Tab
+							label="Parent Organization"
+							style={{ textTransform: 'none',}}
+							value={0}
+						/>
+
+						{isCloud ? 
+							<Tab
+								label="Cloud-Synced Stats"
+								style={{ textTransform: 'none', }}
+								value={1}
+							/>
+						: null}
+
+						<Tab
+							label="Child Organization Stats"
+							disabled={isChildOrg}
+							style={{ textTransform: 'none', }}
+							value={2}
+						/>
+					</Tabs>
+
+					<div style={{paddingBottom: 200, minHeight: 750, }}>
+						{currentTab === 0 ? 
+							<div style={{ marginTop: 30,}}>
+								<BillingStats
+									isCloud={isCloud}
+									clickedFromOrgTab={clickedFromOrgTab}
+									globalUrl={globalUrl}
+									selectedOrganization={selectedOrganization}
+									userdata={userdata}
+								/>
+							</div>
+						: currentTab === 1 ? 
+							<div style={{ marginTop: 30,}}>
+								<BillingStats
+									isCloud={isCloud}
+									clickedFromOrgTab={clickedFromOrgTab}
+									globalUrl={globalUrl}
+									selectedOrganization={selectedOrganization}
+									userdata={userdata}
+
+									syncStats={true}
+								/>
+							</div>
+						: 
+							<BillingStatsChildOrg
+								isCloud={isCloud}
+								clickedFromOrgTab={clickedFromOrgTab}
+								globalUrl={globalUrl}
+								selectedOrganization={selectedOrganization}
+								userdata={userdata}
+								allChildOrgs={allChildOrgs}
+								setAllChildOrgs={setAllChildOrgs}
+								allChildOrgsStats={allChildOrgsStats}
+								setAllChildOrgsStats={setAllChildOrgsStats}
+							/>
+						}
+					</div>
+				</span>
 			</div>
 		</Wrapper>
 	)
@@ -2569,19 +2687,473 @@ const Billing = memo((props) => {
 
 export default memo(Billing);
 
-const PaddingWrapper = memo(({ clickedFromOrgTab, children }) => {
+const BillingStatsChildOrg = memo(({ userdata, globalUrl, selectedOrganization, allChildOrgs, setAllChildOrgs, allChildOrgsStats, setAllChildOrgsStats }) => {
+	const [subOrgStats, setSubOrgStats] = useState([]);
+	const [subOrgs, setSubOrgs] = useState([]);
+	const [subOrgStatsRows, setSubOrgStatsRows] = useState([]);
+	const [subOrgStatsColumns, setSubOrgStatsColumns] = useState([]);
+	const [allOrgLoaded, setAllOrgLoaded] = useState(false);
+	const [allOrgStatsLoaded, setAllOrgStatsLoaded] = useState(false);
+	const [page, setPage] = useState(0);
+	const [rowsPerPage, setRowsPerPage] = useState(10);
+	const [open, setOpen] = useState(false);
+	const [editing, setEditing] = useState("")
+	const [editingOrgId, setEditingOrgId] = useState("")
+	const [limit, setLimit] = useState("")
+	const [tableCreated, setTableCreated] = useState(false)
+	const [searchQuery, setSearchQuery] = useState("");
+	const [filteredRows, setFilteredRows] = useState([]);
+	const { themeMode, brandColor, supportEmail } = useContext(Context);
+	const theme = getTheme(themeMode, brandColor);
+
+	// Handle page change
+	const handleChangePage = (event, newPage) => {
+	  setPage(newPage);
+	};
   
+	const handleChangeRowsPerPage = (event) => {
+	  setRowsPerPage(parseInt(event.target.value, 10));
+	  setPage(0);
+	};
+  
+	const HanldeLoadStats = async () => {
+		const childOrgs = selectedOrganization.child_orgs;
+		if (allChildOrgsStats.length > 0){
+			setSubOrgStats(allChildOrgsStats)
+			setAllOrgStatsLoaded(true)
+			if (allChildOrgsStats.length > 0 && allChildOrgs.length > 0 && subOrgStatsRows.length === 0 && subOrgStatsColumns.length === 0) {
+				HandleCreateTable(allChildOrgsStats, allChildOrgs)
+			}
+			return
+		}
+		const promises = childOrgs.map((org) => {
+			// get org stats base on region url
+			const baseUrl = org?.region_url?.length > 0 && !window?.location?.origin?.includes("localhost") ? org?.region_url : globalUrl;
+			const url = `${baseUrl}/api/v1/orgs/${org.id}/stats`;
+			return fetch(url, {
+				method: "GET",
+				credentials: "include",
+				headers: {
+					"Content-Type": "application/json",
+				},
+			}).then((res) => res.json());
+		});
+	
+		try {
+			const responses = await Promise.all(promises);
+			setSubOrgStats(responses);
+			setAllChildOrgsStats(responses);
+			setAllOrgStatsLoaded(true);
+		} catch (error) {
+			console.error("Error loading stats:", error);
+		}
+	};
+	
+	
+
+	const HandleGetSuborg = async () => {
+		const childOrgs = selectedOrganization.child_orgs
+
+		if (allChildOrgs.length > 0){
+			setSubOrgs(allChildOrgs)
+			setAllOrgLoaded(true)
+			if (allChildOrgsStats.length > 0 && allChildOrgs.length > 0 && subOrgStatsRows.length === 0 && subOrgStatsColumns.length === 0) {
+				HandleCreateTable(allChildOrgsStats, allChildOrgs)
+			}
+			return
+		}
+
+		const promises = childOrgs.map((org) => {
+			const baseUrl = org?.region_url?.length > 0 && !window?.location?.origin?.includes("localhost") ? org?.region_url : globalUrl;
+			const url = `${baseUrl}/api/v1/orgs/${org.id}`;
+			return fetch(url, {
+				method: "GET",
+				credentials: "include",
+				headers: {
+					"Content-Type": "application/json",
+				},
+			}).then((res) => res.json());
+		});
+		try {
+			const responses = await Promise.all(promises);
+			setSubOrgs(responses);
+			setAllChildOrgs(responses);
+			setAllOrgLoaded(true);
+		} catch (error) {
+			console.error("Error loading suborgs:", error);
+		}
+	};
+
+	useEffect(() => {
+		if (subOrgStats.length === 0 && selectedOrganization && selectedOrganization?.child_orgs?.length > 0) {
+			HanldeLoadStats()
+		}
+		if (subOrgs.length === 0 && selectedOrganization && selectedOrganization?.child_orgs?.length > 0) {
+			HandleGetSuborg()
+		}
+
+	}, [selectedOrganization?.child_orgs]);
+
+
+	useEffect(() => {
+
+		if (allOrgLoaded && allOrgStatsLoaded && !tableCreated) {
+			HandleCreateTable(subOrgStats, subOrgs)
+		}
+	}
+	, [allOrgLoaded, allOrgStatsLoaded, tableCreated])
+
+	
+	const HandleCreateTable = (subOrgStats, subOrgs) => {
+		
+		if (subOrgStats.length === 0 || subOrgs.length === 0) return;
+
+		// check whether all of the suborg.success is false
+		const allSubOrgStatsSuccess = subOrgStats.every((stat) => stat.success === false);
+		const allSubOrgsSuccess = subOrgs.every((org) => org.success === false);
+
+		if (allSubOrgStatsSuccess || allSubOrgsSuccess) {
+			setSubOrgStats([])
+			setSubOrgs([])
+			setTableCreated(true)
+			return
+		}
+
+		const rows = subOrgStats.map((stat, index) => {
+			const subOrg = subOrgs[index]
+			if (!subOrg) return null;
+			return {
+				id: index,
+				name: subOrg.name,
+				orgId: subOrg.id,
+				limit: subOrg?.sync_features?.app_executions?.limit || "N/A",
+				usage: stat?.monthly_app_executions || "N/A",
+				workflows_usage: stat?.total_workflow_executions || "N/A",
+				workflow_usage_limit: subOrg?.sync_features?.workflow_executions?.limit || "N/A",
+			}
+		})
+
+		setSubOrgStatsRows(rows)
+
+		const columns = [
+			{ field: "id", headerName: "ID", width: 100 },
+			{ field: "name", headerName: "Name", width: 200 },
+			{ field: "usage", headerName: "App Execution Usage", width: 200 },
+			{ 
+				field: "limit", headerName: "App Execution Limit", width: 200, renderCell: (params) => {
+					return (
+						<>
+						<Typography style={{ fontSize: 16 }}>
+						{params.value}
+						<IconButton
+							style={{ color: theme.palette.primary.main }}
+							onClick={() => {
+								setOpen(true)
+								setEditingOrgId(params.row.orgId)
+								setEditing("app_executions")
+								if (params.value === "N/A") {
+									setLimit("")
+								} else {
+									setLimit(params.value)
+								}
+							}}
+						>
+							<Edit/>
+						</IconButton>
+						</Typography>
+						</>
+					)
+				}
+				},
+				{ field: "workflows_usage", headerName: "Workflow Execution Usage", width: 200 },
+				{ field: "workflow_usage_limit", headerName: "Workflow Execution Limit", width: 200, renderCell: (params) => {
+				return (
+					<>
+						<Typography style={{ fontSize: 16 }}>
+						{params.value}
+						</Typography>
+						<IconButton
+							style={{ color: theme.palette.primary.main }}
+							onClick={() => {
+								setOpen(true)
+								setEditingOrgId(params.row.orgId)
+								setEditing("workflow_executions")
+								if (params.value === "N/A") {
+									setLimit("")
+								} else {
+									setLimit(params.value)
+								}
+							}}
+						>
+							<Edit/>
+						</IconButton>
+					</>
+				)}
+			},
+		]
+
+		setSubOrgStatsColumns(columns)
+
+		if (allOrgLoaded && allOrgStatsLoaded && !tableCreated) {
+			setTableCreated(true)
+		}
+	}
+
+	
+
+	const HandleEditLimit = (orgId, editing, limit) => {
+
+
+		// change limit as number if string
+		if (typeof limit === "string") {
+			limit = parseInt(limit, 10)
+		}
+		if (isNaN(limit)) {
+			toast.error("Please enter a valid number")
+			return
+		}
+
+		if (selectedOrganization.sync_features.app_executions.limit <= 10000) {
+			toast.error("Insufficient app execution limit to increase child org limit")
+			return
+		}
+
+		// check whether limit is greater than than parent org limit
+		if (editing === "app_executions" && limit > selectedOrganization.sync_features.app_executions.limit && !userdata.support) {
+			toast.error("App execution limit cannot be greater than parent org limit")
+			return
+		}
+
+
+		if (editing === "workflow_executions" && limit > selectedOrganization.sync_features.workflow_executions.limit && !userdata.support) {
+			toast.error("Workflow execution limit cannot be greater than parent org limit")
+			return
+		}
+
+		// find the org in the subOrgs array
+		const orgIndex = subOrgs.findIndex((org) => org.id === orgId)
+		if (orgIndex === -1) {
+			toast.error("Organization not found")
+			return
+		}
+
+		const org = subOrgs[orgIndex]
+
+		org.sync_features[editing].limit = limit
+		org.sync_features.editing = true
+		const sync_features = org.sync_features
+		const data = {
+			org_id: orgId,
+            sync_features: sync_features,
+		}
+
+		const url = `${globalUrl}/api/v1/orgs/${orgId}`;
+		fetch(url, {
+			method: "POST",
+			credentials: "include",
+			crossDomain: true,
+			headers: {
+				"Content-Type": "application/json",
+			},
+			body: JSON.stringify(data),
+		}).then((response) =>
+				response.json().then((responseJson) => {
+					if (responseJson["success"] === false) {
+						toast("Failed updating org: ", responseJson.reason);
+					} else {
+						toast("Successfully change suborg limit!");
+						if (editing === "app_executions") {
+							setSubOrgStatsRows((prevRows) => {
+								const newRows = [...prevRows];
+								newRows[orgIndex].limit = limit;
+								return newRows;
+							});
+						}else if (editing === "workflow_executions") {
+							setSubOrgStatsRows((prevRows) => {
+								const newRows = [...prevRows];
+								newRows[orgIndex].workflow_usage_limit = limit;
+								return newRows;
+							});
+						}
+					}
+				})
+			)
+			.catch((error) => {
+				toast("Err: " + error.toString());
+		});
+
+	}
+
+	const HandleClosePopUP = () => {
+		setOpen(false)
+		setEditing("")
+		setEditingOrgId("")
+		setLimit("")
+	}
+
+	return (
+		<div style={{ display: "flex", flexDirection: "column", marginTop: 30, minHeight: 300, marginBottom: 200,  }}>
+			{open && (
+				<IncreaseLimitPopUp open={open} onClose={HandleClosePopUP} limit={limit} HandleEditLimit={HandleEditLimit} setLimit={setLimit} editing={editing} setEditing={setEditing} editingOrgId={editingOrgId} setEditingOrgId={setEditingOrgId}/>
+			)}
+			<Typography style={{ marginBottom: 5, fontSize: 24, fontWeight: "bold" }}>
+				Child Organizations
+			</Typography>
+			<div style={{display: 'flex', flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center', marginBottom: 10}}>
+				<Typography color="textSecondary" style={{ marginTop: 10, fontSize: 16 }}>
+					View and configure execution limits for child organizations. Click the edit icon to modify app and workflow execution limits.
+				</Typography>      
+			</div>
+			{tableCreated ? (
+				subOrgStatsRows.length > 0 && subOrgStatsColumns.length > 0 ? (
+					<>
+						<TextField 
+							style={{ marginBottom: 10, width: 500, marginTop: 20 }} 
+							variant="outlined" 
+							placeholder="Search organizations by name or ID" 
+							value={searchQuery}
+							fullWidth
+							InputProps={{
+								style: {
+									fontSize: "1em",
+									height: 51,
+									width: 693,
+									borderRadius: 4,
+								},
+								startAdornment: (
+									<InputAdornment position="start">
+										<SearchIcon style={{ marginLeft: 5}} />
+									</InputAdornment>
+								),
+							}}
+							onChange={(e) => {
+								setSearchQuery(e.target.value.toLowerCase());
+								const filtered = subOrgStatsRows.filter((row) =>
+									row.name.toLowerCase().includes(e.target.value.toLowerCase().trim()) ||
+									row.orgId.toLowerCase().includes(e.target.value.toLowerCase().trim())
+								);
+								setFilteredRows(filtered);
+							}}
+						/>
+						<DataGrid
+							rows={searchQuery ? filteredRows : subOrgStatsRows}
+							columns={subOrgStatsColumns}
+							pageSize={rowsPerPage}
+							rowsPerPageOptions={[5, 10, 25, 50]}
+							onPageChange={handleChangePage}
+							onPageSizeChange={handleChangeRowsPerPage}
+							autoHeight
+							style={{ height: "300px", width: "100%", backgroundColor: theme.palette.platformColor, color: theme.palette.text.primary }}
+						/>
+					</>
+				) : (
+					<Typography variant="h6" color="secondary" style={{ margin: "auto",}}>
+						{selectedOrganization.child_orgs.length === 0 ? "No child organizations exist." : "Unable to load child organization stats. Statistics may not be initialized yet." }
+					</Typography>
+				)
+			) : (
+				<div style={{ display: "flex", justifyContent: "center", alignItems: "center", height: "100%", margin: 'auto'}}>
+					<CircularProgress style={{ color: "#FF8444" }} />
+				</div>
+			)}
+		</div>
+	);
+});
+
+const IncreaseLimitPopUp = memo(({ open, onClose, limit, setLimit, HandleEditLimit, editingOrgId, editing}) => {
+	const [currentLimit, setCurrentLimit] = useState(limit)
+
+	const { themeMode, brandColor } = useContext(Context);
+	const theme = getTheme(themeMode, brandColor);
+
+	return(
+		<Dialog open={open} onClose={onClose}
+		 PaperProps={{
+			sx: {
+			borderRadius: theme?.palette?.DialogStyle?.borderRadius,
+			border: theme?.palette?.DialogStyle?.border,
+			fontFamily: theme?.typography?.fontFamily,
+			backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+			zIndex: 1000,
+			'& .MuiDialogContent-root': {
+				backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+			},
+			'& .MuiDialogTitle-root': {
+				backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+			},
+			'& .MuiDialogActions-root': {
+				backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+			},
+			}
+		}}
+	>
+			<DialogTitle style={{ fontSize: 24, fontWeight: "bold" }}>
+				Increase {editing.replaceAll("_", " ").replace(/\b\w/g, c => c.toUpperCase())} Limit
+			</DialogTitle>
+			<DialogContent>
+			<TextField 
+				value={currentLimit}
+				onChange={(e) => setCurrentLimit(e.target.value)}
+				label={`${editing.replaceAll("_", " ").replace(/\b\w/g, c => c.toUpperCase())} Limit`}
+				type="string"
+				variant="outlined"
+				fullWidth
+				InputProps={{
+					style: {
+						color: theme.palette.text.primary,
+					},
+				}}
+				InputLabelProps={{
+					style: {
+						color: theme.palette.text.primary,
+					},
+				}}
+				margin="normal"
+				onKeyUp={(e) => {
+					if (e.key === "Enter") {
+						HandleEditLimit(editingOrgId, editing, currentLimit)
+						setLimit(currentLimit)
+						onClose()
+					}}
+				}
+			></TextField>
+			 </DialogContent>
+			<DialogActions>
+				<Button onClick={onClose} style={{ borderRadius: "2px", textTransform: 'none', fontSize:16, marginRight: 5, color: theme.palette.primary.main  }}>
+					Cancel
+				</Button>
+				<Button variant="contained" color="primary" onClick={() => {
+					HandleEditLimit(editingOrgId, editing, currentLimit)
+					setLimit(currentLimit)
+					onClose()
+				}} style={{ borderRadius: "2px", textTransform: 'none', fontSize:16, marginRight: 10 }}>
+					Save
+				</Button>
+			</DialogActions>
+		</Dialog>
+	)
+})
+
+
+const PaddingWrapper = memo(({ clickedFromOrgTab, children }) => {
+	
+	const { themeMode, brandColor } = useContext(Context);
+	const theme = getTheme(themeMode, brandColor);
+
 	const wrapperStyle = useMemo(() => ({
 	  width: clickedFromOrgTab 
 		? "100%"
 		: "auto",
 	  padding: "27px 10px 19px 27px", 
-	  backgroundColor: '#212121', 
+	  backgroundColor: theme.palette.platformColor, 
 	  height: '100%',
 	  boxSizing: 'border-box',
 	  overflow: 'hidden',
-	  maxHeight: "1700px", overflowY: "auto",scrollbarColor: '#494949 transparent', scrollbarWidth: 'thin'
-	}), [clickedFromOrgTab]);
+		maxHeight: "1700px",
+		overflowY: "auto",
+		scrollbarColor: theme.palette.scrollbarColorTransparent,
+		scrollbarWidth: 'thin'
+	}), [clickedFromOrgTab, theme]);
   
 	return (
 	  <div style={wrapperStyle}>
@@ -2590,9 +3162,9 @@ const PaddingWrapper = memo(({ clickedFromOrgTab, children }) => {
 	);
   });
   
-  const Wrapper = memo(({ children, clickedFromOrgTab }) => {
+const Wrapper = memo(({ children, clickedFromOrgTab }) => {
 	return (
-	  <PaddingWrapper clickedFromOrgTab={clickedFromOrgTab}>
+	  <PaddingWrapper  clickedFromOrgTab={clickedFromOrgTab}>
 		{children}
 	  </PaddingWrapper>
 	);
diff --git a/frontend/src/components/BillingStats.jsx b/frontend/src/components/BillingStats.jsx
index 231b5686..5bb09ddb 100644
--- a/frontend/src/components/BillingStats.jsx
+++ b/frontend/src/components/BillingStats.jsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useContext, memo, useMemo } from 'react';
 
-import theme from '../theme.jsx';
+import {getTheme} from '../theme.jsx';
 import classNames from "classnames";
 import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs'
 import { DataGrid, GridColDef, GridValueGetterParams } from '@mui/x-data-grid'
@@ -28,12 +28,20 @@ import {
 	Paper,
 	Chip,
 	Checkbox,
+	Box,
 } from "@mui/material";
 
 import { 
 	BarChart,
+	BarSeries,
+	Bar,
+	BarLabel,
+
 	GridlineSeries,
 	Gridline,
+	TooltipArea,
+	ChartTooltip,
+	TooltipTemplate,
 } from 'reaviz';
 
 import { typecost, typecost_single, } from "../views/HandlePaymentNew.jsx";
@@ -42,31 +50,54 @@ import { Context } from '../context/ContextApi.jsx';
 const LineChartWrapper = ({keys, inputname, height, width}) => {
   const [hovered, setHovered] = useState("");
 	const inputdata = keys.data === undefined ? keys : keys.data
-	
+	const {themeMode} = useContext(Context)
+	const theme = getTheme(themeMode)
+
+
 	return (
 		<div style={{color: "white", border: "1px solid rgba(255,255,255,0.3)", borderRadius: theme.palette?.borderRadius, padding: 30, marginTop: 15, backgroundColor: theme.palette.platformColor, overflow: "hidden", }}>
-			<Typography variant="h6" style={{marginBotton: 15, }}>
+			<Typography variant="h6" style={{marginBotton: 30, }}>
 				{inputname}
 			</Typography>
+
 			<BarChart
+				style={{marginTop: 100, }}
 				width={"100%"}
 				height={height}
 				data={inputdata}
+
+		      	series={
+					<BarSeries
+					  bar={
+						<Bar />
+					  } 
+					/>
+				}
 				gridlines={
 					<GridlineSeries line={<Gridline direction="all" />} />
 				}
 			/>
+
 		</div>
 	)
 }
 
 
 const AppStats = (defaultprops) => {
-  const { globalUrl, selectedOrganization, userdata, isCloud, inputWorkflows,clickedFromOrgTab } = defaultprops;
+  const { 
+	  globalUrl, 
+	  selectedOrganization, 
+	  userdata, 
+	  isCloud, 
+	  inputWorkflows,
+	  clickedFromOrgTab,
+	  syncStats,
+  } = defaultprops;
 
   const [keys, setKeys] = useState([])
   const [searches, setSearches] = useState([]);
   const [appRuns, setAppruns] = useState(undefined);
+  const [childOrgsAppRuns, setChildOrgsAppRuns] = useState(undefined);
   const [appRunCosts, setApprunCosts] = useState(undefined);
   const [workflowRuns, setWorkflowRuns] = useState(undefined);
   const [subflowRuns, setSubflowRuns] = useState(undefined);
@@ -83,6 +114,8 @@ const AppStats = (defaultprops) => {
   const [workflows, setWorkflows] = useState(inputWorkflows === undefined ? [] : inputWorkflows)
   const [resultRows, setResultRows] = useState([])
   const [resultLoading, setResultLoading] = useState(true)
+  const { themeMode, brandColor } = useContext(Context);
+  const theme = getTheme(themeMode, brandColor)
   
   const includedExecutions = selectedOrganization?.sync_features?.app_executions !== undefined ? selectedOrganization?.sync_features?.app_executions?.limit : 0 
 
@@ -94,9 +127,6 @@ const AppStats = (defaultprops) => {
 
 
   const getWorkflowStats = async (workflow, startTime, endTime) => {
-	  if (!userdata.support) {
-		  return workflow
-	  }
 
 	  if (workflow.id === undefined || workflow.id === null || workflow.id === "") {
 		  return workflow
@@ -161,12 +191,8 @@ const AppStats = (defaultprops) => {
   }
 
   const loadWorkflowStats = (foundWorkflows, startTime, endTime) => {
-	  if (!userdata.support) {
-		  return
-	  }
-
 	  if (foundWorkflows === undefined || foundWorkflows === null || foundWorkflows.length === 0) {
-		  console.log("Not workflows")
+		  setResultLoading(false)
 		  return
 	  }
 
@@ -175,6 +201,9 @@ const AppStats = (defaultprops) => {
 	  const promises = foundWorkflows.slice(0, 50).map(wf => getWorkflowStats(wf, startTime, endTime));
 
 	  const allData = Promise.all(promises);
+	  if (allData === undefined || allData === null) {
+		  setResultLoading(false)
+	  }
 
 	  allData.then((data) => {
 	  	var total = 0
@@ -234,15 +263,16 @@ const AppStats = (defaultprops) => {
 			return
 		}
 
-		if (statistics["daily_statistics"] === undefined || statistics["daily_statistics"] === null) {
+		const statKey = syncStats === true ? "onprem_stats" : "daily_statistics"
+		if (statistics[statKey] === undefined || statistics[statKey] === null) {
 			setFilteredStatistics(statistics)
 			return
 		}
 
 		// Calculate month to date cost
 		var mtd_cost = 0
-		for (let key in statistics["daily_statistics"]) {
-			const item = statistics["daily_statistics"][key]
+		for (let key in statistics[statKey]) {
+			const item = statistics[statKey][key]
 			if (item["date"] === undefined) {
 				continue
 			}
@@ -300,8 +330,8 @@ const AppStats = (defaultprops) => {
 
 		// Check if start time is before the daily statistics["date"] string
 		var newlist = []
-		for (let key in statistics["daily_statistics"]) {
-			const item = statistics["daily_statistics"][key]
+		for (let key in statistics[statKey]) {
+			const item = statistics[statKey][key]
 			if (item["date"] === undefined) {
 				continue
 			}
@@ -332,7 +362,7 @@ const AppStats = (defaultprops) => {
 		var appexecutions = 0
 		var estimatedcost = 0
 		if (newlist.length > 0) {
-			tmpstats["daily_statistics"] = newlist
+			tmpstats[statKey] = newlist
 
 			for (let key in newlist) {
 				const item = newlist[key]
@@ -386,7 +416,8 @@ const AppStats = (defaultprops) => {
 			return 
 		}
 
-		const dailyStats = inputdata.daily_statistics
+		const statKey = syncStats === true ? "onprem_stats" : "daily_statistics"
+		const dailyStats = inputdata[statKey]
 		if (dailyStats === undefined || dailyStats === null) {
 			return
 		}
@@ -396,6 +427,11 @@ const AppStats = (defaultprops) => {
 			"data": []
 		}
 
+		var childorgappRuns = {
+			"key": "Child Org App Runs",
+			"data": []
+		}
+
 		var workflowRuns = {
 			"key": "Workflow Runs (includes subflows)",
 			"data": []
@@ -437,6 +473,13 @@ const AppStats = (defaultprops) => {
 				})
 			} 
 
+			if (item["child_app_executions"] !== undefined && item["child_app_executions"] !== null) {
+				childorgappRuns["data"].push({
+					key: new Date(item["date"]),
+					data: inputdata["child_app_executions"]
+				})
+			}
+
 			// Check if workflow_executions key in item
 			if (item["workflow_executions"] !== undefined && item["workflow_executions"] !== null) {
 				workflowRuns["data"].push({
@@ -466,6 +509,15 @@ const AppStats = (defaultprops) => {
 			})
 		}
 
+		if (inputdata["daily_child_app_executions"] !== undefined && inputdata["daily_app_executions"] !== null) {
+			childorgappRuns["data"].push({
+				key: new Date(),
+				data: inputdata["daily_child_app_executions"]
+			})
+
+			//setApprunCosts(appcostRuns)
+		}
+
 		if (inputdata["daily_workflow_executions"] !== undefined && inputdata["daily_workflow_executions"] !== null) {
 			workflowRuns["data"].push({
 				key: new Date(),
@@ -480,6 +532,11 @@ const AppStats = (defaultprops) => {
 			})
 		}
 
+		// Only for parent orgs
+		if (childorgappRuns["data"].length > 0) {
+	  		setChildOrgsAppRuns(childorgappRuns)
+		}
+
 		setSubflowRuns(subflowRuns)
 		setWorkflowRuns(workflowRuns)
 		setAppruns(appRuns)
@@ -529,11 +586,14 @@ const AppStats = (defaultprops) => {
 
 	const paperStyle = {
 		textAlign: "center", 
-		padding: 40, 
-		margin: 5, 
-		backgroundColor: theme.palette.platformColor,
-		border: "1px solid rgba(255,255,255,0.3)",
-		maxWidth: 300,
+		padding: "40px", 
+		margin: "5px", 
+		backgroundColor: theme.palette.cardBackgroundColor,
+		border: theme.palette.defaultBorder,
+		maxWidth: "300px",
+		"&:hover": {
+			backgroundColor: theme.palette.cardHoverColor,
+		},
 	}
 
 	const columns: GridColDef[] = [
@@ -646,85 +706,94 @@ const AppStats = (defaultprops) => {
     <div className="content" style={{width: "100%", margin: "auto", }}>
 		<Typography style={{margin: "auto", marginLeft: 10, marginBottom: 20, fontSize: 16}} color="textSecondary">
 			All shown statistics are gathered from <a 
-				href={`${globalUrl}/api/v1/orgs/${selectedOrganization.id}/stats`} 
+				href={`${globalUrl}/api/v1/orgs/${selectedOrganization?.id}/stats`} 
 				target="_blank"
-				style={{ textDecoration: "none", color: "#FF8444",}}
+				style={{ textDecoration: "none", color: theme.palette.linkColor,}}
 			>Your Organisation Statistics. </a>
 			It exists to give you more insight into your workflows, and to understand your utilization of the Shuffle platform. <b>The billing tracker is in Beta, and is always calculated manually before being invoiced.</b>
+
+			<br style={{}}/>
+			{syncStats !== true ? null : 
+				"PS: You are currently looking at data from your onprem synced org"}
 		</Typography>
 
 		<div style={{display: "flex", flexDirection: "column", textAlign: "center",}}>
 			<div style={{flexDirection: "row", }}>
 			{filteredStatistics !== undefined ?
 				<div style={{flex: 1, display: "flex", textAlign: "center",}}>
-					<Tooltip title={
-						<Typography variant="body1" style={{padding: 10, }}>
-							The cost of app runs in the selected period based on {filteredStatistics.monthly_app_executions} App Runs. These numbers do not exclude your included 10.000/month or {includedExecutions} App Runs per month. App Run cost: ${invocationCost}. 
-						</Typography>
-					}>
-						<Paper style={paperStyle}>
-							<Typography variant="h4">
-								${selectedOrganization.lead_info.customer === false && selectedOrganization.lead_info.pov === false ?
-									0 
-									: 
-									apprunCost
-								}
+
+					{syncStats == true ? null : 
+						<Tooltip title={
+							<Typography variant="body1" style={{padding: 10, }}>
+								The cost of app runs in the selected period based on {filteredStatistics.monthly_app_executions} App Runs. These numbers do not exclude your included 10.000/month or {includedExecutions} App Runs per month. App Run cost: ${invocationCost}. 
 							</Typography>
-							<Typography variant="h6">
-								Period Cost
-							</Typography>
-						</Paper>
-					</Tooltip>
+						}>
+							<Box sx={paperStyle}>
+								<Typography variant="h4">
+									${selectedOrganization?.lead_info?.customer === false && selectedOrganization?.lead_info?.pov === false ?
+										0 
+										: 
+										apprunCost
+									}
+								</Typography>
+								
+								<Typography variant="h6">
+									Period Cost
+								</Typography>
+							</Box>
+						</Tooltip>
+					}
+
+					{syncStats === true ? null :
 					<Tooltip title={
 						<Typography variant="body1" style={{padding: 10, }}>
 							App runs in the selected period
 						</Typography>
 					}>
-					<Paper style={paperStyle}>
-						<Typography variant="h4">
-							{filteredStatistics.monthly_app_executions === null || filteredStatistics.monthly_app_executions === undefined ? 0 : filteredStatistics.monthly_app_executions}
-						</Typography>
-						<Typography variant="h6">
-							App Runs 
-						</Typography>
-					</Paper>
+						<Box sx={paperStyle}>
+							<Typography variant="h4">
+								{filteredStatistics.monthly_app_executions === null || filteredStatistics.monthly_app_executions === undefined ? 0 : filteredStatistics.monthly_app_executions}
+							</Typography>
+							<Typography variant="h6">
+								App Runs 
+							</Typography>
+						</Box>
 					</Tooltip> 
+					}
+
+					{syncStats === true ? null :
 					<Tooltip title={
 						<Typography variant="body1" style={{padding: 10, }}>
 							Workflow runs in the selected period 
 						</Typography>
 					}>
-						<Paper style={paperStyle}>
+						<Box sx={paperStyle}>
 							<Typography variant="h4">
 								{filteredStatistics.monthly_workflow_executions === null || filteredStatistics.monthly_workflow_executions === undefined ? 0 : filteredStatistics.monthly_workflow_executions}
 							</Typography>
 							<Typography variant="h6">
 								Workflow Runs 
 							</Typography>
-						</Paper>
+						</Box>
 					</Tooltip>
-					<Tooltip title={
-						<Typography variant="body1" style={{padding: 10, }}>
-							Estimated cost to be billed at the end of the current month. Subtracted contractually included app runs. Actual cost month to date: ${monthToDateCost}. App Run cost: ${invocationCost}.
-						</Typography>
-					}>
-						<Paper style={{
-							textAlign: "center", 
-							padding: 40, 
-							margin: 5, 
-							marginLeft: clickedFromOrgTab? null:90, 
-							backgroundColor: theme.palette.platformColor,
-							border: "1px solid rgba(255,255,255,0.3)",
-							maxWidth: 300,
-						}}>
-							<Typography variant="h4">
-								${monthTotalCost}
+					}
+
+					{syncStats === true ? null :
+						<Tooltip title={
+							<Typography variant="body1" style={{padding: 10, }}>
+								Estimated cost to be billed at the end of the current month. Subtracted contractually included app runs. Actual cost month to date: ${monthToDateCost}. App Run cost: ${invocationCost}.
 							</Typography>
-							<Typography variant="h6">
-								Estimated cost 
-							</Typography>
-						</Paper>
-					</Tooltip>
+						}>
+							<Box sx={paperStyle}>
+								<Typography variant="h4">
+									${monthTotalCost}
+								</Typography>
+								<Typography variant="h6">
+									Estimated cost 
+								</Typography>
+							</Box>
+						</Tooltip>
+					}
 				</div>
 			: null}
 			</div>
@@ -895,7 +964,13 @@ const AppStats = (defaultprops) => {
 		{appRuns === undefined ? 
 			null
 			: 
-			<LineChartWrapper keys={appRuns} height={300} width={"100%"} inputname={"Daily App Runs"}/>
+			<LineChartWrapper keys={appRuns} height={300} width={"100%"} inputname={"App Runs - Current Org"}/>
+		}
+
+		{childOrgsAppRuns === undefined ? 
+			null
+			: 
+			<LineChartWrapper keys={childOrgsAppRuns} height={300} width={"100%"} inputname={"Child Org App Runs"}/>
 		}
 
 		{workflowRuns === undefined ? 
@@ -916,56 +991,58 @@ const AppStats = (defaultprops) => {
 			<LineChartWrapper keys={appRunCosts} height={300} width={"100%"} inputname={"Apprun cost - Cost per day"}/>
 		*/}
 
+		{syncStats === true ? null : 
+			<div style={{height: 150+resultRows.length * 25, padding: "10px 0px 10px 0px", }}>
+				{resultLoading ? 
+					<div style={{margin: "auto", alignItems: "center", width: 350, height: "100%", }}>
+						<Typography variant="body2" color="textSecondary" component="p" style={{textAlign: "center", marginTop: 50, marginBottom: 15, }}>
+							Loading usage for selected period (may take a while) 
+						
+							<CircularProgress style={{marginTop: 15, }} /> 
+						</Typography>
+					</div>
+					:
+					<DataGrid
+						rows={resultRows}
+						columns={columns}
+						pageSize={100}
+						rowsPerPageOptions={[10, 20, 50, 100]}
+						checkboxSelection
+						disableSelectionOnClick
+						onPageSizeChange={(newPageSize) => {
+							//setRowsPerPage(newPageSize)
+							//submitSearch(workflowId, status, startTime, endTime, rowCursor, newPageSize) 
+						}}
+						// event for when clicking next page
+						// Hide page changer
+						onPageChange={(params) => {
+							console.log("page params: ", params)
+						}}
+						onSelectionModelChange={(newSelection) => {
+							console.log("newSelection: ", newSelection)
+							//console.log("newSelection: ", newSelection)
+							//setSelectedWorkflowExecutionsIndexes(newSelection)
+							//var found = []	
+							//for (var i = 0; i < newSelection.length; i++) {
+							//	// Find the workflow in the resultRows
+							//	var selected = resultRows.find((workflow) => {
+							//		return workflow.id === newSelection[i]
+							//	})
 
-		<div style={{height: 150+resultRows.length * 25, padding: "10px 0px 10px 0px", }}>
-			{resultLoading ? 
-				<div style={{margin: "auto", alignItems: "center", width: 350, height: "100%", }}>
-					<Typography variant="body2" color="textSecondary" component="p" style={{textAlign: "center", marginTop: 50, marginBottom: 15, }}>
-						Loading usage for selected period (may take a while) 
-					</Typography>
-					<CircularProgress style={{}} /> 
-				</div>
-				:
-				<DataGrid
-					rows={resultRows}
-					columns={columns}
-					pageSize={100}
-					rowsPerPageOptions={[10, 20, 50, 100]}
-					checkboxSelection
-					disableSelectionOnClick
-					onPageSizeChange={(newPageSize) => {
-						//setRowsPerPage(newPageSize)
-						//submitSearch(workflowId, status, startTime, endTime, rowCursor, newPageSize) 
-					}}
-					// event for when clicking next page
-					// Hide page changer
-					onPageChange={(params) => {
-						console.log("page params: ", params)
-					}}
-					onSelectionModelChange={(newSelection) => {
-						console.log("newSelection: ", newSelection)
-						//console.log("newSelection: ", newSelection)
-						//setSelectedWorkflowExecutionsIndexes(newSelection)
-						//var found = []	
-						//for (var i = 0; i < newSelection.length; i++) {
-						//	// Find the workflow in the resultRows
-						//	var selected = resultRows.find((workflow) => {
-						//		return workflow.id === newSelection[i]
-						//	})
+							//	if (selected === undefined || selected === null) {
+							//		continue
+							//	}
 
-						//	if (selected === undefined || selected === null) {
-						//		continue
-						//	}
+							//	found.push(selected)
+							//}
 
-						//	found.push(selected)
-						//}
-
-						//setSelectedWorkflowExecutions(found)
-					}}
-					// Track which items are selected
-				  />
-			}
-		  </div>
+							//setSelectedWorkflowExecutions(found)
+						}}
+						// Track which items are selected
+					  />
+				}
+			  </div>
+		}
     </div>
   )
 
diff --git a/frontend/src/components/Branding.jsx b/frontend/src/components/Branding.jsx
index e549d12e..f913a58a 100644
--- a/frontend/src/components/Branding.jsx
+++ b/frontend/src/components/Branding.jsx
@@ -1,8 +1,7 @@
 import React, { useState, useEffect, useContext } from "react";
 import ReactGA from 'react-ga4';
-import theme from "../theme.jsx";
+import {getTheme} from "../theme.jsx";
 import { ToastContainer, toast } from "react-toastify" 
-
 import {
 	CheckCircle as CheckCircleIcon,
 } from "@mui/icons-material";
@@ -13,8 +12,11 @@ import {
 	Divider,
 	Button,
 	Tooltip,
-	Grid,
-	Card,
+	ToggleButtonGroup,
+	ToggleButton,
+	useMediaQuery,
+	TextField,
+	Box,
 } from "@mui/material";
 
 import {
@@ -27,18 +29,98 @@ import { Context } from "../context/ContextApi.jsx";
 
 const Branding = (props) => {
     const { globalUrl, userdata, serverside, billingInfo,clickedFromOrgTab, stripeKey, selectedOrganization, handleGetOrg, } = props;
+	const { themeMode, handleThemeChange, supportEmail, setSupportEmail, logoutUrl, setLogoutUrl, brandColor, setBrandColor, setBrandName } = useContext(Context)
     //const alert = useAlert();
     const [publishingInfo, setPublishingInfo] = useState("");
 	const [publishRequirements, setPublishRequirements] = useState([])
+	const [currentSelectedTheme, setCurrentSelectedTheme] = useState(themeMode);
+	const [integrationPartner, setIntegrationPartner] = useState(false);
+	const [changingTheme, setChangingTheme] = useState(false);
+	const theme = getTheme(themeMode, brandColor)
+	const [selectedBrandColor, setSelectedBrandColor] = useState(theme?.palette?.main || "#FF8544")
+	const [selectedBrandName, setSelectedBrandName] = useState(selectedOrganization?.branding?.brand_name || "")
 
-	const { leftSideBarOpenByClick } = useContext(Context)
- 
-  	const handleEditOrg = (joinStatus) => {
+	const [isLoading,setIsLoading] = useState(false);
+
+	const handleEditOrg = (joinStatus) => {
+	setIsLoading(true)
   	  const data = {
       	  "org_id": selectedOrganization.id,
-		  "creator_config": joinStatus,
   	  };
 
+	  if (joinStatus === "join" || joinStatus === "leave") {
+		data["creator_config"]  = joinStatus
+	  }
+
+	if (joinStatus === "light" || joinStatus === "dark" || joinStatus === "system") {
+		data["branding"]  = {
+			"theme": joinStatus,
+			"enable_chat": selectedOrganization?.branding?.enable_chat || false,
+			"home_url": selectedOrganization?.branding?.home_url || "",
+			"brand_color": selectedOrganization?.branding?.brand_color || theme.palette.primary.main,
+			"brand_name": selectedOrganization?.branding?.brand_name || "",
+			"logout_url": selectedOrganization?.branding?.logout_url || "",
+			"support_email": selectedOrganization?.branding?.support_email || "",
+		}
+
+		data["editing_branding"] = true;
+	}
+
+	if (joinStatus === "brand_color") {
+		data["branding"]  = {
+			"theme": selectedOrganization?.branding?.theme || "dark",
+			"enable_chat": selectedOrganization?.branding?.enable_chat || false,
+			"home_url": selectedOrganization?.branding?.home_url || "",
+			"brand_color": selectedBrandColor,
+			"brand_name": selectedOrganization?.branding?.brand_name || "",
+			"logout_url": selectedOrganization?.branding?.logout_url || "",
+			"support_email": selectedOrganization?.branding?.support_email || "",
+		}
+
+		data["editing_branding"] = true;
+	}
+
+	if (joinStatus === "brand_name") {
+		data["branding"]  = {
+			"theme": selectedOrganization?.branding?.theme || "dark",
+			"enable_chat": selectedOrganization?.branding?.enable_chat || false,
+			"home_url": selectedOrganization?.branding?.home_url || "",
+			"brand_color": selectedOrganization?.branding?.brand_color || theme.palette.primary.main,
+			"brand_name": selectedBrandName,
+			"logout_url": selectedOrganization?.branding?.logout_url || "",
+			"support_email": selectedOrganization?.branding?.support_email || "",
+		}
+		toast.info("Updating brand name to " + selectedBrandName + ". Please wait a moment.")
+		data["editing_branding"] = true;
+	}
+
+	if (joinStatus === "support_email") {
+		data["branding"]  = {
+			"theme": selectedOrganization?.branding?.theme || "dark",
+			"enable_chat": selectedOrganization?.branding?.enable_chat || false,
+			"home_url": selectedOrganization?.branding?.home_url || "",
+			"brand_color": selectedOrganization?.branding?.brand_color || theme.palette.primary.main,
+			"brand_name": selectedOrganization?.branding?.brand_name || "",
+			"support_email": supportEmail,
+			"logout_url": selectedOrganization?.branding?.logout_url || "",
+		}
+		data["editing_branding"] = true;
+	}
+
+	if (joinStatus === "logout_url") {
+		data["branding"]  = {
+			"theme": selectedOrganization?.branding?.theme || "dark",
+			"enable_chat": selectedOrganization?.branding?.enable_chat || false,
+			"home_url": selectedOrganization?.branding?.home_url || "",
+			"brand_color": selectedOrganization?.branding?.brand_color || theme.palette.primary.main,
+			"brand_name": selectedOrganization?.branding?.brand_name || "",
+			"support_email": selectedOrganization?.branding?.support_email || "",
+			"logout_url": logoutUrl,
+		}
+		data["editing_branding"] = true;
+	}
+
+
   	  const url = globalUrl + `/api/v1/orgs/${selectedOrganization.id}`;
   	  fetch(url, {
   	    mode: "cors",
@@ -56,20 +138,65 @@ const Branding = (props) => {
   	        if (responseJson["success"] === false) {
   	          	toast("Failed updating org: ", responseJson.reason);
   	        } else {
-				if (joinStatus == "join") {
-					setPublishingInfo("Your organization is now part of the Partner Program. You can now create, publish and manage content for your organization's public page.")
-				} else {
-					setPublishingInfo("Your organization is no longer part of the Creator Incentive Program. You can still create a creator account to manage your organization's content.")
+				if (joinStatus === "join" || joinStatus === "leave") {
+					if (joinStatus === "join") {
+						setPublishingInfo("Your organization is now part of the Partner Program. You can now create, publish and manage content for your organization's public page.")
+					} else {
+						setPublishingInfo("Your organization is no longer part of the Creator Incentive Program. You can still create a creator account to manage your organization's content.")
+					}
 				}
+
+				if (joinStatus === "light" || joinStatus === "dark" || joinStatus === "system") {
+					handleThemeChange(joinStatus)
+					setChangingTheme(false)
+					setCurrentSelectedTheme(joinStatus)
+				}
+
+				if (joinStatus === "support_email") {
+					toast.info("Support email updated successfully.")
+					if (supportEmail?.length > 0) {
+						setSupportEmail(supportEmail)
+					}else {
+						setSupportEmail("support@shuffler.io")
+					}
+				}
+
+				if (joinStatus === "logout_url") {
+					toast.info("Logout URL updated successfully.")
+					setLogoutUrl(logoutUrl)
+				}
+
+				if (joinStatus === "brand_color") {
+					toast.info("Brand color updated successfully.")
+					setBrandColor(selectedBrandColor)
+					localStorage.setItem("brandColor", selectedBrandColor)
+				}
+
+				if (joinStatus === "brand_name") {
+					toast.info("Brand name updated successfully.")
+					setBrandName(selectedBrandName)
+					localStorage.setItem("brandName", selectedBrandName)
+				}
+
           		handleGetOrg(selectedOrganization.id);
-  	        }
+
+				setIsLoading(false)
+				}
   	      })
   	    )
   	    .catch((error) => {
   	      toast("Err: " + error.toString());
-  	    });
+			setIsLoading(false)
+  	    })
   	};
 
+	useEffect(() => {
+		if (userdata && userdata?.active_org && userdata?.active_org?.branding?.theme?.length > 0) {
+			console.log("Setting current selected theme from userdata", userdata?.active_org?.branding?.theme);	
+			setCurrentSelectedTheme(userdata?.active_org?.branding?.theme);
+		}
+	},[userdata]);
+
     // Should enable / disable org branding
     const handleChangePublishing = () => {
       console.log("Handle change publishing");
@@ -117,16 +244,56 @@ const Branding = (props) => {
 	const leadinfo = selectedOrganization.lead_info === undefined || selectedOrganization.lead_info === null || selectedOrganization.lead_info === "" ? "" : JSON.stringify(selectedOrganization.lead_info)
 	const isPartner = leadinfo.includes("partner")
 
+	
+	useEffect(() => {
+		if (selectedOrganization?.branding?.theme && selectedOrganization?.creator_org?.length === 0) {
+			setCurrentSelectedTheme(selectedOrganization.branding.theme);
+		}
+
+		if (selectedOrganization?.creator_org?.length > 0 && userdata?.active_org?.branding.theme) {
+			setCurrentSelectedTheme(userdata?.active_org?.branding.theme);
+		}
+
+		if (
+			selectedOrganization &&
+			selectedOrganization?.branding?.brand_color &&
+			selectedOrganization?.branding?.brand_color !== selectedBrandColor
+		  ) {
+			setSelectedBrandColor(selectedOrganization.branding.brand_color);
+		  }
+
+		if (selectedOrganization?.branding?.brand_name && selectedOrganization?.branding?.brand_name !== selectedBrandName) {
+			setSelectedBrandName(selectedOrganization.branding.brand_name);
+		}
+
+	}, [selectedOrganization, userdata]);
+	
+	useEffect(() => {
+		if ((userdata && userdata?.org_status?.includes("integration_partner") && !integrationPartner && !userdata?.org_status?.includes("sub_org")) || userdata?.support) {
+			setIntegrationPartner(true)
+		}
+
+	},[userdata, integrationPartner]);
+
+	const handleColorChange = (e) => {
+		setSelectedBrandColor(e.target.value);
+	};
+
+	const saveColorChanges = () => {
+		toast.info("Updating brand color to " + selectedBrandColor + ". Please wait a moment.")
+		handleEditOrg("brand_color");
+	};
+
 
 	return (
-		<div style={{ width: clickedFromOrgTab? "100%": "auto", height: "100%", minHeight: 1100, boxSizing: 'border-box', transition: "width 0.3s ease", padding: "27px 10px 19px 27px", height: "auto", backgroundColor: '#212121', borderRadius: '16px', }}>
-			<div style={{height: 843, overflowY: "auto",}}>
+		<div style={{ width: clickedFromOrgTab? "100%": "auto", height: "100%", minHeight: 1100, boxSizing: 'border-box', transition: "width 0.3s ease", padding: "27px 10px 19px 27px", backgroundColor: theme.palette.platformColor, borderRadius: '16px', scrollbarWidth: "thin", scrollbarColor: theme.palette.scrollbarColorTransparent, }}>
+			<div style={{ overflowY: "auto",}}>
 				<div style={{width: "100%", overflowX: 'hidden', }}>
 				<Typography style={{fontSize: 24, fontWeight: "bold", marginTop: clickedFromOrgTab ?0:null,}}>
 				Partner Status & Branding
 			</Typography>
 			<Typography variant="body1" color="textSecondary" style={{ marginTop: 10, marginBottom: 10, fontSize: 16 }}>
-				You can customize your organization's branding by uploading a logo, changing the color scheme and a lot more. 
+				Please note that same theme settings are applied to all sub organizations for partners.
 			</Typography>
 
 			<Typography variant="body1" color="textSecondary" style={{display: 'flex', marginTop: 20, marginBottom: 10 }}>
@@ -150,7 +317,8 @@ const Branding = (props) => {
 						style={{ textDecoration: "none" }} // Optional: remove underline
 					>
 						<Button 
-						variant="contained" 
+								variant="contained" 
+								color="primary"
 						style={{
 							marginTop: 20, 
 							marginBottom: 10, 
@@ -176,15 +344,15 @@ const Branding = (props) => {
 					</Button>
 					)}
 
-			<Divider style={{marginTop: 50, marginBottom: 50, }} />
+			<Divider style={{marginTop: 50, marginBottom: 50, color: theme.palette.defaultBorder}} />
 			<Typography style={{fontSize: 24, fontWeight: "bold"}}>
-				Partner Program 
+				Public Partner Program 
 			</Typography>
 			<div style={{ display: "flex", width: 900, marginTop: 10}}>
 				<div>
 					<span>
-						<Typography variant="body1" color="textSecondary" style={{fontSize: 16}}>
-							By changing publishing settings, you agree to our <a href="/docs/terms_of_service" target="_blank" style={{ textDecoration: "none", color: "#f86a3e"}}>Terms of Service</a>, and acknowledge that your organization's non-sensitive data will be added as a <a target="_blank" style={{ textDecoration: "none", color: "#f86a3e"}} href="https://shuffler.io/creators">creator account</a>. None of your existing workflows, apps, or other stored data will be published. Any admin in your organization can manage the creator configuration. Becoming a creator organization IS reversible.<div/>Support: <a href="mailto:support@shuffler.io"target="_blank" style={{ textDecoration: "none", color: "#f86a3e"}}>support@shuffler.io</a>
+						<Typography variant="body2" color="textSecondary">
+							By changing publishing settings, you agree to our <a href="/docs/terms_of_service" target="_blank" style={{ textDecoration: "none", color: theme.palette.linkColor}}>Terms of Service</a>, and acknowledge that your organization's non-sensitive data will be added as a <a target="_blank" style={{ textDecoration: "none", color: theme.palette.linkColor}} href="https://shuffler.io/creators">creator account</a>. None of your existing workflows, apps, or other stored data will be published. Any admin in your organization can manage the creator configuration. Becoming a creator organization IS reversible.<div/>Support: <a href={`mailto:${supportEmail}`} target="_blank" style={{ textDecoration: "none", color: theme.palette.linkColor}}>{supportEmail}</a>
 						</Typography>
 						{selectedOrganization.creator_id == "" ? 
 							<Typography variant="h6" color="textSecondary" style={{ marginTop: 20, marginBottom: 10, color: "grey", }}>
@@ -195,7 +363,9 @@ const Branding = (props) => {
 						}
 
 						<Button
-							style={{ height: 40, marginTop: 10, width: 300, textTransform: 'none', fontSize: 18, backgroundColor: "#ff8544", color: "#1a1a1a" }}
+							variant="contained"
+							color="primary"
+							style={{ height: 40, marginTop: 10, width: 300, textTransform: 'none', fontSize: 18, }}
 							variant={selectedOrganization.creator_id == "" ? "contained" : "outlined"}
 							color={selectedOrganization.creator_id == "" ? "primary" : "secondary"}
 							disabled={!isOrganizationReady()}
@@ -222,6 +392,257 @@ const Branding = (props) => {
 				</div>
 			</div>
 				</div>
+
+
+				{integrationPartner ? (
+					<>
+					<Divider style={{marginTop: 50, marginBottom: 50, color: theme.palette.defaultBorder}} />
+					<Typography style={{fontSize: 24, fontWeight: "bold"}}>
+						Parent & Sub Organization Branding
+					</Typography>
+					<Typography variant="body1" color="textSecondary" style={{ marginTop: 10, marginBottom: 10, fontSize: 16 }}>
+						Sub organizations are not allowed to change their branding. The branding is inherited from the parent organization.
+					</Typography>
+							<ToggleButtonGroup
+							value={currentSelectedTheme}
+							exclusive
+							disabled={isLoading}
+							onChange={(event, newTheme) => {
+								if (newTheme === null) {
+									return;
+								}
+								if (newTheme === currentSelectedTheme) {
+									return;
+								}
+								if (changingTheme === true) {
+									return
+								}
+								setChangingTheme(true)
+								handleEditOrg(newTheme);
+							}}
+							aria-label="theme"
+							style={{ justifyContent: "flex-start", marginBottom: 10, marginTop: 20 }}
+							>
+							<ToggleButton value="light" aria-label="light theme" style={{ backgroundColor: currentSelectedTheme === "light" ? theme.palette.hoverColor : theme.palette.backgroundColor }}>
+								Light
+							</ToggleButton>
+							<ToggleButton value="dark" aria-label="dark theme" style={{ backgroundColor: currentSelectedTheme === "dark" ? theme.palette.hoverColor : theme.palette.backgroundColor }}>
+								Dark
+							</ToggleButton>
+							<ToggleButton value="system" aria-label="system theme" style={{ backgroundColor: currentSelectedTheme === "system" ? theme.palette.hoverColor : theme.palette.backgroundColor }}>
+								System
+							</ToggleButton>
+							</ToggleButtonGroup>
+					</>
+				): null}
+
+				{integrationPartner ? <>
+						<Divider style={{marginTop: 50, marginBottom: 50, color: theme.palette.defaultBorder}} />
+							<Typography variant="text" style={{color: theme.palette.text.primary, fontFamily: theme.typography.fontFamily,}}>Brand Name</Typography>
+							<div style={{ display: "flex", alignItems: 'center', justifyContent: 'flex-start', marginBottom: 10, gap: 15,  maxWidth: 434 }}>
+							  <TextField
+							   	type="text"
+								id="brandName"
+								value={selectedBrandName}
+								onChange={(e) => {
+									const value = e.target.value;
+									setSelectedBrandName(value);
+								}}
+								size="small"
+								PaperProps={{ style: { backgroundColor: theme.palette.backgroundColor, borderRadius: 4, border: `1px solid ${theme.palette.defaultBorder}` } }}
+								style={{ 
+									height: 36, 
+									borderRadius: 4, 
+									border: `1px solid ${theme.palette.defaultBorder}`,
+									width: 300
+								}}
+								/>
+								<Button 
+								onClick={()=>{
+									if (selectedBrandName !== selectedOrganization.branding.brandName) {
+										handleEditOrg("brand_name");
+									}
+								}}
+								disabled={isLoading}
+								variant="contained"
+								color="primary"
+								style={{ fontSize: 16, textTransform: 'capitalize',  boxShadow: "none", borderRadius: 4, width: 110, height: 35 }}
+								>
+									Update 
+								</Button>
+							</div>	
+				</>: null}
+				
+				{integrationPartner ? <>
+							<Typography variant="text" style={{color: theme.palette.text.primary, fontFamily: theme.typography.fontFamily}}>Brand Color</Typography>
+							<div style={{ display: "flex", alignItems: 'center', justifyContent: 'flex-start', marginBottom: 10, gap: 15,  maxWidth: 434 }}>
+							<input 
+								type="color" 
+								id="color" 
+								name="color" 
+								value={selectedBrandColor} 
+								onChange={handleColorChange} 
+								style={{ 
+								width: 50, 
+								height: 50, 
+								minWidth: 50,
+								minHeight: 50,
+								cursor: "pointer",
+								borderRadius: 5, 
+								border: "none"
+								}} 
+							/>
+							<TextField 
+								type="text" 
+								id="colorCode" 
+								value={selectedBrandColor}
+								size="small"
+								fullWidth={true}
+								PaperProps={{ style: { backgroundColor: theme.palette.backgroundColor, borderRadius: 4, border: `1px solid ${theme.palette.defaultBorder}` } }}
+								style={{ 
+									height: 36, 
+									padding: "0 10px", 
+									borderRadius: 4, 
+									border: `1px solid ${theme.palette.defaultBorder}`,
+									width: 260
+								}} 
+								/>
+							<Button
+							onClick={()=>{saveColorChanges();}}
+							disabled={isLoading}
+							variant="contained"
+							color="primary"
+							style={{ fontSize: 16, textTransform: 'capitalize',  boxShadow: "none", borderRadius: 4, width: 110, height: 35 }}
+							>
+							 Update
+							</Button>
+							</div>	
+				</>: null}
+
+
+				{integrationPartner ? (
+					<div style={{ width: "100%", maxWidth: 434, marginRight: 10, marginTop: 20 }}>
+					<Typography variant="text" style={{color: theme.palette.text.primary, fontFamily: theme.typography.fontFamily}}>Support Email</Typography>
+					<Box
+					sx={{
+						display: "flex",
+						flexDirection: "row",
+						alignItems: "center",
+						justifyContent: "space-between",
+					}}
+					>
+						<TextField
+						required
+						style={{
+							flex: "1",
+							display: "flex",
+							height: 35,
+							width: "100%",
+							maxWidth: 434,
+							fontFamily: theme.typography.fontFamily,
+							marginTop: "5px",
+							marginRight: "15px",
+							color: theme.palette.textFieldStyle.color,
+							backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+						}}
+						fullWidth={true}
+						placeholder="Support Email"
+						type="email"
+						id="standard-required"
+						margin="normal"
+						variant="outlined"
+						value={supportEmail}
+						onChange={(e) => {
+							setSupportEmail(e.target.value)
+						}}
+						color="primary"
+						InputProps={{
+							style: {
+								color: theme.palette.textFieldStyle.color,
+								height: "35px",
+								fontSize: "1em",
+								borderRadius: 4,
+								backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+							},
+						}}
+					/>
+					  <Button
+						style={{ fontSize: 16, textTransform: 'capitalize',  boxShadow: "none", borderRadius: 4, width: 110, height: 35 }}
+						variant="contained"
+						color="primary"
+						disabled={isLoading}
+						onClick={() => {
+							toast.info("Updating support email..")
+							handleEditOrg("support_email")
+						}}
+						>
+							Update
+					</Button>
+					</Box>
+					</div>
+				) : null}
+
+                {integrationPartner ? (
+					<div style={{ width: "100%", maxWidth: 434, marginRight: 10, marginTop: 20 }}>
+					<Typography variant="text" style={{color: theme.palette.text.primary, fontFamily: theme.typography.fontFamily}}>Logout URL</Typography>
+					<Box
+					sx={{
+						display: "flex",
+						flexDirection: "row",
+						alignItems: "center",
+						justifyContent: "space-between",
+					}}
+					>
+						<TextField
+						required
+						style={{
+							flex: "1",
+							display: "flex",
+							height: 35,
+							width: "100%",
+							maxWidth: 434,
+							fontFamily: theme.typography.fontFamily,
+							marginTop: "5px",
+							marginRight: "15px",
+							color: theme.palette.textFieldStyle.color,
+							backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+						}}
+						fullWidth={true}
+						placeholder="Logout URL"
+						type="text"
+						id="standard-required"
+						margin="normal"
+						variant="outlined"
+						value={logoutUrl}
+						onChange={(e) => {
+							setLogoutUrl(e.target.value)
+						}}
+						color="primary"
+						InputProps={{
+							style: {
+								color: theme.palette.textFieldStyle.color,
+								height: "35px",
+								fontSize: "1em",
+								borderRadius: 4,
+								backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+							},
+						}}
+					/>
+					  <Button
+						style={{ fontSize: 16, textTransform: 'capitalize',  boxShadow: "none", borderRadius: 4, width: 110, height: 35 }}
+						variant="contained"
+						color="primary"
+						disabled={isLoading}
+						onClick={() => {
+							toast.info("Updating logout url..")
+							handleEditOrg("logout_url")
+						}}
+						>
+							Update
+					</Button>
+					</Box>
+				</div>
+				) : null}
 			</div>
 		</div>
 	)
diff --git a/frontend/src/components/CacheView.jsx b/frontend/src/components/CacheView.jsx
index 5ff867d6..1e94d131 100644
--- a/frontend/src/components/CacheView.jsx
+++ b/frontend/src/components/CacheView.jsx
@@ -1,8 +1,12 @@
 import React, { useState, useEffect, useContext, memo } from "react";
-import theme from "../theme.jsx";
+import { makeStyles } from "@mui/styles";
+import { getTheme } from "../theme.jsx";
 import { toast } from 'react-toastify';
-import ReactJson from "react-json-view-ssr";
 
+import ReactJson from "react-json-view-ssr";
+import { GetIconInfo } from "../views/Workflows2.jsx";
+import { red } from "../views/AngularWorkflow.jsx";
+import CollectIngestModal from "../components/CollectIngestModal.jsx";
 import {
 	Typography,
     Tooltip,
@@ -11,7 +15,6 @@ import {
     Button,
     Tabs,
     Tab,
-    Grid,
     List,
     ListItem,
     ListItemText,
@@ -26,8 +29,18 @@ import {
     DialogContent,
 	FormControl,
 	Select,
+	Autocomplete,
+	ButtonGroup,
+	InputLabel,
+	Pagination,
+	PaginationItem,
 } from "@mui/material";
 
+import { 
+	DataGrid, 
+	GridColDef,
+} from '@mui/x-data-grid';
+
 import {
 	Link as LinkIcon,
     AutoFixHigh as AutoFixHighIcon,
@@ -35,6 +48,7 @@ import {
     Edit as EditIcon,
     FileCopy as FileCopyIcon,
     SelectAll as SelectAllIcon,
+	DeleteOutline as DeleteOutlineIcon,
     OpenInNew as OpenInNewIcon,
     CloudDownload as CloudDownloadIcon,
     Description as DescriptionIcon,
@@ -43,7 +57,6 @@ import {
     Close as CloseIcon,
     Apps as AppsIcon,
     Image as ImageIcon,
-    Delete as DeleteIcon,
     Cached as CachedIcon,
     AccessibilityNew as AccessibilityNewIcon,
     Lock as LockIcon,
@@ -55,6 +68,14 @@ import {
     VisibilityOff as VisibilityOffIcon,
 	Clear as ClearIcon,
 	Add as AddIcon,
+	Rocket as RocketIcon, 
+	Webhook as WebhookIcon, 
+	Air as AirIcon, 
+	RocketLaunch as RocketLaunchIcon, 
+	Send as SendIcon,
+	SmartToy as SmartToyIcon,
+	Settings as SettingsIcon,
+	FilterAlt as FilterAltIcon,
 } from "@mui/icons-material";
 import { validateJson, } from "../views/Workflows.jsx";
 import { Context } from "../context/ContextApi.jsx";
@@ -75,7 +96,15 @@ const scrollStyle2 = {
     overflow: "scroll",
 }
 
+const useStyles = makeStyles({
+	notchedOutline: {
+		borderColor: "#f85a3e !important",
+	},
+});
 
+// 
+
+//const CacheView = (props) => {
 const CacheView = memo((props) => {
     const { globalUrl, userdata, serverside, orgId, isSelectedDataStore, selectedOrganization } = props;
     const [orgCache, setOrgCache] = React.useState("");
@@ -86,7 +115,6 @@ const CacheView = memo((props) => {
     const [key, setKey] = React.useState("");
     const [value, setValue] = React.useState("");
     const [cacheInput, setCacheInput] = React.useState("");
-    const [cacheCursor, setCacheCursor] = React.useState("");
     const [dataValue, setDataValue] = React.useState({});
     const [editCache, setEditCache] = React.useState(false);
     const [cachedLoaded, setCachedLoaded] = React.useState(false);
@@ -94,26 +122,142 @@ const CacheView = memo((props) => {
     const [showDistributionPopup, setShowDistributionPopup] = useState(false);
     const [selectedSubOrg, setSelectedSubOrg] = useState([]);
     const [selectedCacheKey, setSelectedCacheKey] = useState("");
+	const [totalAmount, setTotalAmount] = useState(0);
+	const [page, setPage] = useState(0);
+	const [pageSize, setPageSize] = useState(50)
+	const [cursors, setCursors] = useState({
+		0: "",
+	})
+	const [_, setUpdate] = useState(Math.random()) 
+	const [selectedRows, setSelectedRows] = useState([]);
 
 	// Direct category migration from ../components/Files.jsx
     const [selectAllChecked, setSelectAllChecked] = React.useState(false)
   	const [renderTextBox, setRenderTextBox] = React.useState(false);
-  	const [fileCategories, setFileCategories] = React.useState(["default"]);
+  	const [datastoreCategories, setDatastoreCategories] = React.useState(["default"]);
 	const [selectedCategory, setSelectedCategory] = React.useState("default");
 	const [selectedFileId, setSelectedFileId] = React.useState("");
     const [updateToThisCategory, setUpdateToThisCategory] = useState("")
-	const [showFileCategoryPopup, setShowFileCategoryPopup] = React.useState(false);
-  	const [selectedFiles, setSelectedFiles] = useState([]);
+	const [workflows, setWorkflows] = useState([]);
+
+    const [selectedFiles, setSelectedFiles] = useState([]);
+	const [showAutomationMenu, setShowAutomationMenu] = useState(false);
+	const [showSettingsMenu, setShowSettingsMenu] = useState(false);
+	const [showCollectIngestMenu, setShowCollectIngestMenu] = useState(false);
+
+	const defaultAutomation = [
+		{
+			"name": "Run workflow",
+			"description": "Runs a workflow with the updated value.",
+			"options": [{
+				"key": "workflow_id",
+				"value": "",
+			}],
+			"icon": <AirIcon />, 
+			"enabled": false,
+		},
+		{
+			"name": "Send message",
+			"description": "",
+			"type": "singul",
+			"options": [{
+				"key": "app",
+				"value": "",
+			}],
+			"icon": <SendIcon />,
+			"disabled": true,
+			"enabled": false,
+		},
+		{
+			"name": "Enrich",
+			"description": "",
+			"type": "singul",
+			"options": [{
+				"key": "",
+				"value": "",
+			}],
+			"icon": "/images/logos/singul.svg",
+			"enabled": false,
+			"disabled": true,
+		},
+		{
+			"name": "Run AI Agent",
+			"description": "",
+			"options": [{
+				"key": "",
+				"value": "",
+			}],
+			"icon": <SmartToyIcon />,
+			"enabled": false,
+			"disabled": true,
+		},
+		{
+			"name": "Send webhook",
+			"description": "Sends the updated value to a specified webhook URL.",
+			"options": [{
+				"key": "webhook_url",
+				"value": "",
+			}],
+			"icon": <WebhookIcon />, 
+			"enabled": false,
+		},
+	]
+
+	const [categoryAutomations, setCategoryAutomations] = useState(defaultAutomation)
+	const [categoryConfig, setCategoryConfig] = useState(undefined)
+    
+    const { themeMode, brandColor } = useContext(Context);
+    const theme = getTheme(themeMode, brandColor);
+	const classes = useStyles();
+
+
+	const getWorkflows = () => {
+		const url = `${globalUrl}/api/v1/workflows`
+		fetch(url, {
+			method: "GET",
+			headers: {
+				"Content-Type": "application/json",
+				Accept: "application/json",
+			},
+			credentials: "include",
+		})
+		.then((response) => {
+			if (response.status !== 200) {
+				console.log("Status not 200 for workflows :O!");
+				return;
+			}
+
+			return response.json();
+		})
+		.then((responseJson) => {
+			if (responseJson?.success !== true) {
+				setWorkflows(responseJson)
+			} else {
+				toast.warn("Failed to load workflows. Please try again or contact support@shuffler if this persists.")
+			}
+		})
+		.catch((error) => {
+			toast(error.toString());
+		});
+	}
+
+	useEffect(() => {
+		setCursors({
+			0: "",
+		})
+		setPage(0)
+		setSelectedRows([])
+	}, [selectedCategory])
 
     useEffect(() => {
-        if (orgId?.length > 0) {
-            listOrgCache(orgId, selectedCategory)
-        }
-    }, [orgId])
+		getWorkflows()
+        listOrgCache(orgId, selectedCategory, 0, pageSize, page)
+    }, [])
+
 
     const handleKeyDown = (event) => {
       if (event.key === 'Enter') {
-        fileCategories.push(event.target.value);
+        datastoreCategories.push(event.target.value);
         setSelectedCategory(event.target.value);
         setRenderTextBox(false);
       }
@@ -124,9 +268,41 @@ const CacheView = memo((props) => {
       }
     }
 
+    const listOrgCache = (orgId, category, index, amount, page, keyValue) => {
+        setCachedLoaded(false)
+		if (index === undefined || index === null) {
+			index = 0
+		}
+
+		var url = `${globalUrl}/api/v1/orgs/${orgId}/list_cache`
+
+		if (category !== undefined && category !== null && category !== "default" && category !== "") {
+			url += "?category=" + category.replaceAll(" ", "_")
+		} else {
+			url += "?category=default"
+			category = "default"
+		}
+
+		if (amount !== undefined && amount !== null && amount > 0) {
+			url += "&top=" + amount
+		}
+
+		if (page !== undefined && page !== null && page >= 0) {
+			if (cursors[page-1] !== undefined && cursors[page-1] !== null && cursors[page-1] !== "") {
+				url += "&cursor=" + cursors[page-1] 
+			}
+		}
+
+		if (keyValue !== undefined && keyValue !== null && keyValue !== "") {
+			url += "&key=" + keyValue
+
+			setCursors({
+				0: "",
+			})
+			setPage(0)
+			setSelectedRows([])
+		}
 
-    const listOrgCache = (orgId, category) => {
-		const url = `${globalUrl}/api/v1/orgs/${orgId}/list_cache${category !== undefined ? `?category=${category.replaceAll(" ", "_")}` : ""}`
         fetch(url, {
             method: "GET",
             headers: {
@@ -144,26 +320,98 @@ const CacheView = memo((props) => {
 			return response.json();
 		})
 		.then((responseJson) => {
-			if (responseJson.success === true) {
-				setListCache(responseJson.keys);
-                setCachedLoaded(true);
+            setCachedLoaded(true);
+			if (responseJson?.success === true) {
+				setListCache(responseJson.keys)
 
-				if (fileCategories.length === 1 && fileCategories[0] === "default") {
+				if (responseJson.total_amount !== undefined && responseJson.total_amount !== null && responseJson.total_amount > 0) {
+					setTotalAmount(responseJson.total_amount)
+				} else {
+					setTotalAmount(responseJson.keys.length)
+				}
+
+				if (responseJson?.cursor !== undefined && responseJson?.cursor !== null && responseJson?.cursor !== "") {
+					cursors[page] = responseJson.cursor
+				}
+
+				// Especially important during first load
+				if (index < 2 && (category === "default" || category === "" || category === undefined)) { 
+					// If it exists and isn't blank/default, load it 
+					const urlParams = new URLSearchParams(window.location.search);
+					const categoryParam = urlParams.get("category");
+					if (categoryParam && categoryParam !== undefined && categoryParam !== "default" && categoryParam !== "") {
+						setSelectedCategory(categoryParam);
+						if (index === undefined || index === null) {
+							index = 0
+						}
+	
+						listOrgCache(orgId, categoryParam, index+1, amount, page)
+					} else {
+						setSelectedCategory("default");
+					}
+				}
+
+				if ((category === undefined || category === "default" || category === "") && datastoreCategories.length === 1 && datastoreCategories[0] === "default") {
 					var newcategories = ["default"]
 					for (var key in responseJson.keys) {
-						if (responseJson.keys[key].category !== undefined && responseJson.keys[key].category !== null && responseJson.keys[key].category !== "" && !fileCategories.includes(responseJson.keys[key].category)) {
-							newcategories.push(responseJson.keys[key].category);
+						var foundcategory = responseJson.keys[key].category
+						if (foundcategory !== undefined && foundcategory !== null && foundcategory !== ""){
+							foundcategory = category.replaceAll(" ", "_")
+
+							if (!newcategories.includes(foundcategory)) {
+								newcategories.push(foundcategory)
+							}
 						}
 					}
 
-					console.log("CATEGORIES: ", newcategories)
+					if (responseJson?.categories !== undefined && responseJson?.categories !== null && responseJson?.categories.length > 0) {
+						for (var i = 0; i < responseJson.categories.length; i++) {
+							const foundcategory = responseJson.categories[i].replaceAll(" ", "_")
+							if (foundcategory !== undefined && foundcategory !== null && foundcategory !== "" && foundcategory !== "default" && !newcategories.includes(foundcategory)) {
+								newcategories.push(responseJson.categories[i]);
+							}
+						}
+					}
 
-					setFileCategories(newcategories)
+					setDatastoreCategories(newcategories)
 				}
-			}
 
-			if (responseJson.cursor !== undefined && responseJson.cursor !== null && responseJson.cursor !== "") {
-				setCacheCursor(responseJson.cursor);
+
+				if (responseJson?.category_config !== undefined && responseJson?.category_config !== null) {
+
+					if (responseJson?.category_config?.id !== undefined && responseJson?.category_config?.id !== null && responseJson?.category_config?.id !== "") {
+						setCategoryConfig(responseJson.category_config)
+					}
+
+					// Handle other configs here.
+					if (responseJson?.category_config?.automations !== undefined && responseJson?.category_config?.automations !== null && responseJson?.category_config?.automations.length > 0) {
+						// Find icons if they exist
+						for (var key in responseJson.category_config.automations) {
+							//if (responseJson.category_config.automations[key].icon === undefined || responseJson.category_config.automations[key].icon === null || responseJson.category_config.automations[key].icon === "") {
+							const foundItem = defaultAutomation.find((automation) => automation.name === responseJson.category_config.automations[key].name)
+							if (foundItem) {
+								responseJson.category_config.automations[key].disabled = foundItem.disabled
+								responseJson.category_config.automations[key].icon = foundItem.icon
+								responseJson.category_config.automations[key].type = foundItem?.type
+							} else {
+								responseJson.category_config.automations[key].icon = <RocketIcon />
+							}
+						}
+
+						for (var key in defaultAutomation) {
+							if (!responseJson.category_config.automations.some((automation) => automation.name === defaultAutomation[key].name)) {
+								// If the automation doesn't exist in the response, add it with default values
+								responseJson.category_config.automations.push(defaultAutomation[key])
+							}
+						}
+
+						setCategoryAutomations(responseJson.category_config.automations)
+					} else {
+						setCategoryAutomations(defaultAutomation)
+					}
+				} 
+			} else {
+				toast.warn("Failed to load keys. Please try again or contact support@shuffler if this persists.")
 			}
 		})
 		.catch((error) => {
@@ -172,15 +420,19 @@ const CacheView = memo((props) => {
     };
 
 
-    const deleteCache = (orgId, key) => {
+    const deleteEntry = (orgId, key, itemCategory, refreshList) => {
 		const method = "POST"
         const url = `${globalUrl}/api/v1/orgs/${orgId}/delete_cache`
-		const parsed = {
+		var parsed = {
 			"org_id": orgId,
 			"key": key,
 			"category": selectedCategory === "" || selectedCategory === "default" ? "" : selectedCategory,
 		}
 
+		if (itemCategory !== undefined) {
+			parsed["category"] = itemCategory.replaceAll(" ", "_");
+		}
+
         fetch(url, {
 			method: method,
             headers: {
@@ -191,12 +443,15 @@ const CacheView = memo((props) => {
         })
             .then((response) => {
                 if (response.status === 200) {
-                    toast("Successfully deleted Cache");
-                    setTimeout(() => {
-                        listOrgCache(orgId, selectedCategory)
-                    }, 1000);
+					if (refreshList === undefined || refreshList === null || refreshList === true) {
+
+                    	toast.success("Deleted datastore entry");
+						setTimeout(() => {
+							listOrgCache(orgId, selectedCategory, 0, pageSize, page)
+						}, 1000);
+					}
                 } else {
-                    toast("Failed deleting Cache. Does it still exist?");
+                    toast.error(`Failed deleting entry ${key} in category ${itemCategory || selectedCategory}. If this persists, please contact support@shuffler.io.`)
                 }
             })
             .catch((error) => {
@@ -205,13 +460,25 @@ const CacheView = memo((props) => {
     };
 
     const editOrgCache = (orgId) => {
-        const cache = { 
+        var entry = { 
 			key: dataValue.key, 
 			value: value,
-			category: selectedCategory, 
+			category: selectedCategory,
 		}
 
-        setCacheInput([cache]);
+		if (dataValue?.category !== "" && dataValue?.category !== "default") {
+			entry.category = dataValue.category.replaceAll(" ", "_");
+
+		}
+
+        if (listCache.length > 0) {
+            const selectedCache = listCache.find((data) => data.key === dataValue.key);
+            if (selectedCache?.suborg_distribution?.length > 0) {
+                entry.suborg_distribution = selectedCache.suborg_distribution;
+            }
+        }
+
+        setCacheInput([entry]);
 
         fetch(globalUrl + `/api/v1/orgs/${orgId}/set_cache`, {
 
@@ -221,7 +488,7 @@ const CacheView = memo((props) => {
                 Accept: "application/json",
             },
             credentials: "include",
-            body: JSON.stringify(cache),
+            body: JSON.stringify(entry),
         })
             .then((response) => {
                 if (response.status !== 200) {
@@ -233,8 +500,8 @@ const CacheView = memo((props) => {
             })
             .then((responseJson) => {
                 setAddCache(responseJson);
-                toast("Cache Edited Successfully!");
-                listOrgCache(orgId, selectedCategory);
+                toast.success("Edit saved");
+                listOrgCache(orgId, selectedCategory, 0, pageSize, page);
                 setModalOpen(false);
             })
             .catch((error) => {
@@ -272,7 +539,7 @@ const CacheView = memo((props) => {
             .then((responseJson) => {
                 setAddCache(responseJson);
                 toast("New key added Successfully!");
-                listOrgCache(orgId, selectedCategory);
+                listOrgCache(orgId, selectedCategory, 0, pageSize, page);
                 setModalOpen(false);
             })
             .catch((error) => {
@@ -324,6 +591,19 @@ const CacheView = memo((props) => {
       };
 
 
+	const timestamp = (timestamp) => {
+		if (timestamp === undefined || timestamp === null || timestamp === "") {
+			return null
+		}
+
+		const date = new Date(timestamp * 1000);
+		if (date.toString() === "Invalid Date" || date.toString() === "Invalid Date NaN") {
+			return null
+		}
+
+		return date.toISOString()?.slice(0, 19)?.replace("T", " ")
+	}
+
     const modalView = (
         // console.log("key:", dataValue.key),
         //console.log("value:",dataValue.value),
@@ -354,11 +634,12 @@ const CacheView = memo((props) => {
             }}
         >
             <DialogTitle>
-                <span style={{ color: "white" }}>
+                <span style={{ color: theme.palette.text.primary }}>
                     { editCache ? "Edit Key" : "Add Key"}{selectedCategory === "" || selectedCategory === "default" ? "" : ` in category '${selectedCategory}'`}
                 </span>
+
             </DialogTitle>
-            <div style={{ paddingLeft: "30px", paddingRight: '30px', backgroundColor: "#212121", }}>
+            <div style={{ paddingLeft: "30px", paddingRight: '30px', backgroundColor: theme.palette.DialogStyle.backgroundColor, }}>
                 Key
                 <TextField
                     color="primary"
@@ -368,7 +649,7 @@ const CacheView = memo((props) => {
                     InputProps={{
                         style: {
                             height: "50px",
-                            color: "white",
+                            color: theme.palette.textFieldStyle.color,
                             fontSize: "1em",
                         },
                     }}
@@ -383,7 +664,7 @@ const CacheView = memo((props) => {
                     onChange={(e) => setKey(e.target.value)}
                 />
             </div>
-            <div style={{ paddingLeft: 30, paddingRight: 30, backgroundColor: "#212121" }}>
+            <div style={{ paddingLeft: 30, paddingRight: 30, backgroundColor: theme.palette.DialogStyle.backgroundColor }}>
 				<div style={{display: "flex", }}>
 					<Typography style={{marginTop: 25, marginBottom: 0, flex: 20, }}>
 						Value - ({isValidJson.valid === true ? "Valid" : "Invalid"} JSON)
@@ -404,7 +685,7 @@ const CacheView = memo((props) => {
                     style={{ backgroundColor: theme.palette.textFieldStyle.backgroundColor, marginTop: 0, }}
                     InputProps={{
                         style: {
-                            color: "white",
+                            color: theme.palette.textFieldStyle.color,
                             fontSize: "1em",
                         },
                     }}
@@ -422,23 +703,45 @@ const CacheView = memo((props) => {
 					value={value}
                     onChange={(e) => setValue(e.target.value)}
                 />
+
+
+				{editCache ? 
+					<div>
+						<Typography variant="body2" color="textSecondary" style={{ marginTop: 10, }}>
+							Created: {timestamp(dataValue?.created)}
+						</Typography>
+						<Typography variant="body2" color="textSecondary" style={{ }}>
+							Edited: {timestamp(dataValue?.edited)}
+						</Typography>
+						{dataValue?.workflow_id !== "" ?
+							<Typography variant="body2" color="textSecondary" style={{ }}>
+								Workflow: {dataValue.workflow_id}
+							</Typography>
+						: null}
+						{dataValue?.category !== "" && dataValue?.category !== "default" ?
+							<Typography variant="body2" color="textSecondary" style={{ }}>
+								Category: {dataValue.category}
+							</Typography>
+						: null}
+
+					</div>
+				: null}
             </div>
             <DialogActions style={{ paddingLeft: "30px", paddingRight: '30px' }}>
                 <Button
-                    style={{ borderRadius: "2px", fontSize: 16, color: "#ff8544", textTransform:"none" }}
+                    style={{ borderRadius: "2px", fontSize: 16, color: theme.palette.primary.main, textTransform:"none" }}
                     onClick={() => {
 						setModalOpen(false)
                         setKey("")
 						setValue("")
 						setDataValue({})
 					}}
-                    color="primary"
                 >
                     Cancel
                 </Button>
                 <Button
                     variant="contained"
-                    style={{ borderRadius: "2px", backgroundColor: "#ff8544",color: "#1a1a1a", textTransform:"none" }}
+                    style={{ borderRadius: "2px", textTransform:"none" }}
                     onClick={() => {
                         if (value === "") {
                             toast("Key or Value can not be empty");
@@ -453,6 +756,7 @@ const CacheView = memo((props) => {
                 >
                     {editCache ? "Edit":"Submit"}
                 </Button>
+
             </DialogActions>
         </Dialog>
     );
@@ -516,11 +820,11 @@ const CacheView = memo((props) => {
 			.then((response) =>
 				response.json().then((responseJson) => {
 					if (responseJson["success"] === false) {
-						toast("Failed overwriting datastore");
+						toast.error("Failed overwriting datastore");
 					} else {
-						toast("Successfully updated datastore!");
+						toast.success("Successfully updated datastore!");
 						setTimeout(() => {
-							listOrgCache(orgId, selectedCategory);
+							listOrgCache(orgId, selectedCategory, 0, pageSize, page);
 							setShowDistributionPopup(false);
 						}, 1000);
 					}
@@ -559,9 +863,9 @@ const CacheView = memo((props) => {
 		}}
 	>
 		<DialogTitle>
-			<div style={{ color: "rgba(255,255,255,0.9)" }}>
+			<Typography variant="h5" color="textPrimary">
 				Select sub-org to distribute Datastore key
-			</div>
+			</Typography>
 		</DialogTitle>
 		<DialogContent style={{ color: "rgba(255,255,255,0.65)" }}>
 			<MenuItem value="none" onClick={()=> {handleSelectSubOrg(null, "none")}}>None</MenuItem>
@@ -604,7 +908,7 @@ const CacheView = memo((props) => {
 
 			<div style={{ display: "flex", marginTop: 20 }}>
 				<Button
-					style={{ borderRadius: "2px", textTransform: 'none', fontSize:16, color: "#ff8544"  }}
+					style={{ borderRadius: "2px", textTransform: 'none', fontSize:16, color: theme.palette.primary.main  }}
 					onClick={() => setShowDistributionPopup(false)}
 					color="primary"
 				>
@@ -612,7 +916,7 @@ const CacheView = memo((props) => {
 				</Button>
 				<Button
 					variant="contained"
-					style={{ borderRadius: "2px", textTransform: 'none', fontSize:16, color: "#1a1a1a", backgroundColor: "#ff8544", marginLeft: 10 }}
+					style={{ borderRadius: "2px", textTransform: 'none', fontSize:16, marginLeft: 10 }}
 					onClick={() => {
 						changeDistribution(selectedCacheKey, selectedSubOrg);
 					}}
@@ -625,522 +929,1325 @@ const CacheView = memo((props) => {
 		</Dialog>
     ) : null;
 
+	const saveAutomation = (allAutomation, settings) => {
+		// Check if icon is a string. Otherwise make it empty.
+		var removedIcons = {}
+		allAutomation.forEach((automation) => {
+			const originalIcon = automation.icon
+			if (typeof automation.icon !== "string") {
+				automation.icon = "";
+			} 
+		})
+
+		const url = `${globalUrl}/api/v2/datastore/automate`
+		const data = {
+			"category": selectedCategory === "" || selectedCategory === "default" ? "" : selectedCategory,
+			"automations": allAutomation,
+		}
+
+		if (settings !== undefined && settings !== null && Object.keys(settings).length > 0) {
+			data["settings"] = settings 
+		}
+
+		fetch(url, {
+			method: "POST",
+			headers: {
+				"Content-Type": "application/json",
+				Accept: "application/json",
+			},
+			credentials: "include",
+			body: JSON.stringify(data),
+		})
+		.then((response) => {
+			if (response.status !== 200) {
+				console.log("Status not 200 for automations :O!");
+				return;
+			}
+
+			return response.json();
+		})
+		.then((responseJson) => {
+			if (responseJson?.success === true) {
+				toast.success("Saved successfully!")
+			} else {
+				toast.warn("Failed to save automations. Please try again or contact support@shuffler if this persists.")
+			}
+		})
+		.catch((error) => {
+			toast.error(error.toString());
+		})
+	}
+
+
+	const AutomationOptions = ({ automation, index }) => {
+		const [showOptions, setShowOptions] = useState(false);
+		const [hovered, setHovered] = useState(false);
+
+		const [updated, setUpdated] = useState(false);
+		const [updatedAutomation, setUpdatedAutomation] = useState(automation);
+		const [_, setUpdate] = useState(Math.random()) // Force re-render
+
+		if (automation.icon === undefined || automation.icon === null || automation.icon === "") {
+			for (var i = 0; i < defaultAutomation.length; i++) {
+				if (defaultAutomation[i].name === automation.name) {
+					automation.icon = defaultAutomation[i].icon
+					break;
+				}
+			}
+		}
+
+		const runSave = () => { 
+			setUpdated(false)
+
+			const newAutomations = [...categoryAutomations]
+			newAutomations[index] = updatedAutomation
+
+			setCategoryAutomations(newAutomations)
+			setUpdate(Math.random()) // Force re-render
+
+			saveAutomation(newAutomations)
+		}
+
+		return (
+			<div key={index} style={{ 
+					marginBottom: 10, 
+					backgroundColor: hovered ? theme.palette.hoverColor : "transparent",
+					paddingTop: 5, 
+				}} 
+				onMouseEnter={() => setHovered(true)}
+				onMouseLeave={() => setHovered(false)}
+			>
+				<div style={{display: "flex", }}>
+					<Tooltip title={automation.enabled ? "Disable Automation" : "Enable Automation"} style={{}} aria-label={""}>
+						<Checkbox
+							style={{ marginRight: 10, marginTop: -10, }}
+							checked={automation.enabled}
+							// Check if automation options have a value
+							disabled={automation?.disabled === true || automation.options.length === 0 || automation.options.some((option) => option.value === "")}
+							onChange={(e) => {
+								e.stopPropagation()
+								e.preventDefault()
+
+								updatedAutomation.enabled = !updatedAutomation.enabled
+								setUpdatedAutomation(updatedAutomation)
+								setUpdated(true)
+
+								setUpdate(Math.random()) 
+							}}
+						/>
+					</Tooltip>
+					<div 
+						style={{
+							display: "flex",
+							cursor: !automation?.disabled ? "pointer" : "not-allowed",
+							width: "100%", 
+						}}
+						disabled={automation?.disabled === true}
+						onClick={() => {
+							if (automation?.disabled === true) {
+								return
+							}
+
+							setShowOptions(!showOptions)
+
+							// Auto saves when the options are closed/saved
+							if (updated && showOptions) {
+								runSave()
+							}
+						}}
+					>
+						{typeof automation?.icon === "string" && automation?.icon?.length > 0 ? 
+							<img src={automation.icon} alt={automation.name} style={{ width: 20, height: 20, }} />
+							:
+							automation.icon
+						}
+
+						<Typography variant="body1" style={{ 
+							color: automation?.disabled === true ? theme.palette.text.secondary : theme.palette.text.primary, 
+							marginLeft: 10, 
+						}}>
+							{automation.name}
+						</Typography>
+					</div>
+
+					{automation?.disabled !== true ? 
+						<Button
+							style={{ 
+								borderRadius: theme.palette.borderRadius,
+								textTransform: 'none', 
+								color: updated ? theme.palette.primary.main : theme.palette.text.secondary,
+								marginTop: -6,
+
+								position: "absolute",
+								right: 25, 
+							}}
+							disabled={!updated}
+							onClick={(e) => {
+								e.stopPropagation();
+								e.preventDefault();
+
+								runSave()
+							}}
+						>
+							Save
+						</Button>
+					: null}
+				</div>
+
+				{showOptions && (
+					updatedAutomation.options.map((option, optionIndex) => {
+						if (option?.key === "workflow_id") {
+							return ( 
+								<Autocomplete
+									key={optionIndex}
+
+									multiple
+									label="Find a workflow"
+									id="workflow_search"
+									autoHighlight
+									freeSolo
+									value={workflows?.filter(w => option?.value.includes(w.id)) || []}
+									classes={{ inputRoot: classes.inputRoot }}
+									ListboxProps={{
+										style: {
+											backgroundColor: theme.palette.surfaceColor,
+											color: theme.palette.text.primary,
+											borderRadius: theme.palette.borderRadius,
+										},
+									}}
+									onChange={(event, newValue) => {
+										option.value = ""
+										for (var i = 0; i < newValue.length; i++) {
+											option.value += newValue[i].id + ","
+										}
+
+										if (newValue.length > 0) {
+											updatedAutomation.enabled = true
+										} else {
+											updatedAutomation.enabled = false 
+										}
+
+										updatedAutomation.options[optionIndex] = option
+										setUpdatedAutomation(updatedAutomation)
+										setUpdated(true)
+
+										setUpdate(Math.random()) // Force re-render
+									}}
+
+									getOptionLabel={(option) => {
+										if (
+											option === undefined ||
+											option === null ||
+											option?.name === undefined ||
+											option?.name === null
+										) {
+											return "No Workflows Selected";
+										}
+
+										const newname = (
+											option.name.charAt(0).toUpperCase() + option.name.substring(1)
+										).replaceAll("_", " ")
+
+										return newname
+									}}
+									options={workflows}
+									fullWidth
+									style={{
+										backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+										borderRadius: theme.palette.textFieldStyle.borderRadius,
+										color: theme.palette.textFieldStyle.color,
+										height: 35,
+										marginBottom: 40,
+									}}
+									renderOption={(props, data, state) => {
+										/*
+										if (data.id === option?.value) {
+											data = workflow;
+										}
+										*/
+
+										return (
+											<Tooltip arrow placement="left" title={
+												<span style={{}}>
+													{data.image !== undefined && data.image !== null && data.image.length > 0 ?
+														<img src={data.image} alt={data.name} style={{ backgroundColor: theme.palette.surfaceColor, maxHeight: 200, minHeigth: 200, borderRadius: theme.palette?.borderRadius, }} />
+														: null}
+													<Typography>
+														Choose {data.name}
+													</Typography>
+												</span>
+											} >
+												<MenuItem
+													{...props}
+													style={{
+														backgroundColor: theme.palette.surfaceColor,
+														color: data.id === option?.value ? "red" : theme.palette.text.primary,
+														borderBottom: data.id === "parent" ? "2px solid rgba(255,255,255,0.5)" : null
+													}}
+													value={data}
+												>
+													{data.name}
+												</MenuItem>
+											</Tooltip>
+										)
+									}}
+									renderInput={(params) => {
+										return (
+											<TextField
+												{...params}
+												style={{
+													backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+													color: theme.palette.textFieldStyle.color,
+													borderRadius: theme.palette.textFieldStyle.borderRadius,
+													height: 35,
+													fontSize: 16,
+													marginTop: "16px"
+												}}
+												InputProps={{
+													...params.InputProps,
+													style: {
+														height: 35,
+														display: "flex",
+														alignItems: "center",
+														padding: "0px 8px",
+														fontSize: 16,
+														borderRadius: 4,
+													},
+													inputProps: {
+														...params.inputProps,
+														style: {
+															height: "100%",
+															boxSizing: "border-box",
+														}
+
+													}
+												}}
+												variant="outlined"
+												placeholder="Select workflows to run"
+											/>
+										)
+									}}
+								/>
+							)
+						}
+
+						return (
+							<TextField
+								key={optionIndex}
+								fullWidth
+								style={{
+									...theme.palette.textFieldStyle,
+									marginBottom: 20, 
+									marginTop: 10, 
+								}}
+            					InputProps={{
+								  style: {
+									backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+									color: theme.palette.textFieldStyle.color,
+								  },
+								}}
+								label={option.key}
+								defaultValue={option.value}
+								onBlur={(e) => {
+									if (e.target.value === "") {
+										updatedAutomation.enabled = false 
+									} else {
+										updatedAutomation.enabled = true 
+									}
+
+									updatedAutomation.options[optionIndex].value = e.target.value;
+									setUpdatedAutomation(updatedAutomation)
+									setUpdated(true)
+								}}
+							/>
+						)
+					})
+				)}
+			</div>
+		)
+	}
+
+
+	const setCategorySettingsField = (field, value) => {
+		// Check if categoryConfig.settings is set or not. Otherwise set it.
+		var categoryConfig2 = categoryConfig 
+		if (categoryConfig === undefined || categoryConfig === null) {
+			categoryConfig2 = {}
+		}
+
+		if (categoryConfig?.settings === undefined || categoryConfig?.settings === null) {
+			categoryConfig2.settings = {}
+		}
+
+		categoryConfig2.settings[field] = value
+		setCategoryConfig(categoryConfig2)
+
+		saveAutomation(
+			categoryAutomations, 
+			categoryConfig2.settings,
+		)
+	}
+
+	const columns: GridColDef<(typeof rows)[number]>[] = [
+	  { 
+		  field: 'key', 
+		  headerName: 'Key', 
+		  width: 200, 
+		  filterable: true,
+		  sortable: true,
+	  },
+	  {
+		width: 600,
+		field: 'value',
+		filterable: true,
+		headerName: 'Value',
+		renderCell: (props) => {
+			const data = props.row
+        	const validate = validateJson(data.value)
+
+			return (
+				<div onClick={(e) => {
+					e.preventDefault()
+					e.stopPropagation()
+				}}
+				>
+					{validate.valid ?
+						<ReactJson
+							id={"reactjson_" + data.key}
+							src={validate.result}
+							theme={theme.palette.jsonTheme}
+							style={{
+								...theme.palette.reactJsonStyle,
+								backgroundColor: theme.palette.platformColor,
+								border: theme.palette.defaultBorder,
+								padding: 5,
+								minWidth: 600, 
+								maxHeight: 600,
+								overflowY: "auto",
+							}}
+							collapsed={true}
+							enableClipboard={(copy) => {
+								// handleReactJsonClipboard(copy);
+							}}
+							collapseStringsAfterLength={theme.palette.jsonCollapseStringsAfterLength}
+							iconStyle={theme.palette.jsonIconStyle}
+							displayDataTypes={false}
+							onSelect={(select) => {
+
+								// HandleJsonCopy(showResult, select, data.action.label);
+								console.log("SELECTED!: ", select);
+							}}
+							name={null}
+							/>
+					:
+					<Typography variant="body2" style={{maxHeight: 200, overflow: "hidden", }}>
+						{data.value}
+					</Typography>
+					}
+				</div>
+			)
+		}
+	  },
+	  {
+		field: 'actions',
+		headerName: 'Actions',
+		description: 'Actions for this key.',
+		width: 175,
+		filterable: false,
+		  sortable: false,
+
+		renderCell: (props) => {
+			const data = props.row
+
+			return ( 
+				<span style={{ display: "flex" }}>
+					{data?.workflow_id === "" || data?.workflow_id === null || data?.workflow_id === undefined ?
+						<IconButton
+							disabled={data.workflow_id?.length === 0}
+							style={{}}
+						>
+							<OpenInNewIcon
+								style={{
+									color:
+										data.workflow_id?.length !== 0
+											? "#FF8444"
+											: "grey",
+								}}
+							/>
+						</IconButton>
+						: (
+						<Tooltip
+							title={"Go to workflow"}
+							style={{}}
+							aria-label={"Download"}
+						>
+							<span>
+								<a
+									rel="noopener noreferrer"
+									style={{
+										textDecoration: "none",
+											color: "#f85a3e",
+										}}
+										href={`/workflows/${data.workflow_id}`}
+										target="_blank"
+									>
+										<IconButton
+											disabled={data.workflow_id?.length ===0}
+											style={{marginLeft: 10}}
+										>
+											<OpenInNewIcon
+												style={{
+													width: 24, height: 24,
+													color:
+														data.workflow_id?.length !== 0
+															? "#FF8444"
+															: "grey",
+												}}
+											/>
+										</IconButton>
+									</a>
+								</span>
+							</Tooltip>
+						)}
+
+						<Tooltip
+							title={data?.org_id !== selectedOrganization.id ? "You can not edit this cache as it is controlled by parent organization." : "Edit this key" }
+							style={{}}
+							aria-label={"Edit"}
+						>
+							<span>
+								<IconButton
+									style={{ padding: "6px" }}
+									disabled={data.org_id !== selectedOrganization.id ? true : false}
+									onClick={() => {
+										// Try to make the value JSON indented 
+										const valid = validateJson(data.value)
+										var newvalue = data.value
+										if (valid.valid) {
+											// JSON stringify with indentation
+											newvalue = JSON.stringify(valid.result, null, 2)
+										}
+
+
+										setEditCache(true)
+										setDataValue({
+											"key": data.key,
+											"value": newvalue,
+
+											"edited": data.edited,
+											"created": data.created,
+											"workflow_id": data.workflow_id,
+											"category": data.category,
+										})
+										setValue(newvalue)
+										setModalOpen(true)
+									}}
+								>
+									<svg
+										width="24"
+										height="24"
+										viewBox="0 0 24 24"
+										fill="none"
+										xmlns="http://www.w3.org/2000/svg"
+										>
+										<path
+											d="M16.1038 4.66848C16.3158 4.45654 16.5674 4.28843 16.8443 4.17373C17.1212 4.05903 17.418 4 17.7177 4C18.0174 4 18.3142 4.05903 18.5911 4.17373C18.868 4.28843 19.1196 4.45654 19.3315 4.66848C19.5435 4.88041 19.7116 5.13201 19.8263 5.40891C19.941 5.68582 20 5.9826 20 6.28232C20 6.58204 19.941 6.87882 19.8263 7.15573C19.7116 7.43263 19.5435 7.68423 19.3315 7.89617L8.43807 18.7896L4 20L5.21038 15.5619L16.1038 4.66848Z"
+											stroke={themeMode=== "dark" ? "#F1F1F1" : "#333"}
+											strokeLinecap="round"
+											strokeLinejoin="round"
+										/>
+										</svg>
+								</IconButton>
+							</span>
+						</Tooltip>
+						<Tooltip
+							title={data?.org_id !== selectedOrganization.id ? "You can not access public URL for this key as it is controlled by parent organization." : "Public URL (types: text, raw, json)" }
+							style={{ marginLeft: 0, }}
+							aria-label={"Public URL"}
+						>
+							<span>
+								<IconButton
+									style={{ padding: "6px" }}
+									disabled={data.public_authorization === undefined || data.public_authorization === null || data.public_authorization === "" || data.org_id !== selectedOrganization.id ? true : false}
+									onClick={() => {
+										window.open(`${globalUrl}/api/v1/orgs/${orgId}/cache/${data.key}?type=text&authorization=${data.public_authorization}`, "_blank");
+									}}
+								>
+									<LinkIcon
+									/>
+								</IconButton>
+							</span>
+						</Tooltip>
+						<Tooltip
+							title={selectedOrganization?.id !== undefined && data?.org_id !== selectedOrganization.id ? "You can not delete this key as it is controlled by parent organization." : "Delete this key" }
+							aria-label={"Delete"}
+						>
+							<span>
+								<IconButton
+									style={{ padding: "6px" }}
+									disabled={selectedOrganization?.id === undefined ? false : data.org_id !== selectedOrganization.id ? true : false}
+									onClick={() => {
+										deleteEntry(orgId, data.key, data.category)
+									}}
+								>
+									<svg
+											width="24"
+											height="24"
+											viewBox="0 0 24 24"
+											xmlns="http://www.w3.org/2000/svg"
+											style={{
+												stroke: data.org_id === selectedOrganization.id ? "#fd4c62" : "#c8c8c8",
+											}}
+											>
+											<path
+												d="M5 7.20001H6.6H19.4"
+												strokeLinecap="round"
+												strokeLinejoin="round"
+												fill="none"
+											/>
+											<path
+												d="M17.7996 7.2V18.4C17.7996 18.8243 17.631 19.2313 17.331 19.5314C17.0309 19.8314 16.624 20 16.1996 20H8.19961C7.77526 20 7.3683 19.8314 7.06824 19.5314C6.76818 19.2313 6.59961 18.8243 6.59961 18.4V7.2M8.99961 7.2V5.6C8.99961 5.17565 9.16818 4.76869 9.46824 4.46863C9.7683 4.16857 10.1753 4 10.5996 4H13.7996C14.224 4 14.6309 4.16857 14.931 4.46863C15.231 4.76869 15.3996 5.17565 15.3996 5.6V7.2"
+												strokeLinecap="round"
+												strokeLinejoin="round"
+												fill="none"
+											/>
+											</svg>
+								</IconButton>
+							</span>
+						</Tooltip>
+					</span>
+			)
+		}
+	  },
+	  {
+		field: 'distribution',
+		headerName: 'Distribution',
+		description: 'Controls whether this key is distributed to sub-organizations.',
+		width: 100,
+		filterable: false,
+		  sortable: false,
+
+		renderCell: (props) => {
+			const data = props.row
+            const isDistributed = data?.suborg_distribution?.length > 0 ? true : false;
+
+			return (
+				<div>
+					{selectedOrganization.id !== undefined && data?.org_id !== selectedOrganization.id ?
+						  <ListItemText
+							primary={
+								<Tooltip
+							  title="Parent organization controlled datastore. You can use, but not modify this key. Contact an admin of your parent organization if you need changes to this."
+							  placement="top"
+						  >
+							  <Chip
+								  label={"Parent"}
+								  variant="contained"
+								  color="secondary"
+							  />
+						  </Tooltip>
+							}
+							style={{display: "table-cell", textAlign: 'center', verticalAlign: 'middle', }}
+							/>
+						  :
+						  <ListItemText
+							primary={
+								<Tooltip
+							  title="Distributed to sub-organizations. This means the sub organizations can use this datastore key, but can not modify it."
+							  placement="top"
+						  >
+							  <Checkbox
+								  disabled={ userdata?.active_org?.role !== "admin" || (selectedOrganization.creator_org !== undefined && selectedOrganization.creator_org !== null && selectedOrganization.creator_org !== "" )? true : false}
+								  checked={isDistributed}
+								  style={{ margin: "auto" }}
+								  color="secondary"
+								  onClick={() => {
+									setShowDistributionPopup(true)
+									if(data?.suborg_distribution?.length > 0){
+										setSelectedSubOrg(data.suborg_distribution)
+									}else{
+										setSelectedSubOrg([])
+									}
+									setSelectedCacheKey(data.key)
+								  }}
+							  />
+						  </Tooltip>
+							}
+							style={{display: "table-cell", textAlign: 'center', verticalAlign: 'middle', }}
+							/>
+					  }
+				</div>
+			)
+		}
+	  },
+	];
+
+
+	const isAutomating = categoryAutomations?.find((automation) => automation.enabled) !== undefined
     return (
-        <div style={{paddingBottom: isSelectedDataStore?null:250, minHeight: 1000, boxSizing: "border-box", width: isSelectedDataStore? "100%" :null, transition: "width 0.3s ease", padding:isSelectedDataStore?"27px 10px 27px 27px":null, height: isSelectedDataStore?"100%":null, color: isSelectedDataStore?'#ffffff':null, backgroundColor: isSelectedDataStore?'#212121':null, borderTopRightRadius: isSelectedDataStore?'8px':null, borderBottomRightRadius: isSelectedDataStore?'8px':null, borderLeft: "1px solid #494949" }}>
+        <div style={{
+			minHeight: 2000, 
+			height: isSelectedDataStore?"100%":null, 
+
+			paddingBottom: isSelectedDataStore?null:250, 
+			boxSizing: "border-box", 
+			width: isSelectedDataStore? "100%" :null, 
+			transition: "width 0.3s ease", 
+			padding:isSelectedDataStore?"27px 10px 27px 27px":null, 
+			color: isSelectedDataStore?'#ffffff':null, 
+			backgroundColor: isSelectedDataStore? theme.palette.platformColor :null, 
+			borderTopRightRadius: isSelectedDataStore?'8px':null, 
+			borderBottomRightRadius: isSelectedDataStore?'8px':null, 
+			borderLeft: theme.palette.defaultBorder 
+		}}>
             {modalView}
+
+			<CollectIngestModal 
+				globalUrl={globalUrl}
+				open={showCollectIngestMenu}
+				setOpen={setShowCollectIngestMenu}
+
+				workflows={workflows}
+				getWorkflows={getWorkflows}
+			/>
+
             {cacheDistributionModal}
-            <div style={{height: "100%", maxHeight: 1700, overflowY: "auto", scrollbarColor: '#494949 transparent', scrollbarWidth: 'thin'}}>
-              <div style={{ height: "100%", width: "calc(100% - 20px)", scrollbarColor: '#494949 transparent', scrollbarWidth: 'thin'  }}>
+
+            <div style={{height: "100%", overflowY: "auto", scrollbarColor: theme.palette.scrollbarColorTransparent, scrollbarWidth: 'thin'}}>
+              <div style={{ height: "100%", width: "calc(100% - 20px)", scrollbarColor: theme.palette.scrollbarColorTransparent, scrollbarWidth: 'thin'  }}>
               <div style={{ marginTop: isSelectedDataStore?null:20, marginBottom: 20 }}>
-                <h2 style={{ display: isSelectedDataStore?null: "inline" }}>Shuffle Datastore {selectedCategory === "" || selectedCategory === "default" ? "" : `- Category '${selectedCategory}'`}</h2>
-                <span style={{ marginLeft: isSelectedDataStore?null:25, color:isSelectedDataStore?"#9E9E9E":null}}>
-                    Datastore is a permanent key-value database for storing data that can be used cross-workflow. <br/>You can store anything from lists of IPs to complex configurations.&nbsp;
+
+				<div style={{display: "flex", position: "relative", }}>
+
+					<Typography variant="h5" style={{ display: isSelectedDataStore?null: "inline", fontWeight: 500 }}>
+						Shuffle Datastore
+					</Typography>
+
+					{userdata?.support === true ? 
+						<Tooltip title={"Collect (support only)"} style={{}} aria-label={""}>
+							<span style={{position: "absolute", right: 0, }}>
+								<Button
+									style={{ 
+										whiteSpace: "nowrap", 
+										height: 35, 
+										textTransform: 'none', 
+
+										//border: isAutomating ? `1px solid ${theme.palette.primary.main}` : null,
+									}}
+									variant="outlined"
+									color="secondary"
+									onClick={() => {
+										setShowCollectIngestMenu(true)
+									}}
+								>
+									<FilterAltIcon style={{marginRight: 10, }}/>
+									Collect (beta) 
+								</Button>
+							</span>
+						</Tooltip> 
+					: null}
+				</div>
+
+                <Typography variant="body2" color="textSecondary" style={{ marginLeft: isSelectedDataStore?null:25, marginTop: 10}}>
+                    Datastore is a permanent key-value database for storing data which can be used for automation. &nbsp;
                     <a
                         target="_blank"
                         rel="noopener noreferrer"
                         href="/docs/organizations#datastore"
-                        style={{ textDecoration: isSelectedDataStore?null:"none", color: isSelectedDataStore?"#FF8444":"#f85a3e" }}
+                        style={{ textDecoration: isSelectedDataStore?null:"none", color: theme.palette.linkColor }}
                     >
                         Learn more
                     </a>
-                </span>
+                </Typography>
             </div>
-            <Button
-                style={{backgroundColor: isSelectedDataStore? "#ff8544":null, fontSize: 16, boxShadow: isSelectedDataStore ? "none":null,textTransform: isSelectedDataStore ? 'capitalize':null, color:isSelectedDataStore?"#1a1a1a":null, borderRadius:isSelectedDataStore?4:null, width:isSelectedDataStore?162:null, height:isSelectedDataStore?40:null}}
-                variant="contained"
-                color="primary"
-                onClick={() =>{ 
-                    setEditCache(false)
-                    setModalOpen(true)
 
-					setValue("")
-                }}
-            >
-                Add Key 
-            </Button>
-            <Button
-                style={{ marginLeft: 16, marginRight: 15, backgroundColor: isSelectedDataStore?"#2F2F2F":null, boxShadow: isSelectedDataStore ? "none":null,textTransform: isSelectedDataStore ? 'capitalize':null,borderRadius:isSelectedDataStore?4:null, width:isSelectedDataStore?81:null, height:isSelectedDataStore?40:null,  }}
-                variant="contained"
-                color="primary"
-                onClick={() => listOrgCache(orgId,selectedCategory)}
-            >
-                <CachedIcon />
-            </Button>
+			<div style={{width: "100%", position: "relative", }}>
+				<ButtonGroup>
+					<Button
+						style={{textTransform: isSelectedDataStore ? 'capitalize':null, width : isSelectedDataStore ? 120 : null, height:isSelectedDataStore?40:null}}
+						variant="contained"
+						color="primary"
+						onClick={() =>{ 
+							setEditCache(false)
+							setModalOpen(true)
 
-			{fileCategories !== undefined &&
-				fileCategories !== null &&
-				fileCategories.length > 1 ? (
-					<FormControl style={{ minWidth: 150, maxWidth: 150 }}>
-						<Select
-							labelId="input-namespace-select-label"
-							id="input-namespace-select-id"
-							style={{
-								color: "white",
-								minWidth: 122,
-								maxWidth: 122,
+							setValue("")
+						}}
+					>
+						Add Key 
+					</Button>
+					<Button
+						style={{ marginRight: 15, width:isSelectedDataStore ? 81:null, height:isSelectedDataStore?40:null,  }}
+						variant="contained"
+						color="secondary"
+						onClick={() => {
+							listOrgCache(orgId, selectedCategory, 0, pageSize, page);
+						}}
+					>
+						<CachedIcon />
+					</Button>
+				</ButtonGroup>
+
+				<ButtonGroup style={{marginTop: 0, }}>
+				{datastoreCategories !== undefined &&
+					datastoreCategories !== null &&
+					datastoreCategories.length > 1 ? (
+
+						<FormControl style={{ minWidth: 150, maxWidth: 150, marginTop: 8, }}>
+						    <InputLabel id="category-choice" style={{
+								color: "rgba(255, 255, 255, 0.65)",
+							}}>
+								Category
+							</InputLabel>
+							<Select
+								labelId="category-choice"
+								style={{
+									minWidth: 150,
+									maxWidth: 150,
+									height: 35,
+									borderRadius: "5px 0px 0px 5px",
+								}}
+								value={selectedCategory}
+								onChange={(event) => {
+									setCategoryConfig(undefined)
+									setCategoryAutomations(defaultAutomation)
+
+									//if (selectAllChecked || listCache.length > 0) {
+									if (selectAllChecked || selectedFiles.length > 0) {
+										setUpdateToThisCategory(event.target.value)
+										return
+									}
+
+
+									setSelectedCategory(event.target.value)
+									if (event.target.value === "all" || event.target.value === "default") {
+    									listOrgCache(orgId, "", 0, pageSize, page)
+									} else {
+    									listOrgCache(orgId, event.target.value, 0, pageSize, page)
+									}
+
+									// Add it to the url as a query
+									if (window.location.search.includes("category=")) {
+										const newurl = window.location.href.replace(/category=[^&]+/, `category=${event.target.value}`)
+										window.history.pushState({ path: newurl }, "", newurl)
+									} else {
+										window.history.pushState({ path: window.location.href }, "", `${window.location.href}&category=${event.target.value}`)
+									}
+								}}
+							>
+								{datastoreCategories.map((data, index) => {
+									// Should find the icon for things
+									// Fix uppercase at start of words
+									const fixedname = data?.charAt(0)?.toUpperCase() + data?.slice(1)?.replaceAll("_", " ")
+									const iconDetails = GetIconInfo({
+										"app_name": fixedname,
+										"name": fixedname,
+									})
+
+									return (
+										<MenuItem
+											key={index}
+											value={data}
+											style={{ 
+												color: theme.palette.textFieldStyle.color, 
+												display: "flex", 
+												borderBottom: theme.palette.defaultBorder,
+											}}
+										>
+											<Typography style={{display: "flex", marginTop: 5, }}>
+												<div style={{marginRight: 10, }}>
+													{iconDetails?.originalIcon && (
+														iconDetails?.originalIcon
+													)}
+												</div>
+
+												{fixedname}
+											</Typography>
+										</MenuItem>
+									);
+								})}
+							</Select>
+						</FormControl>
+					) : null}
+
+				<div style={{display: "inline-flex", position:"relative", top: 8}}>
+					{renderTextBox ? 
+						<Tooltip title={"Close"} style={{}} aria-label={""}>
+							<Button
+								style={{ 
+									height: 35, 
+									borderRadius: 4,  
+									textTransform: 'none', 
+									fontSize: 16,
+									borderRadius: "0px 5px 5px 0px",
+
+									marginRight: 10, 
+								}}
+								color="secondary"
+            	                variant="contained"
+								onClick={() => {
+									setRenderTextBox(false);
+									console.log(" close clicked")
+								}}
+							>
+								<ClearIcon/>
+							</Button>
+						</Tooltip>
+						:
+						<Tooltip title={"Add new file category"} style={{}} aria-label={""}>
+							<Button
+								style={{ 
+									whiteSpace: "nowrap", 
+									width: datastoreCategories !== undefined && datastoreCategories !== null && datastoreCategories.length > 1 ? 50 : 169, 
+									height: 35, 
+									textTransform: 'none', 
+									fontSize: 16, 
+
+									borderRadius: "0px 5px 5px 0px",
+								}}
+								variant="outlined"
+								color="secondary"
+            	                onClick={() => {
+									setRenderTextBox(true);
+								}}
+							>
+								<AddIcon/>
+								{datastoreCategories !== undefined && datastoreCategories !== null && datastoreCategories.length > 1 ? "" : "Category"}
+							</Button>
+						</Tooltip> 
+					}
+
+					{renderTextBox && <TextField
+						onKeyPress={(event)=>{
+							handleKeyDown(event);
+							if(event.key === 'Enter' && selectedFileId.length > 0){
+								setUpdateToThisCategory(event.target.value)
+							}
+								
+						}}
+						style={{
+							height: 35,
+							width: 200,
+							marginTop: 0,
+						}}
+						InputProps={{
+							style: {
+								color: theme.palette.textFieldStyle.color,
 								height: 35,
-								float: "right",
-								position: 'relative',
-								top: 8
-							}}
-							value={selectedCategory}
-							onChange={(event) => {
-								//if (selectAllChecked || listCache.length > 0) {
-								if (selectAllChecked || selectedFiles.length > 0) {
-									setUpdateToThisCategory(event.target.value)
-									setShowFileCategoryPopup(true)
-									return
-								}
+								fontSize: 16,
+								borderRadius: 4,
+								paddingTop: 0,
+							},
+						}}
+						color="primary"
+						placeholder="Category name"
+						required
+						margin="dense"
+						defaultValue={""}
+						autoFocus
+					/>}
+				</div>
+				</ButtonGroup>
 
-								setSelectedCategory(event.target.value)
-								if (event.target.value === "all" || event.target.value === "default") {
-    								listOrgCache(orgId) 
-								} else {
-    								listOrgCache(orgId, event.target.value)
-								}
-									
 
-								// Add it to the url as a query
-								if (window.location.search.includes("category=")) {
-									const newurl = window.location.href.replace(/category=[^&]+/, `category=${event.target.value}`)
-									window.history.pushState({ path: newurl }, "", newurl)
-								} else {
-									window.history.pushState({ path: window.location.href }, "", `${window.location.href}&category=${event.target.value}`)
-								}
-							}}
-						>
-							{fileCategories.map((data, index) => {
-								return (
-									<MenuItem
-										key={index}
-										value={data}
-										style={{ color: "white" }}
-									>
-										{data.replaceAll("_", " ")}
-									</MenuItem>
-								);
-							})}
-						</Select>
-						<Dialog 
-							PaperProps={{
-								sx: {
-									borderRadius: theme?.palette?.DialogStyle?.borderRadius,
-									border: theme?.palette?.DialogStyle?.border,
-									fontFamily: theme?.typography?.fontFamily,
-									backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
-									zIndex: 1000,
-									'& .MuiDialogContent-root': {
-										backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
-									},
-									'& .MuiDialogTitle-root': {
-										backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
-									},
-									'& .MuiDialogActions-root': {
-										backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
-									},
-								},
-							}} 
-							open={showFileCategoryPopup} 
-							onClose={() => {
-								setShowFileCategoryPopup(false)
-							}}
-						>
-							<DialogTitle>File Categories</DialogTitle>
-							<DialogContent>
-								Please note that your selected files ({selectedFileId?.length}) will be moved to the <kbd>{updateToThisCategory}</kbd> category.
-							</DialogContent>
-							<DialogActions>
-								<Button 
-									onClick={() => {
-										setShowFileCategoryPopup(false)
-									}} 
-									style={{fontSize: 16, textTransform: 'none'}}
-								>
-									Close
-								</Button>
-								<Button 
-									onClick={() => {
-										//handleUpdateFileCategory(updateToThisCategory)
-										toast.error("Not implemented.")
-									}} 
-									style={{fontSize: 16, textTransform: 'none', color: "#1a1a1a", backgroundColor: "#ff8544"}}
-								>
-									Update
-								</Button>
-							</DialogActions>
-						</Dialog>
-					</FormControl>
-				) : null}
+				<ButtonGroup style={{ position: "absolute", right: 0, top: 5, }}>
+					<Tooltip title={"Automate current Category"} style={{}} aria-label={""}>
+						<span>
+							<Button
+								style={{ 
+									whiteSpace: "nowrap", 
+									height: 35, 
+									textTransform: 'none', 
 
-			<div style={{display: "inline-flex", position:"relative", top: 8}}>
-				{renderTextBox ? 
-					<Tooltip title={"Close"} style={{}} aria-label={""}>
-						<Button
-							style={{ marginLeft: 5, marginRight: 15, height: 35, borderRadius: 4, backgroundColor: "#494949", textTransform: 'none', fontSize: 16, color: "#f1f1f1" }}
-							color="primary"
-							onClick={() => {
-								setRenderTextBox(false);
-								console.log(" close clicked")
+									border: isAutomating ? `1px solid ${theme.palette.primary.main}` : null,
 								}}
-						>
-							<ClearIcon/>
-						</Button>
-					</Tooltip>
-					:
-					<Tooltip title={"Add new file category"} style={{}} aria-label={""}>
-						<Button
-							style={{ marginLeft: 5, marginRight: 15, width: 169, height: 35, borderRadius: 4, backgroundColor: "#494949", textTransform: 'none', fontSize: 16, color: "#f1f1f1" }}
-							color="primary"
-							onClick={() => {
-								setRenderTextBox(true);
+								variant="contained"
+								color="secondary"
+								disabled={selectedCategory === undefined || selectedCategory === "" || selectedCategory === "default"}
+								onClick={() => {
+									// Set up: 
+									// Workflow triggers for when a key is added/edited/deleted. 
+									// Automatic ingest mechanisms: 
+									//   - IOCs (monitor URLs)
+									//   - Singul ingest
+									setShowAutomationMenu(true)
 								}}
+							>
+								{isAutomating ? <RocketLaunchIcon style={{color: theme.palette.primary.main, marginRight: 10 }}/> : <RocketIcon style={{marginRight: 10, color: theme.palette.secondary.main, }} />}
+								Automate (beta) 
+							</Button>
+						</span>
+					</Tooltip> 
+
+					<Tooltip title={"Other category settings"} style={{}} aria-label={""}>
+						<Button
+							style={{ 
+								whiteSpace: "nowrap", 
+								height: 35, 
+								textTransform: 'none', 
+								marginLeft: 3, 
+							}}
+							variant="outlined"
+							color="secondary"
+							disabled={selectedCategory === undefined || selectedCategory === "" || selectedCategory === "default"}
+							onClick={() => {
+								setShowSettingsMenu(true)
+							}}
 						>
-							<AddIcon/>
-							Category (beta)
+							<SettingsIcon style={{color: theme.palette.secondary.main, }} />
 						</Button>
 					</Tooltip> 
-				}
+				</ButtonGroup>
 
-				{renderTextBox && <TextField
-					onKeyPress={(event)=>{
-						handleKeyDown(event);
-						if(event.key === 'Enter' && selectedFileId.length > 0){
-							//setShowFileCategoryPopup(true)
-							setUpdateToThisCategory(event.target.value)
-						}
+				{showAutomationMenu || showSettingsMenu ? 
+					<Dialog
+						open={showAutomationMenu || showSettingsMenu}
+						onClose={() => {
+							setShowAutomationMenu(false)
+							setShowSettingsMenu(false)
+						}}
+						PaperProps={{
+							sx: {
+								borderRadius: theme?.palette?.DialogStyle?.borderRadius,
+								border: theme?.palette?.DialogStyle?.border,
+								minWidth: 500,
+								minHeight: 700,
+								fontFamily: theme?.typography?.fontFamily,
+								backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+								zIndex: 1000,
+								'& .MuiDialogContent-root': {
+								  backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+								},
+								'& .MuiDialogTitle-root': {
+								  backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+								},
+								'& .MuiDialogActions-root': {
+								  backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+								},
+							},
+						}}
+					>
+						<DialogTitle>
+						</DialogTitle>
+						<DialogContent style={{ paddingLeft: "30px", paddingRight: '30px', backgroundColor: theme.palette.DialogStyle.backgroundColor, }}>
+							{showSettingsMenu === true ? 
+								<div>
+									<Typography variant="h6" style={{ color: theme.palette.text.primary, marginBottom: 20 }}>
+										<SettingsIcon style={{ verticalAlign: "middle", marginRight: 10 }} />
+										Settings for category '{selectedCategory}'
+									</Typography>
+
+									<div style={{display: "flex", marginTop: 50,  }}>
+										<div style={{flex: 2, }}>
+											<Typography variant="body1" style={{ color: theme.palette.text.primary, }}>
+												Timeout	
+											</Typography>
+											<Typography variant="body2" style={{ color: theme.palette.text.secondary, marginBottom: 20 }}>
+												You can set a timeout for the category. This will delete all keys in this category after the specified time. Timeout is in seconds and based on last <b>EDITED</b> time.
+											</Typography>
+										</div>
+										<TextField
+											style={{ backgroundColor: theme.palette.textFieldStyle.backgroundColor, marginLeft: 20, flex: 1, }}
+											InputProps={{
+												style: {
+													color: theme.palette.textFieldStyle.color,
+													fontSize: "1em",
+												},
+											}}
+											fullWidth
+											autoComplete="Timeout"
+											placeholder="86400"
+											id="Timeoutfield"
+											margin="normal"
+											variant="outlined"
+											label="Timeout (seconds)"
+											defaultValue={categoryConfig?.settings?.timeout || ""}
+											onBlur={(e) => {
+												// Check if it's a number or not
+												var timeoutValue = 0
+												if (isNaN(e.target.value) || e.target.value === "" || e.target.value === null) {
+													toast.info("Timeout must be a number. Setting to 0.")
+												} else {
+													timeoutValue = parseInt(e.target.value, 10)
+													if (timeoutValue < 60) { 
+														toast.info("Timeout must be between 60 seconds or more. Setting to 0.")
+													}
+
+													if (timeoutValue === categoryConfig?.settings?.timeout) {
+														return
+													}
+												}
+
+												setCategorySettingsField("timeout", timeoutValue)
+											}}
+										/>
+									</div>
+
+									<div style={{display: "flex", marginTop: 25,  }}>
+										<div style={{flex: 3, }}>
+											<Typography variant="body1" style={{ color: theme.palette.text.primary, }}>
+												{categoryConfig?.settings?.public === true ? "" : "NOT"} Public 
+											</Typography>
+											<Typography variant="body2" style={{ color: theme.palette.text.secondary, marginBottom: 20 }}>
+												This will make the url for this category public. Metadata will be cleared, except for timestamps. Types: keys,ndjson,csv,values,json,meta
+
+												<div style={{marginTop: 20, }}>
+													<div><b>URL (when public):</b></div> {globalUrl}/api/v2/datastore/category/{selectedCategory}?top=10000&type=keys&org_id={orgId}
+												</div>
+											</Typography>
+										</div>
+										<div style={{flex: 1, marginLeft: 60, marginTop: 25, }}>
+											<Tooltip title={categoryConfig?.settings?.public === true ? "Disable public access for this category" : "Enable public access to data in this category"} style={{}} aria-label={""}>
+												<Checkbox
+													checked={categoryConfig?.settings?.public === true}
+													onChange={(e) => {
+														setCategorySettingsField("public", e.target.checked)
+														setUpdate(Math.random()) // Force update to re-render the component
+													}}
+													style={{marginTop: 10, }}
+													color="secondary"
+												/>
+											</Tooltip>
+										</div>
+									</div>
+
+									<div style={{display: "flex", marginTop: 25,  }}>
+										<div style={{flex: 2, }}>
+											<Typography variant="body1" style={{ color: theme.palette.text.primary, }}>
+												Subscribing
+											</Typography>
+											<Typography variant="body2" style={{ color: theme.palette.text.secondary, marginBottom: 20 }}>
+												Enabling this feature will allow other organizations to subscribe to this category. This is NOT fully available yet.
+											</Typography>
+										</div>
+									</div>
+								</div>
+								:
+								<div>
+									<Typography variant="h6" style={{ color: theme.palette.text.primary, marginBottom: 20 }}>
+										<RocketIcon style={{ verticalAlign: "middle", marginRight: 10 }} />
+										Automation for category '{selectedCategory}'
+									</Typography>
+
+									<Typography variant="body2" style={{ color: theme.palette.text.secondary, marginBottom: 20, marginTop: 20, }}>
+										When
+									</Typography>
+									<Typography variant="body1" style={{ color: theme.palette.text.primary, marginBottom: 20 }}>
+										A key is edited 
+									</Typography>
+
+									<Typography variant="body2" style={{ color: theme.palette.text.secondary, marginTop: 100, marginBottom: 20 }}>
+										Do
+									</Typography>
+									{categoryAutomations.map((automation, index) => {
+
+										return (
+											<AutomationOptions 
+												key={index}
+												automation={automation} 
+												index={index} 
+											/>	
+										)
+									})}
+								</div>
+							}
 							
-					}}
-					style={{
-						height: 35,
-						width: 200,
-						marginTop: 0,
-					}}
-					InputProps={{
-						style: {
-							color: "white",
-							height: 35,
-							fontSize: 16,
-							borderRadius: 4,
-							paddingTop: 0,
-						},
-					}}
-					color="primary"
-					placeholder="Category name"
-					required
-					margin="dense"
-					defaultValue={""}
-					autoFocus
-				/>}</div>
+						</DialogContent>
+					</Dialog>
+				: null}
+			</div>
+
             {isSelectedDataStore? null :<Divider
                 style={{
                     marginTop: 20,
                     marginBottom: 20,
                 }}
             />}
-            <div
-                style={{
-                borderRadius: 4,
-                marginTop: 24,
-                border: "1px solid #494949",
-                width: "100%",
-                overflowX: "auto", 
-                paddingBottom: 0,
-                }}
-            >
-            <List 
-             style={{
-                borderRadius: 4,
-                paddingBottom: 0,
-                tableLayout: "auto", 
-                display: "table", 
-                width: '100%',
-                minWidth: 800,
-                overflowX: "auto",
-             }}>
-                <ListItem style={{width: isSelectedDataStore?"100%":null, borderBottom:isSelectedDataStore?"1px solid #494949":null, display: "table-row"}}>
-                {["Key", "Value", "Actions", "Updated", "Distribution"].map((header, index) => (
-                        <ListItemText
-                            key={index}
-                            primary={header}
-                            style={{
-                                display: "table-cell",
-                                padding: index === 0 ? "0px 8px 8px 15px": "0px 8px 8px 8px",
-                                whiteSpace: "nowrap",
-                                overflow: "hidden",
-                                textOverflow: "ellipsis",
-                                borderBottom: "1px solid #494949"
-                            }}
-                        />
-                    ))}
-                </ListItem>
-                {cachedLoaded === false
-                    ? [...Array(6)].map((_, rowIndex) => (
-                        <ListItem
-                            key={rowIndex}
-                            style={{
-                                display: "table-row",
-                                backgroundColor: "#212121",
-                            }}
-                        >
-                            {Array(5)
-                                .fill()
-                                .map((_, colIndex) => (
-                                    <ListItemText
-                                        key={colIndex}
-                                        style={{
-                                            display: "table-cell",
-                                            padding: "8px",
-                                        }}
-                                    >
-                                        <Skeleton
-                                            variant="text"
-                                            animation="wave"
-                                            sx={{
-                                                backgroundColor: "#1a1a1a",
-                                                height: "20px",
-                                                borderRadius: "4px",
-                                            }}
-                                        />
-                                    </ListItemText>
-                                ))}
-                        </ListItem>
-                    ))
-                    : listCache?.length === 0 ? (
-                        <ListItem style={{ display: "table-row" }}>
-                            {Array(5).fill().map((_, index) => (
-                                <ListItemText
-                                    key={index}
-                                    style={{
-                                        display: "table-cell",
-                                        padding: "8px",
-                                        textAlign: index === 0 ? "center" : "left",
-                                    }}
-                                    primary={index === 2 ? "No key found." : null}
-                                    colSpan={index === 0 ? 5 : undefined}
-                                />
-                            ))}
-                        </ListItem>
 
-                    ): listCache?.map((data, index) => {
-						var category = selectedCategory 
-						if (selectedCategory === "default") { 
-							category = ""
+		      <DataGrid
+				rows={listCache}
+				columns={columns}
+
+				checkboxSelection
+				disableRowSelectionOnClick
+				rowSelectionModel={selectedRows}
+				onRowSelectionModelChange={(newSelection) => {
+					setSelectedRows(newSelection)
+				}}
+				keepNonExistentRowsSelected={false}
+				getRowId={(row) => row.key}
+
+				autoHeight={true}
+				sx={{
+					marginTop: 1, 
+					height: listCache.length*52+500,
+					width: "100%",
+					'.MuiTablePagination-selectLabel, .MuiTablePagination-select, .MuiTablePagination-selectIcon': {
+					  display: 'none',
+					},
+					marginBottom: 20, 
+				}}
+
+				loading={cachedLoaded === false}
+				pagination
+				paginationMode="server"
+				page={page}
+				rowCount={totalAmount}
+				onPageChange={(newPage, second) => {
+    				listOrgCache(orgId, selectedCategory, 0, pageSize, newPage)
+
+					setPage(newPage)
+				}}
+				onPageSizeChange={(newSize) => {
+					setPageSize(newSize);
+					setPage(0)
+					setSelectedRows([])
+
+					setCursors({
+						0: "",
+					}) 
+				}}
+
+
+				filterMode="client"
+				onFilterModelChange={(model) => {
+					// Specific search for the key itself to find it fast across the index
+					if (model?.items?.length === 1) {
+						if (model?.items[0]?.operatorValue === "equals" && model?.items[0]?.columnField === "key") {
+							// Run backend search for a specific key
+							listOrgCache(orgId, selectedCategory, 0, pageSize, page, model?.items[0]?.value)
+						}
+					}
+				}}
+
+				getRowHeight={() => {
+					return "auto"
+				}}
+
+				hideFooterSelectedRowCount={true}
+				hideFooter={true}
+			  />
+
+			  <div
+				style={{
+				  position: 'fixed',
+				  bottom: 10,
+				  left: 250,
+				  right: 0,
+				  height: 52,
+				  zIndex: 1000,
+				  display: 'flex',
+				  alignItems: 'center',
+				  paddingLeft: 16,
+				}}
+			  >
+				<div style={{
+					width: 1200, 
+					margin: "auto", 
+					padding: 10, 
+					backgroundColor: theme.palette.platformColor,
+					borderRadius: 4,
+					border: "1px solid rgba(255, 255, 255, 0.5)",
+
+					display: "flex",
+					textAlign: "center", 
+				}}>
+					<Typography variant="body2" style={{ color: theme.palette.text.primary, marginRight: 50, marginTop: 6, marginLeft: 350, }}>
+						{page * pageSize + 1} - {Math.min((page + 1) * pageSize, totalAmount)} of {totalAmount}
+					</Typography>
+					
+					<Pagination
+					  count={Number.parseInt(totalAmount/pageSize*100/2)}
+					  page={page+1}
+					  renderItem={(item) => {
+						  var disabled = false
+						  if (item?.type === "page") {
+							  if (cursors[item.page-1] === undefined) {
+								  disabled = true 
+							  }
+						  }
+						  if (item?.type === "previous") {
+							  disabled = page === 0
+						  }
+
+						  if (cachedLoaded === false) {
+							  disabled = true 
+						  }
+
+						  return (
+							<PaginationItem
+							  {...item}
+							  style={{
+								  marginLeft: 4,
+								  marginRight: 4,
+								  height: 35,
+								  width: 35,
+							  }}
+
+							  disabled={disabled}
+							/>
+						  )
+
+					  }}
+					  onChange={(e, value) => {
+						if (value < 1) {
+							return
 						}
 
-						if (data?.category === undefined && category === "") {
-						} else if (data?.category !== category) {
-							return null
-						}
+						const newPage = value-1
 
-                        var bgColor = isSelectedDataStore? "#212121":"#27292d";
-                        if (index % 2 === 0) {
-                            bgColor = isSelectedDataStore? "#1A1A1A":"#1f2023";
-                        }
+						listOrgCache(orgId, selectedCategory, 0, pageSize, newPage)
 
-              			const validate = validateJson(data.value);
-                        const isDistributed = data?.suborg_distribution?.length > 0 ? true : false;
-                        return (
-                            <ListItem key={index} style={{display:'table-row', backgroundColor: bgColor, maxHeight: 300, overflow: "auto", borderBottomLeftRadius: listCache?.length - 1 === index ? 8 : 0, borderBottomRightRadius: listCache?.length - 1 === index ? 8 : 0,}}>
-                                <ListItemText
-                                    style={{
-                                        display: "table-cell",
-                                        overflow: "hidden",
-                                        verticalAlign: "middle",
-                                        padding: "8px 8px 8px 15px",
-                                        maxWidth: 200,
-                                        overflowX: "auto",
-                                    }}
-                                    primary={data.key}
-                                />
-                                <ListItemText
-                                    style={{
-										display: "table-cell",
-                                        overflowY: "auto",
-                                        overflowX: "auto",
-                                        borderRadius: 4,
-                                        padding: "15px 5px",
-                                        maxHeight: 300,
-                                        verticalAlign: "middle",
-                                        maxWidth: 300,
-									}}
-                                    primary={validate.valid ?
-                                            <ReactJson
-                                                src={validate.result}
-                                                theme={theme.palette.jsonTheme}
-                                                style={{
-                                                    padding: 5,
-                                                    maxHeight: 300,
-                                                    overflowY: "auto",
-                                                    backgroundColor: "#151515",
-                                                    border: "1px solid rgba(255,255,255,0.7)",
-                                                }}
-                                                collapsed={true}
-                                                enableClipboard={(copy) => {
-                                                    // handleReactJsonClipboard(copy);
-                                                }}
-                                                collapseStringsAfterLength={theme.palette.jsonCollapseStringsAfterLength}
-                                                iconStyle={theme.palette.jsonIconStyle}
-                                                displayDataTypes={false}
-                                                onSelect={(select) => {
-                                                    // HandleJsonCopy(showResult, select, data.action.label);
-                                                    console.log("SELECTED!: ", select);
-                                                }}
-                                                name={"value"}
-                                                />
-										:
-										data.value
+						setPage(newPage)
+					  }}
+					/>
+
+					{selectedRows.length > 0 ?
+						<Button
+							style={{ marginLeft: 50, }}
+							onClick={() => {
+								setCachedLoaded(false)
+								for (var key in selectedRows) {
+									// Find the item and its category
+									var foundCategory = ""
+									for (var i = 0; i < listCache.length; i++) {
+										if (listCache[i].key === selectedRows[key]) {
+											foundCategory = listCache[i].category
+											break
+										}
 									}
-								/>
-                                <ListItemText
-                                    style={{
-                                        display: "table-cell",
-                                        verticalAlign: "middle",
-                                        padding: 8
-                                    }}
-                                    primary={(
-                                        <span style={{ display: "inline" }}>
-                                        <Tooltip
-                                            title={data?.org_id !== selectedOrganization.id ? "You can not edit this cache as it is controlled by parent organization." : "Edit this key" }
-                                            style={{}}
-                                            aria-label={"Edit"}
-                                        >
-                                            <span>
-                                                <IconButton
-                                                    style={{ padding: "6px" }}
-                                                    disabled={data.org_id !== selectedOrganization.id ? true : false}
-                                                    onClick={() => {
-                                                        setEditCache(true)
-                                                        setDataValue({
-															"key": data.key,
-															"value":data.value
-														})
-														setValue(data.value)
-                                                        setModalOpen(true)
-                                                    }}
-                                                >
-                                                    <img src="/icons/editIcon.svg" alt="edit" />
-                                                </IconButton>
-                                            </span>
-                                        </Tooltip>
-                                        <Tooltip
-                                            title={data?.org_id !== selectedOrganization.id ? "You can not access public URL for this key as it is controlled by parent organization." : "Public URL (types: text, raw, json)" }
-                                            style={{ marginLeft: 0, }}
-                                            aria-label={"Public URL"}
-                                        >
-                                            <span>
-                                                <IconButton
-                                                    style={{ padding: "6px" }}
-													disabled={data.public_authorization === undefined || data.public_authorization === null || data.public_authorization === "" || data.org_id !== selectedOrganization.id ? true : false}
-                                                    onClick={() => {
-														window.open(`${globalUrl}/api/v1/orgs/${orgId}/cache/${data.key}?type=text&authorization=${data.public_authorization}`, "_blank");
-                                                    }}
-                                                >
-													<LinkIcon
-													/>
-                                                </IconButton>
-                                            </span>
-                                        </Tooltip>
-                                        <Tooltip
-                                            title={data?.org_id !== selectedOrganization.id ? "You can not delete this key as it is controlled by parent organization." : "Delete this key" }
-                                            aria-label={"Delete"}
-                                        >
-                                            <span>
-                                                <IconButton
-                                                    style={{ padding: "6px" }}
-                                                    disabled={data.org_id !== selectedOrganization.id ? true : false}
-                                                    onClick={() => {
-                                                        deleteCache(orgId, data.key);
-                                                        //deleteFile(orgId);
-                                                    }}
-                                                >
-                                                    <svg
-															width="24"
-															height="24"
-															viewBox="0 0 24 24"
-															xmlns="http://www.w3.org/2000/svg"
-															style={{
-																stroke: data.org_id === selectedOrganization.id ? "#fd4c62" : "#c8c8c8",
-															}}
-															>
-															<path
-																d="M5 7.20001H6.6H19.4"
-																strokeLinecap="round"
-																strokeLinejoin="round"
-																fill="none"
-															/>
-															<path
-																d="M17.7996 7.2V18.4C17.7996 18.8243 17.631 19.2313 17.331 19.5314C17.0309 19.8314 16.624 20 16.1996 20H8.19961C7.77526 20 7.3683 19.8314 7.06824 19.5314C6.76818 19.2313 6.59961 18.8243 6.59961 18.4V7.2M8.99961 7.2V5.6C8.99961 5.17565 9.16818 4.76869 9.46824 4.46863C9.7683 4.16857 10.1753 4 10.5996 4H13.7996C14.224 4 14.6309 4.16857 14.931 4.46863C15.231 4.76869 15.3996 5.17565 15.3996 5.6V7.2"
-																strokeLinecap="round"
-																strokeLinejoin="round"
-																fill="none"
-															/>
-															</svg>
-                                                </IconButton>
-                                            </span>
-                                        </Tooltip>
-                                    </span>
-                                    )}
-                                />
-								<ListItemText
-									style={{
-										display: "table-cell",
-                                        verticalAlign: "middle",
-                                        padding: 8
-									}}
-									primary={new Date(data.edited * 1000).toISOString()}
-								/>
-                                {selectedOrganization.id !== undefined && data?.org_id !== selectedOrganization.id ?
-                                      <ListItemText
-                                        primary={
-                                            <Tooltip
-                                          title="Parent organization controlled datastore. You can use, but not modify this key. Contact an admin of your parent organization if you need changes to this."
-                                          placement="top"
-                                      >
-                                          <Chip
-                                              label={"Parent"}
-                                              variant="contained"
-                                              color="secondary"
-                                          />
-                                      </Tooltip>
-                                        }
-                                        style={{display: "table-cell", textAlign: 'center', verticalAlign: 'middle', }}
-                                        />
-                                      :
-                                      <ListItemText
-                                        primary={
-                                            <Tooltip
-                                          title="Distributed to sub-organizations. This means the sub organizations can use this datastore key, but can not modify it."
-                                          placement="top"
-                                      >
-                                          <Checkbox
-                                              disabled={ userdata?.active_org?.role !== "admin" || (selectedOrganization.creator_org !== undefined && selectedOrganization.creator_org !== null && selectedOrganization.creator_org !== "" )? true : false}
-                                              checked={isDistributed}
-                                              style={{ margin: "auto" }}
-                                              color="secondary"
-                                              onClick={() => {
-												setShowDistributionPopup(true)
-												if(data?.suborg_distribution?.length > 0){
-													setSelectedSubOrg(data.suborg_distribution)
-												}else{
-													setSelectedSubOrg([])
-												}
-												setSelectedCacheKey(data.key)
-                                              }}
-                                          />
-                                      </Tooltip>
-                                        }
-                                        style={{display: "table-cell", textAlign: 'center', verticalAlign: 'middle', }}
-                                        />
-                                  }
-                            </ListItem>
-                        );
-                    })}
-            </List>
-            </div>
+
+									deleteEntry(orgId, selectedRows[key], foundCategory, false)
+								}
+
+								setSelectedRows([])
+								setTimeout(() => {
+									// Refresh the list
+									listOrgCache(orgId, selectedCategory, 0, pageSize, page)
+									toast.success("Deleted " + selectedRows.length + " keys from datastore")
+								}, 2500)
+
+							}}
+							variant={"outlined"}
+							color="secondary"
+						>
+							<DeleteOutlineIcon 
+								style={{
+									color: red,
+									marginRight: 10, 
+								}}
+							/>
+							Delete {selectedRows.length} Key{ selectedRows.length > 1 ? "s" : "" }
+						</Button>
+					: null}
+				</div>
+			  </div>
+
               </div>
             </div>
         </div>
     );
-});
+})
 
+//export default CacheView;
 export default memo(CacheView);
diff --git a/frontend/src/components/ChatBot.jsx b/frontend/src/components/ChatBot.jsx
new file mode 100644
index 00000000..4e491ea4
--- /dev/null
+++ b/frontend/src/components/ChatBot.jsx
@@ -0,0 +1,846 @@
+import React, { useState, useEffect, useContext } from "react";
+
+import { useParams, useNavigate, Link } from "react-router-dom";
+import { v4 as uuidv4 } from "uuid";
+import theme from '../theme.jsx';
+import Markdown from 'react-markdown'
+import { isMobile } from "react-device-detect";
+import { Context } from '../context/ContextApi.jsx';
+
+import AppSearch from "../components/AppSearch1.jsx";
+
+import {
+	Divider,
+	ButtonGroup,
+  	TextField,
+	Button,
+	IconButton,
+	Typography,
+	CircularProgress,
+	Card, 
+	CardContent,
+} from "@mui/material";
+
+import {
+	Send as SendIcon,
+} from "@mui/icons-material";
+
+import AuthenticationOauth2 from "../components/Oauth2Auth.jsx";
+import AuthenticationWindow from "../components/AuthenticationWindow.jsx";
+
+const ChatBot = (props) => {
+	const { globalUrl } =  props 
+	const { supportEmail } = useContext(Context)
+	const [messages, setMessages] = useState([])
+	const [message, setMessage] = useState("");
+	const [loading, setLoading] = useState(false);
+    const [appAuthentication, setAppAuthentication] = React.useState([]);
+	const [inputAuth, setInputAuth] = useState([])
+	const [forceReauthentication, setForceReauthentication] = useState(false);
+	const [selectedType, setSelectedType] = useState("atomic");
+
+	const [appname, setAppname] = useState("");
+	const [threadId, setThreadId] = useState("");
+	const [runId, setRunId] = useState("");
+
+	const [showAppSearch, setShowAppSearch] = useState(false);
+
+
+	const waitingMsg = "Processing..."
+	const viewWidth = isMobile ? "92%" : 800 
+
+	useEffect(() => {
+		// Check if loading and remove Waiting... from messages
+		const newmessages = messages 
+		const foundmessages = messages.filter((msg) => msg.message !== waitingMsg)
+		if (foundmessages.length < newmessages.length) {
+			setMessages(foundmessages);
+		}
+
+		// Wait 0.5 second 
+		const objDiv = document.getElementById("messages-window");
+		if (objDiv !== undefined && objDiv !== null) {
+			setTimeout(() => {
+				objDiv.scrollTop = objDiv.scrollHeight;
+			}, 250);
+		}
+	}, [messages]);
+
+	useEffect(() => {
+		if (appname === undefined || appname === null || appname === "") {
+			return
+		}
+
+		// Find the last message that was sent by us and reuse the same message content
+		// with added app stuff only
+		for (var i = messages.length-1; i >= 0; i--) {
+			const msg = messages[i]
+			if (msg.status === "sent") {
+				handleSubmit(undefined, msg.message)
+				break
+			}
+		}
+	}, [appname])
+
+	window.title = "Shuffle - New Chat"
+	let navigate = useNavigate();
+
+	// Automatic submit handler based on a lot of stuff :)
+	const handleSubmit = (e, inputmsg) => {
+		if (e !== undefined) {
+			e.preventDefault();
+			e.stopPropagation();
+		}
+
+		setLoading(true)
+		setMessage("");
+
+		const sentId = uuidv4();
+		var parsedData = {
+			"query": inputmsg,
+			"thread_id": threadId,
+			"run_id": runId,
+		}
+
+		if (appname !== undefined && appname !== null && appname !== "") {
+			parsedData["app_name"] = appname
+		}
+
+		if (inputAuth !== undefined && inputAuth.length > 0) {
+			// Forcing first auth app to be used in request
+			try {
+				parsedData["app_name"] = inputAuth[0].name
+				parsedData["app_id"] = inputAuth[0].id
+				parsedData["category"] = inputAuth[0].category
+				parsedData["action_name"] = inputAuth[0].action_name
+			} catch (e) {
+			}
+
+			try {
+				parsedData["app_name"] = inputAuth.apps[0].name
+				parsedData["app_id"] = inputAuth.apps[0].id
+				parsedData["category"] = inputAuth.apps[0].category
+				parsedData["action_name"] = inputAuth.apps[0].action_name
+			} catch (e) {
+			}
+		}
+
+		if (selectedType !== "default") {
+			if (selectedType == "workflow") {
+				parsedData["output_format"] = "workflow_suggestion" 
+			} else {
+				parsedData["output_format"] = selectedType
+			}
+		}
+
+		console.log("INPUT: ", parsedData)
+
+		setInputAuth([])
+
+		var newmessages = messages;
+		newmessages.push({
+			"id": sentId,
+			"status": "sent",
+			"message": inputmsg,
+		})
+		newmessages.push({
+			"id": sentId,
+			"status": "received",
+			"message": waitingMsg,
+		})
+
+		setMessages(newmessages);
+
+		//fetch(`http://localhost:8080/api/v1/conversation`, {
+		fetch(`${globalUrl}/api/v1/conversation`, {
+			method: "POST",
+			headers: {
+				"Content-Type": "application/json",
+			},
+			credentials: "include",
+			body: JSON.stringify(parsedData),
+		})
+		.then((res) => res.text())
+		.then((resText) => {
+			setLoading(false)
+			var data = {}
+
+			// JSON parse
+			try {	
+				data = JSON.parse(resText);
+			} catch (e) {
+				console.log("Error parsing response as JSON: ", e);
+
+				newmessages = newmessages.filter((msg) => msg.message !== waitingMsg);
+				newmessages.push({
+					"status": "received",
+					"message": resText,
+					"id": uuidv4(),
+				});
+
+				setMessages(newmessages);
+
+				return;
+			}
+
+
+			if (data.run_id !== undefined && data.run_id !== null && data.run_id !== "") {
+				setRunId(data.run_id)
+			}
+
+			if (data.thread_id !== undefined && data.thread_id !== null && data.thread_id !== "") {
+				setThreadId(data.thread_id)
+			}
+
+			if (data.success === undefined) {
+				newmessages = newmessages.filter((msg) => msg.message !== waitingMsg);
+				newmessages.push({
+					"status": "received",
+					"message": resText,	
+					"id": uuidv4(),
+				});
+
+				setMessages(newmessages);
+
+				return;
+			}
+
+			// authentication for app
+			// app validation (choose one)
+			const defaultMessage = `Default output. The feature you're interacting with may not have been implemented yet. Contact ${supportEmail} with a screenshot of this and your input please.`
+				
+			var outputmessage = defaultMessage;
+			var status = "received";
+			var action = ""
+			if (data.success === false) {
+				if (data.reason !== undefined) {
+					outputmessage = data.reason
+				} 
+
+				status = "error"
+			} else {
+				if (data.reason !== undefined) {
+					outputmessage = data.reason
+				}
+			}
+
+			if (data.action !== undefined) {
+				//console.log("Action is defined: ", data.action);
+				action = data.action
+
+				if (data.action === "app_authentication") {
+					// If success & app auth -> say auth success and show available labels
+					// If !success & app auth -> do authentication
+					if (data.success === true) {
+						newmessages = newmessages.filter((msg) => msg.message !== waitingMsg);
+						// No action for this.
+						// "action": action,
+						var appname = ""
+						if (data.apps !== undefined && data.apps !== null && data.apps.length > 0) {
+							appname = data.apps[0].name.replaceAll("_", " ")
+						}
+
+						var outputmessage = `**Please specify which ${appname} action you want to use**: \n`
+						if (data.available_labels !== undefined && data.available_labels !== null && data.available_labels.length > 0) {
+							for (var i = 0; i < data.available_labels.length; i++) {
+								outputmessage += "* " + data.available_labels[i] + "\n"
+							}
+							outputmessage += "* Reauthenticate ([see auth](/admin?tab=app_auth))"
+						}
+						//Some opavailable actions: " + data.apps.map((app) => app.name).join(", ")
+						const parsedmessage = {
+							"status": status,
+							"message": outputmessage,
+							"id": uuidv4(),
+							"category": data.category,
+
+							"thread_id": data.thread_id,
+							"run_id": data.run_id,
+						}
+						newmessages.push(parsedmessage);
+						setMessages(newmessages);
+
+						return
+
+					} else {
+						if (data.apps !== undefined) {
+							setInputAuth(data.apps)
+
+							setMessage(inputmsg);
+
+							setForceReauthentication(true)
+						}
+					}
+				} else if (data.action === "select_category" || data.action === "select_app") {
+					console.log("[DEBUG] APP SELECTION! Should help them choose an app to use")
+					// Show a search field
+					setShowAppSearch(true)
+				}
+			}
+
+			newmessages = newmessages.filter((msg) => msg.message !== waitingMsg);
+			const parsedmessage = {
+				"status": status,
+				"message": outputmessage,
+				"id": uuidv4(),
+				"action": action,
+				"category": data.category,
+
+				"thread_id": data.thread_id,
+				"run_id": data.run_id,
+			}
+			newmessages.push(parsedmessage);
+			setMessages(newmessages);
+			console.log("New message: ", parsedmessage)
+		})
+		.catch((err) => {
+			setLoading(false)
+			console.log("Problem: ", err);
+
+			setMessage(message);
+			newmessages = newmessages.filter((msg) => msg.message !== waitingMsg);
+
+			// Find the message with the sentId and change the status to error
+			newmessages.push({
+				"status": "error",
+				"message": message,
+				"error_message": "Failed to send: "+err,
+				"id": sentId,
+			});
+			setMessages(newmessages);
+		});
+	};
+
+	// Used to verify if the user is logged in after auth is done
+	const getAppAuthentication = () => {
+		console.log("Continue chat from the previous stage!");
+
+		fetch(globalUrl + "/api/v1/apps/authentication", {
+			method: "GET",
+			headers: {
+				"Content-Type": "application/json",
+				Accept: "application/json",
+			},
+			credentials: "include",
+		})
+		.then((response) => {
+			if (response.status !== 200) {
+				console.log("Status not 200 for app auth :O!");
+			}
+
+			return response.json();
+		})
+		.then((responseJson) => {
+			if (!responseJson.success) {
+				console.log("Failed to get app auth!");
+				return;
+			}
+
+			var newauth = [];
+			for (let authkey in responseJson.data) {
+				if (responseJson.data[authkey].defined === false) {
+					continue;
+				}
+
+				newauth.push(responseJson.data[authkey]);
+			}
+
+			if (newauth.length > appAuthentication.length) {
+				console.log("New auth is longer than old auth. Set new auth!");
+
+				setForceReauthentication(false)
+
+				// Check if last message contains "reauth"
+				if (messages.length > 0) {
+					const lastmessage = messages[messages.length-1];
+					if (lastmessage.message.toLowerCase().includes("re-auth")) {
+						console.log("Skipping resend due to reauth") 
+
+						var newmessages = messages 
+						newmessages.push({
+							"status": "received",
+							"message": "Authentication done. What do you want to do?",
+							"id": uuidv4(),
+						});
+						setMessages(newmessages);
+
+					} else {
+						handleSubmit(undefined, message)
+					}
+				} else {
+					handleSubmit(undefined, message)
+				}
+			}
+
+			setAppAuthentication(newauth)
+
+		})
+		.catch((err) => {
+			console.log("Error in getAppAuthentication: ", err);
+		})
+	}
+
+	const AuthWrapper = (props) => {
+		const { app } = props;
+  		const [authenticationModalOpen, setAuthenticationModalOpen] = React.useState(false);
+
+		console.log("AUTH: ", app)
+
+		return (
+			<div style={{position: "absolute", right: 250, bottom: 150, }}>
+				{app.authentication.type === "oauth2" || app.authentication.type === "oauth2-app" ?
+					<AuthenticationOauth2
+						selectedApp={app}
+						selectedAction={{
+							"app_name": app.name,
+							"app_id": app.id,
+							"app_version": app.version,
+							"large_image": app.large_image,
+						}}
+						authenticationType={app.authentication}
+						isCloud={true}
+						authButtonOnly={true}
+						getAppAuthentication={getAppAuthentication}
+					/>
+				: 
+					<Button
+						fullWidth
+						variant="contained"
+						style={{
+							marginBottom: 20, 
+							marginTop: 20, 
+							flex: 1,
+							textTransform: "none",
+							textAlign: "left",
+							justifyContent: "flex-start",
+							backgroundColor: "#ffffff",
+							color: "#2f2f2f",
+							borderRadius: theme.palette?.borderRadius,
+							minWidth:  300, 
+							maxWidth: 300,
+							maxHeight: 50,
+							overflow: "hidden",
+							border: `1px solid ${theme.palette.inputColor}`,
+						}}
+						color="primary"
+						fullWidth
+						color="primary"
+						onClick={(e) => {
+							console.log("Click? ")
+							e.preventDefault();
+							setAuthenticationModalOpen(true);
+						}}
+					>
+						<span style={{display: "flex"}}>
+							<img
+								alt={app.name}
+								style={{ margin: 4, minHeight: 30, maxHeight: 30, borderRadius: theme.palette?.borderRadius, }}
+								src={app.large_image}
+							/>
+							<Typography style={{ margin: 0, marginLeft: 10, marginTop: 5,}} variant="body1">
+								Authenticate
+							</Typography>
+
+						</span>
+					</Button>
+				}
+
+				{app.authentication.type !== "oauth2" && authenticationModalOpen ?
+					<AuthenticationWindow
+						selectedApp={app}
+						globalUrl={globalUrl}
+						getAppAuthentication={getAppAuthentication}
+						appAuthentication={appAuthentication}
+						authenticationModalOpen={authenticationModalOpen}
+						setAuthenticationModalOpen={setAuthenticationModalOpen}
+					/>
+				: null}
+			</div>
+			)
+	}
+
+	var amountfinished = 0;
+	const showAuthentication = inputAuth.map((app, index) => {
+		const authexists = appAuthentication.find((auth) => auth.app.id === app.id);
+		if (authexists !== undefined && forceReauthentication === false) {
+			console.log("Auth exists: ", authexists);
+			amountfinished += 1 
+			return null
+		}
+
+		return (
+			<div key={index}>
+				<AuthWrapper app={app} />
+			</div>
+		)
+	})
+
+	if (amountfinished === inputAuth.length && amountfinished > 0) {
+
+		setInputAuth([])
+		setAppAuthentication([])
+	}
+
+	const showSamples = 
+		<div style={{marginLeft: 10, marginRight: 10, }}>
+			<Card style={{backgroundColor: theme.palette.surfaceColor, borderRadius: theme.palette?.borderRadius,}}>
+				<CardContent>
+					<Typography variant="h6">
+						How many incidents did we get last week?
+					</Typography>
+				</CardContent>
+			</Card>
+			<Card style={{backgroundColor: theme.palette.surfaceColor, borderRadius: theme.palette?.borderRadius, marginTop: 10, }}>
+				<CardContent>
+					<Typography variant="h6">
+						Answer the last email from Jim about the new project, and say we're on it
+					</Typography>
+				</CardContent>
+			</Card>
+			<Card style={{backgroundColor: theme.palette.surfaceColor, borderRadius: theme.palette?.borderRadius, marginTop: 10, }}>
+				<CardContent>
+					<Typography variant="h6">
+						Is the IP 1.2.3.4 blocked? If not, block it.
+					</Typography>
+				</CardContent>
+			</Card>
+		</div>
+
+  function OuterLink(props) {
+      return (
+        <a
+		  target="_blank"
+		  rel="noopener noreferrer"
+          href={props.href}
+          style={{ color: "#f85a3e", textDecoration: "none" }}
+        >
+          {props.children}
+        </a>
+      );
+  }
+
+  function Img(props) {
+    return <img style={{ borderRadius: theme.palette?.borderRadius, width: 750, maxWidth: "100%", marginTop: 15, marginBottom: 15, }} alt={props.alt} src={props.src} />;
+  }
+
+  function CodeHandler(props) {
+    //console.log("Codehandler PROPS: ", props)
+
+    const propvalue = props.value !== undefined && props.value !== null ? props.value : props.children !== undefined && props.children !== null && props.children.length > 0 ? props.children[0] : ""
+
+    return (
+      <div
+        style={{
+          minWidth: "50%",
+          maxWidth: "100%",
+          backgroundColor: theme.palette.inputColor,
+          overflowY: "auto",
+
+		  // Check if props.inline === true, then do it inline
+		  padding: props.inline ? 0 : 15,
+		  display: props.inline ? "inline" : "block",
+        }}
+      >
+        <code
+          style={{
+            // Wrap if larger than X
+            whiteSpace: "pre-wrap",
+            overflow: "auto",
+          }}
+        >{propvalue}</code>
+      </div>
+    );
+  }
+
+
+  const markdownStyle = {
+    color: "rgba(255, 255, 255, 0.65)",
+    overflow: "hidden",
+    paddingBottom: 100,
+    margin: "auto",
+    maxWidth: "100%",
+    minWidth: "100%",
+    overflow: "hidden",
+    fontSize: isMobile ? "1.3rem" : "1.0rem",
+  }
+
+  const Heading = (props) => {
+    const element = React.createElement(
+      `h${props.level}`,
+      { style: { marginTop: props.level === 1 ? 20 : 50 } },
+      props.children
+    );
+    const [hover, setHover] = useState(false);
+
+    var extraInfo = "";
+    return (
+      <Typography
+        onMouseOver={() => {
+          setHover(true);
+        }}
+      >
+        {props.level !== 1 ? (
+          <Divider
+            style={{
+              width: "90%",
+              marginTop: 40,
+              backgroundColor: theme.palette.inputColor,
+            }}
+          />
+        ) : null}
+        {element}
+        {/*hover ? <LinkIcon onMouseOver={() => {setHover(true)}} style={{cursor: "pointer", display: "inline", }} onClick={() => {
+					window.location.href += "#hello"
+					console.log(window.location)
+					//window.history.pushState('page2', 'Title', '/page2.php');
+					//window.history.replaceState('page2', 'Title', '/page2.php');
+				}} /> 
+				: ""
+				*/}
+        {extraInfo}
+      </Typography>
+    );
+  }
+
+	const OrderedList = (props) => {
+		var parsedchildren = []
+		for (var i = 0; i < props.children.length; i++) {
+			const child = props.children[i]
+			if (child === "\n") {
+				continue
+			}
+
+			if (child.props !== undefined && child.props.children !== undefined) {
+				// Remove <p> from the child wrapper
+				var parsedchild = []
+				for (var j = 0; j < child.props.children.length; j++) {
+					const childchild = child.props.children[j]
+					// print the raw childchild bytes, not string
+					if (childchild === "\n") {
+						continue
+					}
+
+					// If the childchild has <p> around it, remove it
+					parsedchild.push(childchild) 
+
+					/*
+					// Not doing this as it breaks links
+					if (childchild.props !== undefined && childchild.props.children !== undefined) {
+						parsedchild.push(childchild.props.children)
+					} else {
+						parsedchild.push(childchild) 
+					}
+					*/
+				}
+
+				parsedchildren.push(parsedchild)
+			}
+		}
+
+		return (
+			<ol style={{marginTop: 0, }}>
+				{parsedchildren.map((child, index) => {
+					return (
+						<li key={index} style={{minHeight: 0, display: "block", }}>
+							<p style={{marginTop: 0, marginBottom: 10, }}>
+								{index+1}. {child}
+							</p>
+						</li>
+					)
+				})}
+			</ol>
+		)
+	}
+
+	const Paragraph = (props) => {
+		return (
+			<p style={{marginTop: 15, marginBottom: 15, }}>
+				{props.children}
+			</p>
+		)
+	}
+
+    const markdownComponents = {
+		ol: OrderedList,
+		ul: OrderedList,
+    	img: Img,
+    	code: CodeHandler,
+    	h1: Heading,
+    	h2: Heading,
+    	h3: Heading,
+    	h4: Heading,
+    	h5: Heading,
+    	h6: Heading,
+    	a: OuterLink,
+		p: Paragraph,
+    }
+
+	const chatWindow = 
+		<div style={{minWidth: viewWidth, maxWidth: viewWidth, margin: "auto", textAlign: "left", minHeight: 1500, }}>
+			{messages.length === 0 ? 
+				<span>
+					<h1>Shuffle AI</h1>
+
+
+
+					{showSamples}
+				</span>
+			: null}
+			<div 
+				id="messages-window"
+				style={{
+					marginTop: 50, 
+					display: "flex", 
+					flexDirection: "column", 
+					minHeight: 1500,
+					maxHeight: isMobile ? "85%" : "85%", 
+					overflow: "auto", paddingBottom: 200, 
+				}}
+			>
+				{messages.map((message, index) => {
+					const float = message.status === "sent" ? "left" : "right";
+					const border = message.status === "error" ? "red" : "rgba(255,255,255,0.3)" 
+
+					const hasAction = message.action !== undefined && message.action !== null && message.action !== "" 
+
+					return (
+					// Make a chat bubble component
+						<div key={index} style={{position: "relative", width: "100%", marginTop: 15, marginLeft: isMobile ? 10 : 0, }}>
+							<Typography variant="body1" style={{display: "flex", backgroundColor: theme.palette.surfaceColor, color: "white", padding: "0px 10px 0px 10px", borderRadius: theme.palette?.borderRadius, float: float, border: `1px solid ${border}`, "cursor": hasAction ? "pointer" : "default", maxWidth: viewWidth-30, overflowWrap: "break-word", whiteSpace: "pre-line" }} onClick={() => {
+									if (!hasAction) {
+										return
+									}
+
+									if (message.action === "login") {
+										navigate("/login?view=/conversation&message=You must log in to use ShuffleGPT")
+									} else if (message.action === "app_authentication") {
+										console.log("App auth action!")
+										//setAuthenticationModalOpen(true)
+									} else {
+										console.log("\n\nUnknown click action: ", message.action)
+									}
+							}}>
+								{message.message === waitingMsg ? <CircularProgress style={{height: 20, width: 20, marginTop: 20, marginRight: 10,  }} /> : null} 
+								  <span>
+									  <Markdown
+										components={markdownComponents}
+										id="markdown_wrapper"
+										style={{
+											minHeight: 20, 
+											marginTop: 0, 
+											display: "flex",
+											flexDirection: "row",
+										}}
+									  >
+										{message.message}
+									  </Markdown>
+
+									{message.thread_id !== undefined && message.thread_id !== null && message.thread_id !== "" ?
+										<Typography variant="body2" style={{color: "rgba(255,255,255,0.5)", marginTop: 5, }}>
+											Thread: {message.thread_id}
+										</Typography>
+										: null
+									}
+								  </span>
+							</Typography>
+
+							{message.status === "error" && message.error_message ?
+								<Typography variant="body2" style={{color: "red", }}>
+									{message.error_message}
+								</Typography>
+							: null}
+
+							{(message.action === "select_category" || message.action === "select_app") && showAppSearch && index === messages.length-1 ?
+								<div style={{position: "absolute", right: 0, bottom: -100, }}>
+									<AppSearch 
+										placeholder={"Find your "+message.category+" app"}
+										setNewSelectedApp={setAppname}
+									/>
+								</div>
+							: null}
+						</div>
+						)
+				})}
+			</div>
+			{showAuthentication} 	
+
+		<div style={{position: "fixed", bottom: 0, left: 0, width: "100%", zIndex: 100, backgroundColor: theme.palette.platformColor, }}>
+			<div style={{width: viewWidth, margin: "auto", }}>
+				{messages.length === 0 ? 
+					<span>
+						<Typography variant="body2" color="textSecondary">
+							Query Type
+						</Typography>
+						<ButtonGroup 
+							fullWidth
+							color="secondary"
+							style={{display: "flex", marginTop: 10, }}
+						>
+							{/*
+							<Button
+								fullWidth
+								disabled
+								variant={selectedType === "default" ? "contained" : "outlined"}
+								onClick={() => setSelectedType("default")}
+							>
+								Auto	
+							</Button>
+							*/}
+							<Button
+								fullWidth
+								variant={selectedType === "atomic" ? "contained" : "outlined"}
+								onClick={() => setSelectedType("atomic")}
+							>
+								Auto-run action 
+							</Button>
+							<Button
+								fullWidth
+								variant={selectedType === "support" ? "contained" : "outlined"}
+								onClick={() => setSelectedType("support")}
+							>
+								Support		
+							</Button>
+						</ButtonGroup>
+					</span>
+				: null}
+
+				<form onSubmit={(e) => handleSubmit(e, message)} style={{bottom: 20, marginTop: 10, marginBottom: isMobile ? 0 : 10, maxWidth: viewWidth, minWidth: viewWidth, }}>
+					<TextField
+						id="message"
+						fullWidth
+						disabled={loading}
+						label="Send a message"
+						value={message}
+						onChange={(e) => setMessage(e.target.value)}
+						variant="outlined"
+						autoFocus
+						InputProps={{
+							endAdornment: (
+								<IconButton
+									aria-label="send message"
+									onClick={(e) => handleSubmit(e, message)}
+								>
+									<SendIcon color="primary" />
+								</IconButton>
+							)
+						}}
+					/>
+					
+				</form>
+				{isMobile ? null : 
+					<Typography variant="body2" color="textSecondary" align="center" style={{marginTop: 0,}} >
+						{`The Shuffle AI is a test system for automatic workflow generation and atomic functions for the future of Shuffle. Shuffle AI may use your organization info in the query, and attempts to auto-correct any failed behavior. If you have any questions, please contact us at ${supportEmail}`}
+					</Typography>
+				}
+			</div>
+		</div>
+	</div>
+
+return (
+	<div style={{width: isMobile ? "100%" : 1000, margin: "auto", paddingTop: 50, }}>
+		{chatWindow}
+	</div>
+)
+}
+
+export default ChatBot;
diff --git a/frontend/src/components/CloudSyncTab.jsx b/frontend/src/components/CloudSyncTab.jsx
index 08926570..88df2610 100644
--- a/frontend/src/components/CloudSyncTab.jsx
+++ b/frontend/src/components/CloudSyncTab.jsx
@@ -26,7 +26,7 @@ import {
     Visibility as VisibilityIcon,
     VisibilityOff as VisibilityOffIcon,
 } from "@mui/icons-material";
-import theme from "../theme.jsx";
+import { getTheme } from "../theme.jsx";
 import { styled } from '@mui/styles';
 import { Context } from "../context/ContextApi.jsx";
 
@@ -48,13 +48,21 @@ const CloudSyncTab = (props) => {
     const [, forceUpdate] = React.useState();
     const itemColor = "white";
     const isCloud = window?.location?.host === "localhost:3002" || window?.location?.host === "shuffler.io";
+
+    const { themeMode, brandColor } = useContext(Context);
+    const theme = getTheme(themeMode, brandColor);
+
     useEffect(() => { getSettings(); }, []);
+
     const GridItem = (props) => {
         const [expanded, setExpanded] = React.useState(false);
         const [showEdit, setShowEdit] = React.useState(false);
         const [newValue, setNewValue] = React.useState(-100);
 
-        const primary = props.data.primary;
+        var primary = props.data.primary
+
+		const shownName = props.data.newname !== undefined && props.data.newname !== null && props.data.newname !== primary ? props.data.newname : primary
+
         const secondary = props.data.secondary;
         const primaryIcon = props.data.icon;
         const secondaryIcon = props.data.active ?
@@ -167,9 +175,9 @@ const CloudSyncTab = (props) => {
                 <div
                     style={{
                         margin: 4,
-                        backgroundColor: "#1a1a1a",
+                        backgroundColor: theme.palette.backgroundColor,
                         borderRadius: 8,
-                        color: "white",
+                        color: theme.palette.text.primary,
                         minHeight: expanded ? 250 : "inherit",
                         maxHeight: expanded ? 300 : "inherit",
                         boxShadow: "none",
@@ -188,13 +196,13 @@ const CloudSyncTab = (props) => {
                             <Avatar>{primaryIcon}</Avatar>
                         </ListItemAvatar>
                         <ListItemText
-                            style={{ textTransform: "capitalize", color: "#F1F1F1", fontSize: 14, fontWeight: 400, }}
-                            primary={primary}
+                            style={{ textTransform: "capitalize", color: theme.palette.text.primary, fontSize: 14, fontWeight: 400, }}
+                            primary={shownName}
                         />
                         {isCloud && userdata.support === true ?
                             <Tooltip title="Edit features (support users only)">
                                 <EditIcon
-                                    color="secondary"
+                                    color="textPrimary"
                                     style={{ marginRight: 10, cursor: "pointer", }}
                                     onClick={(e) => {
                                         e.preventDefault();
@@ -475,7 +483,7 @@ const CloudSyncTab = (props) => {
                     } else {
                         toast("Cloud Syncronization successfully set up!");
                         setOrgSyncResponse(
-                            "Successfully started syncronization. Cloud features you now have access to can be seen below."
+                            "Successfully started syncronization. Cloud/Hybrid features are available below."
                         );
                     }
 
@@ -527,20 +535,20 @@ const CloudSyncTab = (props) => {
     return (
             <div style={{padding: "27px 10px 19px 27px",}}>
             <div style={{ marginBottom: 20 }}>
-                <h2
-                    style={{ marginBottom: 8, marginTop: 0, color: "#ffffff" }}
+                <Typography variant="h5"
+                    style={{ marginBottom: 8, marginTop: 0, fontWeight: 500}}
                 >
                     Cloud syncronization
-                </h2>
-                <span style={{ color: "#C8C8C8", fontSize: 16, fontWeight: 400, }}>
-                    What does <a href="/docs/organizations#cloud_sync" target="_blank" rel="noopener noreferrer" style={{ color: "rgba(255, 132, 68, 1)", fontSize: 16, textDecoration: 'none', }}>cloud sync</a> do? Cloud synchronization is a way of getting more out of Shuffle. Shuffle will ALWAYS make every option open source, but features relying on other users can't be done without a collaborative approach.
-                    </span>
+                </Typography>
+                <Typography variant="body2" style={{ color: theme.palette.text.secondary, fontSize: 16, fontWeight: 400, }}>
+                    What does <a href="/docs/organizations#cloud_sync" target="_blank" rel="noopener noreferrer" style={{ color: theme.palette.linkColor, fontSize: 16, textDecoration: 'none', }}>cloud sync</a> do? Cloud synchronization is a way of getting more out of Shuffle. Shuffle will ALWAYS make every option open source, but features relying on other users can't be done without a collaborative approach. This will by default back up apps and workflows.
+                </Typography>
             </div>
 
             {isCloud ? (
                 <div style={{ marginTop: 15, display: "flex" }}>
                     <div style={{ flex: 1 }}>
-                        <Typography style={{fontWeight: 400, fontSize: 16, color: "#F1F1F1"}}>
+                        <Typography style={{fontWeight: 400, fontSize: 16, color: theme.palette.text.secondary}}>
                             Currently syncronizing:{" "}
                             {selectedOrganization.cloud_sync_active === true
                                 ? <span style={{ color: "#4CFD72", fontSize: 16, marginLeft: 16}}>True</span>
@@ -561,28 +569,31 @@ const CloudSyncTab = (props) => {
                                 marginRight: 10,
                                 fontSize: 16, 
                                 fontWeight: 400,
+                                color: theme.palette.text.primary,
                                 fontFamily: theme.typography.fontFamily,
                             }}
                         >
                             Your Api key
                         </Typography>
                         {userSettings?.apikey === undefined || userSettings?.apikey === null || userSettings?.apikey?.length <=0 ? (
-                                <Skeleton variant="rectangular" animation="wave" sx={{backgroundColor: '#212121', border: '1px solid #646464', width: 500, height: 50, marginTop: 2 }}/>
+                                <Skeleton variant="rectangular" animation="wave" sx={{backgroundColor: theme.palette.loaderColor, border: '1px solid #646464', width: 500, height: 50, marginTop: 2 }}/>
                         ):
                         <div style={{ display: "flex" }}>
                             <TextField
-                                color="primary"
                                 style={{
-                                    backgroundColor: theme.palette.inputColor,
+                                    backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                                    borderRadius: theme.palette.textFieldStyle.borderRadius,
+                                    color: theme.palette.textFieldStyle.color,
                                     maxWidth: 500,
                                     height: 35
                                 }}
                                 InputProps={{
                                     sx: {
                                         height: "35px",
-                                        color: "white",
+                                        color: theme.palette.textFieldStyle.color,
                                         fontSize: "1em",
-                                        backgroundColor: '#212121',
+                                        backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                                        borderRadius: theme.palette.textFieldStyle.borderRadius,
                                     },
                                     endAdornment: (
                                         <InputAdornment position="end">
@@ -639,14 +650,15 @@ const CloudSyncTab = (props) => {
                         <TextField
                             color="primary"
                             style={{
-                                backgroundColor: "#1a1a1a",
+                                backgroundColor: theme.palette.textFieldStyle.backgroundColor,
                                 marginRight: 10,
                                 height: 35,
                             }}
                             InputProps={{
                                 style: {
                                     height: "35px",
-                                    color: "white",
+                                    color: theme.palette.textFieldStyle.color,
+                                    backgroundColor: theme.palette.textFieldStyle.backgroundColor,
                                     fontSize: "1em",
                                 },
                             }}
@@ -701,17 +713,19 @@ const CloudSyncTab = (props) => {
                 </div>
             )}
 
-            <h2 style={{ marginLeft: 5, marginTop: 40, marginBottom: 5 }}>
-                Features
-            </h2>
-            <Typography variant="body2" color="textSecondary" style={{ marginBottom: 24, fontSize: 16, fontWeight: 400, marginLeft: 5, color: "#C8C8C8" }}>
+            <Typography variant="h5" style={{ marginLeft: 5, marginTop: 40, marginBottom: 5 }}>
+				{isCloud ? "Cloud" : "Hybrid"} Features
+            </Typography>
+            <Typography variant="body2" color="textSecondary" style={{ marginBottom: 24, fontSize: 16, fontWeight: 400, marginLeft: 5, color: theme.palette.text.secondary }}>
               Features and Limitations that are currently available to you in your Cloud or Hybrid Organization. App Executions (App Runs) reset monthly. If the organization is a customer or in a trial, these features limitations are not always enforced.            </Typography>
-            <Grid container style={{ width: "100%", marginBottom: 15,  }}>
+                <Grid container style={{ width: "100%", marginBottom: 15,  }}>
 
                 {selectedOrganization.sync_features === undefined ||
                     selectedOrganization.sync_features === null
                     ? <Grid container spacing={2} justifyContent="center">
+
                     {[...Array(18)].map((_, i) => (
+
                         <Grid item xs={12} sm={6} md={4} key={i}>
                             <div
                                 style={{
@@ -728,7 +742,7 @@ const CloudSyncTab = (props) => {
                                     variant="rectangular"
                                     height={50}
                                     width={343}
-                                    sx={{ backgroundColor: '#1a1a1a', display: 'flex', borderRadius: 1 }}
+                                    sx={{ backgroundColor: theme.palette.loaderColor, display: 'flex', borderRadius: 1 }}
                                     animation="wave"
                                 />
                             </div>
@@ -750,6 +764,13 @@ const CloudSyncTab = (props) => {
                         }
 
                         const newkey = key.replaceAll("_", " ");
+
+						// Rewrites to frontend names
+						var newname = newkey
+						if (newkey === "app executions") {
+							newname = "app runs"
+						}
+
                         const griditem = {
                             primary: newkey,
                             secondary:
@@ -764,6 +785,8 @@ const CloudSyncTab = (props) => {
                             data_collection: "None",
                             active: item.active,
                             icon: <PolylineIcon style={{ color: "#1a1a1a" }} />,
+
+							newname: newname,
                         };
 
                         return (
diff --git a/frontend/src/components/CollectIngestModal.jsx b/frontend/src/components/CollectIngestModal.jsx
new file mode 100644
index 00000000..afba4afa
--- /dev/null
+++ b/frontend/src/components/CollectIngestModal.jsx
@@ -0,0 +1,205 @@
+import React, { useState, useEffect, useContext, memo } from "react";
+
+import { Context } from "../context/ContextApi.jsx";
+import { getTheme } from "../theme.jsx";
+import { GetIconInfo } from "../views/Workflows2.jsx";
+import { toast } from 'react-toastify';
+
+import {
+	Dialog,
+	DialogTitle,
+	DialogContent,
+	Typography,
+	Paper,
+	LinearProgress,
+	Grid,
+	Button,
+} from '@mui/material';
+
+import {
+	Rocket as RocketIcon,
+	FilterAlt as FilterAltIcon,
+} from '@mui/icons-material';
+
+const CollectIngestModal = (props) => {
+	const { globalUrl, open, setOpen } = props;
+
+    const { themeMode, brandColor } = useContext(Context);
+    const theme = getTheme(themeMode, brandColor);
+
+	if (open === undefined || open === null) {
+		console.error("CollectIngestModal: 'open' prop is required.");
+		return null
+	}
+
+	if (setOpen === undefined || setOpen === null) {
+		console.error("CollectIngestModal: 'setOpen' prop is required.");
+		return null
+	}
+
+	const startIngestion = (appname, index) => {
+		console.log("APPNAME:", appname, "INDEX:", index)
+
+		const body = {
+			"app_name": appname,
+			"label": appname,
+		}
+
+		const url = `${globalUrl}/api/v2/workflows/generate`
+		fetch(url, {
+			method: "POST",
+			headers: {
+				"Content-Type": "application/json",
+			},
+			body: JSON.stringify(body),
+			credentials: "include",
+		})
+		.then((response) => {
+			if (!response.ok) {
+				throw new Error(`HTTP error! status: ${response.status}`);
+			}
+			return response.json();
+		})
+		.then((data) => {
+			console.log("Ingestion started successfully:", data);
+			toast.success(`Ingestion for ${appname} started successfully!`);
+		})
+		.catch((error) => {
+			console.error("Error starting ingestion:", error);
+			toast.error(`Failed to start ingestion for ${appname}. Please try again.`);
+		});
+
+	}
+
+	const IngestItem = (props) => {
+		const { type, index } = props
+
+		const [hovering, setHovering] = useState(false);
+		const [isFinished, setIsFinished] = useState(false);
+
+		const appname = type
+		const ingestedAmount = 20
+
+		const iconDetails = GetIconInfo({
+			"app_name": appname,
+			"name": appname,
+		})
+
+		return (
+			//<Grid item xs={hovering ? 12 : 5.9}
+			<Grid item xs={12}
+				style={{
+					minHeight: hovering ? 225 : 145, 
+					maxHeight: hovering ? 225 : 145, 
+					cursor: "pointer",
+					position: "relative",
+					transition: "all 0.3s ease-in-out",
+
+					borderRadius: theme.palette.borderRadius,
+					border: hovering ? `2px solid ${theme.palette.primary.main}` : isFinished ? `2px solid ${theme.palette.success.main}` : `2px solid ${theme.palette.secondary.main}`,
+					textAlign: "center", 
+					marginBottom: 5, 
+
+					overflow: "hidden",
+				}}
+				onMouseEnter={() => setHovering(true)}
+				onMouseLeave={() => setHovering(false)}
+			>
+				<div style={{marginTop: 35, marginBottom: 35, }}>
+					{iconDetails?.originalIcon && (
+						iconDetails?.originalIcon
+					)}
+
+					<Typography variant="h4" style={{marginTop: 10, }}>
+
+						{appname}
+					</Typography> 
+				</div>
+
+				<Button variant="contained" onClick={() => {
+					toast.info("Starting ingest for relevant apps")
+					startIngestion(appname, index)
+				}}>
+					Start Ingestion	
+				</Button>
+				{hovering ?
+					<div>
+					</div>
+				: null}
+
+				{isFinished ? 
+					<div>
+						<Typography variant="body1" style={{
+							position: "absolute",
+							bottom: 10,
+							left: 10, 
+							color: theme.palette.text.secondary,
+						}}>
+							{ingestedAmount} / X 
+						</Typography>
+						<LinearProgress 
+							style={{
+								width: "100%", 
+								position: "absolute",
+								bottom: 0,
+							}}
+							variant="determinate"
+							fullWidth value={{ingestedAmount}} 
+						/>
+					</div>
+				: null}
+			</Grid>
+		)
+	}
+
+	return (
+		<Dialog 
+			PaperProps={{
+				sx: {
+					borderRadius: theme?.palette?.DialogStyle?.borderRadius,
+					border: theme?.palette?.DialogStyle?.border,
+					minWidth: 500,
+					minHeight: 700,
+					fontFamily: theme?.typography?.fontFamily,
+					backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+					zIndex: 1000,
+					'& .MuiDialogContent-root': {
+						backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+					},
+					'& .MuiDialogTitle-root': {
+						backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+					},
+					'& .MuiDialogActions-root': {
+						backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+					},
+				},
+			}} 
+			open={open} 
+			onClose={() => {
+				setOpen(false)
+			}}
+		>
+			<DialogTitle>
+			</DialogTitle>
+			<DialogContent style={{ paddingLeft: "30px", paddingRight: '30px', backgroundColor: theme.palette.DialogStyle.backgroundColor, }}>
+
+				<Typography variant="h6" style={{ color: theme.palette.text.primary, marginBottom: 20 }}>
+					<FilterAltIcon style={{ verticalAlign: "middle", marginRight: 10 }} />
+					Collection and Ingestion
+				</Typography>
+
+				<Grid container>
+					<IngestItem type="Ingest Tickets" index={1} />
+					<IngestItem type="Enable Threat feeds" index={2} />
+					<IngestItem type="Track Assets" index={2} />
+					<IngestItem type="Enable Search" index={2} />
+					<IngestItem type="Enable Mitre Att&ck techniques" index={2} />
+					<IngestItem type="Enable Detection Rules" index={2} />
+					<IngestItem type="Ingest Logs" index={2} />
+				</Grid>
+			</DialogContent>
+		</Dialog>
+	)
+}
+
+export default CollectIngestModal
diff --git a/frontend/src/components/ConfigureWorkflow.jsx b/frontend/src/components/ConfigureWorkflow.jsx
index a6ac8623..b6f0c734 100755
--- a/frontend/src/components/ConfigureWorkflow.jsx
+++ b/frontend/src/components/ConfigureWorkflow.jsx
@@ -1,7 +1,7 @@
-import React, { useState, useEffect } from "react";
+import React, { useState, useEffect, useContext } from "react";
 import { useInterval } from "react-powerhooks";
 import { toast } from 'react-toastify';
-import theme from "../theme.jsx";
+import {getTheme} from "../theme.jsx";
 import WorkflowValidationTimeline from "../components/WorkflowValidationTimeline.jsx"
 
 import {
@@ -20,7 +20,7 @@ import {
   Collapse,
   IconButton,
 } from "@mui/material";
-
+import { Context } from "../context/ContextApi.jsx";
 import { 
 	FavoriteBorder as FavoriteBorderIcon,
 	Error as ErrorIcon,
@@ -76,6 +76,8 @@ const ConfigureWorkflow = (props) => {
   const [showFinalizeAnimation, setShowFinalizeAnimation] = React.useState(false);
   const [loopRunning, setLoopRunning] = useState(false)
   const [checkStarted, setCheckStarted] = React.useState(false);
+  const { themeMode } = useContext(Context);
+  const theme = getTheme(themeMode);
 
   useEffect(() => { 
 	  if (requiredActions.length === 0) { 
@@ -631,7 +633,7 @@ const ConfigureWorkflow = (props) => {
 		if (aa !== undefined) {
 			aa('init', {
 					appId: "JNSS5CFDZZ",
-					apiKey: "db08e40265e2941b9a7d8f644b6e5240",
+					apiKey: "c8f882473ff42d41158430be09ec2b4e",
 			})
 
 			const timestamp = new Date().getTime()
@@ -799,7 +801,7 @@ const ConfigureWorkflow = (props) => {
 		>
 			<div 
 				style={{
-					border: filled ? `1px solid ${theme.palette.green}` : "1px solid rgba(255,255,255,0.3)", borderRadius: theme.palette?.borderRadius, width: "100%", padding: 12, cursor: filled ? "default" : "pointer", 
+					border: filled ? `1px solid ${theme.palette.green}` : theme.palette.textFieldStyle.border, borderRadius: theme.palette?.borderRadius, width: "100%", padding: 12, cursor: filled ? "default" : "pointer", 
 				}}
 				id="app-config"
 			>
diff --git a/frontend/src/components/Countries.jsx b/frontend/src/components/Countries.jsx
index 2cb9c853..590e4caf 100644
--- a/frontend/src/components/Countries.jsx
+++ b/frontend/src/components/Countries.jsx
@@ -142,7 +142,6 @@ const countries = [
     suggested: true,
   },
   { code: 'GA', label: 'Gabon', phone: '241' },
-  { code: 'GB', label: 'United Kingdom', phone: '44' },
   { code: 'GD', label: 'Grenada', phone: '1-473' },
   { code: 'GE', label: 'Georgia', phone: '995' },
   { code: 'GF', label: 'French Guiana', phone: '594' },
@@ -178,7 +177,6 @@ const countries = [
   { code: 'IE', label: 'Ireland', phone: '353' },
   { code: 'IL', label: 'Israel', phone: '972' },
   { code: 'IM', label: 'Isle of Man', phone: '44' },
-  { code: 'IN', label: 'India', phone: '91' },
   {
     code: 'IO',
     label: 'British Indian Ocean Territory',
@@ -390,12 +388,6 @@ const countries = [
   },
   { code: 'UA', label: 'Ukraine', phone: '380' },
   { code: 'UG', label: 'Uganda', phone: '256' },
-  {
-    code: 'US',
-    label: 'United States',
-    phone: '1',
-    suggested: true,
-  },
   { code: 'UY', label: 'Uruguay', phone: '598' },
   { code: 'UZ', label: 'Uzbekistan', phone: '998' },
   {
diff --git a/frontend/src/components/CreatorGrid.jsx b/frontend/src/components/CreatorGrid.jsx
index f3922e3e..96e9c059 100644
--- a/frontend/src/components/CreatorGrid.jsx
+++ b/frontend/src/components/CreatorGrid.jsx
@@ -37,7 +37,7 @@ import {
   AvatarGroup,
 } from "@mui/material"
 
-const searchClient = algoliasearch("JNSS5CFDZZ", "db08e40265e2941b9a7d8f644b6e5240")
+const searchClient = algoliasearch("JNSS5CFDZZ", "c8f882473ff42d41158430be09ec2b4e")
 const CreatorGrid = props => {
 	const { maxRows, showName, showSuggestion, isMobile, globalUrl, parsedXs, isHeader }  = props
 	const rowHandler = maxRows === undefined || maxRows === null ? 50 : maxRows
diff --git a/frontend/src/components/DashboardBarchart.jsx b/frontend/src/components/DashboardBarchart.jsx
index 58f20708..74970549 100644
--- a/frontend/src/components/DashboardBarchart.jsx
+++ b/frontend/src/components/DashboardBarchart.jsx
@@ -65,80 +65,83 @@ export const LoadStats = (globalUrl, cachekey) => {
 }
 
 const DashboardBarchart = (props) => {
-	const { timelineData, title, height, } = props;
-	var inputHeight = 15 
-	if (height !== undefined && height !== null) {
-		inputHeight = height
-	}
+	// this is clearly unfinished and not worth my time. 
+	// refer to health page to see how i made it work there w/o using chartjs
 
-	const barOptions = {
-		plugins: {
-    		tooltip: {
-      			enabled: true, // Ensure tooltips are enabled
-			},
-	  	},
-	    tooltips: {
-	      mode: 'index',
-	      intersect: false,
-	    },
-        legend: {
-            display: false
-        },
-        layout: {
-            padding: {
-                top: 0, // Adjust the top padding as needed
-                bottom: -10, // Adjust the bottom padding as needed
-                left: 0, // Adjust the left padding as needed
-                right: 0, // Adjust the right padding as needed
-            },
-        },
-        scales: {
-			y: {
-				beginAtZero: false,
-			},
-            yAxes: [{
-                ticks: {
-                    display: false 
-                },
-				beginAtZero: false,
-            }],
-            xAxes: [{
-                ticks: {
-                    display: false 
-                },
-				beginAtZero: false,
-            }]
-        },
-        tooltips: {
-            callbacks: {
-                label: function (tooltipItem, data) {
-                    const label = data.labels[tooltipItem.index]
-                    return label.split('\n')[0]
-                },
-                afterLabel: function (tooltipItem, data) {
-					const amount = tooltipItem.value === undefined || tooltipItem.value === null ? 0 : tooltipItem.value
-                    return `Amount: ${amount}` 
-                },
-                title: function () {
-                    return title === undefined ? '' : title
-                }
-            }
-        }
-    }
+	// const { timelineData, title, height, } = props;
+	// var inputHeight = 15 
+	// if (height !== undefined && height !== null) {
+	// 	inputHeight = height
+	// }
 
-	return (
-		<Bar
-	        data={timelineData}
-	        options={barOptions}
-			height={inputHeight}
-	        getElementAtEvent={(elements) => {
-	      	  if (elements && elements.length > 0) {
-	      		  //toast("Click event")
-	      		  console.log("Clicked: ", elements)
-	      	  }
-	        }}
-	    />
-	)
+	// const barOptions = {
+	// 	plugins: {
+    // 		tooltip: {
+    //   			enabled: true, // Ensure tooltips are enabled
+	// 		},
+	//   	},
+	//     tooltips: {
+	//       mode: 'index',
+	//       intersect: false,
+	//     },
+    //     legend: {
+    //         display: false
+    //     },
+    //     layout: {
+    //         padding: {
+    //             top: 0, // Adjust the top padding as needed
+    //             bottom: -10, // Adjust the bottom padding as needed
+    //             left: 0, // Adjust the left padding as needed
+    //             right: 0, // Adjust the right padding as needed
+    //         },
+    //     },
+    //     scales: {
+	// 		y: {
+	// 			beginAtZero: false,
+	// 		},
+    //         yAxes: [{
+    //             ticks: {
+    //                 display: false 
+    //             },
+	// 			beginAtZero: false,
+    //         }],
+    //         xAxes: [{
+    //             ticks: {
+    //                 display: false 
+    //             },
+	// 			beginAtZero: false,
+    //         }]
+    //     },
+    //     tooltips: {
+    //         callbacks: {
+    //             label: function (tooltipItem, data) {
+    //                 const label = data.labels[tooltipItem.index]
+    //                 return label.split('\n')[0]
+    //             },
+    //             afterLabel: function (tooltipItem, data) {
+	// 				const amount = tooltipItem.value === undefined || tooltipItem.value === null ? 0 : tooltipItem.value
+    //                 return `Amount: ${amount}` 
+    //             },
+    //             title: function () {
+    //                 return title === undefined ? '' : title
+    //             }
+    //         }
+    //     }
+    // }
+
+	// return (
+	// 	<Bar
+	//         data={timelineData}
+	//         options={barOptions}
+	// 		height={inputHeight}
+	//         getElementAtEvent={(elements) => {
+	//       	  if (elements && elements.length > 0) {
+	//       		  //toast("Click event")
+	//       		  console.log("Clicked: ", elements)
+	//       	  }
+	//         }}
+	//     />
+	// )
 }
 
 export default DashboardBarchart;
diff --git a/frontend/src/components/DocsGrid.jsx b/frontend/src/components/DocsGrid.jsx
index 7a32001c..d22beaa4 100644
--- a/frontend/src/components/DocsGrid.jsx
+++ b/frontend/src/components/DocsGrid.jsx
@@ -29,7 +29,7 @@ import {
 
 	
 
-const searchClient = algoliasearch("JNSS5CFDZZ", "db08e40265e2941b9a7d8f644b6e5240")
+const searchClient = algoliasearch("JNSS5CFDZZ", "c8f882473ff42d41158430be09ec2b4e")
 const DocsGrid = props => {
 	const { maxRows, showName, showSuggestion, isMobile, globalUrl, parsedXs, userdata, }  = props
 	const rowHandler = maxRows === undefined || maxRows === null ? 50 : maxRows
diff --git a/frontend/src/components/EditOrgTab.jsx b/frontend/src/components/EditOrgTab.jsx
index c1cd11fc..0e2b5176 100644
--- a/frontend/src/components/EditOrgTab.jsx
+++ b/frontend/src/components/EditOrgTab.jsx
@@ -3,6 +3,8 @@ import OrgHeaderexpanded from "../components/OrgHeaderexpandedNew.jsx";
 import OrgHeader from '../components/OrgHeaderNew.jsx';
 import { toast } from "react-toastify";
 import CloudSyncTab from '../components/CloudSyncTab.jsx';
+import { Context } from '../context/ContextApi.jsx';
+import { getTheme  } from '../theme.jsx';
 import {
     FileCopy as FileCopyIcon,
 } from "@mui/icons-material";
@@ -10,6 +12,7 @@ import {
     Button,
     Tooltip,
     IconButton,
+    Typography,
 } from "@mui/material";
 
 const EditOrgTab = (props) => {
@@ -33,6 +36,9 @@ const EditOrgTab = (props) => {
         }
     }, []);
 
+    const { themeMode, brandColor } = useContext(Context);
+    const theme = getTheme(themeMode, brandColor);
+
     const handleStatusChange = (event) => {
         const { value } = event.target;
         setSelectedStatus(value);
@@ -283,23 +289,23 @@ If you're interested, please let me know a time that works for you, or set up a
 
 
     return (
-        <div style={{ width: "100%", boxSizing: 'border-box', padding: "27px 10px 19px 27px", height:"100%", backgroundColor: '#212121', borderRadius: '16px',  }}>
-            <div style={{ height: "100%", width: "100%", overflowX: 'hidden', scrollbarColor: '#494949 transparent', scrollbarWidth: 'thin'}} >
+        <div style={{ width: "100%", boxSizing: 'border-box', padding: "27px 10px 19px 27px", height:"100%", backgroundColor: theme.palette.platformColor, borderRadius: '16px',  }}>
+            <div style={{ height: "100%", width: "100%", overflowX: 'hidden', scrollbarColor: theme.palette.scrollbarColorTransparent, scrollbarWidth: 'thin'}} >
             <div style={{ marginBottom: 20 }}>
                 <div style={{display:"flex"}}>
                     <div style={{width:'70%'}}>
-                <h2 style={{ marginBottom: 8, marginTop: 0, color: "#ffffff" }}>Organization overview</h2>
-                <span style={{ color: "#9E9E9E" }}>
+                <Typography variant='h3' sx={{ marginBottom: "15px", marginTop: 0, }}>Organization overview</Typography>
+                <Typography variant="body2" style={{ color: theme.palette.text.secondary, fontSize: 16 }}>
                     On this page organization admins can configure organisations, and sub-orgs (MSSP).{" "}
                     <a
                         target="_blank"
                         rel="noopener noreferrer"
                         href="/docs/organizations#organization"
-                        style={{ color: "#FF8444" }}
+                        style={{ color: theme.palette.linkColor, }}
                     >
                         Learn more
                     </a>
-                </span>
+                </Typography>
                 </div>
                 <div style={{display:"flex", alignItems:"center", marginLeft:50}}>
                 <Tooltip
diff --git a/frontend/src/components/EditWorkflow.jsx b/frontend/src/components/EditWorkflow.jsx
index b67bde93..dbd8d3ea 100644
--- a/frontend/src/components/EditWorkflow.jsx
+++ b/frontend/src/components/EditWorkflow.jsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useContext } from "react";
-import theme from '../theme.jsx';
+import { getTheme } from '../theme.jsx';
 import { isMobile } from "react-device-detect"
 import { MuiChipsInput } from "mui-chips-input";
 import { toast } from "react-toastify"
@@ -46,7 +46,7 @@ import {
 	Slider,
 
 } from "@mui/material";
-
+import { Context } from "../context/ContextApi.jsx";
 import {
 	DatePicker,
 	LocalizationProvider,
@@ -69,7 +69,8 @@ const EditWorkflow = (props) => {
 	const { globalUrl, workflow, setWorkflow, modalOpen, setModalOpen, showUpload, usecases, setNewWorkflow, appFramework, isEditing, userdata, apps, saveWorkflow, expanded, scrollTo, setRealtimeMarkdown, boxWidth, setBoxWidth, } = props
 
 	const [_, setUpdate] = React.useState(""); // Used for rendering, don't remove
-
+	const {themeMode, brandColor} = useContext(Context)
+	const theme = getTheme(themeMode, brandColor)
 	const [submitLoading, setSubmitLoading] = React.useState(false);
 	const [showMoreClicked, setShowMoreClicked] = React.useState(isEditing !== false ? true : false);
 
@@ -187,7 +188,7 @@ const EditWorkflow = (props) => {
 	}
 
 	const newWorkflow = isEditing === true ? false : true
-	const priority = userdata === undefined || userdata === null ? null : userdata.priorities.find(prio => prio.type === "usecase" && prio.active === true)
+	const priority = userdata === undefined || userdata === null || userdata.priorities === null || userdata.priorities === undefined ? null : userdata?.priorities?.find(prio => prio.type === "usecase" && prio.active === true)
 	var upload = "";
 	var total_count = 0
 
@@ -203,26 +204,24 @@ const EditWorkflow = (props) => {
 				setModalOpen(false);
 			}}
 			PaperProps={{
-				style: {
-					color: "white",
-					minWidth: isMobile ? "90%" : 650,
-					maxWidth: isMobile ? "90%" : 650,
-					minHeight: 400,
-					paddingTop: 25,
-					paddingLeft: 50,
+				sx: {
+					color: theme.palette.DialogStyle.color,
+					minWidth: isMobile ? "90%" : "650px",
+					maxWidth: isMobile ? "90%" : "650px",
+					minHeight: "400px",
 					//minWidth: isMobile ? "90%" : newWorkflow === true ? 1000 : 550,
 					//maxWidth: isMobile ? "90%" : newWorkflow === true ? 1000 : 550,
-		    		borderRadius: theme.palette.borderRadius,
-		    		backgroundColor: "black",
+		    		borderRadius: theme.palette.DialogStyle.borderRadius,
+		    		backgroundColor: themeMode === "dark" ? "black" :  theme?.palette?.DialogStyle?.backgroundColor,
 				},
 			}}
 		>
-			<DialogTitle style={{ padding: 30, paddingBottom: 0, zIndex: 1000, }}>
+			<DialogTitle style={{ padding: 30, paddingBottom: 0, zIndex: 1000, paddingTop: "25px", paddingLeft: "50px"}}>
 				<div style={{ display: "flex" }}>
-					<div style={{ flex: 1, color: "rgba(255,255,255,0.9)" }}>
+					<div style={{ flex: 1, color: theme.palette.textColor }}>
 						<div style={{ display: "flex" }}>
-							<Typography variant="h4" style={{ flex: 9, }}>
-								{newWorkflow ? "New" : "Editing"} workflow
+							<Typography variant="h4" style={{ flex: 9, marginTop: 25, }}>
+								{newWorkflow ? "New" : "Editing"} Workflow
 							</Typography>
 
 							{newWorkflow === true ? null :
@@ -248,7 +247,7 @@ const EditWorkflow = (props) => {
 
 						</div>
 						<Typography variant="body2" color="textSecondary" style={{ marginTop: 20, maxWidth: 440, }}>
-							Workflows can be built from scratch, or from templates. <a href="/usecases2" rel="noopener noreferrer" target="_blank" style={{ textDecoration: "none", color: "#f86a3e" }}>Usecases</a> can help you discover next steps, and you can <a href="/search?tab=workflows" rel="noopener noreferrer" target="_blank" style={{ textDecoration: "none", color: "#f86a3e" }}>search</a> for them directly. <a href="/docs/workflows" rel="noopener noreferrer" target="_blank" style={{ textDecoration: "none", color: "#f86a3e" }}>Learn more</a>
+							Workflows can be built from scratch, or from templates. <a href="/usecases2" rel="noopener noreferrer" target="_blank" style={{ textDecoration: "none", color: theme.palette.linkColor }}>Usecases</a> can help you discover next steps, and you can <a href="/search?tab=workflows" rel="noopener noreferrer" target="_blank" style={{ textDecoration: "none", color: theme.palette.linkColor }}>search</a> for them directly. <a href="/docs/workflows" rel="noopener noreferrer" target="_blank" style={{ textDecoration: "none", color:theme.palette.linkColor }}>Learn more</a>
 						</Typography>
 
 						<div style={{marginTop: 10, marginBottom: 10, marginRight: 50, }}>
@@ -288,20 +287,21 @@ const EditWorkflow = (props) => {
 			</DialogTitle>
 			<FormControl>
 				<div style={{ 
-					borderTop: "1px solid rgba(255,255,255,0.5)", 
+					borderTop: theme.palette.defaultBorder, 
 					width: 600, 
 					position: "fixed", 
 					right: 20, 
 					bottom: 0, 
 					zIndex: 1002, 
-					backgroundColor: theme.palette.backgroundColor,
 					height: 75, 
 					paddingTop: 20, 
-					paddingLeft: 75, 
+					paddingLeft: 30, 
+					backgroundColor: themeMode === "dark" ? "#262626" :  theme.palette.DialogStyle.backgroundColor,
 				}}>
 					<Button
 						variant="contained"
 						style={{}}
+						id="save_workflow_button"
 						disabled={name.length === 0 || submitLoading === true}
 						onClick={() => {
 							setSubmitLoading(true)
@@ -387,7 +387,7 @@ const EditWorkflow = (props) => {
 					</Button>
 				</div>
 
-				<DialogContent style={{ paddingTop: 10, display: "flex", minHeight: 300, zIndex: 1001, paddingBottom: 200, }}>
+				<DialogContent style={{ paddingTop: 10, display: "flex", minHeight: 300, zIndex: 1001, paddingBottom: 400, paddingLeft: 50, }}>
 					<div style={{ minWidth: newWorkflow ? 500 : 550, maxWidth: newWorkflow ? 450 : 500, }}>
 						<TextField
 							onChange={(event) => {
@@ -395,7 +395,7 @@ const EditWorkflow = (props) => {
 							}}
 							InputProps={{
 								style: {
-									color: "white",
+									color: theme.palette.textFieldStyle.color,
 								},
 							}}
 							color="primary"
@@ -406,6 +406,7 @@ const EditWorkflow = (props) => {
 							label="Name"
 							autoFocus
 							fullWidth
+							id="Enter-Workflow-Name"
 						/>
 
 						<div style={{ display: "flex", marginTop: 10, }}>
@@ -467,7 +468,7 @@ const EditWorkflow = (props) => {
 								style={{ flex: 1, maxHeight: 120, overflow: "auto", }}
 								InputProps={{
 									style: {
-										color: "white",
+										color: theme.palette.textFieldStyle.color,
 									},
 								}}
 								placeholder="Tags"
@@ -543,6 +544,8 @@ const EditWorkflow = (props) => {
 											}}
 										>
 											<FormControlLabel value="test" control={<Radio />} label="Test" />
+											<FormControlLabel value="staging" control={<Radio />} label="Staging" />
+											<FormControlLabel value="preprod" control={<Radio />} label="Pre-production" />
 											<FormControlLabel value="production" control={<Radio />} label="Production" />
 
 										</RadioGroup>
@@ -577,12 +580,20 @@ const EditWorkflow = (props) => {
 								<Typography variant="h4" style={{ marginTop: 50, }}>
 									Multi-Tenancy, Backups & Security
 								</Typography>
-
 								<Typography variant="body2" color="textSecondary" style={{ marginTop: 30, marginBottom: 10, }}>
-									Multi-Tenant Workflows. Make one workflow, and keep a separate, synced copy in all your tenants. Control distributed auth, runtime locations, files, datastore keys etc. (contact support@shuffler.io if you want a demo. Please try it!)
+									Control mechanisms for multi-tenancy, backups, and security.
 								</Typography>
 
-								{userdata !== undefined && userdata !== null && userdata.orgs !== undefined && userdata.orgs !== null && userdata.orgs.length > 0 ?
+								<Typography variant="h6" style={{ marginTop: 50, }}>
+									Multi-Tenant Workflows
+								</Typography>
+
+								<Typography variant="body2" color="textSecondary" style={{ marginTop: 10, marginBottom: 10, }}>
+									Make one workflow, and keep a separate, synced copy in your other tenants. Control distributed auth, runtime locations, files, datastore keys etc. Can only distribute from parent org to child org. Need help trying it? <a href="https://shuffler.io/contact" target="_blank" style={{color: "#f85a3e", textDecoration: "none",}}>Contact us for a demo</a>
+								</Typography>
+
+								{userdata !== undefined && userdata !== null && userdata.orgs !== undefined && userdata.orgs !== null && userdata.orgs.length > 0  ?
+
 									userdata.orgs.filter(org => org.creator_org === userdata.active_org.id).length === 0 ?
 										userdata.active_org.creator_org === undefined || userdata.active_org.creator_org === null || userdata.active_org.creator_org === "" ?
 											<Typography variant="body2" style={{ marginTop: 10, color: "rgba(255,255,255,0.7)" }}>
@@ -600,6 +611,7 @@ const EditWorkflow = (props) => {
 											multiple
 											style={{ marginTop: 10, }}
 											value={innerWorkflow.suborg_distribution === undefined || innerWorkflow.suborg_distribution === null ? ["none"] : innerWorkflow.suborg_distribution}
+											disabled={workflow?.parentorg_workflow !== undefined && workflow?.parentorg_workflow !== null && workflow?.parentorg_workflow.length > 0}
 											onChange={(e) => {
 												var newvalue = e.target.value
 												if (newvalue.length > 1 && newvalue[0] === "none") {
@@ -1274,7 +1286,7 @@ const EditWorkflow = (props) => {
 
 
 				{newWorkflow === true ?
-					<span style={{ marginTop: 30, }}>
+					<span style={{ paddingTop: 30 }}>
 						<Typography variant="h6" style={{ marginLeft: 30, paddingBottom: 0, }}>
 							Relevant Workflows
 						</Typography>
diff --git a/frontend/src/components/EnvironmentTab.jsx b/frontend/src/components/EnvironmentTab.jsx
index cd0a9416..6aefcf89 100644
--- a/frontend/src/components/EnvironmentTab.jsx
+++ b/frontend/src/components/EnvironmentTab.jsx
@@ -1,5 +1,5 @@
 import React, { memo, useContext, useEffect, useState } from 'react';
-import theme from "../theme.jsx";
+import { getTheme } from "../theme.jsx";
 import {
     Tooltip,
     Typography,
@@ -62,6 +62,9 @@ const EnvironmentTab = memo((props) => {
     const [selectedSubOrg, setSelectedSubOrg] = React.useState([]);
 	const [showLocationActionModal, setShowLocationActionModal] = React.useState(undefined)
 
+  const {  themeMode, supportEmail, brandColor } = useContext(Context);
+  const theme = getTheme(themeMode, brandColor);
+
 
     useEffect(() => {
         getEnvironments();
@@ -370,7 +373,7 @@ const EnvironmentTab = memo((props) => {
           })
           .catch((error) => {
             toast(
-              "Failed dismissing alert. Please contact support@shuffler.io if this persists.",
+              `Failed dismissing alert. Please contact ${supportEmail} if this persists.`,
             );
           });
       };
@@ -512,11 +515,11 @@ const EnvironmentTab = memo((props) => {
           }}
         >
             <DialogTitle>
-                <span style={{ color: "white" }}>Add Location</span>
+                <Typography variant='h5' color="textPrimary" >Add Location</Typography>
             </DialogTitle>
             <DialogContent>
                 <div>
-                    Location Name
+                    <Typography variant='body2' color="textPrimary">Location Name</Typography>
                     <TextField
                         color="primary"
                         style={{ backgroundColor: theme.palette.textFieldStyle.backgroundColor,}}
@@ -524,7 +527,7 @@ const EnvironmentTab = memo((props) => {
                         InputProps={{
                             style: {
                                 height: "50px",
-                                color: "white",
+                                color: theme.palette.textFieldStyle.color,
                                 fontSize: "1em",
                             },
                         }}
@@ -539,19 +542,18 @@ const EnvironmentTab = memo((props) => {
                         }
                     />
                 </div>
-                {loginInfo} {/* Assuming loginInfo is part of the relevant content */}
+                {loginInfo}
             </DialogContent>
             <DialogActions>
                 <Button
-                    style={{ borderRadius: "2px", fontSize: 16, textTransform: "none", color: "#ff8544" }}
+                    style={{ borderRadius: "2px", fontSize: 16, textTransform: "none", color: theme.palette.primary.main, }}
                     onClick={() => setModalOpen(false)}
-                    color="primary"
                 >
                     Cancel
                 </Button>
                 <Button
                     variant="contained"
-                    style={{ borderRadius: "2px", fontSize: 16, textTransform: "none", backgroundColor: "#ff8544", color: "#1a1a1a" }}
+                    style={{ borderRadius: "2px", fontSize: 16, textTransform: "none", }}
                     onClick={() => {
                         submitEnvironment(modalUser); // Assuming modalUser is available
                     }}
@@ -733,9 +735,9 @@ const EnvironmentTab = memo((props) => {
           }}
       >
   <DialogTitle>
-    <div style={{ color: "rgba(255,255,255,0.9)" }}>
+    <Typography variant='h5' color="textPrimary" >
       Select sub-org to distribute Environments
-    </div>
+    </Typography>
   </DialogTitle>
   <DialogContent style={{ color: "rgba(255,255,255,0.65)" }}>
     <MenuItem value="none" onClick={()=> {handleSelectSubOrg(null, "none")}}>None</MenuItem>
@@ -778,7 +780,7 @@ const EnvironmentTab = memo((props) => {
 
     <div style={{ display: "flex", marginTop: 20 }}>
       <Button
-        style={{ borderRadius: "2px", textTransform: 'none', fontSize:16, color: "#ff8544"  }}
+        style={{ borderRadius: "2px", textTransform: 'none', fontSize:16, color: theme.palette.primary.main  }}
         onClick={() => setShowDistributionPopup(false)}
         color="primary"
       >
@@ -786,7 +788,7 @@ const EnvironmentTab = memo((props) => {
       </Button>
       <Button
         variant="contained"
-        style={{ borderRadius: "2px", textTransform: 'none', fontSize:16, color: "#1a1a1a", backgroundColor: "#ff8544", marginLeft: 10 }}
+        style={{ borderRadius: "2px", textTransform: 'none', fontSize:16,  marginLeft: 10 }}
         onClick={() => {
           changeDistribution(selectedEnvironment, selectedSubOrg);
         }}
@@ -800,27 +802,27 @@ const EnvironmentTab = memo((props) => {
   ) : null;
 
     return (
-        <div style={{ width: "100%", minHeight: 1100, boxSizing: 'border-box', padding: "27px 10px 19px 27px", height:"100%", backgroundColor: '#212121',borderTopRightRadius: '8px', borderBottomRightRadius: 8, borderLeft: "1px solid #494949", }}>
+        <div style={{ width: "100%", minHeight: 1100, boxSizing: 'border-box', padding: "27px 10px 19px 27px", height:"100%", backgroundColor: theme.palette.platformColor,borderTopRightRadius: '8px', borderBottomRightRadius: 8, borderLeft: theme.palette.defaultBorder, }}>
             {modalView}
             {EnvironmentDistributionModal}
-            <div style={{ height: "100%", maxHeight: 1700, overflowY: "auto", scrollbarColor: '#494949 transparent', scrollbarWidth: 'thin' }}>
-              <div style={{ height: "100%", width: "calc(100% - 20px)", scrollbarColor: '#494949 transparent', scrollbarWidth: 'thin'}}>
+            <div style={{ height: "100%", maxHeight: 1700, overflowY: "auto", scrollbarColor: theme.palette.scrollbarColorTransparent, scrollbarWidth: 'thin' }}>
+              <div style={{ height: "100%", width: "calc(100% - 20px)", scrollbarColor: theme.palette.scrollbarColorTransparent, scrollbarWidth: 'thin'}}>
               <div style={{ marginBottom: 20 }}>
-                <h2 style={{ marginBottom: 8, marginTop: 0, color: "#ffffff" }}>Runtime Locations</h2>
-                <span style={{ color: textColor }}>
-                    Decides which Orborus <b>runtime location</b> to run your workflows in. Previously called Environments. <br /> If you have scale problems, <a href="https://shuffler.io/docs/configuration#high-availability" target="_blank" rel="noopener noreferrer" style={{ color: "#FF8444" }}>check the docs</a> or talk to our team: support@shuffler.io.&nbsp;
+                <Typography variant='h5' color="textPrimary" style={{ marginBottom: 8, marginTop: 0,}}>Runtime Locations</Typography>
+                <Typography variant='body2' color="textSecondary">
+                    Decides which Orborus <b>runtime location</b> to run your workflows in. Previously called Environments. <br /> If you have scale problems, <a href="https://shuffler.io/docs/configuration#high-availability" target="_blank" rel="noopener noreferrer" style={{ color: theme.palette.linkColor }}>check the docs</a> or talk to our team: {supportEmail}.&nbsp;
                     <a
                         target="_blank"
                         rel="noopener noreferrer"
                         href="/docs/organizations#locations"
-                        style={{ color: "#FF8444" }}
+                        style={{ color: theme.palette.linkColor,  }}
                     >
                         Learn more
                     </a>
-                </span>
+                </Typography>
             </div>
             <Button
-                style={{ backgroundColor: '#ff8544', color: "#1a1a1a", borderRadius: 4, textTransform: "capitalize", fontSize: 16,  }}
+                style={{ borderRadius: 4, textTransform: "capitalize", fontSize: 16,  }}
                 variant="contained"
                 color="primary"
                 onClick={() => setModalOpen(true)}
@@ -828,9 +830,9 @@ const EnvironmentTab = memo((props) => {
                 Add Location
             </Button>
             <Button
-                style={{ backgroundColor: "#2F2F2F", borderRadius: 4, width: 81, height: 40, marginLeft: 16, marginRight: 15 }}
+                style={{ borderRadius: 4, width: 81, height: 40, marginLeft: 16, marginRight: 15 }}
                 variant="contained"
-                color="primary"
+                color="secondary"
                 onClick={getEnvironments}
             >
                 <CachedIcon />
@@ -851,7 +853,7 @@ const EnvironmentTab = memo((props) => {
                 style={{
                 borderRadius: 4,
                 marginTop: 24,
-                border: "1px solid #494949",
+                border: theme.palette.defaultBorder,
                 width: "100%",
                 overflowX: "auto", 
                 paddingBottom: 0,
@@ -873,7 +875,7 @@ const EnvironmentTab = memo((props) => {
                     width: "100%",
                     minWidth: 800,
                     paddingBottom: 0,
-                    borderBottom: "1px solid #494949",    
+                    borderBottom: theme.palette.defaultBorder,    
                   }}
               >
                     {["Type", "Status", "Scale", "Pipeline", "Name", "Type", "Queue", "Actions", "Distribution"].map((header, index) => {
@@ -901,7 +903,7 @@ const EnvironmentTab = memo((props) => {
         style={{
           display: "grid",
           gridTemplateColumns: "80px 80px 80px 120px 120px 120px 120px 350px 150px",
-          backgroundColor: "#212121",
+          backgroundColor: theme.palette.platformColor,
           height: 40,
           width: "100%",
           boxSizing: "border-box",
@@ -919,7 +921,7 @@ const EnvironmentTab = memo((props) => {
               variant="text"
               animation="wave"
               sx={{
-                backgroundColor: "#1a1a1a",
+                backgroundColor: theme.palette.loaderColor,
                 borderRadius: "4px",
               }}
             />
@@ -941,9 +943,9 @@ const EnvironmentTab = memo((props) => {
           return null;
         }
   
-        var bgColor = "#212121";
+        var bgColor = themeMode === "dark" ? "#212121" : "#FFFFFF";
         if (index % 2 === 0) {
-          bgColor = "#1A1A1A";
+            bgColor = themeMode === "dark" ? "#1A1A1A" :  "#EAEAEA";
         }
   
         // Check if there's a notification for it in userdata.priorities
@@ -1013,7 +1015,9 @@ const EnvironmentTab = memo((props) => {
               environment.name === "Cloud" ? (
               <Tooltip title="Cloud" placement="top">
                 <CloudIcon
-                style={{ color: "rgba(255,255,255,0.8)" }}
+                  style={{
+                    color: themeMode === "dark" ? "#CCCCCC" : "#333333",
+                  }}
                 />
               </Tooltip>
               ) : environment.run_type === "docker" ? (
@@ -1075,7 +1079,7 @@ const EnvironmentTab = memo((props) => {
 							: 
 							<span>IP / label: {environment?.running_ip?.split(":")[0]}. May stay running up to a minute after stopping Orborus.</span>
 						  : 
-							"Cloud is automatically configured. Reachout to support@shuffler.io if you have any questions."
+							`Cloud is automatically configured. Reachout to ${supportEmail} if you have any questions.`
 						}
 
 						<br />
@@ -1169,7 +1173,7 @@ const EnvironmentTab = memo((props) => {
               		<ListItemText
                     	primary={
                 			environment.Type === "cloud" ? 
-                              <Tooltip title={"Make a new environment to set up a Datalake node. Please contact support@shuffler.io if this is something you want to see on Cloud directly."} placement="top">
+                              <Tooltip title={`Make a new environment to set up a Datalake node. Please contact ${supportEmail} if this is something you want to see on Cloud directly.`} placement="top">
                                 <CancelIcon style={{ color: "rgba(255,255,255,0.3)" }} />
                               </Tooltip>
                 		:
@@ -1267,13 +1271,12 @@ const EnvironmentTab = memo((props) => {
                         />
                         <ListItemText
                             style={{
-                              minWidth: 300,
-                              overflow: "hidden",
+                              minWidth: 350,
                             }}
                           >
                             <div style={{ display: "flex", flexWrap: "nowrap" }}>
                               <ButtonGroup
-                                style={{ borderRadius: "5px 5px 5px 5px", flexWrap: "nowrap" }}
+                                style={{ borderRadius: "5px 5px 5px 5px", flexWrap: "nowrap", width: "100%" }}
                               >
                                 <Button
                                   variant="outlined"
@@ -1369,7 +1372,7 @@ const EnvironmentTab = memo((props) => {
                               </ButtonGroup>
 
                               <IconButton disabled={environment.Type === "cloud"} onClick={()=> {setIsExpanded(prev => !prev)}}>
-                                {listItemExpanded === index ? <ExpandLessIcon /> : <ExpandMoreIcon />}
+                                {listItemExpanded === index ? <ExpandLessIcon sx={{color: theme.palette.text.primary}} /> : <ExpandMoreIcon sx={{color: theme.palette.text.primary}}/>}
                               </IconButton>
                             </div>
                           </ListItemText>
@@ -1420,7 +1423,7 @@ const EnvironmentTab = memo((props) => {
           <Collapse in={listItemExpanded === index} timeout="auto" unmountOnExit>
           	<Grid container justifyContent="center" style={{minWidth: 850, maxWidth: 850, }}>
     			<Grid item xs={12} sm={8} md={6}>
-                    <div style={{minWidth: 700, maxWidth: 700, minHeight: 350, display: 'flex', justifyContent: "center", backgroundColor: "transparent", }}>
+                    <div style={{minWidth: 750, maxWidth: 750, minHeight: 350, display: 'flex', justifyContent: "center", backgroundColor: "transparent", }}>
                         <div style={{ paddingTop: 50, paddingBottom: 100, }}>
                           <Typography variant="h6">
                             Self-Hosted Orborus instance
@@ -1443,7 +1446,7 @@ const EnvironmentTab = memo((props) => {
                         >
                           <Tab
                             value={0}
-                          label=<span>
+                          label=<span style={{color: theme.palette.text.secondary, }}>
                             <img
                             src="/icons/docker.svg"
                             style={{ width: 20, height: 20, marginRight: 10, }}
@@ -1452,32 +1455,32 @@ const EnvironmentTab = memo((props) => {
                           />
                           <Tab
                             value={1}
-                          label=<span>
+                          label=<span style={{color: theme.palette.text.secondary, }}>
                             <img
                             src="/icons/docker.svg"
-                            style={{ width: 20, height: 20, marginRight: 10, }}
+                            style={{ width: 20, height: 20, marginRight: 10,}}
                             /> Scale
                           </span>
                           />
                           <Tab
                             value={2}
-                          label=<span>
+                          label=<span style={{color: theme.palette.text.secondary, }}>
                             <img
                             src="/icons/k8s.svg"
-                            style={{ width: 20, height: 20, marginRight: 10, }}
+                            style={{ width: 20, height: 20, marginRight: 10 }}
                             /> k8s 
                           </span>
                           />
                           </Tabs>
                           <Typography variant="body1" color="textSecondary" style={{marginTop: 15, }}>
                             {installationTab === 2 ?
-                            <span>
+                            <Typography variant='body2' color="textSecondary">
                                 Check our <a href="https://docs.docker.com/get-started/get-docker/" target="_blank" rel="noopener noreferrer" style={{textDecoration: "none", color: "#f85a3e",}}>Kubernetes documentation</a> for more information on how to run Shuffle on Kubernetes. The status of the node will change when connected.
-                            </span>
+                            </Typography>
                             :
-                            <span>
+                            <Typography variant='body2' color="textSecondary">
                                 1. <a href="https://docs.docker.com/get-started/get-docker/" target="_blank" rel="noopener noreferrer" style={{textDecoration: "none", color: "#f85a3e",}}>Ensure Docker is installed</a> and the target server can reach '{globalUrl}'
-                            </span>
+                            </Typography>
                           }
         
                           </Typography>
@@ -1501,13 +1504,19 @@ const EnvironmentTab = memo((props) => {
                           >
                             <div style={{ display: "flex", position: "relative", }}>
                               <code
-                                contenteditable="true"
+                                contentEditable="true"
                                 id="orborus_command"
                                 style={{
-                                  // Wrap if larger than X
                                   whiteSpace: "pre-wrap",
                                   overflow: "auto",
                                   marginRight: 30,
+                                  backgroundColor: themeMode === "dark" ? "#1e1e1e" : "#f5f5f5",
+                                  color: themeMode === "dark" ? "#f8f8f2" : "#333",
+                                  padding: "8px",
+                                  borderRadius: "4px",
+                                  fontFamily: "monospace",
+                                  fontSize: 18,
+                                  border: themeMode === "dark" ? "1px solid #555" : "1px solid #ddd",
                                 }}
                               >
                                 {getOrborusCommand(environment)}
@@ -1532,7 +1541,8 @@ const EnvironmentTab = memo((props) => {
                             </div>
         
                             <Divider style={{marginTop: 25, marginBottom: 10, }}/>
-                            Configure HTTP Proxies: <Checkbox 
+                            <div style={{display: 'flex', alignItems: 'center', }}>
+                            <Typography variant='body2' color="textSecondary">Configure HTTP Proxies:</Typography> <Checkbox 
                               id="shuffle_skip_proxies"
                               onClick={() => {
                                 if (commandController.proxies === undefined) { 
@@ -1545,8 +1555,10 @@ const EnvironmentTab = memo((props) => {
                                 setUpdate(Math.random())
                               }}
                             />
+                            </div>
                             <div />
-                            Disable Pipelines & Data Lake: <Checkbox 
+                            <div style={{display: 'flex', alignItems: 'center', }}>
+                            <Typography variant='body2' color="textSecondary">Disable Pipelines & Data Lake:</Typography> <Checkbox 
                               id="shuffle_skip_pipelines"
                               onClick={() => {
                                 if (commandController.pipelines === undefined) { 
@@ -1559,6 +1571,7 @@ const EnvironmentTab = memo((props) => {
                               }}
                             />
                             </div>
+                            </div>
                         }
         
                           <Typography variant="body1" color="textSecondary" style={{marginTop: 15, }}>
diff --git a/frontend/src/components/Files.jsx b/frontend/src/components/Files.jsx
index f825fb7f..71c3af28 100644
--- a/frontend/src/components/Files.jsx
+++ b/frontend/src/components/Files.jsx
@@ -43,7 +43,7 @@ import {
 
 import Dropzone from "../components/Dropzone.jsx";
 import ShuffleCodeEditor from "../components/ShuffleCodeEditor1.jsx";
-import theme from "../theme.jsx";
+import {getTheme} from "../theme.jsx";
 import { Context } from "../context/ContextApi.jsx";
 
 const Files = memo((props) => {
@@ -58,6 +58,8 @@ const Files = memo((props) => {
   const [openEditor, setOpenEditor] = React.useState(false);
   const [renderTextBox, setRenderTextBox] = React.useState(false);
   const [loadFileModalOpen, setLoadFileModalOpen] = React.useState(false);
+  const { themeMode, brandColor } = useContext(Context);
+  const theme = getTheme(themeMode, brandColor);
 
   const [field1, setField1] = React.useState("");
   const [field2, setField2] = React.useState("");
@@ -442,7 +444,7 @@ const Files = memo((props) => {
       </DialogContent>
       <DialogActions>
         <Button
-          style={{ borderRadius: "2px", textTransform: 'none', fontSize:16, color: "#ff8544"  }}
+          style={{ borderRadius: "2px", textTransform: 'none', fontSize:16, color: theme.palette.primary.main }}
           onClick={() => setLoadFileModalOpen(false)}
           color="primary"
         >
@@ -450,7 +452,7 @@ const Files = memo((props) => {
         </Button>
         <Button
 		  variant="contained"
-          style={{ borderRadius: "2px", textTransform: 'none', fontSize:16, color: "#1a1a1a", backgroundColor: "#ff8544" }}
+          style={{ borderRadius: "2px", textTransform: 'none', fontSize:16,  }}
           disabled={downloadUrl.length === 0 || !downloadUrl.includes("http")}
           onClick={() => {
             handleGithubValidation();
@@ -517,9 +519,9 @@ const Files = memo((props) => {
 		}}
 	>
 		<DialogTitle>
-			<div style={{ color: "rgba(255,255,255,0.9)" }}>
+			<Typography variant="h5" color="textPrimary" >
 				Select sub-org to distribute files
-			</div>
+			</Typography>
 		</DialogTitle>
 		<DialogContent style={{ color: "rgba(255,255,255,0.65)" }}>
 			<MenuItem value="none" onClick={()=> {handleSelectSubOrg(null, "none")}}>None</MenuItem>
@@ -562,15 +564,14 @@ const Files = memo((props) => {
 
 			<div style={{ display: "flex", marginTop: 20 }}>
 				<Button
-					style={{ borderRadius: "2px", textTransform: 'none', fontSize:16, color: "#ff8544"  }}
+					style={{ borderRadius: "2px", textTransform: 'none', fontSize:16, color: theme.palette.primary.main }}
 					onClick={() => setShowDistributionPopup(false)}
-					color="primary"
 				>
 					Cancel
 				</Button>
 				<Button
 					variant="contained"
-					style={{ borderRadius: "2px", textTransform: 'none', fontSize:16, color: "#1a1a1a", backgroundColor: "#ff8544", marginLeft: 10 }}
+					style={{ borderRadius: "2px", textTransform: 'none', fontSize:16, marginLeft: 10 }}
 					onClick={() => {
 						changeDistribution(fileIdSelectedForDistribution, selectedSubOrg);
 					}}
@@ -906,27 +907,27 @@ const Files = memo((props) => {
 			onDrop={uploadFile}
 		>
 			{fileDistributionModal}
-			<div style={{width: "100%", minHeight: 1100, boxSizing: 'border-box', padding: "27px 10px 19px 27px", height:"100%", backgroundColor: '#212121',borderTopRightRadius: '8px', borderBottomRightRadius: 8, borderLeft: "1px solid #494949", }}>
+			<div style={{width: "100%", minHeight: 1100, boxSizing: 'border-box', padding: "27px 10px 19px 27px", height:"100%", backgroundColor: theme.palette.platformColor,borderTopRightRadius: '8px', borderBottomRightRadius: 8, borderLeft: theme.palette.defaultBorder, }}>
 
-        		<div style={{height: "100%", maxHeight: 1700,overflowY: 'auto', scrollbarColor: '#494949 transparent', scrollbarWidth: 'thin'}}>
-					<div style={{ height: "100%", width: "calc(100% - 20px)", scrollbarColor: '#494949 transparent', scrollbarWidth: 'thin' }}>
+        		<div style={{height: "100%", maxHeight: 1700,overflowY: 'auto', scrollbarColor: theme.palette.scrollbarColorTransparent, scrollbarWidth: 'thin'}}>
+					<div style={{ height: "100%", width: "calc(100% - 20px)", scrollbarColor: theme.palette.scrollbarColorTransparent, scrollbarWidth: 'thin' }}>
 					<DownloadFileIcon setLoadFileModalOpen={setLoadFileModalOpen} isSelectedFiles={isSelectedFiles} />
 
 				{fileDownloadModal} 
 
 				<div style={{ marginTop: isSelectedFiles ? 2: 20, marginBottom:20 }}>
-					<h2 style={{ display: isSelectedFiles ? null : "inline", marginTop: isSelectedFiles?0:null, marginBottom: isSelectedFiles?8:null, color: "#FFFFFF"}}>Files</h2>
-					<span style={{ marginLeft: isSelectedFiles ? null : 25, color:isSelectedFiles?"#9E9E9E":null}}>
+					<Typography variant="h5" color="textPrimary" style={{ display: isSelectedFiles ? null : "inline", marginTop: isSelectedFiles?0:null, marginBottom: isSelectedFiles?8:null, fontWeight: 500}}>Files</Typography>
+					<Typography variant="body2" color="textSecondary" style={{ marginLeft: isSelectedFiles ? null : 25,}}>
 						Files from Workflows are a way to store as well as edit files.{" "}
 						<a
 							target="_blank"
 							rel="noopener noreferrer"
 							href="https://shuffler.io/docs/organizations#files"
-							style={{ textDecoration: isSelectedFiles ? null:"none", color: isSelectedFiles? "#FF8444": "#f85a3e" }}
+							style={{ textDecoration: isSelectedFiles ? null:"none", color: theme.palette.linkColor }}
 						>
 							Learn more
 						</a>
-					</span>
+					</Typography>
 				</div>
 
 
@@ -937,7 +938,7 @@ const Files = memo((props) => {
 					onClick={() => {
 						upload.click();
 					}}
-					style={{backgroundColor: isSelectedFiles?'#ff8544':null, color:isSelectedFiles?"#212121":null, textTransform: 'none',fontSize: 16, borderRadius:isSelectedFiles?4:null, width:isSelectedFiles?143:null, height:isSelectedFiles?35:null, boxShadow: isSelectedFiles?'none':null,}}
+					style={{ textTransform: 'none',fontSize: 16, borderRadius:isSelectedFiles?4:null, width:isSelectedFiles?143:null, height:isSelectedFiles?35:null, boxShadow: isSelectedFiles?'none':null,}}
 				>
 			     Upload files
 				</Button>
@@ -958,9 +959,9 @@ const Files = memo((props) => {
 					}}
 				/>
 				<Button
-					style={{ marginLeft: 16, marginRight: 15, backgroundColor:isSelectedFiles?"#2F2F2F":null,borderRadius:isSelectedFiles?4:null, width:isSelectedFiles?81:null, height:isSelectedFiles?35:null, boxShadow: isSelectedFiles?'none':null, }}
+					style={{ marginLeft: 16, marginRight: 15, borderRadius:isSelectedFiles?4:null, width:isSelectedFiles?81:null, height:isSelectedFiles?35:null, boxShadow: isSelectedFiles?'none':null, }}
 					variant="contained"
-					color="primary"
+					color="secondary"
 					onClick={() => getFiles(selectedCategory)}
 				>
 					<CachedIcon />
@@ -976,7 +977,6 @@ const Files = memo((props) => {
 							labelId="input-namespace-select-label"
 							id="input-namespace-select-id"
 							style={{
-								color: "white",
 								minWidth: 122,
 								maxWidth: 122,
 								height: 35,
@@ -1013,7 +1013,6 @@ const Files = memo((props) => {
 									<MenuItem
 										key={index}
 										value={data}
-										style={{ color: "white" }}
 									>
 										{data.replaceAll("_", " ")}
 									</MenuItem>
@@ -1044,8 +1043,8 @@ const Files = memo((props) => {
 								Please note that your selected files ({selectedFileId?.length}) will be moved to the <kbd>{updateToThisCategory}</kbd> category.
 							</DialogContent>
 							<DialogActions>
-								<Button onClick={() => setShowFileCategoryPopup(false)} style={{fontSize: 16, textTransform: 'none'}}>Close</Button>
-								<Button onClick={() => handleUpdateFileCategory(updateToThisCategory)} style={{fontSize: 16, textTransform: 'none', color: "#1a1a1a", backgroundColor: "#ff8544"}}>Update</Button>
+								<Button onClick={() => setShowFileCategoryPopup(false)} style={{fontSize: 16, textTransform: 'none', color: theme.palette.primary.main }}>Close</Button>
+								<Button variant="contained" color="primary" onClick={() => handleUpdateFileCategory(updateToThisCategory)} style={{fontSize: 16, textTransform: 'none', }}>Update</Button>
 							</DialogActions>
 						</Dialog>
 					</FormControl>
@@ -1055,8 +1054,9 @@ const Files = memo((props) => {
 				{renderTextBox ? 
 					<Tooltip title={"Close"} style={{}} aria-label={""}>
 						<Button
-							style={{ marginLeft: 5, marginRight: 15, height: 35, borderRadius: 4, backgroundColor: "#494949", textTransform: 'none', fontSize: 16, color: "#f1f1f1" }}
-							color="primary"
+							style={{ marginLeft: 5, marginRight: 15, height: 35, borderRadius: 4, textTransform: 'none', fontSize: 16, }}
+							variant="contained"
+						color="secondary"
 							onClick={() => {
 								setRenderTextBox(false);
 								console.log(" close clicked")
@@ -1068,8 +1068,9 @@ const Files = memo((props) => {
 					:
 					<Tooltip title={"Add new file category"} style={{}} aria-label={""}>
 						<Button
-							style={{ marginLeft: 5, marginRight: 15, width: 169, height: 35, borderRadius: 4, backgroundColor: "#494949", textTransform: 'none', fontSize: 16, color: "#f1f1f1" }}
-							color="primary"
+							style={{whiteSpace: 'nowrap', textWrap: 'nowrap', marginLeft: 5, marginRight: 15, width: 169, height: 35, borderRadius: 4,  textTransform: 'none', fontSize: 16, }}
+							variant="contained"
+							color="secondary"
 							onClick={() => {
 								setRenderTextBox(true);
 								}}
@@ -1096,7 +1097,8 @@ const Files = memo((props) => {
 					}}
 					InputProps={{
 						style: {
-							color: "white",
+							color: theme.palette.textFieldStyle.color,
+							backgroundColor: theme.palette.textFieldStyle.backgroundColor,
 							height: 35,
 							fontSize: 16,
 							borderRadius: 4,
@@ -1133,7 +1135,7 @@ const Files = memo((props) => {
 					style={{
 					borderRadius: 4,
 					marginTop: 24,
-					border: "1px solid #494949",
+					border: theme.palette.defaultBorder,
 					width: "100%",
 					overflowX: "auto", 
 					paddingBottom: 0,
@@ -1151,7 +1153,7 @@ const Files = memo((props) => {
 					>
 					<ListItem
 						style={{
-							borderBottom: "1px solid #494949" ,
+							borderBottom: theme.palette.defaultBorder ,
 							display: "table-row"
 						}}
 						>
@@ -1198,7 +1200,7 @@ const Files = memo((props) => {
 								padding: index === 0 ? "0px 8px 8px 15px" : "0px 8px 8px 8px",
 								whiteSpace: "nowrap",
 								textOverflow: "ellipsis",
-								borderBottom: "1px solid #494949",
+								borderBottom: theme.palette.defaultBorder,
 								verticalAlign: "middle"
 								}}
 								primaryTypographyProps={{
@@ -1215,7 +1217,7 @@ const Files = memo((props) => {
                             key={rowIndex}
                             style={{
                                 display: "table-row",
-                                backgroundColor: "#212121",
+                                backgroundColor: theme.palette.platformColor,
                             }}
                         >
                             {Array(8)
@@ -1232,7 +1234,7 @@ const Files = memo((props) => {
                                             variant="text"
                                             animation="wave"
                                             sx={{
-                                                backgroundColor: "#1a1a1a",
+                                                backgroundColor: theme.palette.loaderColor,
                                                 height: "20px",
                                                 borderRadius: "4px",
                                             }}
@@ -1257,9 +1259,9 @@ const Files = memo((props) => {
 									return null;
 								}
 	
-								var bgColor = isSelectedFiles ? "#212121":"#27292d";
+								var bgColor = themeMode === "dark" ? "#212121" : "#FFFFFF";
 								if (index % 2 === 0) {
-									bgColor = isSelectedFiles ? "#1A1A1A":"#1f2023";
+									bgColor = themeMode === "dark" ? "#1A1A1A" :  "#EAEAEA";
 								}
 								const isDistributed = file?.suborg_distribution?.length > 0 ? true : false;
 								const filenamesplit = file.filename.split(".")
@@ -1425,9 +1427,20 @@ const Files = memo((props) => {
 																readFileData(file)
 															}}
 														>
-															<img src="/icons/editIcon.svg" alt="edit icon"
-																style={{color: iseditable ? "white" : "grey", width: 24, height: 24}}
-															/>
+															<svg
+																width="24"
+																height="24"
+																viewBox="0 0 24 24"
+																fill="none"
+																xmlns="http://www.w3.org/2000/svg"
+																>
+																<path
+																	d="M16.1038 4.66848C16.3158 4.45654 16.5674 4.28843 16.8443 4.17373C17.1212 4.05903 17.418 4 17.7177 4C18.0174 4 18.3142 4.05903 18.5911 4.17373C18.868 4.28843 19.1196 4.45654 19.3315 4.66848C19.5435 4.88041 19.7116 5.13201 19.8263 5.40891C19.941 5.68582 20 5.9826 20 6.28232C20 6.58204 19.941 6.87882 19.8263 7.15573C19.7116 7.43263 19.5435 7.68423 19.3315 7.89617L8.43807 18.7896L4 20L5.21038 15.5619L16.1038 4.66848Z"
+																	stroke={themeMode=== "dark" ? "#F1F1F1" : "#333"}
+																	strokeLinecap="round"
+																	strokeLinejoin="round"
+																/>
+															</svg>
 														</IconButton>
 													</span>
 												</Tooltip>
@@ -1470,15 +1483,39 @@ const Files = memo((props) => {
 																downloadFile(file);
 															}}
 														>
-															<img src="/icons/downloadIcon.svg" alt="download icon"
-																style={{
-																	width: 24, height: 24,
-																	color:
-																		file.status === "active"
-																			? "white"
-																			: "grey",
-																}}
+															<svg
+															width="24"
+															height="24"
+															viewBox="0 0 24 24"
+															fill="none"
+															xmlns="http://www.w3.org/2000/svg"
+															>
+															<rect
+																width="24"
+																height="24"
+																fill={themeMode === "dark" ? "#212121" : "#EDEDED"}
+																fillOpacity="0.02"
 															/>
+															<path
+																d="M8.22595 16.4463L11.7792 19.9995L15.3324 16.4463"
+																stroke={file.status === "active" ? (themeMode === "dark" ? "#F1F1F1" : "black") : "grey"}
+																strokeLinecap="round"
+																strokeLinejoin="round"
+															/>
+															<path
+																d="M11.7792 12.0049V19.9997"
+																stroke={file.status === "active" ? (themeMode === "dark" ? "#F1F1F1" : "black") : "grey"}
+																strokeLinecap="round"
+																strokeLinejoin="round"
+															/>
+															<path
+																d="M19.6676 17.415C20.4399 16.8719 21.019 16.0968 21.321 15.2023C21.6229 14.3078 21.632 13.3403 21.3468 12.4403C21.0617 11.5402 20.4971 10.7545 19.7352 10.197C18.9732 9.6396 18.0534 9.33948 17.1092 9.34021H15.99C15.7228 8.299 15.2229 7.33196 14.5279 6.5119C13.8329 5.69184 12.961 5.04013 11.9777 4.60583C10.9944 4.17153 9.92534 3.96596 8.85109 4.00459C7.77684 4.04322 6.72535 4.32505 5.77578 4.82886C4.82621 5.33267 4.00331 6.04534 3.36902 6.9132C2.73474 7.78106 2.30559 8.78151 2.11391 9.83922C1.92222 10.8969 1.97297 11.9844 2.26236 13.0196C2.55174 14.0549 3.07221 15.011 3.78459 15.816"
+																stroke={file.status === "active" ? (themeMode === "dark" ? "#F1F1F1" : "black") : "grey"}
+																strokeLinecap="round"
+																strokeLinejoin="round"
+															/>
+															</svg>
+
 														</IconButton>
 													</span>
 												</Tooltip>
@@ -1496,7 +1533,31 @@ const Files = memo((props) => {
 																toast(file.id + " copied to clipboard");
 														}}
 													>
-														<img src="/icons/copyIcon.svg" alt="copy icon" style={{ color: "white", width: 24, height: 24 }} />
+														<svg
+															width="24"
+															height="24"
+															viewBox="0 0 24 24"
+															fill="none"
+															xmlns="http://www.w3.org/2000/svg"
+															>
+															<rect
+																width="24"
+																height="24"
+																fillOpacity="1"
+															/>
+															<path
+																d="M14 4H7.6C7.17565 4 6.76869 4.16857 6.46863 4.46863C6.16857 4.76869 6 5.17565 6 5.6V18.4C6 18.8243 6.16857 19.2313 6.46863 19.5314C6.76869 19.8314 7.17565 20 7.6 20H17.2C17.6243 20 18.0313 19.8314 18.3314 19.5314C18.6314 19.2313 18.8 18.8243 18.8 18.4V8.8L14 4Z"
+																stroke={themeMode === "dark" ? "#F1F1F1" : "#333"}
+																strokeLinecap="round"
+																strokeLinejoin="round"
+															/>
+															<path
+																d="M14 4V8.8H18.8"
+																stroke={themeMode === "dark" ? "#F1F1F1" : "#333"}
+																strokeLinecap="round"
+																strokeLinejoin="round"
+															/>
+															</svg>
 													</IconButton>
 												</Tooltip>
 												<Tooltip
@@ -1570,7 +1631,6 @@ const Files = memo((props) => {
                                               disabled={userdata?.active_org?.role !== "admin" || (selectedOrganization.creator_org !== undefined && selectedOrganization.creator_org !== null && selectedOrganization.creator_org !== "" ) ? true : false}
                                               checked={isDistributed}
                                               style={{ }}
-                                              color="secondary"
                                               onClick={() => {
 												setShowDistributionPopup(true)
 												if(file?.suborg_distribution?.length > 0){
diff --git a/frontend/src/components/LeftSideBar.jsx b/frontend/src/components/LeftSideBar.jsx
index 432075ec..eeae20bc 100644
--- a/frontend/src/components/LeftSideBar.jsx
+++ b/frontend/src/components/LeftSideBar.jsx
@@ -11,6 +11,11 @@ import {
   Toc as TocIcon,
   Settings as SettingsIcon 
 } from "@mui/icons-material";
+import LightModeIcon from '@mui/icons-material/LightMode';
+import DarkModeIcon from '@mui/icons-material/DarkMode';
+import MonitorIcon from '@mui/icons-material/Monitor';
+
+
 import SearchBox from "./SearchData.jsx";
 import {
   Button,
@@ -30,11 +35,13 @@ import {
   Portal,
   Collapse,
   Tooltip,
+  ToggleButtonGroup,
+  ToggleButton,
 } from "@mui/material";
-import theme from "../theme.jsx";
 import RecentWorkflow from "../components/RecentWorkflow.jsx";
 
 import { useNavigate } from "react-router";
+import { getTheme } from "../theme.jsx";
 
 import { Link } from "react-router-dom";
 import {
@@ -57,8 +64,7 @@ const ExpandMoreAndLessIcon = "/icons/expandMoreIcon.svg";
 const LeftSideBar = ({ userdata, serverside, globalUrl, notifications, }) => {
 
   const navigate = useNavigate();
-  const {setLeftSideBarOpenByClick, leftSideBarOpenByClick, setSearchBarModalOpen, searchBarModalOpen} = useContext(Context);
-
+  const {setLeftSideBarOpenByClick, leftSideBarOpenByClick, setSearchBarModalOpen, searchBarModalOpen, logoutUrl, themeMode, handleThemeChange,  isDocSearchModalOpen, setIsDocSearchModalOpen, supportEmail} = useContext(Context);
   const [expandLeftNav, setExpandLeftNav] = useState(false);
   const [activeOrgName, setActiveOrgName] = useState(
     userdata?.active_org?.name || "Select Organziation"
@@ -73,7 +79,10 @@ const LeftSideBar = ({ userdata, serverside, globalUrl, notifications, }) => {
   const [recentworkflows, setRecentworkflows] = useState(null);
   const [usersWorkFlows, setUsersWorkFlows] = useState([]);
   const [currentOpenTab, setCurrentOpenTab] = useState("");
-  const currentPath = window.location.pathname;
+  const params = new URLSearchParams(window.location.search);
+  const [currentSelectedTheme, setCurrentSelectedTheme] = useState(themeMode);
+  const tab = params.get("tab");
+  const currentPath = tab ? `${window.location.pathname}?tab=${tab}` : window.location.pathname;
   const [hoverOnAvatar, setHoverOnAvatar] = useState(false);
   const [orgOptions, setOrgOptions] = useState(
     userdata?.orgs?.map((org) => ({
@@ -87,21 +96,35 @@ const LeftSideBar = ({ userdata, serverside, globalUrl, notifications, }) => {
     return orgOptions.find((option) => option.name === selectedOrg);
   }, [selectedOrg, orgOptions]);
 
-//With this code it is opening search bar on google chrome search bar as well which is not required
-useEffect(() => {
-  const handleKeyDown = (event) => {
-    if ((event.ctrlKey || event.metaKey) && event.key === "k") {
-      event.preventDefault();
-      setSearchBarModalOpen((prev)=> !prev);
+  const theme = getTheme(themeMode);
+  const darkText = "#0F1419"
+  const lightText = "#CDCDCD"
+  const lightHoverColor = "#D6D6D6"
+  const darkHoverColor = "#2F2F2F"
+
+	//With this code it is opening search bar on google chrome search bar as well which is not required
+	useEffect(() => {
+	  const handleKeyDown = (event) => {
+		if ((event.ctrlKey || event.metaKey) && event.key === "k") {
+		  event.preventDefault();
+		  setSearchBarModalOpen((prev)=> !prev);
+		}
+	  };
+
+	  window.addEventListener("keydown", handleKeyDown);
+
+	  return () => {
+		window.removeEventListener("keydown", handleKeyDown);
+	  };
+	}, [setSearchBarModalOpen]);
+
+  useEffect(() => {
+    if (userdata && userdata?.active_org?.branding?.theme?.length > 0) {
+      setCurrentSelectedTheme(userdata?.active_org?.branding?.theme);
+    }else if (userdata && userdata?.theme?.length > 0) {
+      setCurrentSelectedTheme(userdata?.theme);
     }
-  };
-
-  window.addEventListener("keydown", handleKeyDown);
-
-  return () => {
-    window.removeEventListener("keydown", handleKeyDown);
-  };
-}, [setSearchBarModalOpen]);
+  }, [userdata]);
   
   const CustomPopper = (props) => {
     return (
@@ -125,10 +148,12 @@ useEffect(() => {
           }}
           sx={{
             zIndex: 1000015,
-            backgroundColor: "#1f1f1f",
+            backgroundColor: theme.palette.backgroundColor,
+            color: theme.palette.text.primary,
             opacity: 1,
             "& .MuiAutocomplete-listbox": {
-              backgroundColor: "#1f1f1f",
+              backgroundColor: theme.palette.backgroundColor,
+              color: theme.palette.text.primary,
               padding: 0,
               margin: 0,
               borderRadius: "4px",
@@ -138,15 +163,16 @@ useEffect(() => {
             outline: "1px solid #555555",
             borderRadius: 1,
             overflow: 'hidden'
-            
           }}
         >
           <Box
           sx={{
             scrollbarWidth: "thin",
-            scrollbarColor: "#494949 transparent",
+            scrollbarColor: theme.palette.scrollbarColorTransparent,
+            color: theme.palette.text.primary,
             "& .MuiAutocomplete-listbox": {
-              backgroundColor: "#1f1f1f",
+              backgroundColor:theme.palette.backgroundColor,
+              color: theme.palette.text.primary,
               padding: 0,
               margin: 0,
               borderRadius: "4px",
@@ -155,18 +181,19 @@ useEffect(() => {
         >
           {props.children}
         </Box>
+
         <Link to="/admin?tab=tenants" style={hrefStyle}>
 			<Box
 				sx={{
 				  width: "100%",
 				  padding: "12px 8px",
 				  textAlign: "center",
-				  color: "#fff",
+				  color: theme.palette.text.primary,
 				  fontSize: "16px",
 				  cursor: "pointer",
 				  borderTop: "1px solid #444444",
 				  "&:hover": {
-					backgroundColor: "#444444",
+					  backgroundColor: theme.palette.hoverColor,
 				  },
 				  textTransform: 'none'
 				}}
@@ -240,15 +267,24 @@ useEffect(() => {
       setOpenautomateTab(true);
       setOpenSecurityTab(false);
       setCurrentOpenTab("apps");
-        } else if ((lastTabOpenByUser === "detection" && currentPath.includes("/detections")) || currentPath.includes("/detections")) {
+        } else if ((lastTabOpenByUser === "forms" && currentPath.includes("/forms")) || currentPath.includes("/forms")) {
       setOpenautomateTab(false);
       setOpenSecurityTab(true);
-      setCurrentOpenTab("detection");
-        } else if ((lastTabOpenByUser === "response" && currentPath.includes("/response")) || currentPath.includes("/response")) {
+      setCurrentOpenTab("forms");
+        } else if ((lastTabOpenByUser === "datastore" && currentPath.includes("/admin?tab=datastore")) || currentPath.includes("/admin?tab=datastore")) {
       setOpenautomateTab(false);
       setOpenSecurityTab(true);
-      setCurrentOpenTab("response");
-        } else if ((lastTabOpenByUser === "docs" || currentPath.includes("/docs")) || currentPath.includes("/docs")) {
+      setCurrentOpenTab("datastore");
+    } else if ((lastTabOpenByUser === "files" && currentPath.includes("/admin?tab=files")) || currentPath.includes("/admin?tab=files")) {
+      setOpenautomateTab(false);
+      setOpenSecurityTab(true);
+      setCurrentOpenTab("files");
+    }
+    else if ((lastTabOpenByUser === "locations" && currentPath.includes("/admin?tab=locations")) || currentPath.includes("/admin?tab=locations")) {
+      setOpenautomateTab(false);
+      setOpenSecurityTab(true);
+      setCurrentOpenTab("locations");
+    } else if ((lastTabOpenByUser === "docs" || currentPath.includes("/docs")) || currentPath.includes("/docs")) {
       setOpenautomateTab(false);
       setOpenSecurityTab(false);
       setCurrentOpenTab("docs");
@@ -373,6 +409,82 @@ useEffect(() => {
     }
   }, [usersWorkFlows]); 
 
+  const handleChangeTheme = (newTheme) => {
+
+
+    const data = {
+      	  "org_id": userdata?.active_org?.id,
+  	};
+
+    data["branding"]  = {
+			"theme": newTheme,
+			"enable_chat": userdata?.active_org?.branding?.enable_chat || false,
+			"home_url": userdata.active_org?.branding?.home_url || "",
+			"brand_color": userdata?.active_org?.branding?.brand_color || theme.palette.primary.main,
+			"brand_name": userdata?.active_org?.branding?.brand_name || "",
+			"logout_url": userdata?.active_org?.branding?.logout_url || "",
+			"support_email": userdata?.active_org?.branding?.support_email || "",
+		}
+
+		data["editing_branding"] = true;
+
+    const url = globalUrl + `/api/v1/orgs/${userdata?.active_org?.id}`;
+          fetch(url, {
+            mode: "cors",
+            method: "POST",
+            body: JSON.stringify(data),
+            credentials: "include",
+            crossDomain: true,
+            withCredentials: true,
+            headers: {
+              "Content-Type": "application/json; charset=utf-8",
+            },
+          })
+            .then((response) =>
+              response.json().then((responseJson) => {
+                if (responseJson["success"] === false) {
+                    toast("Failed updating org: ", responseJson.reason);
+                }
+                })
+  	      ) 
+            .catch((error) => {
+              console.log("Error changing theme: ", error);
+            });
+  };
+
+  
+  const handleUpdateTheme = (newTheme) => {
+    handleThemeChange(newTheme);
+    setCurrentSelectedTheme(newTheme)
+    
+    const data = {
+      "user_id": userdata?.id,
+      "theme": newTheme,
+    }
+
+    const url = globalUrl + `/api/v1/users/updateuser`;
+    fetch(url, {
+      mode: "cors",
+      method: "PUT",
+      body: JSON.stringify(data),
+      credentials: "include",
+      crossDomain: true,
+      withCredentials: true,
+      headers: {
+        "Content-Type": "application/json; charset=utf-8",
+      },
+    }).then((response) =>
+      response.json().then((responseJson) => {
+        if (responseJson["success"] === false) {
+          toast("Failed saving your theme: ", responseJson.reason);
+        }
+      })
+    ).catch((error) => {
+      console.log("Error saving your theme: ", error);
+    }); 
+  };
+    
+
   const removeCookie = (name, path = "/") => {
     document.cookie = `${name}=; path=${path}; expires=Thu, 01 Jan 1970 00:00:00 GMT;`;
   };
@@ -399,8 +511,11 @@ useEffect(() => {
         // Clear localStorage
         localStorage.clear();
 
-        // Redirect to home immediately
-        window.location.href = "/";
+        if(userdata?.org_status?.includes("integration_partner") && logoutUrl?.length > 0){
+          window.location.href = logoutUrl
+        } else {
+          window.location.pathname = "/";
+        }
       })
       .catch((error) => {
         console.error("Logout error:", error);
@@ -412,7 +527,7 @@ useEffect(() => {
       <IconButton
         style={{
           marginRight: 5,
-          color: theme.palette.primary.contrastText,
+          color: themeMode === "dark" ? lightText : darkText,
         }}
         aria-controls="simple-menu"
         aria-haspopup="true"
@@ -445,17 +560,17 @@ useEffect(() => {
         sx={{
           zIndex: 1000015,
           "& .MuiPaper-root": {
-            backgroundColor: "#1F1F1F",
-            color: "#FFFFFF",
-            borderRadius: 1,
+            backgroundColor: theme.palette.backgroundColor,
+            color: theme.palette.text.primary,
+            borderRadius: theme.palette.borderRadius/3,
           },
           "& .MuiList-root": {
-            backgroundColor: "#1F1F1F",
+            backgroundColor: theme.palette.backgroundColor,
           },
           "& .MuiMenuItem-root": {
-            color: "#FFFFFF",
+            color: theme.palette.text.primary,
             "&:hover": {
-              backgroundColor: "#333333",
+              backgroundColor: theme.palette.hoverColor,
             },
           },
           "& .MuiDivider-root": {
@@ -463,6 +578,44 @@ useEffect(() => {
           },
         }}
       >
+        {userdata && (userdata?.org_status?.includes("integration_partner") && userdata?.org_status?.includes("sub_org")) ? null : (
+          <>
+            <ToggleButtonGroup
+      value={currentSelectedTheme}
+      exclusive
+      onChange={(event, newTheme) => {
+        if (newTheme === null) {
+          return;
+        }
+        if (newTheme === currentSelectedTheme) {
+          return;
+        }
+        handleThemeChange(newTheme)
+        setCurrentSelectedTheme(newTheme);
+        if (userdata?.org_status?.includes("integration_partner")){
+            handleChangeTheme(newTheme);
+        } else {
+
+          handleUpdateTheme(newTheme);
+        }
+      }}
+      aria-label="theme"
+      style={{display: 'flex', justifyContent: "center", marginBottom: 10,  }}
+      >
+
+      <ToggleButton value="light" aria-label="light theme" style={{ backgroundColor: currentSelectedTheme === "light" ? theme.palette.hoverColor : theme.palette.backgroundColor }}>
+        <LightModeIcon style={{ color: themeMode === "light" ? darkText : lightText }} />
+      </ToggleButton>
+      <ToggleButton value="dark" aria-label="dark theme" style={{ backgroundColor: currentSelectedTheme === "dark" ? theme.palette.hoverColor : theme.palette.backgroundColor }}>
+        <DarkModeIcon style={{ color: themeMode === "light" ? darkText : lightText }} />
+      </ToggleButton>
+      <ToggleButton value="system" aria-label="system theme" style={{ backgroundColor: currentSelectedTheme === "system" ? theme.palette.hoverColor : theme.palette.backgroundColor }}>
+        <MonitorIcon style={{ color: themeMode === "light" ? darkText : lightText }} />
+      </ToggleButton>
+      </ToggleButtonGroup>
+      <Divider style={{ marginTop: 10, marginBottom: 10, color: theme.palette.defaultBorder }} />
+          </>
+        )}
         <Link to="/admin" style={hrefStyle}>
           <MenuItem
             onClick={(event) => {
@@ -470,7 +623,7 @@ useEffect(() => {
             }}
             style={{fontSize: 18}}
           >
-            <BusinessIcon style={{ marginRight: 5 }} /> Organization
+            <BusinessIcon style={{ marginRight: 5 }} /> Org Admin 
           </MenuItem>
         </Link>
         <Link to="/settings" style={hrefStyle}>
@@ -480,11 +633,13 @@ useEffect(() => {
             }}
             style={{fontSize: 18}}
           >
-            <SettingsIcon style={{ marginRight: 5 }} /> Account
+            <SettingsIcon style={{ marginRight: 5 }} /> User Account
           </MenuItem>
         </Link>
 
         <Divider style={{ marginTop: 10, marginBottom: 10, }} />
+
+	  	{/*
 		<Link to="/admin?admin_tab=notifications" style={hrefStyle}>
 		  <MenuItem
 			onClick={(event) => {
@@ -492,7 +647,7 @@ useEffect(() => {
 			}}
       style={{fontSize: 18}}
 		  >
-			<NotificationsIcon style={{ marginRight: 5 }} /> Notifications ({
+			<NotificationsIcon style={{ marginRight: 5 }} /> Org Notifications ({
 				notifications === undefined || notifications === null ? 0 : 
 				notifications?.filter((notification) => notification.read === false).length
 			}) 
@@ -500,8 +655,9 @@ useEffect(() => {
 		</Link>
 
         <Divider style={{ marginTop: 10, marginBottom: 10, }} />
+	  	*/}
 
-        <Link to="/docs" style={hrefStyle}>
+        <Link to={userdata && userdata?.org_status?.includes("integration_partner") && userdata?.active_org?.branding?.documentation_link?.length > 0 ? userdata?.active_org?.branding?.documentation_link : "/docs" } target={userdata?.active_org?.branding?.documentation_link?.length > 0 && userdata?.org_status?.includes("integration_partner") ? "_blank" : "_self" } style={hrefStyle}>
           <MenuItem
             onClick={(event) => {
               handleClose();
@@ -512,7 +668,7 @@ useEffect(() => {
           </MenuItem>
         </Link>
         <MenuItem
-          style={{ color: "white", fontSize: 18 }}
+          style={{ fontSize: 18 }}
           onClick={(event) => {
             handleClickLogout();
             event.preventDefault();
@@ -525,7 +681,7 @@ useEffect(() => {
         <Divider style={{ marginBottom: 10, }} />
 
         <Typography color="textSecondary" align="center" style={{ marginTop: 5, marginBottom: 5, fontSize: 18 }}>
-          Version: 2.0.0
+          Version: 2.1.0-rc2
         </Typography>
       </Menu>
     </span>
@@ -589,6 +745,8 @@ useEffect(() => {
 
     localStorage.setItem("globalUrl", "");
     localStorage.setItem("getting_started_sidebar", "open");
+    localStorage.removeItem("workflows");
+    localStorage.removeItem("apps");
 
     fetch(`${globalUrl}/api/v1/orgs/${orgId}/change`, {
       mode: "cors",
@@ -647,7 +805,7 @@ useEffect(() => {
             toast(responseJson.reason);
           } else {
             toast(
-              "Failed changing org. Try again or contact support@shuffler.io if this persists."
+              `Failed changing org. Try again or contact ${supportEmail} if this persists.`
             );
           }
         }
@@ -742,7 +900,7 @@ useEffect(() => {
     width: expandLeftNav ? "100%" : 30,
     justifyContent: expandLeftNav ? "flex-start" : "center",
     height: 35,
-    color: openautomatetab ? "#F1F1F1" : "#C8C8C8",
+    color: openautomatetab ? "#F1F1F1" : themeMode === "dark" ? lightText : darkText,
     textTransform: "none",
     "& .MuiButton-root	": {
       width: expandLeftNav ? "100%" : 30,
@@ -757,7 +915,8 @@ useEffect(() => {
 			"US": "us",
 			"EU": "eu",
 			"CA": "ca",
-			"UK": "gb"
+			"UK": "gb",
+      "au": "au",
 		};
 
     region = regionMapping[region_url] || "eu";
@@ -772,6 +931,9 @@ useEffect(() => {
 
   }, [window?.location?.pathname]);
 
+  const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
+  const showPartnerLogo = userdata?.org_status?.includes("integration_partner") && userdata?.active_org?.image !== undefined && userdata?.active_org?.image !== null && userdata?.active_org?.image.length > 0 
+
   return (
     <div
       style={{
@@ -784,12 +946,13 @@ useEffect(() => {
         transition: "width 0.3s ease",
         boxShadow: "0px 4px 12px rgba(0, 0, 0, 0.2)" ,
         resize: 'both',
-
-		zoom: 0.8, 
+        zoom: isSafari ? undefined : 0.8,
+        transform: isSafari ? "scale(0.8)" : undefined,
+        transformOrigin: isSafari ? "top left" : undefined,
         height: "calc((100vh - 32px)*1.2)",
       }}
     >
-      {searchBarModalOpen ? <ModalView serverside={serverside} userdata={userdata} searchBarModalOpen={searchBarModalOpen} setSearchBarModalOpen={setSearchBarModalOpen} globalUrl={globalUrl} /> : null}
+      {searchBarModalOpen && !isDocSearchModalOpen ? <ModalView serverside={serverside} userdata={userdata} searchBarModalOpen={searchBarModalOpen} setSearchBarModalOpen={setSearchBarModalOpen} globalUrl={globalUrl} isDocSearchModalOpen={isDocSearchModalOpen} /> : null}
       <Box
         sx={{
           display: "flex",
@@ -831,11 +994,13 @@ useEffect(() => {
             }
           }}
         >
-          <Link to="/">
+          <Link to={isCloud && !showPartnerLogo ? "/" : "/workflows"}>
             <img
-              src={ShuffleLogo}
+              src={
+				  showPartnerLogo ? userdata?.active_org?.image : ShuffleLogo
+			  }
               alt="Shuffle Logo"
-              style={{ width: 24, height: 24 }}
+              style={{ width: showPartnerLogo ? 30 : 24, height: showPartnerLogo ? 30 : 24 }}
             />
           </Link>
         </Tooltip>
@@ -868,14 +1033,32 @@ useEffect(() => {
             disableElevation
             disableRipple
           >
-            <img
-              src={ExpandMoreAndLessIcon}
+          <svg
               style={{
-                transform: expandLeftNav ? "rotate(-180deg)" : "",
-                transition: "transform 0.3s ease",
+                transform: expandLeftNav ? "" : "rotate(180deg)",
+                transition: "transform 0.3s ease"
               }}
-              alt="Expand/Collapse Icon"          
-            />
+              width="24"
+              height="24"
+              viewBox="0 0 24 24"
+              fill="none"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <circle
+                cx="12"
+                cy="12"
+                r="12"
+                transform="matrix(-1 0 0 1 24 0)"
+                fill={themeMode === "dark" ? "#2F2F2F" : "#D0D0D0"}
+              />
+              <path
+                d="M14 18L8 12L14 6"
+                stroke={themeMode === "dark" ? "#F1F1F1" : "#2F2F2F"}
+                strokeWidth="1.5"
+                strokeLinecap="round"
+                strokeLinejoin="round"
+              />
+            </svg>
           </Button>
         </Box>
       </Box>
@@ -923,19 +1106,19 @@ useEffect(() => {
                       "& input": {
                         padding: "8px 14px",
                         fontSize: "14px",
-                        color: "#C8C8C8",
+                        color: themeMode === "dark" ? lightText : darkText,
                       },
                       backgroundColor: "transparent",
                     }}
                     variant="outlined"
                     InputProps={{
                       startAdornment: (
-                        <SearchIcon style={{ color: "#CDCDCD", width: 24, height: 24, marginLeft: 16 }} />
+                        <SearchIcon style={{ color: themeMode === "dark" ? lightText : darkText, width: 24, height: 24, marginLeft: 16 }} />
                       ),
                       endAdornment: (
                         <span
                           style={{
-                            color: "#C8C8C8",
+                            color: themeMode === "dark" ? lightText : darkText,
                             fontSize: "12px",
                             marginRight: 16,
                             whiteSpace: "nowrap",
@@ -948,16 +1131,18 @@ useEffect(() => {
                     }}
                     onClick={() => {
                       setSearchBarModalOpen(true);
+                      setIsDocSearchModalOpen(false);
                     }}
                     onChange={() => {
                       setSearchBarModalOpen(true);
+                      setIsDocSearchModalOpen(false);
                     }}
                   />
             </Fade>
             ):(
             <>
             <Fade in={!expandLeftNav} timeout={500}>
-              <Button style={{color: "#CDCDCD", backgroundColor: "transparent", marginBottom: 5, borderRadius: 8, marginTop: 5 }} onClick={()=>{setSearchBarModalOpen(true)}} onMouseOver={(event)=>{event.currentTarget.style.backgroundColor = "#2f2f2f"}} onMouseLeave={(event)=> {event.currentTarget.style.backgroundColor = "transparent"}} disableElevation disableRipple><SearchIcon style={{width: 24, height: 24}}/></Button>
+              <Button style={{color: themeMode === "dark" ? lightText : darkText, backgroundColor: "transparent", marginBottom: 5, borderRadius: 8, marginTop: 5 }} onClick={()=>{setSearchBarModalOpen(true)}} onMouseOver={(event)=>{event.currentTarget.style.backgroundColor = "#2f2f2f"}} onMouseLeave={(event)=> {event.currentTarget.style.backgroundColor = "transparent"}} disableElevation disableRipple><SearchIcon style={{width: 24, height: 24}}/></Button>
             </Fade>
             </>)}
             <span style={{display: expandLeftNav ? "none": "inline", border: "1px solid #494949", width: 48, marginLeft: 14, marginRight: 14}}></span>
@@ -970,7 +1155,7 @@ useEffect(() => {
               height: "100%",
               overflowY: expandLeftNav ? "auto" : "hidden",
               scrollbarWidth: 'thin', 
-              scrollbarColor: "#494949 transparent",
+              scrollbarColor: theme.palette.scrollbarColorTransparent,
               overflowX: "hidden",
             }}
       >
@@ -983,55 +1168,73 @@ useEffect(() => {
           }}
         >
           <Box sx={{ display: "flex", flexDirection: "row", marginTop: 2.5, width: expandLeftNav ? "100%" : 48, padding: "0px", }}>
-	  		<Link to="/dashboards/automate" style={hrefStyle}>
             <Button
+              component={Link}
+              to="/usecases"
               onClick={(event) => {
                 setOpenautomateTab(true);
                 setOpenSecurityTab(false);
-                setCurrentOpenTab("automate");
-                localStorage.setItem("lastTabOpenByUser", "automate");
+                setCurrentOpenTab("usecases");
+                localStorage.setItem("lastTabOpenByUser", "usecases");
               }}
               variant="text"
               style={{
                 ...ButtonStyle,
-                backgroundColor: ((currentOpenTab === "automate" && currentPath.includes("/dashboards/automate"))|| (!expandLeftNav && (currentPath === "/workflows" || currentPath === "/usecases" || currentPath.includes("/search"))))? "#2f2f2f": "transparent",
+                backgroundColor: ((currentOpenTab === "automate") || (!expandLeftNav && (currentPath === "/workflows" || currentPath === "/usecases" || currentPath.includes("/search"))))? themeMode === "dark" ? darkHoverColor : lightHoverColor : "transparent",
               }}
               onMouseOver={(event)=>{
-                event.currentTarget.style.backgroundColor = "#2f2f2f";
+                event.currentTarget.style.backgroundColor = themeMode === "dark" ? darkHoverColor : lightHoverColor;
               }}
               onMouseOut={(event)=>{
-                event.currentTarget.style.backgroundColor = ((currentOpenTab === "automate" && currentPath.includes("/dashboards/automate"))|| (!expandLeftNav && (currentPath === "/workflows" || currentPath === "/usecases" || currentPath.includes("/search"))))? "#2f2f2f": "transparent";
+                event.currentTarget.style.backgroundColor = ((currentOpenTab === "automate")|| (!expandLeftNav && (currentPath === "/workflows" || currentPath === "/usecases" || currentPath.includes("/search"))))? themeMode === "dark" ? darkHoverColor : lightHoverColor : "transparent";
               }}
             >
-              <img
-                src={detectionIcon}
-                style={{ width: 18, height: 18, marginRight: expandLeftNav ? 10 : 0 }}
-                alt="Automate Icon"
-              />
+                  <svg
+                    width="18"
+                    height="18"
+                    viewBox="0 0 16 11"
+                    fill="none"
+                    xmlns="http://www.w3.org/2000/svg"
+                    style={{
+                      marginRight: expandLeftNav ? 10 : 0,
+                    }}
+                  >
+                    <path
+                      d="M7.99935 6.83317C8.73573 6.83317 9.33268 6.23622 9.33268 5.49984C9.33268 4.76346 8.73573 4.1665 7.99935 4.1665C7.26297 4.1665 6.66602 4.76346 6.66602 5.49984C6.66602 6.23622 7.26297 6.83317 7.99935 6.83317Z"
+                      stroke={themeMode === "dark" ? lightText : darkText}
+                      strokeLinecap="round"
+                      strokeLinejoin="round"
+                    />
+                    <path
+                      d="M10.8269 2.67329C11.1988 3.04478 11.4938 3.48593 11.6951 3.97153C11.8964 4.45712 12 4.97763 12 5.50329C12 6.02895 11.8964 6.54946 11.6951 7.03505C11.4938 7.52064 11.1988 7.9618 10.8269 8.33329M5.17354 8.32662C4.80163 7.95513 4.5066 7.51398 4.3053 7.02838C4.104 6.54279 4.00039 6.02228 4.00039 5.49662C4.00039 4.97096 4.104 4.45045 4.3053 3.96486C4.5066 3.47927 4.80163 3.03811 5.17354 2.66662M12.7135 0.786621C13.9633 2.03681 14.6654 3.73219 14.6654 5.49995C14.6654 7.26772 13.9633 8.9631 12.7135 10.2133M3.28687 10.2133C2.03706 8.9631 1.33496 7.26772 1.33496 5.49995C1.33496 3.73219 2.03706 2.03681 3.28687 0.786621"
+                      stroke={themeMode === "dark" ? lightText : darkText}
+                      strokeLinecap="round"
+                      strokeLinejoin="round"
+                    />
+                  </svg>
               <span
                 style={{
                   display: expandLeftNav ? "inline" : "none",
                   marginRight: "auto",
                   opacity: expandLeftNav ? 1 : 0,
                   transition: "opacity 0.3s ease",
-                  color: currentOpenTab === "automate" && currentPath.includes("/dashboards/automate") ? "#F1F1F1" : "#C8C8C8",
+                  color: themeMode === "dark" ? lightText : darkText
                 }}
               >
                 Automate
               </span>
             </Button>
-	  		</Link> 
             <IconButton
               onClick={() => {
                 setOpenautomateTab((prev) => !prev);
                 setOpenSecurityTab(false);
               }}
               style={{
-                  color: "#FFFFFF",
+                  color: themeMode === "dark" ? lightText : darkText,
                   marginLeft: 0.625,
               }}
               onMouseOver={(event)=>{
-                event.currentTarget.style.backgroundColor = "#2f2f2f";
+                event.currentTarget.style.backgroundColor = themeMode === "dark" ? darkHoverColor : lightHoverColor;
               }}
               onMouseOut={(event)=>{
                 event.currentTarget.style.backgroundColor = "transparent";
@@ -1067,8 +1270,9 @@ useEffect(() => {
               gap: 10,
             }}
           >
-	  		<Link to="/usecases" style={hrefStyle}>
             <Button
+              component={Link}
+              to="/usecases"
               onClick={(event) => {
                 setCurrentOpenTab("usecases");
                 localStorage.setItem("lastTabOpenByUser", "usecases");
@@ -1076,18 +1280,18 @@ useEffect(() => {
               style={{
                 width: "100%",
                 height: 35,
-                color: currentOpenTab === "usecases" && expandLeftNav && currentPath.includes("/usecases") ? "#FFFFFF" : "#C8C8C8",
+                color: themeMode === "dark" ? lightText : darkText,
                 justifyContent: "flex-start",
                 fontSize: 18,
                 textTransform: "none",
-                backgroundColor: currentOpenTab === "usecases" && expandLeftNav && currentPath.includes("/usecases")? "#2f2f2f": "transparent",
+                backgroundColor: currentOpenTab === "usecases" && expandLeftNav ? themeMode === "dark"? darkHoverColor : lightHoverColor : "transparent",
                 marginLeft: 16
               }}
               onMouseOver={(event)=>{
-                event.currentTarget.style.backgroundColor = "#2f2f2f";
+                event.currentTarget.style.backgroundColor = themeMode === "dark" ? darkHoverColor : lightHoverColor;
               }}
               onMouseOut={(event)=>{
-                event.currentTarget.style.backgroundColor = currentOpenTab === "usecases" && expandLeftNav && currentPath.includes("/usecases")? "#2f2f2f": "transparent";
+                event.currentTarget.style.backgroundColor = currentOpenTab === "usecases" && expandLeftNav ? themeMode === "dark"? darkHoverColor : lightHoverColor : "transparent";
               }}
               disableRipple={expandLeftNav ? false : true}
             >
@@ -1097,15 +1301,15 @@ useEffect(() => {
                   display: expandLeftNav ? "inline" : "none",
                   opacity: expandLeftNav ? 1 : 0,
                   transition: "opacity 0.3s ease",
-                  color: currentOpenTab === "usecases" && currentPath.includes("/usecases") ? "#FFFFFF" : "#C8C8C8",
+                  color: themeMode === "dark" ? currentOpenTab === "usecases" ? theme.palette.text.primary : lightText : darkText,
                 }}
               >
                 Usecases
               </span>
             </Button>
-	  		</Link>
-	  		<Link to="/workflows" style={hrefStyle}>
             <Button
+              component={Link}
+              to="/workflows"
               onClick={(event) => {
                 setCurrentOpenTab("workflows");
                 localStorage.setItem("lastTabOpenByUser", "workflows");
@@ -1113,19 +1317,19 @@ useEffect(() => {
               style={{
                 width: "100%",
                 height: 35,
-                color: currentOpenTab === "workflows" && currentPath === "/workflows"  ? "#FFFFFF" : "#C8C8C8",
+                color: themeMode === "dark" ? lightText : darkText,
                 justifyContent: "flex-start",
                 textTransform: "none",
-                backgroundColor: currentOpenTab === "workflows" && currentPath === "/workflows" && expandLeftNav? "#2f2f2f": "transparent",
+                backgroundColor: currentOpenTab === "workflows" && expandLeftNav? themeMode === "dark"? darkHoverColor : lightHoverColor : "transparent",
                 marginLeft: 16,
                 fontSize: 18
               }}
               disableRipple={expandLeftNav ? false : true}
               onMouseOver={(event)=>{
-                event.currentTarget.style.backgroundColor = "#2f2f2f";
+                event.currentTarget.style.backgroundColor = themeMode === "dark" ? darkHoverColor : lightHoverColor;
               }}
               onMouseOut={(event)=>{
-                event.currentTarget.style.backgroundColor = currentOpenTab === "workflows" && currentPath === "/workflows" && expandLeftNav? "#2f2f2f": "transparent";
+                event.currentTarget.style.backgroundColor = currentOpenTab === "workflows" && expandLeftNav? themeMode === "dark"? darkHoverColor : lightHoverColor : "transparent";
               }}
             >
               <span style={{display: expandLeftNav ? "inline" : "none", opacity: expandLeftNav ? 1 : 0, transition: "opacity 0.3s ease", position: 'relative', left: !expandLeftNav ? 10: 0, marginRight: 10, fontSize: 18 }}>•</span>{" "}
@@ -1134,15 +1338,15 @@ useEffect(() => {
                   display: expandLeftNav ? "inline" : "none",
                   opacity: expandLeftNav ? 1 : 0,
                   transition: "opacity 0.3s ease",
-                  color: currentOpenTab === "workflows" && currentPath === "/workflows"  ? "#FFFFFF" : "#C8C8C8",
+                  color: themeMode === "dark" ? currentOpenTab === "workflows" ? theme.palette.text.primary : lightText : darkText,
                 }}
               >
                 Workflows
               </span>
             </Button>
-	  		</Link> 
-	  		<Link to="/apps" style={hrefStyle}>
             <Button
+              component={Link}
+              to="/apps"
               onClick={(event) => {
                 setCurrentOpenTab("apps");
                 localStorage.setItem("lastTabOpenByUser", "apps");
@@ -1150,18 +1354,18 @@ useEffect(() => {
               style={{
                 width: "100%",
                 height: 35,
-                color: currentOpenTab === "apps" && currentPath.includes("/apps") ? "#FFFFFF" : "#C8C8C8",
+                color: themeMode === "dark" ? lightText : darkText,
                 justifyContent: "flex-start",
                 textTransform: "none",
-                backgroundColor: currentOpenTab === "apps" && expandLeftNav && currentPath.includes("/apps") ? "#2f2f2f": "transparent",
+                backgroundColor: currentOpenTab === "apps" && expandLeftNav  ? themeMode === "dark"? darkHoverColor : lightHoverColor : "transparent",
                 marginLeft: 16,
                 fontSize: 18
               }}
               onMouseOver={(event)=>{
-                event.currentTarget.style.backgroundColor = "#2f2f2f";
+                event.currentTarget.style.backgroundColor = themeMode === "dark" ? darkHoverColor : lightHoverColor;
               }}
               onMouseOut={(event)=>{
-                event.currentTarget.style.backgroundColor = currentOpenTab === "apps" && expandLeftNav && currentPath.includes("/apps") ? "#2f2f2f": "transparent";
+                event.currentTarget.style.backgroundColor = currentOpenTab === "apps" && expandLeftNav ? themeMode === "dark"? darkHoverColor : lightHoverColor  : "transparent";
               }}
               disableRipple={expandLeftNav ? false : true}
             >
@@ -1171,13 +1375,12 @@ useEffect(() => {
                   display: expandLeftNav ? "inline" : "none",
                   opacity: expandLeftNav ? 1 : 0,
                   transition: "opacity 0.3s ease",
-                  color: currentOpenTab === "apps" && currentPath.includes("/apps") ? "#FFFFFF" : "#C8C8C8",
+                  color: themeMode === "dark" ? currentOpenTab === "apps" ? theme.palette.text.primary : lightText : darkText,
                 }}
               >
                 Apps
               </span>
             </Button>
-	  		</Link> 
           </Box>
           </Collapse>
           <Box
@@ -1188,29 +1391,24 @@ useEffect(() => {
             }}
           >
 	  		<span style={{ display: "inline-block", width: "100%" }}> 
-          <Link
-            to={"#"}
-            style={{
-              ...hrefStyle,
-              pointerEvents: "auto", 
-            }}
-          >
             <Button
+              component={Link}
+              to="/forms"
               onClick={(event) => {
                 setOpenSecurityTab(true);
                 setOpenautomateTab(false);
-                setCurrentOpenTab("security");
-                localStorage.setItem("lastTabOpenByUser", "security");
+                setCurrentOpenTab("forms");
+                localStorage.setItem("lastTabOpenByUser", "forms");
               }}
               style={{
                 ...ButtonStyle,
               }}
               onMouseOver={(event)=>{
-                event.currentTarget.style.backgroundColor = "#2f2f2f";
+                event.currentTarget.style.backgroundColor = themeMode === "dark" ? darkHoverColor : lightHoverColor;
               }}
               onMouseOut={(event)=>{
                 event.currentTarget.style.backgroundColor = currentOpenTab === "security"
-                  ? "#2f2f2f"
+                  ? themeMode === "dark"? darkHoverColor : lightHoverColor
                   : "transparent";
               }}
             >
@@ -1219,7 +1417,7 @@ useEffect(() => {
                   width: 18,
                   height: 18,
                   marginRight: expandLeftNav ? 10 : 0,
-                  color: "inherit", 
+                  color: themeMode === "dark" ? lightText : darkText 
                 }}
               />
               <span
@@ -1227,16 +1425,14 @@ useEffect(() => {
                   display: expandLeftNav ? "inline" : "none",
                   marginRight: "auto",
                   fontSize: 18,
-                  color: currentOpenTab === "security" 
-                      ? "#F1F1F1"
-                      : "#C8C8C8"
+                  color: themeMode === "dark" ? lightText : darkText
                 }}
               >
 	  			Content
               </span>
             </Button>
-          </Link>
         </span>
+
             <IconButton
               onClick={() => {
                 setOpenSecurityTab((prev) => !prev);
@@ -1244,10 +1440,10 @@ useEffect(() => {
               }}
               style={{
                 marginLeft: 0.625,
-                color: "#FFFFFF",
+                color: themeMode === "dark" ? lightText : darkText,
               }}
               onMouseOver={(event)=>{
-                event.currentTarget.style.backgroundColor = "#2f2f2f";
+                event.currentTarget.style.backgroundColor = themeMode === "dark" ? darkHoverColor : lightHoverColor;
               }}
               onMouseOut={(event)=>{
                 event.currentTarget.style.backgroundColor = "transparent";
@@ -1268,257 +1464,327 @@ useEffect(() => {
               )}
             </IconButton>
           </Box>
-          <Collapse in={openSecurityTab} timeout="auto" unmountOnExit>
+
+          <Collapse in={openSecurityTab} timeout="auto" unmountOnExit >
               <Box
                 style={{
-                  maxHeight: openSecurityTab && expandLeftNav ? 135 : 0,
+                  maxHeight: openSecurityTab && expandLeftNav ? 250 : 0,
                   overflow: "hidden",
                   transition: "max-height 0.3s ease, opacity 0.3s ease",
                   display: "flex",
                   flexDirection: "column",
                   paddingLeft: 16,
+                  gap: "2px",
                 }}
                 disableRipple={expandLeftNav ? false : true}
               >
                 <span style={{ display: "inline-block", width: "100%" }}>
-                  <Link
-                    to={"/forms"}
+                <Button
+                  component={Link}
+                  to="/forms"
+                  onClick={() => {
+                    setCurrentOpenTab("forms");
+                    localStorage.setItem("lastTabOpenByUser", "forms");
+                  }}
+                  sx={{
+                    width: "100%",
+                    height: 35,
+                    color: themeMode === "dark" ? lightText : darkText,
+                    justifyContent: "flex-start",
+                    textTransform: "none",
+                    backgroundColor:
+                      currentOpenTab === "forms" || currentPath.includes("/forms")
+                        ? themeMode === "dark" ? darkHoverColor : lightHoverColor
+                        : "transparent",
+                    "&:hover": {
+                      backgroundColor: themeMode === "dark" ? darkHoverColor : lightHoverColor,
+                    },
+                    cursor: "pointer",
+                  }}
+                >
+                  <span style={{ position: "relative", left: !expandLeftNav ? 10 : 0, marginRight: 10, fontSize: 18 }}>
+                    •
+                  </span>
+                  <span
                     style={{
-                      ...hrefStyle,
-                      pointerEvents: "auto", 
+                      display: expandLeftNav ? "inline" : "none",
+                      opacity: expandLeftNav ? 1 : 0,
+                      transition: "opacity 0.3s ease",
+                      fontSize: 18,
+                      color: themeMode === "dark" ? currentOpenTab === "forms" ? theme.palette.text.primary : lightText : darkText,
                     }}
                   >
-                    <Button
-                      onClick={(event) => {
-                        setCurrentOpenTab("detection");
-                        localStorage.setItem("lastTabOpenByUser", "detection");
-                      }}
-                      sx={{
-                        width: "100%",
-                        height: 35,
-                        color: "#C8C8C8", 
-                        justifyContent: "flex-start",
-                        textTransform: "none",
-                        backgroundColor:
-                          currentOpenTab === "detection" && currentPath.includes("/detection")
-                            ? "#2f2f2f"
-                            : "transparent",
-                        "&:hover": {
-                          backgroundColor: "#2f2f2f", 
-                        },
-                        cursor: "pointer", 
-                      }}
-                    >
-                      <span style={{ position: "relative", left: !expandLeftNav ? 10 : 0, marginRight: 10, fontSize: 18 }}>
-                        •
-                      </span>
-                      <span
-                        style={{
-                          display: expandLeftNav ? "inline" : "none",
-                          opacity: expandLeftNav ? 1 : 0,
-                          transition: "opacity 0.3s ease",
-                          fontSize: 18,
-                          color:
-                            currentOpenTab === "detection" && currentPath.includes("/detection")
-                              ? "#F1F1F1"
-                              : "#C8C8C8"
-                        }}
-                      >
-                       	Forms	
-                      </span>
-                    </Button>
-                  </Link>
-                </span>
-				<span style={{ display: "inline-block", width: "100%" }}>
-                  <Link
-                    to={"/admin?tab=datastore"}
-                    style={{
-                      ...hrefStyle,
-                      pointerEvents: "auto", 
-                    }}
-                  >
-                    <Button
-                      onClick={(event) => {
-                        setCurrentOpenTab("response");
-                        localStorage.setItem("lastTabOpenByUser", "response");
-                      }}
-                      sx={{
-                        width: "100%",
-                        height: 35,
-                        color: "#C8C8C8", 
-                        justifyContent: "flex-start",
-                        textTransform: "none",
-                        backgroundColor:
-                          currentOpenTab === "response" && currentPath.includes("/response")
-                            ? "#2f2f2f"
-                            : "transparent",
-                        "&:hover": {
-                          backgroundColor: "#2f2f2f", 
-                        },
-                        cursor: "pointer", 
-                      }}
-                    >
-                      <span style={{ position: "relative", left: !expandLeftNav ? 10 : 0, marginRight: 10, fontSize: 18 }}>
-                        •
-                      </span>
-                      <span
-                        style={{
-                          display: expandLeftNav ? "inline" : "none",
-                          opacity: expandLeftNav ? 1 : 0,
-                          transition: "opacity 0.3s ease",
-                          fontSize: 18,
-                          color:
-                            currentOpenTab === "response" && currentPath.includes("/response")
-                              ? "#F1F1F1"
-                              : "#C8C8C8"
-                        }}
-                      >
-                       	Datastore	
-                      </span>
-                    </Button>
-                  </Link>
+                    Forms
+                  </span>
+                </Button>
                 </span>
+				{userdata && (userdata?.support || userdata?.active_org?.role === "admin") ? (
+          <>
+            <span style={{ display: "inline-block", width: "100%" }}>
+          <Button
+          component={Link}
+          to="/admin?tab=datastore"
+            onClick={(event) => {
+              setCurrentOpenTab("datastore");
+              localStorage.setItem("lastTabOpenByUser", "datastore");
+            }}
+            sx={{
+              width: "100%",
+              height: 35,
+              justifyContent: "flex-start",
+              textTransform: "none",
+              backgroundColor:
+                currentOpenTab === "datastore"
+                  ? themeMode === "dark" ? darkHoverColor : lightHoverColor
+                  : "transparent",
+              "&:hover": {
+                backgroundColor: themeMode === "dark" ? darkHoverColor : lightHoverColor,
+              },
+              cursor: "pointer", 
+            }}
+          >
+            <span style={{ position: "relative", left: !expandLeftNav ? 10 : 0, marginRight: 10, fontSize: 18 }}>
+              •
+            </span>
+            <span
+              style={{
+                display: expandLeftNav ? "inline" : "none",
+                opacity: expandLeftNav ? 1 : 0,
+                transition: "opacity 0.3s ease",
+                fontSize: 18,
+                color: themeMode === "dark" ? currentOpenTab === "datastore" ? theme.palette.text.primary : lightText : darkText
+              }}
+            >
+               Datastore	
+            </span>
+          </Button>
+      </span>
 
-                <span style={{ display: "inline-block", width: "100%" }}>
-                  <Link
-                    to={"/admin?tab=files"}
-                    style={{
-                      ...hrefStyle,
-                      pointerEvents: "auto", 
-                    }}
-                  >
-                    <Button
-                      onClick={(event) => {
-                        setCurrentOpenTab("response");
-                        localStorage.setItem("lastTabOpenByUser", "response");
-                      }}
-                      sx={{
-                        width: "100%",
-                        height: 35,
-                        color: "#C8C8C8", 
-                        justifyContent: "flex-start",
-                        textTransform: "none",
-                        backgroundColor:
-                          currentOpenTab === "response" && currentPath.includes("/response")
-                            ? "#2f2f2f"
-                            : "transparent",
-                        "&:hover": {
-                          backgroundColor: "#2f2f2f", 
-                        },
-                        cursor: "pointer", 
-                      }}
-                    >
-                      <span style={{ position: "relative", left: !expandLeftNav ? 10 : 0, marginRight: 10, fontSize: 18 }}>
-                        •
-                      </span>
-                      <span
-                        style={{
-                          display: expandLeftNav ? "inline" : "none",
-                          opacity: expandLeftNav ? 1 : 0,
-                          transition: "opacity 0.3s ease",
-                          fontSize: 18,
-                          color:
-                            currentOpenTab === "response" && currentPath.includes("/response")
-                              ? "#F1F1F1"
-                              : "#C8C8C8"
-                        }}
-                      >
-                       	Files	
-                      </span>
-                    </Button>
-                  </Link>
-                </span>
+      <span style={{ display: "inline-block", width: "100%" }}>
+          <Button
+            component={Link}
+            to="/admin?tab=files"
+            onClick={(event) => {
+              setCurrentOpenTab("files");
+              localStorage.setItem("lastTabOpenByUser", "files");
+            }}
+            sx={{
+              width: "100%",
+              height: 35,
+              color: themeMode === "dark" ? lightText : darkText, 
+              justifyContent: "flex-start",
+              textTransform: "none",
+              backgroundColor:
+              currentOpenTab === "files"
+              ? themeMode === "dark" ? darkHoverColor : lightHoverColor
+              : "transparent",
+              "&:hover": {
+                backgroundColor: themeMode === "dark" ? darkHoverColor : lightHoverColor,
+              },
+              cursor: "pointer", 
+            }}
+          >
+            <span style={{ position: "relative", left: !expandLeftNav ? 10 : 0, marginRight: 10, fontSize: 18 }}>
+              •
+            </span>
+            <span
+              style={{
+                display: expandLeftNav ? "inline" : "none",
+                opacity: expandLeftNav ? 1 : 0,
+                transition: "opacity 0.3s ease",
+                fontSize: 18,
+                color: themeMode === "dark" ? currentOpenTab === "files" ? theme.palette.text.primary : lightText : darkText
+              }}
+            >
+               Files	
+            </span>
+          </Button>
+      </span>
 
-                <span style={{ display: "inline-block", width: "100%" }}>
-                  <Link
-                    to={"/admin?tab=locations"}
-                    style={{
-                      ...hrefStyle,
-                      pointerEvents: "auto", 
-                    }}
-                  >
-                    <Button
-                      onClick={(event) => {
-                        setCurrentOpenTab("response");
-                        localStorage.setItem("lastTabOpenByUser", "response");
-                      }}
-                      sx={{
-                        width: "100%",
-                        height: 35,
-                        color: "#C8C8C8", 
-                        justifyContent: "flex-start",
-                        textTransform: "none",
-                        backgroundColor:
-                          currentOpenTab === "response" && currentPath.includes("/response")
-                            ? "#2f2f2f"
-                            : "transparent",
-                        "&:hover": {
-                          backgroundColor: "#2f2f2f", 
-                        },
-                        cursor: "pointer", 
-                      }}
-                    >
-                      <span style={{ position: "relative", left: !expandLeftNav ? 10 : 0, marginRight: 10, fontSize: 18 }}>
-                        •
-                      </span>
-                      <span
-                        style={{
-                          display: expandLeftNav ? "inline" : "none",
-                          opacity: expandLeftNav ? 1 : 0,
-                          transition: "opacity 0.3s ease",
-                          fontSize: 18,
-                          color:
-                            currentOpenTab === "response" && currentPath.includes("/response")
-                              ? "#F1F1F1"
-                              : "#C8C8C8"
-                        }}
-                      >
-	  					Hybrid Locations
-                      </span>
-                    </Button>
-                  </Link>
-                </span>
+      		<span style={{ display: "inline-block", width: "100%" }}>
+			  <Button
+			   component={Link}
+			   to="/admin?admin_tab=notifications"
+				onClick={(event) => {
+				  setCurrentOpenTab("notifications");
+				  localStorage.setItem("lastTabOpenByUser", "notifications");
+				}}
+				variant="text"
+				sx={{
+				  width: "100%",
+				  height: 35,
+				  color: themeMode === "dark" ? lightText : darkText, 
+				  justifyContent: "flex-start",
+				  textTransform: "none",
+				  backgroundColor:
+					currentOpenTab === "notifications"
+					  ? themeMode === "dark" ? darkHoverColor : lightHoverColor
+					  : "transparent",
+				  "&:hover": {
+					backgroundColor: themeMode === "dark" ? darkHoverColor : lightHoverColor,
+				  },
+				  cursor: "pointer", 
+				}}
+			  >
+				<span style={{ position: "relative", left: !expandLeftNav ? 10 : 0, marginRight: 10, fontSize: 18 }}>
+				  •
+				</span>
+				<span
+				  style={{
+					display: expandLeftNav ? "inline" : "none",
+					opacity: expandLeftNav ? 1 : 0,
+					transition: "opacity 0.3s ease",
+					fontSize: 18,
+					color: themeMode === "dark" ? currentOpenTab === "notifications" ? theme.palette.text.primary : lightText : darkText,
+				  }}
+				>
+					Notifications
+				</span>
+			  </Button>
+          </span>
+
+      		<span style={{ display: "inline-block", width: "100%" }}>
+			  <Button
+			   component={Link}
+			   to="/admin?tab=locations"
+				onClick={(event) => {
+				  setCurrentOpenTab("locations");
+				  localStorage.setItem("lastTabOpenByUser", "locations");
+				}}
+				variant="text"
+				sx={{
+				  width: "100%",
+				  height: 35,
+				  color: themeMode === "dark" ? lightText : darkText, 
+				  justifyContent: "flex-start",
+				  textTransform: "none",
+				  backgroundColor:
+					currentOpenTab === "locations"
+					  ? themeMode === "dark" ? darkHoverColor : lightHoverColor
+					  : "transparent",
+				  "&:hover": {
+					backgroundColor: themeMode === "dark" ? darkHoverColor : lightHoverColor,
+				  },
+				  cursor: "pointer", 
+				}}
+			  >
+				<span style={{ position: "relative", left: !expandLeftNav ? 10 : 0, marginRight: 10, fontSize: 18 }}>
+				  •
+				</span>
+				<span
+				  style={{
+					display: expandLeftNav ? "inline" : "none",
+					opacity: expandLeftNav ? 1 : 0,
+					transition: "opacity 0.3s ease",
+					fontSize: 18,
+					color: themeMode === "dark" ? currentOpenTab === "locations" ? theme.palette.text.primary : lightText : darkText,
+				  }}
+				>
+					Runtime Locations
+				</span>
+			  </Button>
+          </span>
+
+          <span style={{ display: "inline-block", width: "100%" }}>
+          <Button
+           component={Link}
+           to="/partners"
+            onClick={(event) => {
+              setCurrentOpenTab("partners");
+              localStorage.setItem("lastTabOpenByUser", "partners");
+            }}
+            variant="text"
+            sx={{
+              width: "100%",
+              height: 35,
+              color: themeMode === "dark" ? lightText : darkText, 
+              justifyContent: "flex-start",
+              textTransform: "none",
+              backgroundColor:
+                currentOpenTab === "partners"
+                  ? themeMode === "dark" ? darkHoverColor : lightHoverColor
+                  : "transparent",
+              "&:hover": {
+                backgroundColor: themeMode === "dark" ? darkHoverColor : lightHoverColor,
+              },
+              cursor: "pointer", 
+            }}
+          >
+            <span style={{ position: "relative", left: !expandLeftNav ? 10 : 0, marginRight: 10, fontSize: 18 }}>
+              •
+            </span>
+            <span
+              style={{
+                display: expandLeftNav ? "inline" : "none",
+                opacity: expandLeftNav ? 1 : 0,
+                transition: "opacity 0.3s ease",
+                fontSize: 18,
+                color: themeMode === "dark" ? currentOpenTab === "locations" ? theme.palette.text.primary : lightText : darkText,
+              }}
+            >
+    Partners
+            </span>
+          </Button>
+          </span>
+          </>): null}
               </Box>
             </Collapse>
 
-	  	  <Link to="/docs" style={hrefStyle}>
           <Button
+            component={Link}
+            to={userdata?.org_status?.includes("integration_partner") && userdata?.active_org?.branding?.documentation_link?.length > 0 ? userdata?.active_org?.branding?.documentation_link : "/docs"}
+            target={userdata?.org_status?.includes("integration_partner") && userdata?.active_org?.branding?.documentation_link?.length > 0 ? "_blank" : "_self"}
             onClick={(event) => {
               setCurrentOpenTab("docs");
               localStorage.setItem("lastTabOpenByUser", "docs");
             }}
             style={{
               ...ButtonStyle,
-              marginTop: 8,
-              marginTop: 8,
-              backgroundColor: currentOpenTab === "docs" && currentPath.includes("/docs") ? "#2f2f2f": "transparent",
+              marginTop: 5,
+              backgroundColor: currentOpenTab === "docs" ? themeMode === 'dark' ? darkHoverColor : lightHoverColor : "transparent",
             }}
             onMouseOver={(event)=>{
-              event.currentTarget.style.backgroundColor = "#2f2f2f";
+              event.currentTarget.style.backgroundColor = themeMode === "dark" ? darkHoverColor : lightHoverColor;
             }}
             onMouseOut={(event)=>{
-              event.currentTarget.style.backgroundColor = currentOpenTab === "docs" && currentPath.includes("/docs") ? "#2f2f2f": "transparent";
+              event.currentTarget.style.backgroundColor = currentOpenTab === "docs" ? themeMode === 'dark' ? darkHoverColor : lightHoverColor : "transparent";
             }}
           >
-            <img
-              src={documentationIcon}
-              style={{ width: 16, height: 16, marginRight: expandLeftNav ? 10 : 0 }}
-              alt="Documentation Icon"
-            />
+            <svg
+                width="18"
+                height="18"
+                viewBox="0 0 14 17"
+                fill="none"
+                xmlns="http://www.w3.org/2000/svg"
+                style={{ marginRight: expandLeftNav ? 10 : 0 }}
+              >
+                <path
+                  d="M7.75 1H2.5C2.10218 1 1.72064 1.15804 1.43934 1.43934C1.15804 1.72064 1 2.10218 1 2.5V14.5C1 14.8978 1.15804 15.2794 1.43934 15.5607C1.72064 15.842 2.10218 16 2.5 16H11.5C11.8978 16 12.2794 15.842 12.5607 15.5607C12.842 15.2794 13 14.8978 13 14.5V6.25L7.75 1Z"
+                  stroke={themeMode === "dark" ? lightText : darkText} 
+                  strokeLinecap="round"
+                  strokeLinejoin="round"
+                />
+                <path
+                  d="M7.75 1V6.25H13"
+                  stroke={themeMode === "dark" ? lightText : darkText} 
+                  strokeLinecap="round"
+                  strokeLinejoin="round"
+                />
+              </svg>
             <span
               style={{
                 display: expandLeftNav ? "inline" : "none",
-                color: currentOpenTab === "docs" && currentPath.includes("/docs") ? "#F1F1F1" : "#C8C8C8",
+                color: themeMode === "dark" ? currentOpenTab === "docs" ? theme.palette.text.primary : lightText : darkText
               }}
             >
               Documentation
             </span>
           </Button>
-	  	  </Link>
 
 
-	  	  <Link to={isCloud ? "/admin?admin_tab=billingstats" : "/admin?admin_tab=locations"} style={hrefStyle}>
           <Button
+            component={Link}
+            to={isCloud ? "/admin" : "/admin"}
             onClick={(event) => {
               setCurrentOpenTab("admin");
               localStorage.setItem("lastTabOpenByUser", "admin");
@@ -1526,27 +1792,25 @@ useEffect(() => {
             style={{
               ...ButtonStyle,
               marginTop: 8,
-              marginTop: 8,
-              backgroundColor: currentOpenTab === "docs" && currentPath.includes("/admin") ? "#2f2f2f": "transparent",
+              backgroundColor: currentOpenTab === "admin" ? themeMode === 'dark' ? darkHoverColor : lightHoverColor : "transparent",
             }}
             onMouseOver={(event)=>{
-              event.currentTarget.style.backgroundColor = "#2f2f2f";
+              event.currentTarget.style.backgroundColor = themeMode === "dark" ? darkHoverColor : lightHoverColor;
             }}
             onMouseOut={(event)=>{
-              event.currentTarget.style.backgroundColor = currentOpenTab === "docs" && currentPath.includes("/admin") ? "#2f2f2f": "transparent";
+              event.currentTarget.style.backgroundColor = currentOpenTab === "admin" ? themeMode === "dark" ? darkHoverColor : lightHoverColor : "transparent";
             }}
           >
-			<BusinessIcon style={{ width: 16, height: 16, marginRight: expandLeftNav ? 10 : 0, color: "rgba(255,255,255,0.5)", }} />
+			<BusinessIcon style={{ width: 16, height: 16, marginRight: expandLeftNav ? 10 : 0, color: themeMode === 'dark' ? lightText : darkText }} />
             <span
               style={{
                 display: expandLeftNav ? "inline" : "none",
-                color: currentOpenTab === "admin" && currentPath.includes("/admin") ? "#F1F1F1" : "#C8C8C8",
+                color: themeMode === "dark" ? currentOpenTab === "admin" ? theme.palette.text.primary : lightText : darkText
               }}
             >
 	  		  Admin
             </span>
           </Button>
-	  	  </Link>
         </Box>
 
         {recentworkflows?.length > 0 ? 
@@ -1569,7 +1833,6 @@ useEffect(() => {
         >
           <Typography
             style={{
-              color: "#CDCDCD",
               fontSize: 18,
               padding: "8px 8px",
               marginBottom: 10,
@@ -1605,6 +1868,20 @@ useEffect(() => {
           marginLeft: 5,
         }}
       >
+	  	
+	  	{userdata?.licensed !== true && !userdata?.org_status?.includes("integration_partner") && expandLeftNav &&
+      <div style={{display: "flex", flexDirection: "column", alignItems: "center", justifyContent: "center", }}>
+      <Button
+	  		variant="outlined"
+	  		style={{marginBottom: 15, borderWidth: 2, }}
+	  		onClick={() => {
+				window.open("https://shuffler.io/contact?category=book_a_demo", "_blank")
+			}}
+	  	>
+	  		Book a Demo
+      </Button>
+      </div>
+		}
         <Box ref={autocompleteRef}>
           <Autocomplete
             disablePortal
@@ -1635,10 +1912,10 @@ useEffect(() => {
                   marginLeft: option.margin_left ? option.margin_left : 0,
                 }}
                 onMouseOver={(e) => {
-                  e.currentTarget.style.backgroundColor = "#444444";
+                  e.currentTarget.style.backgroundColor = theme.palette.hoverColor;
                 }}
                 onMouseOut={(e) => {
-                  e.currentTarget.style.backgroundColor = option.name === selectedOrg ? "#696969" : "transparent";
+                  e.currentTarget.style.backgroundColor = option.name === selectedOrg ? theme.palette.hoverColor : "transparent";
                 }}
                 onClick={(e) => {
                     if (option.id !== userdata?.active_org?.id) {
@@ -1654,7 +1931,7 @@ useEffect(() => {
                       isCloud ? (
                           <span
                       style={{
-                        color: "#bbb",
+                        color: theme.palette.text.primary,
                         fontSize: "16px",
                         marginRight: 12,
                         display: "flex",
@@ -1679,7 +1956,7 @@ useEffect(() => {
                     />
                     <span
                       style={{
-                        color: "#fff",
+                        color: theme.palette.text.primary,
                         fontSize: "16px",
                       }}
                     >
@@ -1753,7 +2030,7 @@ useEffect(() => {
                       display: "flex",
                       width: 48,
                       height: 51,
-                      border: "1px solid #494949",
+                      border: theme.palette.defaultBorder,
                       borderRadius: 8,
                       justifyContent: "center",
                       alignItems: "center",
@@ -1768,6 +2045,7 @@ useEffect(() => {
                         fontSize: "24px",
                         opacity: expandLeftNav ? 0 : 1,
                         transition: "opacity 0.3s ease",
+                        color: themeMode === "dark" ? lightText : darkText,
                       }}
                     />
                   </Box>
@@ -1783,112 +2061,106 @@ useEffect(() => {
             width: "100%",
             marginTop: 16,
             gap: 10,
-            justifyContent: "center",
+            justifyContent: "space-between",
             alignItems: "center",
             marginBottom: expandLeftNav ? 0 : 10,
             height: 55,
             borderRadius: 8,
           }}
-          onMouseOver ={(event)=>{event.currentTarget.style.backgroundColor = "#2f2f2f";setHoverOnAvatar(true)}}
-          onMouseLeave ={(event)=>{event.currentTarget.style.backgroundColor = "transparent";setHoverOnAvatar(false)}}
+          onMouseOver={(event) => {
+            event.currentTarget.style.backgroundColor = themeMode === "dark" ? darkHoverColor : lightHoverColor;
+            setHoverOnAvatar(true);
+          }}
+          onMouseLeave={(event) => {
+            event.currentTarget.style.backgroundColor = "transparent";
+            setHoverOnAvatar(false);
+          }}
         >
           {expandLeftNav ? (
             <>
               <Button
-                style={{
-                  width: "100%",
-                  height: 24,
-                  display: "flex",
-                  cursor: "pointer",
-                  backgroundColor: "transparent",
-                  "&:hover": {
-                    backgroundColor: "transparent",
-                  },
-                  transition: "opacity 0.3s ease",
-                  textTransform: "none",
-                  fontSize: 18,
-                }}
-                disableElevation
-                disableRipple
                 onClick={(event) => {
                   if (anchorElAvatar) {
                     setAnchorElAvatar(null);
                   } else {
                     setAnchorElAvatar(event.currentTarget);
                   }
-                  setOpenAutocomplete(false)
+                  setOpenAutocomplete(false);
                 }}
+                style={{
+                  display: "flex",
+                  alignItems: "center",
+                  backgroundColor: "transparent",
+                  cursor: "pointer",
+                  padding: 0,
+                  minWidth: 0,
+                  gap: 10,
+                  marginLeft: 8,
+                }}
+                disableElevation
+                disableRipple
               >
                 <Avatar
                   sx={{
                     width: 48,
                     height: 48,
-                    backgroundColor: "#2F2F2F",
-                    color: "#FFFFFF",
+                    backgroundColor: themeMode === 'dark' ? darkHoverColor : lightHoverColor,
+                    color: themeMode === 'dark' ? lightText : darkText,
                     fontSize: 30,
                     fontStyle: "bold",
-                    border: hoverOnAvatar ? "1px solid #494949" : "none",
+                    border: hoverOnAvatar ? (themeMode === 'dark' ? "1px solid #494949" : '1px solid #5A5A5A') : "none",
                   }}
                 >
                   {userdata?.username?.substring(0, 1).toUpperCase()}
                 </Avatar>
                 <Typography
                   style={{
-                    color: "#CDCDCD",
-                    margin: "0 5px",
+                    color: themeMode === "dark" ? lightText : darkText,
                     fontSize: 18,
                     whiteSpace: "nowrap",
                     overflow: "hidden",
                     textOverflow: "ellipsis",
                     maxWidth: 150,
-                    textAlign: "center",
-                    marginLeft: 10,
-
                   }}
                 >
                   {userdata?.username}
                 </Typography>
-                {avatarMenu}
               </Button>
+              {avatarMenu}
             </>
           ) : (
-            <>
-              <Button
-                onClick={(event) => {
-                  if (anchorElAvatar) {
-                    setAnchorElAvatar(null);
-                  } else {
-                    setAnchorElAvatar(event.currentTarget);
-                  }
+            <Button
+              onClick={(event) => {
+                if (anchorElAvatar) {
+                  setAnchorElAvatar(null);
+                } else {
+                  setAnchorElAvatar(event.currentTarget);
+                }
+              }}
+              style={{
+                display: "flex",
+                alignItems: "center",
+                flexDirection: 'column',
+                cursor: "pointer",
+                backgroundColor: "transparent",
+                padding: 5,
+                border: hoverOnAvatar ? theme.palette.defaultBorder: "none",
+              }}
+              disableElevation
+              disableRipple
+            >
+              <Avatar
+                sx={{
+                  width: 48,
+                  height: 48,
+                  backgroundColor: themeMode === "dark" ? darkHoverColor : lightHoverColor,
+                  color: theme.palette.text.primary,
+                  fontSize: 30,
                 }}
-                style={{
-                  display: "flex",
-                  alignItems: "center",
-                  flexDirection: 'column',
-                  cursor: "pointer",
-                  backgroundColor: "transparent",
-                  padding: 5,
-                  "&:hover": {
-                    backgroundColor: "transparent",
-                  },
-                  border: hoverOnAvatar ? "1px solid #494949" : "none",
-                }}
-                disableElevation
-                disableRipple
               >
-                <Avatar
-                  sx={{
-                    width: 48,
-                    height: 48,
-                    backgroundColor: "#2F2F2F",
-                    color: "#FFFFFF",
-                    fontSize: 30,
-                  }}
-                >
-                  {userdata?.username?.substring(0, 1).toUpperCase()}
-                </Avatar>
-              </Button>
-            </>
+                {userdata?.username?.substring(0, 1).toUpperCase()}
+              </Avatar>
+            </Button>
           )}
         </Box>
       </Box>
@@ -1898,31 +2170,34 @@ useEffect(() => {
 };
 
 export default LeftSideBar;
-
-
-const ModalView = memo(({searchBarModalOpen, setSearchBarModalOpen, globalUrl, serverside, userdata}) => {
+const ModalView = memo(({searchBarModalOpen, setSearchBarModalOpen, globalUrl, serverside, userdata, isDocSearchModalOpen}) => {
+  const {themeMode}  = useContext(Context);
+  const theme = getTheme(themeMode);
   return (
     (
       <Dialog
-        open={searchBarModalOpen}
+        open={searchBarModalOpen && !isDocSearchModalOpen}
         onClose={() => {
           setSearchBarModalOpen(false);
         }}
         PaperProps={{
-          style: {
-            color: "white",
-            minWidth: 750,
-            height: 785,
-            borderRadius: 16,
+          sx: {
+            color: theme.palette.text.primary,
+            minWidth: "750px",
+            height: "785px",
+            borderRadius: "16px",
             border: "1px solid var(--Container-Stroke, #494949)",
-            background: "var(--Container, #000000)",
+            background: theme?.palette?.DialogStyle?.backgroundColor,
             boxShadow: "0px 16px 24px 8px rgba(0, 0, 0, 0.25)",
             zIndex: 13000,
-                  paddingTop: 20,
+            paddingTop: "20px",
+            '& .MuiDialogContent-root': {
+              backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+            },
           },
         }}
       >
-        <DialogContent className='dialog-content' style={{}}>
+        <DialogContent className='dialog-content' style={{backgroundColor: theme.palette.DialogStyle.backgroundColor}}>
           <SearchBox globalUrl={globalUrl} serverside={serverside} userdata={userdata} />
         </DialogContent>
         <Divider style={{overflow: "hidden"}}/>
diff --git a/frontend/src/components/LicencePopup.jsx b/frontend/src/components/LicencePopup.jsx
index c29095e4..0267267d 100644
--- a/frontend/src/components/LicencePopup.jsx
+++ b/frontend/src/components/LicencePopup.jsx
@@ -1,7 +1,7 @@
-import React, { useState, useEffect } from "react";
+import React, { useState, useEffect, useContext } from "react";
 import ReactGA from 'react-ga4';
 
-import theme from "../theme.jsx";
+import {getTheme} from "../theme.jsx";
 import countries from "../components/Countries.jsx";
 import {
     Box,
@@ -25,12 +25,14 @@ import {
     CardContent,
     ButtonGroup,
     DialogContentText,
+    ToggleButton,
+    ToggleButtonGroup,
 } from "@mui/material";
 
 import { useNavigate, Link } from "react-router-dom";
 import { Autocomplete } from "@mui/material";
 import { toast } from "react-toastify"
-
+import { Context } from "../context/ContextApi.jsx";
 import {
     Cached as CachedIcon,
     ContentCopy as ContentCopyIcon,
@@ -46,7 +48,7 @@ import { handlePayasyougo } from "../views/HandlePaymentNew.jsx"
 import Billing from "./Billing.jsx";
 
 const LicencePopup = (props) => {
-    const { globalUrl, userdata, serverside, billingInfo, stripeKey, setModalOpen, isLoggedIn, isMobile, selectedOrganization, isCloud } = props;
+    const { globalUrl, userdata, serverside, billingInfo, stripeKey, setModalOpen, isScale, isLoggedIn, isMobile, selectedOrganization, isCloud, features, licensePopup = false } = props;
     //const alert = useAlert();
     let navigate = useNavigate();
     const [selectedDealModalOpen, setSelectedDealModalOpen] = React.useState(false);
@@ -72,6 +74,9 @@ const LicencePopup = (props) => {
     const [errorMessage, setErrorMessage] = useState("")
     const [highlight, setHighlight] = useState(false)
 
+    const { themeMode } = useContext(Context);
+    const theme = getTheme(themeMode);
+
     // Cloud
     const [calculatedApps, setCalculatedApps] = useState(600)
     const [calculatedCost, setCalculatedCost] = useState("$600")
@@ -87,29 +92,235 @@ const LicencePopup = (props) => {
     const [calculatedCores, setCalculatedCores] = useState('600')
     const [onpremSelectedValue, setOnpremSelectedValue] = useState(8)
 
-    const payasyougo = "Pay as you go"
+    const [billingCycle, setBillingCycle] = useState("annual")
+    const [scaleValue, setScaleValue] = useState(
+        new URLSearchParams(window.location.search).get("app_runs") || 
+        (userdata?.app_execution_limit / 1000) + 50 || 10
+    );
+
+    useEffect(() => {
+        setScaleValue((userdata?.app_execution_limit / 1000) + 50 || 10)
+    }, [userdata])
+
+    const getPrice = (basePrice) => {
+        return Math.round(billingCycle === "annual" ? basePrice * 0.9 : basePrice); // 10% discount for annual
+    };
+    
     const stripe = typeof window === 'undefined' || window.location === undefined ? "" : props.stripeKey === undefined ? "" : window.Stripe ? window.Stripe(props.stripeKey) : ""
 
+  // Handle slider change for Scale plan
+    const handleScaleChange = (event, newValue) => {
+        setScaleValue(newValue);
+
+        // Add app runs to URL query params
+        const urlSearchParams = new URLSearchParams(window.location.search);
+        urlSearchParams.set("app_runs", newValue); // Convert to actual app runs (k to actual number)
+        const newUrl = `${window.location.pathname}?${urlSearchParams.toString()}`;
+        window.history.replaceState({}, "", newUrl);
+    };
+
+    // Handle billing cycle change
+    const handleBillingCycleChange = (event, newValue) => {
+        if (newValue !== null) {
+            setBillingCycle(newValue);
+
+      if(isCloud){
+        ReactGA.event({
+          category: 'Billingpage',
+          action: 'Billing Cycle Changed',
+          label: `${billingCycle} -> ${newValue}`,
+        });
+      }
+
+      // Add billing cycle to URL query params
+      const urlSearchParams = new URLSearchParams(window.location.search);
+      urlSearchParams.set("billing_cycle", newValue);
+      const newUrl = `${
+        window.location.pathname
+      }?${urlSearchParams.toString()}`;
+      window.history.replaceState({}, "", newUrl);
+        }
+    };
+
+    const payasyougo = "Pay as you go"
+   
     const paperStyle = {
         padding: 20,
+        paddingBottom: 30,
         borderRadius: theme.palette?.borderRadius,
-        height: "100%"
+        height: "100%",
+        
     }
 
+    const userInScalePlan = userdata?.app_execution_limit > 2000
+    const appRuns = (userdata?.app_execution_limit / 1000) + "K App Runs"
+
+    // Add this function to format the limit value
+    const formatLimit = (limit) => {
+        if (limit === null || limit === undefined || limit === 0) return "Unlimited";
+        if (typeof limit === "string" && limit.toLowerCase() === "unlimited") return "Unlimited";
+        if (typeof limit === "number") return limit.toLocaleString();
+        return limit.toString();
+    };
+
+    // Add this function to format the feature text with proper unlimited handling
+    const formatFeatureText = (feature, limit) => {
+        if (!feature) return "";
+
+        // Dynamic features that use limits
+        const featureMapping = {
+            app_executions: (limit) => {
+                const formattedLimit = formatLimit(limit);
+                return `Includes ${formattedLimit} App Executions per month`;
+            },
+            multi_env: (limit) => {
+                const formattedLimit = formatLimit(limit);
+                return formattedLimit === "Unlimited" 
+                    ? "Unlimited Environments"
+                    : `${formattedLimit} Environment${parseInt(formattedLimit) > 1 ? 's' : ''}`;
+            },
+            multi_tenant: (limit) => {
+                const formattedLimit = formatLimit(limit);
+                return formattedLimit === "Unlimited" 
+                    ? "Unlimited Tenants"
+                    : `${formattedLimit} Tenant${parseInt(formattedLimit) > 1 ? 's' : ''}`;
+            },
+            multi_region: (limit) => {
+                const formattedLimit = formatLimit(limit);
+                return formattedLimit === "Unlimited" 
+                    ? "Unlimited Regions"
+                    : `${formattedLimit} Region${parseInt(formattedLimit) > 1 ? 's' : ''}`;
+            },
+            webhook: (limit) => {
+                const formattedLimit = formatLimit(limit);
+                return formattedLimit === "Unlimited" 
+                    ? "Unlimited Webhooks"
+                    : `${formattedLimit} Webhook${parseInt(formattedLimit) > 1 ? 's' : ''}`;
+            },
+            schedules: (limit) => {
+                const formattedLimit = formatLimit(limit);
+                return formattedLimit === "Unlimited" 
+                    ? "Unlimited Schedules"
+                    : `${formattedLimit} Schedule${parseInt(formattedLimit) > 1 ? 's' : ''}`;
+            },
+            user_input: (limit) => {
+                const formattedLimit = formatLimit(limit);
+                return formattedLimit === "Unlimited" 
+                    ? "Unlimited User Inputs"
+                    : `${formattedLimit} User Input${parseInt(formattedLimit) > 1 ? 's' : ''}`;
+            },
+            send_mail: (limit) => {
+                const formattedLimit = formatLimit(limit);
+                return formattedLimit === "Unlimited" 
+                    ? "Unlimited Emails per month"
+                    : `${formattedLimit} Email${parseInt(formattedLimit) > 1 ? 's' : ''} per month`;
+            },
+            send_sms: (limit) => {
+                const formattedLimit = formatLimit(limit);
+                return formattedLimit === "Unlimited" 
+                    ? "Unlimited SMS per month"
+                    : `${formattedLimit} SMS${parseInt(formattedLimit) > 1 ? 's' : ''} per month`;
+            },
+            email_trigger: (limit) => {
+                const formattedLimit = formatLimit(limit);
+                return formattedLimit === "Unlimited" 
+                    ? "Unlimited Email Triggers"
+                    : `${formattedLimit} Email Trigger${parseInt(formattedLimit) > 1 ? 's' : ''}`;
+            },
+            notifications: (limit) => {
+                const formattedLimit = formatLimit(limit);
+                return formattedLimit === "Unlimited" 
+                    ? "Unlimited Notifications"
+                    : `${formattedLimit} Notification${parseInt(formattedLimit) > 1 ? 's' : ''}`;
+            },
+            workflows: (limit) => {
+                const formattedLimit = formatLimit(limit);
+                return formattedLimit === "Unlimited" 
+                    ? "Unlimited Workflows"
+                    : `${formattedLimit} Workflow${parseInt(formattedLimit) > 1 ? 's' : ''}`;
+            },
+            autocomplete: (limit) => {
+                const formattedLimit = formatLimit(limit);
+                return formattedLimit === "Unlimited" 
+                    ? "Unlimited Autocomplete"
+                    : `${formattedLimit} Autocomplete${parseInt(formattedLimit) > 1 ? 's' : ''}`;
+            },
+            workflow_executions: (limit) => {
+                const formattedLimit = formatLimit(limit);
+                return formattedLimit === "Unlimited" 
+                    ? "Unlimited Workflow Executions"
+                    : `${formattedLimit} Workflow Execution${parseInt(formattedLimit) > 1 ? 's' : ''}`;
+            },
+            authentication: (limit) => {
+                const formattedLimit = formatLimit(limit);
+                return formattedLimit === "Unlimited" 
+                    ? "Unlimited Authentication"
+                    : `${formattedLimit} Authentication${parseInt(formattedLimit) > 1 ? 's' : ''}`;
+            },
+            shuffle_gpt: (limit) => {
+                const formattedLimit = formatLimit(limit);
+                return formattedLimit === "Unlimited" 
+                    ? "Unlimited Shuffle GPT"
+                    : `${formattedLimit} Shuffle GPT${parseInt(formattedLimit) > 1 ? 's' : ''}`;
+            },
+        };
+
+        try {
+            // Check if we have a mapping for this feature
+            const formatter = featureMapping[feature];
+            if (formatter) {
+                return formatter(limit);
+            }
+            
+            // Default format for unknown features
+            const formattedLimit = formatLimit(limit);
+            return `${feature}: ${formattedLimit}`;
+        } catch (error) {
+            console.warn(`Error formatting feature ${feature}:`, error);
+            return `${feature}: ${formatLimit(limit)}`;
+        }
+    };
+
+
+    // Update the subscription features section
     billingInfo.subscription = {
         "active": true,
-        "name": "Pay as you go",
-        "price": typecost_single,
-        "currency": "USD",
-        "currency_text": "$",
-        "interval": "app run / month",
-        "description": "Pay as you go",
-        "features": [
-            "Basic Support",
-            "Includes 10.000 app run/month for free. ",
-            "Pay for what you use with no minimum commitment and cancel anytime."
+        "name": appRuns,
+        "price": userInScalePlan ? "" : "Free",
+        "currency": userInScalePlan ? "" : "Free",
+        "currency_text": "",
+        "interval": "",
+        "description": "",
+        "features": userInScalePlan ?  [
+            // Add static features first
+            ...(userInScalePlan ? ["Standard Email Support"] : []),
+            
+            // Then add dynamic features from the database
+            ...Object.entries(features || {})
+                .filter(([_, featureData]) => {
+                    return featureData && 
+                           typeof featureData === 'object' && 
+                           featureData.active === true;
+                })
+                .map(([featureName, featureData]) => {
+                    try {
+                        return formatFeatureText(featureName, featureData?.limit);
+                    } catch (error) {
+                        console.warn(`Error processing feature ${featureName}:`, error);
+                        return "";
+                    }
+                })
+                .filter(feature => 
+                    feature.length > 0 && 
+                    !feature.toLowerCase().includes('unlimited') // Add this filter to remove "unlimited" features
+                )
+        ] : [
+            userInScalePlan ? "Standard Email Support" : "Community Support",
+            userInScalePlan ? `Includes ${appRuns}. ` : `Includes ${appRuns} for free. `,
+            userInScalePlan ? "Multi-Tenant & Multi-Region" : "Get all 2500+ Apps and 10 Workflows",
+            userInScalePlan ? "All features included in the Scale plan" : "Invite up to 5 users"
         ],
-        "limit": 10000,
+        "limit": userInScalePlan ? userdata?.app_execution_limit : 10000,
     }
 
     const sendSignatureRequest = (subscription) => {
@@ -143,6 +354,15 @@ const LicencePopup = (props) => {
             })
     }
 
+    // Create a function to remove duplicates and merge features
+    const mergeUniqueFeatures = (existingFeatures, newFeatures) => {
+        // Convert arrays to Sets to remove duplicates
+        const uniqueFeatures = new Set([
+            ...(existingFeatures || []),
+            ...(newFeatures || [])
+        ]);
+        return Array.from(uniqueFeatures);
+    };
 
     const SubscriptionObject = (props) => {
         const { globalUrl, index, userdata, serverside, billingInfo, stripeKey, selectedOrganization, handleGetOrg, subscription, highlight, } = props;
@@ -151,36 +371,50 @@ const LicencePopup = (props) => {
         const [tosChecked, setTosChecked] = React.useState(subscription.eula_signed)
         const [hovered, setHovered] = React.useState(false)
         const [newBillingEmail, setNewBillingEmail] = useState('');
-        var top_text = "Base Cloud Access"
-        if (subscription.limit === undefined && subscription.level === undefined || subscription.level === null || subscription.level === 0) {
-            subscription.name = "Enterprise"
-            subscription.currency_text = "$"
-            subscription.price = subscription.level * 180
-            subscription.limit = subscription.level * 100000
-            subscription.interval = subscription.recurrence
-            subscription.features = [
-                "Includes " + subscription.limit + " app runs/month. ",
-                "Multi-Tenancy and Region-Selection",
-                "And all other features from /pricing",
-            ]
-        }
+        var top_text = userInScalePlan ? "Scale Plan" : "Starter Plan"
+        // if (subscription.limit === undefined && subscription.level === undefined || subscription.level === null || subscription.level === 0) {
+        //     subscription.name = "Enterprise"
+        //     subscription.currency_text = "$"
+        //     subscription.price = subscription.level * 180
+        //     subscription.limit = subscription.level * 100000
+        //     subscription.interval = subscription.recurrence
+        //     subscription.features = [
+        //         "Includes " + subscription.limit + " app runs/month. ",
+        //         "Multi-Tenancy and Region-Selection",
+        //         "And all other features from /pricing",
+        //     ]
+        // }
+
+        // if (userdata?.app_execution_limit >= 300000) {
+        //     subscription.name = "Enterprise"
+        //     subscription.currency_text = "$"
+        //     subscription.price = typecost_single
+        //     subscription.limit = userdata?.app_execution_limit
+        //     subscription.interval = "app run / month"
+        //     subscription.features = [
+        //         "Includes " + (userdata?.app_execution_limit/1000) + "K app runs/month. ",
+        //         "Multi-Tenancy and Region-Selection",
+        //         "And all other features from /pricing",
+        //     ]
+        // }
+
 
         var newPaperstyle = JSON.parse(JSON.stringify(paperStyle))
         if (subscription.name === "Enterprise" && subscription.active === true) {
-            top_text = "Current Plan"
+            top_text = "Enterprise Plan"
 
-            newPaperstyle.border = "1px solid #f85a3e"
+            // newPaperstyle.border = "1px solid #f85a3e"
         }
 
         var showSupport = false
         if (subscription.name.includes("default")) {
             top_text = "Custom Contract"
-            newPaperstyle.border = "1px solid #f85a3e"
+            // newPaperstyle.border = "1px solid #f85a3e"
             showSupport = true
         }
 
         if (subscription.name.includes("App Run Units")) {
-            top_text = "Cloud Access"
+            top_text = "Scale Plan"
             showSupport = true
         }
 
@@ -250,14 +484,31 @@ const LicencePopup = (props) => {
                 });
         }
 
+
+        const extraFeatures = Object.entries(features || {})
+            .filter(([_, featureData]) => {
+                return featureData && 
+                typeof featureData === 'object' && 
+                featureData.active === true;
+            })
+            .map(([featureName, featureData]) => {
+                return formatFeatureText(featureName, featureData?.limit);
+            })
+            .filter(feature => 
+                feature.length > 0 && 
+                !feature.toLowerCase().includes('unlimited') // Add this filter to remove "unlimited" features
+            )
+
+        subscription.features = mergeUniqueFeatures(subscription.features, extraFeatures);
+
         return (
             <Tooltip
                 style={{ borderRadius: theme.palette?.borderRadius, }}
                 placement="bottom"
             >
-                <div style={{}}>
-                    <Paper
-                        style={newPaperstyle}
+                <div style={{ backgroundColor: theme.palette.cardBackgroundColor, border: "1.2px solid #ff8544", borderRadius: theme.palette?.borderRadius}}>
+                    <div
+                        style={{ backgroundColor: theme.palette.cardBackgroundColor, ...newPaperstyle }}
                     // onMouseEnter={() => setHovered(true)}
                     // onMouseLeave={() => setHovered(false)}
                     >
@@ -343,9 +594,13 @@ const LicencePopup = (props) => {
                                 </div>
                             </DialogContent>
                         </Dialog>
-                        <Button style={{ backgroundColor: '#2F2F2F', color: "white", textTransform: "capitalize", borderRadius: 200, boxShadow: 'none', width: 144, height: 40 }}>Current Plan</Button>
+                        {subscription.active === true && !isScale &&  <Button style={{ textTransform: "capitalize", borderRadius: 200, boxShadow: 'none', fontSize: 13 }}
+                            variant="contained"
+                            color="secondary">
+                            Current Plan
+                        </Button>}
                         <div style={{ display: "flex" }}>
-                            {top_text === "Base Cloud Access" && userdata.has_card_available === true ?
+                            {top_text === "Base Cloud Access" && userdata.has_card_available === true && !isScale ?
                                 <Chip
                                     style={{
                                         backgroundColor: "#f86a3e",
@@ -367,7 +622,7 @@ const LicencePopup = (props) => {
                                     color="primary"
                                 />
                                 : null}
-                            <Typography variant="h6" style={{ marginTop: 10, marginBottom: 10, flex: 5, whiteSpace: 'nowrap' }}>
+                            <Typography variant="h6" style={{ marginTop: 25, marginBottom: 10, flex: 5, whiteSpace: 'nowrap' }}>
                                 {top_text}
                             </Typography>
 
@@ -382,7 +637,7 @@ const LicencePopup = (props) => {
                                     }}
                                 />
                                 : null}
-                            {isCloud && highlight === true && top_text !== "Base Cloud Access" ?
+                            {isCloud && highlight === true && top_text !== "Starter Plan" ?
                                 <Tooltip
                                     title="Sign EULA"
                                     placement="top"
@@ -412,7 +667,7 @@ const LicencePopup = (props) => {
                                         {subscription.currency_text}{subscription.price}
                                     </Typography>
                                     <Typography variant="body1" color="textSecondary" style={{ marginLeft: 10, marginTop: 15, marginBottom: 10 }}>
-                                        / {subscription.interval}
+                                        {subscription.interval.length > 0 ? `/ ${subscription.interval}` : ""}
                                     </Typography>
                                 </div>
                                 : null}
@@ -503,20 +758,17 @@ const LicencePopup = (props) => {
                                     : null}
                             </ul>
                             <Typography variant="body2" color="textSecondary" style={{ marginTop: 20, marginBottom: 10 }}>
-							{subscription.name.includes("Scale") ?
-								""
-								:
-
-								userdata.has_card_available === true ?
-									"While you have a card attached to your account, Shuffle will no longer prevent workflows from running. Billing will occur at the start of each month."
-									:
+							{
 									isCloud ?
-										`You are not subscribed to any plan and are using the free plan with max 10,000 app runs per month. Upgrade to deactivate this limit.`
+                                        userdata?.app_execution_limit && userdata?.app_execution_limit !== 10000 ?
+                                            "You have already subscribed to the Scale plan, which includes " + (userdata?.app_execution_limit/1000) + "K app runs/month. You can increase the limit by upgrading current plan. Contact support@shuffler.io for more information." :
+                                            `You are using free Starter plan with max ${userdata?.app_execution_limit === 10000 ? "10,000" : "2,000"} runs per month. Upgrade to increase this limit.`
+
 										:
 										`You are not subscribed to any plan and are using the free, open source plan. This plan has no enforced limits, but scale issues may occur due to CPU congestion.`
 							}
 						</Typography>
-							{isCloud && (userdata.has_card_available === true || selectedOrganization?.Billing?.Email?.length > 0 )? 
+							{/* {isCloud && (userdata.has_card_available === true || selectedOrganization?.Billing?.Email?.length > 0 )? 
                             	<div>
                                     <span>Billing email: {BillingEmail}</span>
                                     <Button
@@ -594,53 +846,46 @@ const LicencePopup = (props) => {
 								</DialogActions>
 							</Dialog>
                                 </div>
-							: null}
+							: null} */}
                         </div>
                         {isCloud ? (
                             <Button
 							fullWidth
-							disabled={false}
 							color="primary"
+                            variant="contained"
 							style={{
-								marginTop: !userdata.has_card_available ? 20 : 10,
+								marginTop: !userdata.has_card_available ? 25 : 10,
 								borderRadius: 4,
 								height: 40,
 								fontSize: 16,
-								color: "#1a1a1a",
-								backgroundColor: "#ff8544",
 								// backgroundImage: userdata.has_card_available ? null : "linear-gradient(to right, #f86a3e, #f34079)",
 								textTransform: "none",
 
 							}}
 							onClick={() => {
-								if (isCloud) {
-									handlePayasyougo(userdata, selectedOrganization, BillingEmail)
-									//navigate("/pricing?tab=cloud&highlight=true")
-								} else {
-									//window.open("https://shuffler.io/pricing?tab=onprem&highlight=true", "_blank")
-									handlePayasyougo()
-								}
+                                console.log("Subscription: ", subscription.name)
+                                if(!subscription.name.includes("App Run Units") && !userInScalePlan) {
+                                    window.open("https://discord.gg/B2CBzUm", "_blank")
+                                } else {
+                                    window.open("mailto:support@shuffler.io", "_blank")
+                                }
 							}}
 						>
-							{userdata.has_card_available === true ?
-								"Manage Card Details"
-								:
-								"Add Card Details"
-							}
+							Get Support
 						</Button> ) : null}
                             <Button
                             variant="outlined"
+                            color="primary"
                             style={{
                                 marginTop: isCloud? 10 : 30,
                                 borderRadius: 4,
                                 width: "100%",
                                 cursor: "pointer",
                                 textTransform: "capitalize",
-                                backgroundColor: "transparent",
                                 fontSize: 16,
                                 position: "relative", // Required for positioning tooltip
                             }}
-                            title="Click to book a call"
+                            title="Get more app runs"
                             onClick={() => {
                                 if (isCloud) {
                                 ReactGA.event({
@@ -648,7 +893,7 @@ const LicencePopup = (props) => {
                                     action: "bookcall_upgread_popup",
                                     label: "",
                                 })};
-                                window.open("https://drift.me/frikky/meeting", "_blank");
+                                navigate("/contact?category=contact")
                                 // if (isLoggedIn) {
                                 // isLoggedInHandler()
                                 // } else {
@@ -657,7 +902,7 @@ const LicencePopup = (props) => {
                             }}
                         >
 							<span>
-                            	Book a call
+                            	Get more app runs
 							</span>
                             <span
                                 style={{
@@ -679,7 +924,7 @@ const LicencePopup = (props) => {
                             </span>
                         </Button>
                         
-                    </Paper>
+                    </div>
                     {/*
 			<div style={{ paddingRight: 150, display: "flex", alignItems: "baseline" }}>
 				
@@ -692,17 +937,42 @@ const LicencePopup = (props) => {
         )
     }
 
-    useEffect(() => {
-		console.log("New variant: ", shuffleVariant)
+    // useEffect(() => {
+	// 	console.log("New variant: ", shuffleVariant)
 
-		if (shuffleVariant === 1) {
-			setCalculatedCost("$960")
-			setSelectedValue(8)
-		} else {
-			setCalculatedCost("$960")
-			setSelectedValue(300)
-		}
-	}, [shuffleVariant])
+	// 	if (shuffleVariant === 1) {
+	// 		setCalculatedCost("$960")
+	// 		setSelectedValue(8)
+	// 	} else {
+    //         if (userdata && userdata?.app_execution_limit) {
+    //             if (userdata.app_execution_limit >= 30000 && userdata.app_execution_limit < 40000) {
+    //                 setSelectedValue(400)
+    //                 setCalculatedCost("$1280")
+    //             }else if (userdata?.app_execution_limit >= 40000 && userdata?.app_execution_limit < 50000) {
+    //                 setSelectedValue(500)
+    //                 setCalculatedCost("$1600")
+    //             } else if (userdata?.app_execution_limit >= 500000 && userdata?.app_execution_limit < 600000) {
+    //                 setSelectedValue(600)
+    //                 setCalculatedCost("$1920")
+    //             } else if (userdata?.app_execution_limit >= 60000 && userdata?.app_execution_limit < 70000) {
+    //                 setSelectedValue(700)
+    //                 setCalculatedCost("$2240")
+    //             } else if (userdata?.app_execution_limit >= 70000 && userdata?.app_execution_limit < 80000) {
+    //                 setSelectedValue(800)
+    //                 setCalculatedCost("$2560")
+    //             } else if (userdata?.app_execution_limit >= 80000 && userdata?.app_execution_limit < 90000) {
+    //                 setSelectedValue(900)
+    //                 setCalculatedCost("$2880")
+    //             }else {
+    //                 setCalculatedCost("$960")
+    //                 setSelectedValue(300)
+    //             }
+    //         }else {
+    //             setCalculatedCost("$960")
+    //             setSelectedValue(300)
+    //         }
+	// 	}
+	// }, [userdata])
 
     if (typeof window === 'undefined' || window.location === undefined) {
         return null
@@ -857,66 +1127,120 @@ const LicencePopup = (props) => {
         color: "white",
     }
 
-    console.log("Priceitem: ", shuffleVariant)
+    // const isLoggedInHandler = () => {
+    //     if (calculatedCost === payasyougo) {
+    //         handlePayasyougo(props.userdata)
+    //         return
+    //     }
+
+    //     const priceItem =
+	// 		window.location.origin === "https://shuffler.io/" || "https://sandbox.shuffler.io/"
+	// 			? shuffleVariant === 0
+	// 				? "price_1PWI3uDzMUgUjxHSffUBwWCy"
+	// 				: "price_1PWI8EDzMUgUjxHSfEhUB7oL"
+
+	// 			: shuffleVariant === 0
+	// 				? "price_1PZPSSEJjT17t98NLJoTMYja"
+	// 				: "price_1PZPQuEJjT17t98N3yORUtd9";
+
+    //     const successUrl = `${window.location.origin}/admin?admin_tab=billingstats&payment=success`
+    //     const failUrl = `${window.location.origin}/admin?admin_tab=billingstats&payment=failure`
+	// 	const quantity = shuffleVariant === 0 ? selectedValue / 100 : selectedValue
+
+    //     console.log("Priceitem: ", priceItem, quantity, shuffleVariant)
+    //     var checkoutObject = {
+    //         lineItems: [
+    //             {
+    //                 price: priceItem,
+    //                 quantity: quantity,
+    //             },
+    //         ],
+    //         mode: "subscription",
+    //         billingAddressCollection: "auto",
+    //         successUrl: successUrl,
+    //         cancelUrl: failUrl,
+    //         clientReferenceId: props.userdata.active_org.id,
+    //     }
+
+	// 	if (stripe === undefined || stripe === null || stripe.redirectToCheckout === undefined) {
+	// 		window.open("https://shuffler.io/admin?admin_tab=billingstats&payment=stripe_error", "_self")
+	// 	}
+
+    //     stripe.redirectToCheckout(checkoutObject)
+    //         .then(function (result) {
+    //             console.log("SUCCESS STRIPE?: ", result)
+
+    //             ReactGA.event({
+    //                 category: "pricing",
+    //                 action: "add_card_success",
+    //                 label: "",
+    //             })
+    //         })
+    //         .catch(function (error) {
+    //             console.error("STRIPE ERROR: ", error)
+
+    //             ReactGA.event({
+    //                 category: "pricing",
+    //                 action: "add_card_error",
+    //                 label: "",
+    //             })
+    //         })
+    // }
+
     const isLoggedInHandler = () => {
-        if (calculatedCost === payasyougo) {
-            handlePayasyougo(props.userdata)
-            return
+        var priceItem;
+        if (window.location.origin === "https://shuffler.io" || window.location.origin === "https://sandbox.shuffler.io") {
+          priceItem = billingCycle === "monthly" ? "price_1R66rbEJjT17t98NHIQ78nrz" : "price_1R671UEJjT17t98NzfqWvSG7"
+        } else if (window.location.origin === "http://localhost:3002") {
+          priceItem = billingCycle === "monthly" ? "price_1R678hEJjT17t98Nai5J50gs" : "price_1R6c84EJjT17t98NR68gUfT7"
+      }
+    
+        const successUrl = `${window.location.origin}/admin?admin_tab=billingstats&payment=success`;
+        const failUrl = `${window.location.origin}/pricing?admin_tab=billingstats&payment=failure`;
+    
+        let quantity;
+    
+        if (billingCycle === "monthly") {
+          quantity = scaleValue / 10
+        } else {
+          quantity = (scaleValue / 10) * 12
         }
-
-        const priceItem = window.location.origin === "https://shuffler.io" ?
-            shuffleVariant === 0 ? "app_executions" : "cores"
-            :
-            shuffleVariant === 0 ? "price_1PZPSSEJjT17t98NLJoTMYja" : "price_1PZPQuEJjT17t98N3yORUtd9"
-
-        const successUrl = `${window.location.origin}/admin?admin_tab=billingstats&payment=success`
-        const failUrl = `${window.location.origin}/admin?admin_tab=billingstats&payment=failure`
-
-        console.log("Priceitem: ", priceItem, shuffleVariant)
-        var checkoutObject = {
-            lineItems: [
-                {
-                    price: priceItem,
-                    quantity: shuffleVariant === 0 ? selectedValue / 100 : selectedValue,
-                },
-            ],
-            mode: "subscription",
-            billingAddressCollection: "auto",
-            successUrl: successUrl,
-            cancelUrl: failUrl,
-            clientReferenceId: props.userdata.active_org.id,
-        }
-
-		if (stripe === undefined || stripe === null || stripe.redirectToCheckout === undefined) {
-			window.open("https://shuffler.io/admin?admin_tab=billingstats&payment=stripe_error", "_self")
-		}
-
-        stripe.redirectToCheckout(checkoutObject)
-            .then(function (result) {
-                console.log("SUCCESS STRIPE?: ", result)
-
-                ReactGA.event({
-                    category: "pricing",
-                    action: "add_card_success",
-                    label: "",
-                })
-            })
-            .catch(function (error) {
-                console.error("STRIPE ERROR: ", error)
-
-                ReactGA.event({
-                    category: "pricing",
-                    action: "add_card_error",
-                    label: "",
-                })
-            })
-    }
+    
+        redirectToCheckout(priceItem, quantity, successUrl, failUrl);
+      };
+    
+      const redirectToCheckout = (priceItem, quantity, successUrl, failUrl) => {
+        const checkoutObject = {
+          lineItems: [
+            {
+              price: priceItem,
+              quantity: quantity,
+            },
+          ],
+          mode: "subscription",
+          billingAddressCollection: "auto",
+          successUrl: successUrl,
+          cancelUrl: failUrl,
+          clientReferenceId: userdata.active_org.id,
+        };
+    
+        console.log("OBJECT: ", priceItem, checkoutObject);
+    
+        stripe
+          .redirectToCheckout(checkoutObject)
+          .then(function (result) {
+            console.log("SUCCESS STRIPE?: ", result);
+          })
+          .catch(function (error) {
+            console.error("STRIPE ERROR: ", error);
+          });
+      };
 
     return (
         <div>
-            <Grid container spacing={2} columns={16} style={{ flexDirection: "row", flexWrap: "nowrap", borderRadius: '16px', display: "flex", }}>
-                <Grid item xs={8}>
-                    {isCloud && billingInfo.subscription !== undefined && billingInfo.subscription !== null ?
+            <Grid container spacing={2} style={{ flexDirection: "row", flexWrap: "nowrap", borderRadius: '16px', display: "flex"}}>
+                <Grid item maxWidth={licensePopup ? 400 : 450}>
+                    {(selectedOrganization.subscriptions === undefined || selectedOrganization.subscriptions === null || selectedOrganization.subscriptions.length === 0) && isCloud ?
                         <SubscriptionObject
                             index={0}
                             globalUrl={globalUrl}
@@ -928,7 +1252,29 @@ const LicencePopup = (props) => {
                             subscription={billingInfo.subscription}
                             highlight={selectedOrganization.subscriptions === undefined || selectedOrganization.subscriptions === null || selectedOrganization.subscriptions.length === 0}
                         />
-                        : !isCloud ?
+                        : 
+                        selectedOrganization.subscriptions !== undefined &&
+                        selectedOrganization.subscriptions !== null &&
+                        selectedOrganization.subscriptions.length > 0 ?
+                        selectedOrganization.subscriptions
+                            .reverse()
+                            .map((sub, index) => {
+                                return (
+                                    <SubscriptionObject
+                                        index={index + 1}
+                                        globalUrl={globalUrl}
+                                        userdata={userdata}
+                                        serverside={serverside}
+                                        billingInfo={billingInfo}
+                                        stripeKey={stripeKey}
+                                        selectedOrganization={selectedOrganization}
+                                        subscription={sub}
+                                        highlight={true}
+                                    />
+                                )
+                            })
+                        : null}       
+                        {!isCloud ?
                             <span style={{ display: "flex", }}>
                                 <SubscriptionObject
                                     index={0}
@@ -973,7 +1319,7 @@ const LicencePopup = (props) => {
                             </span>
                             : null}
 
-                    {isCloud &&
+                    {/* {isCloud &&
                         selectedOrganization.subscriptions !== undefined &&
                         selectedOrganization.subscriptions !== null &&
                         selectedOrganization.subscriptions.length > 0 ?
@@ -994,63 +1340,188 @@ const LicencePopup = (props) => {
                                     />
                                 )
                             })
-                        : null}
+                        : null} */}
                 </Grid>
-                <Grid item xs={8}>
+                {
+                licensePopup &&
+                (<Grid  item maxWidth={450}>
                     <Grid style={{}}>
                         {errorMessage.length > 0 ? <Typography variant="h4">Error: {errorMessage}</Typography> : null}
                         <Card style={{
                             padding: 20,
-                            borderRadius: theme.palette?.borderRadius,
-                            border: "1px solid #f85a3e",
+                             background:
+                            "linear-gradient(to right, #212121, #212121) padding-box, linear-gradient(90deg, #F86744 0%, #F34475 100%) border-box",
+                            borderWidth: "2px",
+                            borderStyle: "solid",
+                            borderColor: "transparent",
                         }}>
-                            <div>
-                                <Button style={{ backgroundColor: 'rgba(255, 132, 68, 0.2)', color: "#FF8444", textTransform: "capitalize", borderRadius: 200, boxShadow: 'none', }}
+                            <div
+                            style={{
+                                display: "flex",
+                                flexDirection: "row",
+                                alignItems: "center",
+                                justifyContent: "space-between",
+                                marginBottom: 25,
+                                marginLeft: -2,
+                            }}
+                            >
+                               <Button style={{ backgroundColor: 'rgba(255, 132, 68, 0.2)', color: "#FF8444", textTransform: "capitalize", borderRadius: 200, boxShadow: 'none', fontSize: 13 }}
                                     variant="contained"
-                                    color="primary">Recommended </Button>
-
+                                    color="primary">Recommended 
+                                </Button>
+                                {
+                                    billingCycle === "annual" && 
+                                    (
+                                        <Box
+                                sx={{
+                                    background: "rgba(248, 103, 68, 0.1)",
+                                    py: 0.5,
+                                    px: 1.5,
+                                    borderRadius: "8px",
+                                }}
+                                >
+                                        <Typography
+                                            sx={{
+                                            fontWeight: "bold",
+                                            background:
+                                                "linear-gradient(90deg, #FF8544 0%, #FB47A0 100%)",
+                                                WebkitBackgroundClip: "text",
+                                                WebkitTextFillColor: "transparent",
+                                                backgroundClip: "text",
+                                                fontSize: {
+                                                    xs: "12px",
+                                                    md: "14px",
+                                                },
+                                        }}
+                                        >
+                                            10% OFF
+                                        </Typography>
+                                        </Box>
+                                    )
+                                }
+                            </div>
+                            <div
+                            style={{
+                                display: "flex",
+                                flexDirection: "row",
+                                alignItems: "center",
+                                justifyContent: "space-between",
+                                marginBottom: 10,
+                                marginTop: 10,
+                            }}
+                            >
+                            <Typography variant="h6" style={{ }}>
+                               {scaleValue > 300 ? "Enterprise Plan" : "Scale Plan"}
+                            </Typography>
+                            <Box sx={{ display: "flex", justifyContent: "center" }}>
+                                <ToggleButtonGroup
+                                    value={billingCycle}
+                                    exclusive
+                                    onChange={handleBillingCycleChange}
+                                    aria-label="billing cycle"
+                                    sx={{
+                                        backgroundColor: "rgba(255, 255, 255, 0.1)",
+                                        fontFamily: theme.typography.fontFamily,
+                                        borderRadius: "30px",
+                                        marginTop: -1,
+                                        padding: "3px",
+                                        "& .MuiToggleButton-root": {
+                                            border: "none",
+                                            borderRadius: "30px",
+                                            color: "#fff",
+                                            padding: "6px 22px",
+                                            textTransform: "none",
+                                            fontSize: {
+                                                xs: "12px",
+                                            },
+                                            "&.Mui-selected": {
+                                                backgroundColor: "#fff",
+                                                fontFamily: theme.typography.fontFamily,
+                                                color: "#1A1A1A",
+                                                fontWeight: "bold",
+                                                "&:hover": {
+                                                    backgroundColor: "#fff",
+                                                },
+                                            },
+                                            "&:hover": {
+                                                backgroundColor: "rgba(255, 255, 255, 0.2)",
+                                            },
+                                        },
+                                    }}
+                                >
+                                <ToggleButton value="monthly" aria-label="monthly">
+                                    Monthly
+                                </ToggleButton>
+                                <ToggleButton value="annual" aria-label="annual">
+                                    Annual
+                                </ToggleButton>
+                            </ToggleButtonGroup>
+                            </Box>
                             </div>
-                            <Typography variant="h6" style={{ marginTop: 10, marginBottom: 10, flex: 5, }}>{shuffleVariant === 1 ? "Scale" : "Enterprise"}</Typography>
                             <Divider />
                             <Typography variant="body1" color="textSecondary" style={{ marginTop: 20 }}>
-                                {shuffleVariant === 0 ?
-                                    "SaaS / Cloud - Per Month"
-                                    :
-                                    "Open Source + Scale License"
-                                }
+                               App Runs Units
                             </Typography>
 
-                            <Typography style={{ minHeight: 46, cursor: calculatedCores === "Get A Quote" ? "pointer" : "inherit", }} onClick={() => {
-
-                                if (calculatedCores === "Get A Quote") {
-                                    console.log("Clicked on get a quote")
-                                    if (window.drift !== undefined) {
-                                        window.drift.api.startInteraction({ interactionId: 340785 })
-                                    }
-                                }
-                            }}>{calculatedCost}</Typography>
-                            <Typography variant="body1" color="textSecondary" style={{}}>For {shuffleVariant === 1 ? `${selectedValue} CPU cores` : `${selectedValue}k App Runs`}: </Typography>
-                            <div style={{ textAlign: "center" }}>
-
-                                <Slider
-                                    aria-label="Small steps"
-                                    style={{ width: "80%", margin: "auto" }}
-                                    onChange={(event, newValue) => {
-                                        handleChange(event, newValue)
+                            <div style={{ display: "flex", flexDirection: "row", alignItems: "center", gap: 10 , marginTop: 10 }}>
+                                <Typography style={{ 
+                                    fontSize: 24,
+                                    marginTop: 7,
+                                    marginBottom: 10,
+                                    fontWeight: "500",
+                                }} 
+                                >
+                                    {scaleValue > 300 ? "Let's Talk" : `$${getPrice(32) * (scaleValue / 10)}`}
+                                </Typography>
+                                <Typography
+                                    color="text.secondary"
+                                    sx={{
+                                        fontSize: "14px",
+                                        marginBottom: "-2px",
+                                        marginLeft: scaleValue > 300 ? 1 : 0,
                                     }}
-                                    marks
-                                    value={selectedValue}
-                                    step={shuffleVariant === 0 ? 100 : 4}
-                                    min={shuffleVariant === 0 ? 100 : 8}
-                                    max={shuffleVariant === 0 ? 1000 : 32}
-                                    valueLabelDisplay="auto"
-                                />
+                                >
+                                    {scaleValue > 300 ? `for ${scaleValue > 500 ? "500k+" : `${scaleValue}k`} App Runs` : `/month for ${scaleValue}k App Runs`}
+                                </Typography>
                             </div>
+                            <Box sx={{ px: 1 }}>
+                                <Slider
+                                  value={scaleValue}
+                                  onChange={handleScaleChange}
+                                  aria-labelledby="scale-slider"
+                                  valueLabelDisplay="auto"
+                                  valueLabelFormat={(value) => {
+                                    if(value === 510){
+                                      return "500k+"
+                                    }
+                                    return `${value}k`
+                                  }}
+                                  step={10}
+                                  min={10}
+                                  max={510}
+                                  marks
+                                 sx={{
+                                    color: "#ff8544",
+                                    "& .MuiSlider-thumb": {
+                                    width: 15,
+                                    height: 15,
+                                    },
+                                    "& .MuiSlider-valueLabel": {
+                                    backgroundColor: "rgba(33, 33, 33, 1)",
+                                    color: "rgba(241, 241, 241, 1)",
+                                    fontSize: 14,
+                                    borderRadius: "4px",
+                                    border: "1px solid rgba(73, 73, 73, 1)",
+                                    fontFamily: theme?.typography?.fontFamily,
+                                    },
+                                }}
+                                />
+                            </Box>
 
                             <div>
                                 <div style={{ display: 'flex', alignItems: 'center' }}>
                                     <span>{defaultTaskIcon}</span>
-                                    <Typography style={{ fontSize: 14, marginLeft: 8 }}>Priority Support</Typography>
+                                    <Typography style={{ fontSize: 14, marginLeft: 8 }}>Standard Email Support</Typography>
                                 </div>
                                 <Divider />
                                 <div style={{ display: 'flex', alignItems: 'center' }}>
@@ -1069,7 +1540,7 @@ const LicencePopup = (props) => {
                                 <Divider />
                                 <div style={{ display: 'flex', alignItems: 'center' }}>
                                     <span>{defaultTaskIcon}</span>
-                                    <Typography style={{ fontSize: 14, marginLeft: 8 }}>Help with Workflow and App development</Typography>
+                                    <Typography style={{ fontSize: 14, marginLeft: 8 }}>30 Days workflow run history</Typography>
                                 </div>
                             </div>
                             <div style={{ marginTop: 20, }} />
@@ -1088,18 +1559,23 @@ const LicencePopup = (props) => {
                         
 							navigate("/pricing")
 						} else {
-							window.open("https://shuffler.io/pricing?tab=onprem", "_blank")
+							window.open("https://shuffler.io/pricing?tab=Self-Hosted", "_blank")
 						}
                     }}
                     color="primary"
                 >
                     View all plans
                 </Button>
+
                 <Button
                     variant="contained"
                     style={{ borderRadius: 4, textTransform: "capitalize", color: "#1a1a1a", backgroundColor: "#ff8544", width: "100%", fontSize: 16}}
                     onClick={() => {
                         if (isCloud) {
+                            if(scaleValue > 300){
+                                navigate("/contact?category=cloud_enterprise_plan")
+                                return;
+                            }
 							ReactGA.event({
 								category: "header",
 								action: "upgread_clicks_popup",
@@ -1121,13 +1597,14 @@ const LicencePopup = (props) => {
                     }}
                     color="primary"
                 >
-                    Upgrade
+                    {scaleValue > 300 ? "Let's Talk" : "Upgrade"}
                 </Button>
                 </div>
             </DialogActions>
                         </Card>
                     </Grid>
-                </Grid>
+                </Grid>)
+                }
             </Grid> 
         </div>
     )
diff --git a/frontend/src/components/Navbar.jsx b/frontend/src/components/Navbar.jsx
new file mode 100644
index 00000000..07be2cb8
--- /dev/null
+++ b/frontend/src/components/Navbar.jsx
@@ -0,0 +1,2798 @@
+import React, { useContext, useEffect, useState } from "react";
+import { Link, useNavigate } from "react-router-dom";
+
+import {
+  AppBar,
+  Box,
+  Toolbar,
+  IconButton,
+  Typography,
+  Menu,
+  MenuItem,
+  Button,
+  Container,
+  useTheme,
+  useMediaQuery,
+  Divider,
+  alpha,
+  Avatar,
+  Select,
+  Tooltip,
+  DialogTitle,
+  DialogContent,
+  Dialog,
+  Slide,
+  Collapse
+} from "@mui/material";
+import MenuIcon from "@mui/icons-material/Menu";
+import { Close as CloseIcon, Folder as FolderIcon, Code as CodeIcon, LibraryBooks as LibraryBooksIcon } from '@mui/icons-material'
+import SearchBox from "../components/SearchData.jsx";
+import ReactGA from "react-ga4";
+import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown";
+import KeyboardCommandKeyIcon from '@mui/icons-material/KeyboardCommandKey';
+import SearchIcon from "@mui/icons-material/Search";
+// import SearchField from "../components/Searchfield.jsx";
+import { toast } from "react-toastify";
+import AddIcon from '@mui/icons-material/Add';
+import Mousetrap from "mousetrap";
+import LicencePopup from "../components/LicencePopup.jsx";
+import { Context } from "../context/ContextApi.jsx";
+import { getTheme } from "../theme.jsx";
+
+const curpath = (typeof window !== "undefined" && window.location && typeof window.location.pathname === "string")
+? window.location.pathname
+: "";
+
+// Menu Data Structure
+const menuData = {
+  Products: [
+    {
+      title: "Shuffle",
+      description:
+        "The most versatile automation engine with focus on security.",
+      icon: "/images/icons/shuffleLogo.svg",
+      path: "/docs/about",
+      gaData: {
+        category: "navbar",
+        action: "products_click",
+        label: "shuffle_logo_click"
+      }
+    },
+    {
+      title: "Singul",
+      description:
+        "Connect your favorite services with a singul line of code.",
+      icon: "/images/logos/singul.svg",
+      path: "https://singul.io",
+      gaData: {
+        category: "navbar",
+        action: "products_click",
+        label: "singul_click"
+      }
+    },
+    {
+      title: "API Explorer",
+      description:
+        "Explore, run and automate APIs from over 2500 platforms.",
+      icon: "/images/icons/API.svg",
+      path: "/apis",
+      gaData: {
+        category: "navbar",
+        action: "products_click",
+        label: "api_explorer_click"
+      }
+    },
+  ],
+  Services: [
+    {
+      title: "Professional Services",
+      description:
+        "Professional Services help you solve problems at your convenience.",
+      icon: "/images/ProfessionalServices.svg",
+      path: "/professional-services",
+      gaData: {
+        category: "navbar",
+        action: "services_click",
+        label: "professional_services_click"
+      }
+    },
+    {
+      title: "Support",
+      description:
+        "Support to help you build automations with confidence.",
+      icon: "/images/Support.svg",
+      path: "/contact?category=support",
+      gaData: {
+        category: "navbar",
+        action: "services_click",
+        label: "support_click"
+      }
+    },
+    {
+      title: "Training",
+      description:
+        "Tailored to provide hands-on learning of Shuffle for automation mastery.",
+      icon: "/images/Training.svg",
+      path: "/training",
+      gaData: {
+        category: "navbar",
+        action: "services_click",
+        label: "training_click"
+      }
+    },
+    // {
+    //   title: "Security Consultation",
+    //   description:
+    //     "Automate your infrastructure with expert guidance and tailored solutions.",
+    //   icon: "/images/SecurityConsultation.svg",
+    //   path: "/contact?category=security_consultation",
+    //   gaData: {
+    //     category: "navbar",
+    //     action: "services_click",
+    //     label: "security_consultation_click"
+    //   }
+    // },
+  ],
+  Resources: {
+    columns: [
+      {
+        title: "Platform",
+        items: [
+          {
+            title: "Usecases",
+            icon: "/images/icons/usecases.svg",
+            hoverIcon: "/images/icons/usecases_hover.svg",
+            link: "/usecases",
+            gaData: {
+              category: "navbar",
+              action: "resources_click",
+              label: "usecases_click"
+            }
+          },
+          {
+            title: "Documentation",
+            icon: "/images/icons/docs.svg",
+            hoverIcon: "/images/icons/docs_hover.svg",
+            link: "/docs/about",
+            gaData: {
+              category: "navbar",
+              action: "resources_click",
+              label: "documentation_click"
+            }
+          },
+          { title: "FAQ", icon: "/images/icons/faq.svg", hoverIcon: "/images/icons/faq_hover.svg", link: "/faq", gaData: { category: "navbar", action: "resources_click", label: "faq" } },
+        ],
+      },
+      {
+        title: "Company",
+        items: [
+          {
+            title: "About us",
+            icon: "/images/icons/about_us.svg",
+            hoverIcon: "/images/icons/about_us_hover.svg",
+            link: "/docs/about",
+            gaData: {
+              category: "navbar",
+              action: "resources_click",
+              label: "about_us_click"
+            }
+          },
+          {
+            title: "Articles",
+            icon: "/images/icons/articles.svg",
+            hoverIcon: "/images/icons/articles_hover.svg",
+            link: "/articles/2.0_release",
+            gaData: {
+              category: "navbar",
+              action: "resources_click",
+              label: "articles_click"
+            }
+          },
+          {
+            title: "Contact Us",
+            icon: "/images/icons/contact_us.svg",
+            hoverIcon: "/images/icons/contact_us_hover.svg",
+            link: "/contact?category=contact",
+            gaData: {
+              category: "navbar",
+              action: "resources_click",
+              label: "contact_us_click"
+            }
+          },
+        ],
+      },
+      {
+        title: "Join the community",
+        social: true,
+        platforms: [
+          { name: "Discord", icon: "/images/icons/discord.svg", link: "https://discord.gg/B2CBzUm", gaData: { category: "navbar", action: "social_click", label: "discord_icon_click" } },
+          { name: "GitHub", icon: "/images/icons/github.svg", link: "https://github.com/shuffle/shuffle/blob/main/.github/install-guide.md", gaData: { category: "navbar", action: "social_click", label: "github_icon_click" } },
+        ],
+        followUs: [
+          { name: "LinkedIn", icon: "/images/icons/linkedIn.svg", link: "https://www.linkedin.com/company/shuffleio", gaData: { category: "navbar", action: "social_click", label: "linkedin_icon_click" } },
+          { name: "Twitter", icon: "/images/icons/x.svg", link: "https://twitter.com/shuffleio", gaData: { category: "navbar", action: "social_click", label: "twitter_icon_click" } },
+        ],
+      },
+    ],
+  },
+};
+
+// Add this new component at the top level of the file, right after the imports
+const LoadingSkeleton = () => {
+  const theme = useTheme();
+  return (
+    <Box sx={{ display: 'flex', gap: 2, alignItems: 'center' }}>
+      <Box 
+        sx={{
+          width: 42,
+          height: 42,
+          backgroundColor: alpha(theme.palette.primary.main, 0.1),
+          borderRadius: '8px',
+          "@keyframes pulse": {
+            "0%": { opacity: 1 },
+            "50%": { opacity: 0.5 },
+            "100%": { opacity: 1 },
+          },
+          animation: 'pulse 1.5s ease-in-out infinite',
+        }}
+      />
+      <Box 
+        sx={{
+          width: 120,
+          height: 42,
+          backgroundColor: alpha(theme.palette.primary.main, 0.1),
+          borderRadius: '8px',
+          "@keyframes pulse": {
+            "0%": { opacity: 1 },
+            "50%": { opacity: 0.5 },
+            "100%": { opacity: 1 },
+          },
+          animation: 'pulse 1.5s ease-in-out infinite',
+        }}
+      />
+      <Box 
+        sx={{
+          width: 90,
+          height: 42,
+          backgroundColor: alpha(theme.palette.primary.main, 0.1),
+          borderRadius: '8px',
+          "@keyframes pulse": {
+            "0%": { opacity: 1 },
+            "50%": { opacity: 0.5 },
+            "100%": { opacity: 1 },
+          },
+          animation: 'pulse 1.5s ease-in-out infinite',
+        }}
+      />
+      <Box 
+        sx={{
+          width: 42,
+          height: 42,
+          backgroundColor: alpha(theme.palette.primary.main, 0.1),
+          borderRadius: '50%',
+          "@keyframes pulse": {
+            "0%": { opacity: 1 },
+            "50%": { opacity: 0.5 },
+            "100%": { opacity: 1 },
+          },
+          animation: 'pulse 1.5s ease-in-out infinite',
+        }}
+      />
+    </Box>
+  );
+};
+
+// Add this new component for mobile menu
+const MobileMenu = ({ anchorEl, handleClose, isLoggedIn, navigate, isCloud }) => {
+  const [openSection, setOpenSection] = useState(null);
+  const theme = useTheme();
+
+  // Add useEffect to handle body scroll
+  useEffect(() => {
+    if (Boolean(anchorEl)) {
+      // Disable scroll
+      document.body.style.overflow = 'hidden';
+    } else {
+      // Re-enable scroll
+      document.body.style.overflow = 'auto';
+    }
+
+    // Cleanup function to ensure scroll is re-enabled when component unmounts
+    return () => {
+      document.body.style.overflow = 'auto';
+    };
+  }, [anchorEl]);
+
+  const handleSectionClick = (section) => {
+    setOpenSection(openSection === section ? null : section);
+  };
+
+  const handleItemClick = (path) => {
+    handleClose();
+    navigate(path);
+  };
+
+  const showDesktopToast = () => {
+    toast.info("Please open on desktop for the full experience");
+    handleClose();
+  };
+
+  return (
+    <Dialog
+      open={Boolean(anchorEl)}
+      onClose={handleClose}
+      fullScreen
+      TransitionComponent={Slide}
+      TransitionProps={{ direction: "left" }}
+      disableScrollLock
+      PaperProps={{
+        sx: {
+          backgroundColor: "#1A1A1A",
+          color: "white",
+          marginTop: "64px",
+          height: 'calc(100% - 64px)',
+          fontFamily: theme.typography.fontFamily,
+          zIndex: 60000,
+          boxShadow: 'none',
+          borderTop: '1px solid rgba(255, 255, 255, 0.1)',
+          position: 'relative',
+          '&::before': {
+            content: '""',
+            position: 'absolute',
+            top: 0,
+            left: 0,
+            right: 0,
+            height: '4px',
+            background: 'linear-gradient(180deg, rgba(0, 0, 0, 0.2) 0%, rgba(0, 0, 0, 0) 100%)',
+            pointerEvents: 'none',
+          },
+        }
+      }}
+      BackdropProps={{
+        sx: {
+          backgroundColor: 'transparent',
+        }
+      }}
+    >
+      <Box sx={{ overflow: 'auto', height: '100%', backgroundColor: "#1A1A1A" }}>
+        {Object.keys(menuData).map((section) => (
+          <Box key={section}>
+            <Button
+              fullWidth
+              onClick={() => handleSectionClick(section)}
+              sx={{
+                color: 'white',
+                justifyContent: 'space-between',
+                textTransform: 'none',
+                py: 2,
+                fontSize: '16px',
+                px: 3,
+                borderBottom: '1px solid rgba(255,255,255,0.1)',
+                fontFamily: theme.typography.fontFamily,
+                borderRadius: 0,
+                '&:hover': {
+                  backgroundColor: 'rgba(255,255,255,0.05)'
+                }
+              }}
+              endIcon={
+                <KeyboardArrowDownIcon 
+                  sx={{ 
+                    transform: openSection === section ? 'rotate(180deg)' : 'none',
+                    transition: 'transform 0.3s'
+                  }} 
+                />
+              }
+            >
+              {section}
+            </Button>
+
+            <Collapse in={openSection === section}>
+              {section === 'Resources' ? (
+                <Box sx={{ p: 2, borderBottom: '1px solid rgba(255, 255, 255, 0.1)' }}>
+                  {menuData.Resources.columns.map((column, index) => (
+                    <Box 
+                      key={index} 
+                      sx={{ 
+                        mb: 3,
+                        borderBottom: index !== menuData.Resources.columns.length - 1 ? 
+                          '1px solid rgba(255, 255, 255, 0.1)' : 'none',
+                        pb: index !== menuData.Resources.columns.length - 1 ? 3 : 0,
+                      }}
+                    >
+                      <Typography sx={{ 
+                        color: 'white', 
+                        mb: 1,
+                        pl: 1,
+                        fontSize: '14px',
+                        fontFamily: theme.typography.fontFamily,
+                      }}>
+                        {column.title} 
+                      </Typography>
+                      
+                      {column.social ? (
+                        <>
+                          <Box sx={{ display: 'flex', gap: 2, mb: 2, pl: 1 }}>
+                            {column.platforms.map((platform) => (
+                              <IconButton
+                                key={platform.name}
+                                sx={{ 
+                                  padding: 0,
+                                  width: 40,
+                                  height: 40,
+                                  "&:hover": {
+                                    backgroundColor: "transparent",
+                                    opacity: 0.8,
+                                  },
+                                }}
+                                onClick={() => {
+                                  if (isCloud) {
+                                    ReactGA.event(platform.gaData);
+                                  }
+                                  window.open(platform.link, '_blank')
+                                  return;
+                                }}
+                                // onClick={() => showDesktopToast()}
+                              >
+                                <img 
+                                  src={platform.icon} 
+                                  alt={platform.name}
+                                  style={{
+                                    width: "100%",
+                                    height: "100%",
+                                  }}
+                                />
+                              </IconButton>
+                            ))}
+                          </Box>
+                          <Typography sx={{ 
+                            color: 'white', 
+                            mb: 1,
+                            pl: 1,
+                            fontSize: '14px',
+                            fontFamily: theme.typography.fontFamily,
+                          }}>
+                            Follow Us
+                          </Typography>
+                          <Box sx={{ display: 'flex', gap: 2, pl: 1 }}>
+                            {column.followUs.map((platform) => (
+                              <IconButton
+                                key={platform.name}
+                                sx={{ 
+                                  padding: 0,
+                                  width: 40,
+                                  height: 40,
+                                  "&:hover": {
+                                    backgroundColor: "transparent",
+                                    opacity: 0.8,
+                                  },
+                                }}
+                                onClick={() => {
+                                  if (isCloud) {
+                                    ReactGA.event(platform.gaData);
+                                  }
+                                  window.open(platform.link, '_blank')
+                                  return;
+                                }}
+                              >
+                                <img 
+                                  src={platform.icon} 
+                                  alt={platform.name}
+                                  style={{
+                                    width: "100%",
+                                    height: "100%",
+                                  }}
+                                />
+                              </IconButton>
+                            ))}
+                          </Box>
+                        </>
+                      ) : (
+                        column.items.map((item) => (
+                          <Button
+                            key={item.title}
+                            fullWidth
+                            startIcon={
+                              <img 
+                                src={item.icon} 
+                                alt={item.title}
+                                style={{ width: 20, height: 20 }}
+                              />
+                            }
+                            onClick={() => {
+                                if (isCloud) {
+                                    ReactGA.event(item.gaData);
+                                    handleItemClick(item.link)
+                                }else{
+                                    if(item.link.includes("usecases") || item.link.includes("docs")){
+                                        handleItemClick(item.link)
+                                    }else{
+                                       window.open("https://shuffler.io" + item.link, '_blank');
+                                      return;
+                                    }
+                                }
+                            }}
+                            sx={{
+                              color: 'white',
+                              justifyContent: 'flex-start',
+                              textTransform: 'none',
+                              py: 1.5,
+                              fontFamily: theme.typography.fontFamily,
+                              borderRadius: 0,
+                              '&:hover': {
+                                backgroundColor: 'rgba(255,255,255,0.05)'
+                              }
+                            }}
+                          >
+                            {item.title}
+                          </Button>
+                        ))
+                      )}
+                    </Box>
+                  ))}
+                </Box>
+              ) : (
+                <Box>
+                  {menuData[section].map((item) => (
+                    <Button
+                      key={item.title}
+                      fullWidth
+                      onClick={() => {
+                        if (item.title === "Singul") {
+                          window.open(item.path, '_blank');
+                          return;
+                        } else {
+                          handleItemClick(item.path);
+                        }
+                      }}
+                      sx={{
+                        color: 'white',
+                        justifyContent: 'flex-start',
+                        textTransform: 'none',
+                        py: 2,
+                        px: 3,
+                        gap: 2,
+                        fontFamily: theme.typography.fontFamily,
+                        borderBottom: '1px solid #494949',
+                        borderRadius: 0,
+                        position: 'relative',
+                        '&:hover': {
+                          backgroundColor: 'rgba(255,255,255,0.05)'
+                        }
+                      }}
+                    >
+                      <img 
+                        src={item.icon} 
+                        alt={item.title}
+                        style={{ 
+                          width: 40, 
+                          height: 40,
+                          padding: 8,
+                          borderRadius: 4,
+                          backgroundColor: '#2F2F2F',
+                          minWidth: 40,
+                          minHeight: 40,
+                        }}
+                      />
+                      <Box sx={{ textAlign: 'left' }}>
+                        <Box sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
+                          <Typography sx={{ 
+                            fontWeight: 600, 
+                            mb: 0.5,
+                            color: 'white',
+                            fontSize: '15px',
+                            fontFamily: theme.typography.fontFamily,
+                          }}>
+                            {item.title}
+                          </Typography>
+                          {item.title === "Singul" && (
+                            <Typography
+                              sx={{
+                                fontSize: '10px',
+                                color: '#FF8544',
+                                border: '1px solid #FF8544',
+                                borderRadius: '4px',
+                                padding: '2px 6px',
+                                lineHeight: 1,
+                                fontWeight: 500,
+                                textTransform: 'uppercase',
+                                letterSpacing: '0.5px',
+                              }}
+                            >
+                              Coming Soon
+                            </Typography>
+                          )}
+                        </Box>
+                        <Typography 
+                          variant="body2" 
+                          sx={{ 
+                            color: 'white',
+                            fontSize: '12px',
+                            fontFamily: theme.typography.fontFamily,
+                          }}
+                        >
+                          {item.description}
+                        </Typography>
+                      </Box>
+                    </Button>
+                  ))}
+                </Box>
+              )}
+            </Collapse>
+          </Box>
+        ))}
+
+        {/* Static menu items */}
+        <Button
+          fullWidth
+          onClick={() => {
+            if (isCloud) {
+              ReactGA.event({
+                category: "navbar",
+                action: "pricing_click",
+                label: "go_to_pricing",
+              })
+              handleItemClick('/pricing')
+            }else{
+              window.open("https://shuffler.io/pricing", '_blank');
+              return;
+            }
+          }}
+          sx={{
+            color: 'white',
+            justifyContent: 'flex-start',
+            textTransform: 'none',
+            py: 2,
+            px: 3,
+            borderBottom: '1px solid rgba(255,255,255,0.1)',
+            fontFamily: theme.typography.fontFamily,
+            borderRadius: 0,
+            '&:hover': {
+              backgroundColor: 'rgba(255,255,255,0.05)'
+            }
+          }}
+        >
+          Pricing
+        </Button>
+        <Button
+          fullWidth
+          onClick={() => {
+            if (isCloud) {
+              ReactGA.event({
+                category: "navbar",
+                action: "partners_click",
+                label: "go_to_partners",
+              })
+              handleItemClick('/become-partner')
+            }else{
+              window.open("https://shuffler.io/become-partner", '_blank');
+              return;
+            }
+          }}
+          sx={{
+            color: 'white',
+            justifyContent: 'flex-start',
+            textTransform: 'none',
+            py: 2,
+            px: 3,
+            borderBottom: '1px solid rgba(255,255,255,0.1)',
+            fontFamily: theme.typography.fontFamily,
+            borderRadius: 0,
+            '&:hover': {
+              backgroundColor: 'rgba(255,255,255,0.05)'
+            }
+          }}
+        >
+          Partners
+        </Button>
+
+        {/* Action buttons */}
+        <Box sx={{ p: 2, mt: 2 }}>
+          <Button
+            fullWidth
+            variant="contained"
+            onClick={() => {
+                window.open("https://shuffler.io/contact?category=book_a_demo", '_blank');
+                return;
+            }}
+            sx={{
+              backgroundColor: '#FF8544',
+              color: '#1A1A1A',
+              textTransform: 'none',
+              py: 1.5,
+              mb: 2,
+              fontFamily: theme.typography.fontFamily,
+              borderRadius: 0,
+              '&:hover': {
+                
+                backgroundColor: '#FF8544',
+              }
+            }}
+          >
+            Book a Demo
+          </Button>
+          <Button
+            fullWidth
+            variant="outlined"
+            onClick={() => showDesktopToast()}
+            sx={{
+              color: 'white',
+              borderColor: 'rgba(255,255,255,0.3)',
+              textTransform: 'none',
+              py: 1.5,
+              fontFamily: theme.typography.fontFamily,
+              borderRadius: 0,
+              '&:hover': {
+                borderColor: 'white',
+                backgroundColor: 'transparent'
+              }
+            }}
+          >
+            Login
+          </Button>
+        </Box>
+      </Box>
+    </Dialog>
+  );
+};
+
+const Navbar = (props) => {
+  const {
+    globalUrl,
+    isLoaded,
+    isLoggedIn,
+    removeCookie,
+    homePage,
+    userdata,
+    // isMobile,
+    serverside,
+    billingInfo,
+
+    notifications,
+  } = props;
+
+  const topbar_var = "topbar_closed10"
+
+  const theme = useTheme();
+  const {themeMode} = useContext(Context);
+  const  currentTheme = getTheme(themeMode);
+  const {searchBarModalOpen, setSearchBarModalOpen, isDocSearchModalOpen, setIsDocSearchModalOpen} = useContext(Context)
+  const [pricingModalOpen, setPricingModalOpen] = useState(false);
+  const isTabletOrMobile = useMediaQuery(theme.breakpoints.down("lg"));
+  const isMobile = useMediaQuery(theme.breakpoints.down("md"));
+  const [anchorElNav, setAnchorElNav] = useState(null);
+  const [openMenu, setOpenMenu] = useState(null);
+  const [selectedOrganization, setSelectedOrganization] = useState({});
+  const navigate = useNavigate();
+  const [anchorElUser, setAnchorElUser] = useState(null);
+  const [anchorElOrg, setAnchorElOrg] = useState(null);
+  const [isOrgChanging, setIsOrgChanging] = useState(false);
+  const [isHovered, setIsHovered] = useState("");
+  const [orgSelectOpen, setOrgSelectOpen] = useState(false);
+  const [showTopbar, setShowTopbar] = useState(true) // Set to true to show top bar
+  const isCloud =
+  serverside === true || typeof window === "undefined"
+    ? true
+    : window.location.host === "localhost:3002" ||
+    window.location.host === "shuffler.io" ||
+    window.location.host === "localhost:5002";
+
+  const stripeKey = typeof window === 'undefined' || window.location === undefined ? "" : window.location.origin === "https://shuffler.io" ? "pk_live_51PXYYMEJjT17t98N20qEqItyt1fLQjrnn41lPeG2PjnSlZHTDNKHuisAbW00s4KAn86nGuqB9uSVU4ds8MutbnMU00DPXpZ8ZD" : "pk_test_51PXYYMEJjT17t98NbDkojZ3DRvsFUQBs35LGMx3i436BXwEBVFKB9nCvHt0Q3M4MG3dz4mHheuWvfoYvpaL3GmsG00k1Rb2ksO"
+
+  useEffect(() => {
+	// Manually setShowTopbar(true) to show topbar by default
+    const topbar = localStorage.getItem(topbar_var)
+    if (topbar === "true") {
+      setShowTopbar(false)
+	}
+  }, [])
+
+  const pricingModal =
+  <Dialog
+    open={pricingModalOpen}
+    onClose={() => {
+      setPricingModalOpen(false);
+    }}
+    PaperProps={{
+      style: {
+        color: "white",
+        minWidth: 850,
+        minHeight: 370,
+        padding: 20,
+        backgroundColor: "rgba(0, 0, 0, 1)",
+        borderRadius: theme.palette?.borderRadius,
+      },
+    }}
+  >
+    <DialogTitle style={{ display: "flex" }}>
+      <span style={{ color: "white", fontSize: 24 }}>
+        Upgrade your plan
+      </span>
+      <IconButton
+        onClick={() => {
+          if (isCloud) {
+            ReactGA.event({
+              category: "navbar",
+              action: "close_upgrade_modal",
+              label: "navbar_upgrade_modal",
+            })
+          };
+          setPricingModalOpen(false);
+        }}
+        style={{
+          marginLeft: "auto",
+          position: "absolute",
+          top: 20,
+          right: 20,
+        }}
+      >
+        <CloseIcon />
+      </IconButton>
+    </DialogTitle>
+    <div style={{ paddingLeft: "30px", paddingRight: "30px" }}>
+      <LicencePopup
+        serverside={serverside}
+        removeCookie={removeCookie}
+        isLoaded={isLoaded}
+        isLoggedIn={isLoggedIn}
+        globalUrl={globalUrl}
+        selectedOrganization={selectedOrganization}
+        billingInfo={billingInfo}
+        features={selectedOrganization?.sync_features}
+        isCloud={isCloud}
+        userdata={userdata}
+        stripeKey={stripeKey}
+        setModalOpen={setPricingModalOpen}
+        licensePopup={true}
+        {...props}
+      />
+    </div>
+  </Dialog>
+
+
+  const modalView = (
+    <Dialog
+      open={searchBarModalOpen && !isDocSearchModalOpen}
+      onClose={() => {
+        setSearchBarModalOpen(false);
+      }}
+      PaperProps={{
+        sx: {
+          color: "white",
+          minWidth: "750px",
+          height: "785px",
+          borderRadius: "16px",
+          border: "1px solid var(--Container-Stroke, #494949)",
+          background: currentTheme.palette.DialogStyle.backgroundColor,
+          boxShadow: "0px 16px 24px 8px rgba(0, 0, 0, 0.25)",
+        },
+        '& .MuiDialogContent-root': {
+          backgroundColor: currentTheme?.palette?.DialogStyle?.backgroundColor,
+        },
+        '& .MuiDialogTitle-root': {
+          backgroundColor: currentTheme?.palette?.DialogStyle?.backgroundColor,
+        },
+      }}
+      sx={{
+        zIndex: 50005,
+      }}
+    >
+        <Box sx={{ display: "flex", justifyContent: "space-between",backgroundColor: currentTheme?.palette?.DialogStyle?.backgroundColor, alignItems: "center", px: 2, pt: 2 }}>
+          <DialogTitle 
+            sx={{ 
+              color: "var(--Paragraph-text, #C8C8C8)",
+              p: 0,
+              m: 0,
+              fontFamily: theme.typography.fontFamily,
+            }}
+          >
+            Search for Docs, Apps, Workflows and more
+          </DialogTitle>
+          <IconButton 
+            onClick={() => setSearchBarModalOpen(false)}
+            sx={{ 
+              color: 'white',
+              '&:hover': {
+                backgroundColor: 'rgba(255, 255, 255, 0.1)'
+              }
+            }}
+          >
+            <CloseIcon />
+          </IconButton>
+        </Box>
+      <DialogContent style={{backgroundColor: currentTheme?.palette?.DialogStyle?.backgroundColor}} >
+        <Box sx={{ pt: 3 }}>
+          <SearchBox globalUrl={globalUrl} serverside={serverside} userdata={userdata} />
+        </Box>
+      </DialogContent> 
+      <Divider sx={{ backgroundColor: 'rgba(255, 255, 255, 0.1)' }}/>
+    </Dialog>
+  );
+
+  const handleOpenNavMenu = (event) => {
+    setAnchorElNav(event.currentTarget);
+  };
+
+  const handleCloseNavMenu = () => {
+    setAnchorElNav(null);
+  };
+
+  const handleMenuOpen = (menu) => {
+    setOpenMenu(menu);
+  };
+
+  const handleMenuClose = () => {
+    setOpenMenu(null);
+  };
+
+  const handleOpenUserMenu = (event) => {
+    setAnchorElUser(event.currentTarget);
+  };
+
+  const handleCloseUserMenu = () => {
+    setAnchorElUser(null);
+  };
+
+  const handleOpenOrgMenu = (event) => {
+    setAnchorElOrg(event.currentTarget);
+  };
+
+  const handleCloseOrgMenu = () => {
+    setAnchorElOrg(null);
+  };
+
+  const menuStyles = {
+    "& .MuiPaper-root": {
+      backgroundColor: "#212121",
+      marginTop: 1,
+      backdropFilter: "blur(10px)",
+      fontFamily: theme.typography.fontFamily,
+    },
+  };
+
+  const menuItemBox = {
+    display: "flex",
+    alignItems: "flex-start",
+    padding: 2,
+    paddingTop: "20px",
+    paddingBottom: "20px",
+    paddingLeft: "20px",
+    gap: 2,
+    width: "100%",
+    backgroundColor: "#212121",
+    transition: "all 0.2s ease-in-out",
+    borderBottom: "1px solid #494949",
+  };
+
+  const buttonStyles = {
+    fontFamily: theme.typography.fontFamily,
+    color: "white",
+    textTransform: "none",
+    fontSize: "16px",
+    fontWeight: 400,
+    padding: "6px 12px",
+    "& .MuiSvgIcon-root": {
+      transition: "transform 0.2s ease-in-out",
+    },
+    "&:hover": {
+      backgroundColor: "transparent",
+      color: theme.palette.primary.main,
+      "& .MuiSvgIcon-root": {
+        transform: "rotate(180deg)",
+      },
+    },
+    // Add this to hide the ripple effect's container
+    "& .MuiTouchRipple-root": {
+      display: "none",
+    },
+  };
+
+  // Render menu content based on type
+  const renderMenuContent = (item, isCloud) => {
+    if (item === "Resources") {
+      return (
+        <Box sx={{ display: "flex", gap: 8, p: 1.5 }}>
+          {menuData.Resources.columns.map((column, index) => (
+            <Box
+              key={index}
+              sx={{
+                flex: 1,
+                borderRight:
+                  index !== menuData.Resources.columns.length - 1
+                    ? "1px solid rgba(255, 255, 255, 0.1)"
+                    : "none",
+                pr: index !== menuData.Resources.columns.length - 1 ? 4 : 0,
+              }}
+            >
+              <Typography
+                sx={{
+                  color: "white",
+                  fontSize: "20px",
+                  fontWeight: 600,
+                  mb: 2.5,
+                  pl:
+                    index !== menuData.Resources.columns.length - 1
+                      ? "12px"
+                      : 0,
+                  fontFamily: theme.typography.fontFamily,
+                }}
+              >
+                {column.title}
+              </Typography>
+
+              {column.social ? (
+                <>
+                  <Box sx={{ display: "flex", gap: 1.5, mb: 4 }}>
+                    {column.platforms.map((platform) => (
+                      <IconButton
+                        key={platform.name}
+                        component="a"
+                        href={platform.link}
+                        target="_blank"
+                        onClick={() => {
+                          if (isCloud) {
+                            ReactGA.event(platform.gaData);
+                          }
+                          handleMenuClose();
+                        }}
+                        sx={{
+                          padding: 0,
+                          width: 48,
+                          height: 48,
+                          "&:hover": {
+                            backgroundColor: "transparent",
+                            opacity: 0.8,
+                          },
+                        }}
+                      >
+                        <img
+                          src={platform.icon}
+                          alt={platform.name}
+                          style={{
+                            width: "100%",
+                            height: "100%",
+                          }}
+                        />
+                      </IconButton>
+                    ))}
+                  </Box>
+                  <Typography
+                    sx={{
+                      color: "white",
+                      fontSize: "20px",
+                      fontWeight: 500,
+                      mb: 2,
+                      fontFamily: theme.typography.fontFamily,
+                    }}
+                  >
+                    Follow Us
+                  </Typography>
+                  <Box sx={{ display: "flex", gap: 1.5 }}>
+                    {column.followUs.map((platform) => (
+                      <IconButton
+                        key={platform.name}
+                        component="a"
+                        href={platform.link}
+                        target="_blank"
+                        onClick={() => {
+                          if (isCloud) {
+                            ReactGA.event(platform.gaData);
+                          }
+                          handleMenuClose();
+                        }}
+                        sx={{
+                          padding: 0,
+                          width: 48,
+                          height: 48,
+                          "&:hover": {
+                            backgroundColor: "transparent",
+                            opacity: 0.8,
+                          },
+                        }}
+                      >
+                        <img
+                          src={platform.icon}
+                          alt={platform.name}
+                          style={{
+                            width: "100%",
+                            height: "100%",
+                          }}
+                        />
+                      </IconButton>
+                    ))}
+                  </Box>
+                </>
+              ) : (
+                <Box
+                  sx={{
+                    display: "flex",
+                    flexDirection: "column",
+                    gap: 2,
+                  }}
+                >
+                  {column.items.map((item) => (
+                    <Button
+                      key={item.title}
+                      component={Link}
+                      to={item.link}
+                      onClick={() => {
+                        if (isCloud) {
+                          ReactGA.event(item.gaData);
+                          handleMenuClose();
+                        } else if (item.link.includes("docs") || item.link.includes("usecases")) {
+                          handleMenuClose();
+                        } else {
+                          window.open("https://shuffler.io" + item.link, '_blank');
+                          return;
+                        }
+                      }}
+                      startIcon={
+                        <img
+                          width={22}
+                          height={22}
+                          src={isHovered === item.title.toLowerCase() ? item.hoverIcon : item.icon}
+                          alt={item.title}
+                          style={{ width: 22, height: 22, paddingLeft: "5px"}}
+                        />
+                      }
+                      onMouseEnter={() => setIsHovered(item.title.toLowerCase())}
+                      onMouseLeave={() => setIsHovered("")}
+                      sx={{
+                        color: "white",
+                        justifyContent: "flex-start",
+                        textTransform: "none",
+                        padding: "8px 12px",
+                        borderRadius: "8px",
+                        fontSize: "16px",
+                        fontWeight: 500,
+                        fontFamily: theme.typography.fontFamily,
+                        "&:hover": {
+                          backgroundColor: "#292929",
+                          color: theme.palette.primary.main,
+                        },
+                        "& .MuiButton-startIcon": {
+                          marginRight: "12px",
+                        },
+                      }}
+                    >
+                      {item.title}
+                    </Button>
+                  ))}
+                </Box>
+              )}
+            </Box>
+          ))}
+        </Box>
+      );
+    }
+
+    return menuData[item].map((menuItem, index) => (
+      <MenuItem
+        key={menuItem.title}
+        onClick={() => {
+          if (menuItem.title === "Singul") {
+            window.open(menuItem.path, '_blank');
+            return;
+          }
+          if(isCloud) {
+            ReactGA.event(menuItem.gaData);
+          }
+          handleCloseNavMenu();
+          handleMenuClose();
+          if(isCloud) {
+            navigate(menuItem.path);
+          } else {
+            if(menuItem.path.includes("docs")){
+              navigate(menuItem.path);
+              handleMenuClose();
+            }else{
+              window.open("https://shuffler.io" + menuItem.path, '_blank'); 
+              return;
+            }
+          }
+        }}
+        sx={{
+          padding: 0,
+          backgroundColor: "#212121",
+          "&:hover": {
+            backgroundColor: "#212121",
+          },
+          "&:last-child": {
+            borderBottomLeftRadius: "4px",
+            borderBottomRightRadius: "4px",
+          },
+          "&:first-of-type": {
+            paddingTop: "4px",
+          },
+        }}
+      >
+        <Box
+          sx={{
+            ...menuItemBox,
+            borderBottom:
+              index === menuData[item].length - 1
+                ? "none"
+                : "1px solid rgba(255, 255, 255, 0.1)",
+            borderBottomLeftRadius:
+              index === menuData[item].length - 1 ? "4px" : 0,
+            borderBottomRightRadius:
+              index === menuData[item].length - 1 ? "4px" : 0,
+            "&:hover": {
+              backgroundColor: "#292929",
+            },
+          }}
+        >
+          <Box
+            component="img"
+            src={menuItem.icon}
+            sx={{
+              width: isCloud ? 44 : 75,
+              height: isCloud ? 44 : 75,
+              padding: "20px",
+              borderRadius: 1.5,
+              backgroundColor: "#2F2F2F",
+            }}
+          />
+          <Box sx={{ paddingTop: "5px"}}>
+            <Box sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
+              <Typography
+                sx={{
+                  color: "white",
+                  fontWeight: 600,
+                  mb: 0.5,
+                  fontSize: "16px",
+                  fontFamily: theme.typography.fontFamily,
+                }}
+              >
+                {menuItem.title}
+              </Typography>
+              {menuItem.title === "Singul" && (
+                <Typography
+                  sx={{
+                    fontSize: '10px',
+                    color: '#FF8544',
+                    border: '1px solid #FF8544',
+                    borderRadius: '4px',
+                    padding: '2px 6px',
+                    lineHeight: 1,
+                    fontWeight: 500,
+                    textTransform: 'uppercase',
+                    letterSpacing: '0.5px',
+                  }}
+                >
+                  Beta: Coming Soon
+                </Typography>
+              )}
+            </Box>
+            <Typography
+              variant="body2"
+              sx={{
+                color: "#C8C8C8",
+                fontSize: "14px",
+                paddingRight: "12px",
+                fontFamily: theme.typography.fontFamily,
+              }}
+            >
+              {menuItem.description}
+            </Typography>
+          </Box>
+        </Box>
+      </MenuItem>
+    ));
+  };
+
+  const renderDesktopMenu = () => (
+    <Box
+      sx={{
+        flexGrow: 1,
+        display: "flex",
+        gap: isTabletOrMobile ? 0 : 1,
+        marginLeft: isTabletOrMobile ? 2 : 4,
+        alignItems: "center",
+      }}
+    >
+      {Object.keys(menuData).map((item) => (
+        <Box
+          key={item}
+          sx={{
+            position: "relative",
+          }}
+        >
+          <Button
+            onMouseEnter={() => handleMenuOpen(item)}
+            onMouseLeave={(e) => {
+              
+              const dropdown = document.querySelector('.dropdown-content'); // Adjust the selector as needed
+              const rect = e.currentTarget.getBoundingClientRect();
+              const dropdownRect = dropdown ? dropdown.getBoundingClientRect() : null;
+
+              // Check if the cursor is moving down
+              const isMovingDown = e.clientY > rect.bottom;
+
+              // Check if the cursor is within the dropdown area or a buffer zone
+              const isOverDropdown = dropdownRect && (
+                (e.clientY >= dropdownRect.top - 20 && e.clientY <= dropdownRect.bottom + 20) && // Buffer zone
+                (e.clientX >= dropdownRect.left && e.clientX <= dropdownRect.right)
+              );
+
+              if (!isMovingDown && !isOverDropdown) {
+                handleMenuClose();
+              }
+            }}
+            sx={{
+              ...buttonStyles,
+              color: openMenu === item ? theme.palette.primary.main : "white",
+              "& .MuiSvgIcon-root": {
+                transform: openMenu === item ? "rotate(180deg)" : "rotate(0deg)",
+                transition: "transform 0.3s ease",
+              },
+            }}
+            endIcon={<KeyboardArrowDownIcon sx={{ fontSize: 20 }} />}
+          >
+            {item}
+          </Button>
+
+          {/* Custom Dropdown */}
+          <Box
+            className="dropdown-content"
+            onMouseEnter={() => handleMenuOpen(item)}
+            onMouseLeave={handleMenuClose}
+            sx={{
+              position: "absolute",
+              top: "130%",
+              left:
+                item === "Products"
+                  ? 0
+                  : item === "Services"
+                  ? -50
+                  : item === "Resources"
+                  ? isTabletOrMobile ? -330 : -250
+                  : 0,
+              backgroundColor: "#212121",
+              borderTopLeftRadius: 0,
+              borderTopRightRadius: 0,
+              borderBottomLeftRadius: "4px",
+              borderBottomRightRadius: "4px",
+              boxShadow:
+                "0 8px 16px rgba(0, 0, 0, 0.25), 0 2px 4px rgba(0, 0, 0, 0.1)",
+              backdropFilter: "blur(10px)",
+              zIndex: -20, 
+              opacity: openMenu === item ? 1 : 0,
+              visibility: openMenu === item ? "visible" : "hidden",
+              transform: openMenu === item ? "translateY(0)" : "translateY(-8px)", 
+              transition: "transform 0.3s cubic-bezier(0.4, 0, 0.2, 1), opacity 0.3s ease", 
+              pointerEvents: openMenu === item ? "auto" : "none",
+              ...(item === "Resources" && {
+                width: "900px",
+                padding: 3,
+              }),
+            }}
+          >
+            {renderMenuContent(item, isCloud)}
+          </Box>
+        </Box>
+      ))}
+      <Button
+        component={Link}
+        to="/pricing"
+        sx={buttonStyles}
+        onClick={() => {
+          if(isCloud) {
+            navigate("/pricing");
+            ReactGA.event({
+              category: "navbar",
+              action: "pricing_click",
+              label: "go_to_pricing",
+            })
+          } else {
+            window.open("https://shuffler.io/pricing?env=Self-Hosted", '_blank');
+            return;
+          }
+        }}
+      >
+        Pricing
+      </Button>
+      <Box 
+        className="partners-container"
+        sx={{ 
+          position: "relative",
+          "&::after": {
+            // This creates an invisible connection between button and dropdown
+            content: '""',
+            position: "absolute",
+            top: "100%",
+            left: 0,
+            width: "100%",
+            height: "20px", // Buffer zone height
+            backgroundColor: "transparent",
+          },
+          "&:hover .partners-dropdown": {
+            opacity: 1,
+            visibility: "visible",
+            pointerEvents: "auto",
+            transform: "translateY(0)",
+            transition: "opacity 0.3s ease, visibility 0s, transform 0.3s ease",
+          },
+        }}
+      >
+        <Button
+          component={Link}
+          to="/become-partner"
+          sx={{
+            ...buttonStyles,
+          }}
+          onClick={() => {
+            if(isCloud) {
+              navigate("/become-partner");
+              ReactGA.event({
+                category: "navbar",
+                action: "partners_click",
+                label: "go_to_become_partner",
+              })
+            } else {
+              window.open("https://shuffler.io/become-partner", '_blank');
+              return;
+            }
+          }}
+        >
+          Partners
+        </Button>
+        <Box 
+          className="partners-dropdown"
+          sx={{
+            position: "absolute",
+            top: "140%",
+            left: 0,
+            backgroundColor: "#212121",
+            borderRadius: "4px",
+            boxShadow: "0px 5px 15px rgba(0, 0, 0, 0.2)",
+            width: "220px",
+            opacity: 0,
+            visibility: "hidden",
+            pointerEvents: "none",
+            transform: "translateY(-10px)",
+            transition: "opacity 0.3s ease, visibility 0s linear 0.3s, transform 0.3s ease",
+            zIndex: 10,
+            "&:hover": {
+              opacity: 1,
+              visibility: "visible",
+              pointerEvents: "auto",
+              transform: "translateY(0)",
+            },
+            // Add a pseudo-element to create a buffer zone above the dropdown
+            "&::before": {
+              content: '""',
+              position: "absolute",
+              top: "-20px", // Match the height of the buffer zone
+              left: 0,
+              width: "100%",
+              height: "20px",
+              backgroundColor: "transparent",
+            }
+          }}
+        >
+          <Box sx={{}}>
+            <Button
+              fullWidth
+              sx={{
+                color: "white",
+                justifyContent: "flex-start",
+                textTransform: "none",
+                py: 2,
+                px: 2,
+                fontSize: "14px",
+                fontFamily: theme.typography.fontFamily,
+                borderRadius: "4px",
+                "&:hover": {
+                  backgroundColor: "rgba(255,255,255,0.05)"
+                }
+              }}
+              onClick={(e) => {
+                e.preventDefault();
+                e.stopPropagation();
+                if(isCloud) {
+                  navigate("/become-partner");
+                  ReactGA.event({
+                    category: "navbar",
+                    action: "partners_click",
+                    label: "become_partner_click",
+                  })
+                } else {
+                  window.open("https://shuffler.io/become-partner", '_blank');
+                }
+              }}
+            >
+              Become a partner
+            </Button>
+            <Button
+              fullWidth
+              sx={{
+                color: "white",
+                justifyContent: "flex-start",
+                textTransform: "none",
+                fontSize: "14px",
+                fontFamily: theme.typography.fontFamily,
+                py: 2,
+                px: 2,
+                borderRadius: "4px",
+                "&:hover": {
+                  backgroundColor: "rgba(255,255,255,0.05)"
+                }
+              }}
+              onClick={(e) => {
+                e.preventDefault();
+                e.stopPropagation();
+                navigate("/partners");
+                if(isCloud) {
+                  ReactGA.event({
+                    category: "navbar",
+                    action: "partners_click",
+                    label: "discover_partners_click",
+                  })
+                }
+              }}
+            >
+              Discover partners
+            </Button>
+          </Box>
+        </Box>
+      </Box>
+    </Box>
+  );
+
+  const menuItemStyles = {
+    fontFamily: theme.typography.fontFamily,
+    color: "white",
+    "&:hover": {
+      backgroundColor: "rgba(255, 133, 68, 0.1)",
+    },
+  };
+
+  const searchButtonStyles = {
+    fontFamily: theme.typography.fontFamily,
+    color: "rgba(255, 255, 255, 0.7)",
+    border: "1px solid rgba(26, 26, 26, 0.8)",
+    backgroundColor: "#2F2F2F",
+    textTransform: "none",
+    borderRadius: "8px",
+    fontSize: "14px",
+    padding: "6px 12px",
+    display: "flex",
+    alignItems: "center",
+    height: "42px",
+    gap: 1,
+    minWidth: "110px",
+    justifyContent: "space-between",
+    "&:hover": {
+      borderColor: "rgba(255, 255, 255, 0.1)",
+    },
+  };
+
+  const searchIconButtonStyles = {
+    color: "rgba(255, 255, 255, 0.7)",
+    padding: "8px",
+    minWidth: "unset",
+    height: "42px",
+    "&:hover": {
+      backgroundColor: "#3F3F3F",
+    },
+  };
+
+  // Add this shared button style
+  const sharedButtonStyles = {
+    fontFamily: theme.typography.fontFamily,
+    textTransform: "none",
+    fontSize: "16px",
+    fontWeight: 600,
+    padding: "6px 24px",
+  };
+
+
+  useEffect(() => {
+		Mousetrap.bind(['command+k', 'ctrl+k'], () => {
+			setSearchBarModalOpen(true);
+			setIsDocSearchModalOpen(false);
+			return false; // Prevent the default action
+		});
+		Mousetrap.bind(['esc'], () => {
+			setSearchBarModalOpen(false);
+			setIsDocSearchModalOpen(false);
+			return false; // Prevent the default action
+		});
+
+		return () => {
+			Mousetrap.unbind(['command+k', 'ctrl+k']);
+		};
+	}, []);
+
+  useEffect(() => {
+    if (isLoggedIn && userdata?.active_org?.id?.length > 0) {
+      handleGetOrg(userdata.active_org.id);
+    }
+  }, [isLoggedIn]);
+
+  const handleGetOrg = (orgId) => {
+    fetch(`${globalUrl}/api/v1/orgs/${orgId}`, {
+      method: "GET",
+      credentials: "include",
+      headers: {
+        "Content-Type": "application/json",
+      },
+    })
+      .then((response) => {
+        if (response.status === 401) {
+        }
+
+        return response.json();
+      })
+      .then((responseJson) => {
+        if (responseJson["success"] === false) {
+          console.log("Error getting org: ", responseJson);
+        } else {
+          setSelectedOrganization(responseJson);
+        }
+      })
+      .catch((error) => {
+        console.log("Error getting org: ", error);
+      });
+  };
+
+  const handleClickLogout = () => {
+    console.log("SHOULD LOG OUT");
+
+    toast.info("Logging out...");
+    // Don't really care about the logout
+    fetch(globalUrl + "/api/v1/logout", {
+      credentials: "include",
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+    })
+      .then(() => {
+        // Log out anyway
+        removeCookie("session_token", { path: "/" });
+        removeCookie("session_token", { path: "/" });
+        removeCookie("session_token", { path: "/" });
+
+        removeCookie("__session", { path: "/" });
+        removeCookie("__session", { path: "/" });
+        removeCookie("__session", { path: "/" });
+
+        removeCookie("__session", { path: "/" });
+       
+        window.location.pathname = "/";
+
+        localStorage.setItem("globalUrl", "")
+
+        // Delete userinfo from localstorage
+        localStorage.removeItem("apps")
+        localStorage.removeItem("workflows")
+        localStorage.removeItem("userinfo")
+      })
+      .catch((error) => {
+        console.log(error);
+      });
+  };
+
+  const topbarHeight = showTopbar ? 40 : 0
+  const topbar = !isCloud || !showTopbar ? null :
+    curpath === "/" || curpath.includes("/docs") || curpath === "/pricing" || curpath === "/contact" || curpath === "/search" || curpath === "/usecases" || curpath === "/training" || curpath === "/professional-services" ?
+      <span style={{ zIndex: 50001, marginTop: -4}}>
+        {/* uncommit this to show topbar for release */}
+        {/* <div style={{ position: "relative", height: topbarHeight, backgroundImage: "linear-gradient(to right, #f86a3e, #f34079)", overflow: "hidden", }}>
+          <Typography style={{ paddingTop: 7, fontSize:16, margin: "auto", textAlign: "center", color: "white", }}>
+            // Shuffle 1.4.0 is out! Read more about&nbsp; 
+            Shuffle 2.0.0 is out now!&nbsp;
+            <u>
+              <span onClick={() => {
+                ReactGA.event({
+                  category: "landingpage",
+                  action: "click_header_training",
+                  label: "",
+                })
+
+                navigate("/articles/2.0_release")
+
+              }} style={{ cursor: "pointer", textDecoration: "none", fontWeight: 600, color: "rgba(255,255,255,0.9)" }}>
+				Read about it here.
+             </span>
+            </u>
+          </Typography>
+          <IconButton color="secondary" style={{ position: "absolute", top: 0, right: 20, }} onClick={(event) => {
+            setShowTopbar(false)
+
+            // Set storage that it's clicked
+            localStorage.setItem(topbar_var, "true")
+          }}>
+            <CloseIcon />
+          </IconButton>
+        </div> */}
+        {/* commit below div if we need to show release stuff */}
+        <div style={{ position: "relative", height: topbarHeight, backgroundImage: "linear-gradient(to right, #f86a3e, #f34079)", overflow: "hidden", }}>
+           <Typography style={{ paddingTop: 7, fontSize:16, margin: "auto", textAlign: "center", color: "white", }}>
+             {/* Shuffle 1.4.0 is out! Read more about&nbsp; */}
+             New&nbsp;
+             <u>
+               <span onClick={() => {
+                 ReactGA.event({
+                   category: "landingpage",
+                   action: "click_header_training",
+                   label: "",
+                 })
+ 
+                 navigate("/training")
+ 
+               }} style={{ cursor: "pointer", textDecoration: "none", fontWeight: 600, color: "rgba(255,255,255,0.9)" }}>
+                 Public Training
+               </span>
+             </u>
+             &nbsp;Dates Released! 
+           </Typography>
+           <IconButton color="secondary" style={{ position: "absolute", top: 0, right: 20, }} onClick={(event) => {
+             setShowTopbar(false)
+ 
+             // Set storage that it's clicked
+             localStorage.setItem(topbar_var, "true")
+           }}>
+             <CloseIcon />
+           </IconButton>
+         </div>
+      </span>
+      :
+      null
+
+  const handleClickChangeOrg = (orgId) => {
+    setIsOrgChanging(true);
+    const data = { org_id: orgId };
+
+    localStorage.setItem("globalUrl", "");
+    localStorage.setItem("getting_started_sidebar", "open");
+    toast.info("Changing organization...");
+    fetch(`${globalUrl}/api/v1/orgs/${orgId}/change`, {
+      mode: "cors",
+      credentials: "include",
+      crossDomain: true,
+      method: "POST",
+      body: JSON.stringify(data),
+      withCredentials: true,
+      headers: {
+        "Content-Type": "application/json; charset=utf-8",
+      },
+    })
+      .then(function (response) {
+        if (response.status !== 200) {
+          console.log("Error in response");
+        } else {
+          localStorage.removeItem("apps");
+          localStorage.removeItem("workflows");
+          localStorage.removeItem("userinfo");
+        }
+
+        return response.json();
+      })
+      .then(function (responseJson) {
+        if (responseJson.success === true) {
+          if (
+            responseJson.region_url !== undefined &&
+            responseJson.region_url !== null &&
+            responseJson.region_url.length > 0
+          ) {
+            console.log("Region Change: ", responseJson.region_url);
+            localStorage.setItem("globalUrl", responseJson.region_url);
+            //globalUrl = responseJson.region_url
+          }
+
+          if (responseJson["reason"] === "SSO_REDIRECT") {
+            toast.info("Redirecting to SSO login page as SSO is required for this organization.");
+            setTimeout(() => {
+              window.location.href = responseJson["url"];
+            }, 2000);
+          } else {
+            toast("Successfully changed active organization - refreshing!");
+            setTimeout(() => {
+              window.location.reload();
+            }, 2000);
+          }
+        } else {
+          setIsOrgChanging(false);
+          if (
+            responseJson.reason !== undefined &&
+            responseJson.reason !== null &&
+            responseJson.reason.length > 0
+          ) {
+            toast(responseJson.reason);
+          } else {
+            toast("Failed changing org. Try again or contact support@shuffler.io if this persists.");
+          }
+        }
+      })
+      .catch((error) => {
+        console.log("error changing: ", error);
+        setIsOrgChanging(false);
+      });
+  };
+
+  // Add these helper functions from LeftSideBar
+  const getRegionTag = (region_url) => {
+    let regiontag = "EU";
+    if (region_url !== undefined && region_url !== null && region_url.length > 0) {
+      const regionsplit = region_url.split(".");
+      if (regionsplit.length > 2 && !regionsplit[0].includes("shuffler")) {
+        const namesplit = regionsplit[0].split("/");
+        regiontag = namesplit[namesplit.length - 1];
+
+        if (regiontag === "california") {
+          regiontag = "US";
+        } else if (regiontag === "frankfurt") {
+          regiontag = "EU-2";
+        } else if (regiontag === "ca") {
+          regiontag = "CA";
+        }
+      }
+    }
+    return regiontag;
+  };
+
+  const getRegionFlag = (region_url) => {
+    const regionTag = getRegionTag(region_url);
+    const regionMapping = {
+      "US": "us",
+      "EU": "eu",
+      "EU-2": "de",
+      "CA": "ca",
+      "UK": "gb"
+    };
+
+    const region = regionMapping[regionTag] || "eu";
+    return `https://flagcdn.com/48x36/${region}.png`;
+  };
+
+  // Add this useEffect to prevent scroll locking
+  useEffect(() => {
+    // Remove modal classes that cause scroll locking
+    const removeModalClasses = () => {
+      document.body.style.overflow = 'auto';
+      document.body.style.paddingRight = '0px';
+    };
+
+    // Create observer to watch for class changes
+    const observer = new MutationObserver((mutations) => {
+      mutations.forEach((mutation) => {
+        if (mutation.attributeName === 'class') {
+          if (document.body.classList.contains('MuiModal-open')) {
+            removeModalClasses();
+          }
+        }
+      });
+    });
+
+    // Start observing
+    observer.observe(document.body, {
+      attributes: true,
+      attributeFilter: ['class'],
+    });
+
+    // Cleanup
+    return () => {
+      observer.disconnect();
+      removeModalClasses();
+    };
+  }, []);
+
+  const handleOrgSelectClick = (event) => {
+    // Prevent the default Select behavior
+    event.preventDefault();
+    if(isCloud){
+      ReactGA.event({
+        category: "navbar",
+        action: "org_dropdown_click",
+        label: "org_dropdown_click",
+      })
+    }
+    // Toggle the select open state
+    setOrgSelectOpen(!orgSelectOpen);
+  };
+
+  return (
+    <AppBar
+      position="fixed"
+      sx={{
+		transition: serverside === true ? "none": undefined,
+        backgroundColor: "transparent",
+        boxShadow: "none",
+        backgroundImage: "none",
+        fontFamily: theme.typography.fontFamily,
+        padding: "5px 0",
+        zIndex: 12000,
+        "&::before": {
+          content: '""',
+          position: "absolute",
+          top: 0,
+          left: 0,
+          right: 0,
+          bottom: 0,
+          backgroundColor: "rgba(26, 26, 26, 0.75)",
+          backdropFilter: "blur(10px)",
+          zIndex: -1,
+        },
+      }}
+    >
+      {topbar}
+      <Container maxWidth="xl" sx={{ zoom: {
+        md: "0.7",
+        lg: "0.8",
+        xl: "1",
+      } }}>
+        <Toolbar disableGutters sx={{ justifyContent: "space-between" }}>
+          <Box sx={{ display: "flex", alignItems: "center" }}>
+            <Link
+              to="/"
+              style={{
+                textDecoration: "none",
+                display: "flex",
+                alignItems: "center",
+                paddingLeft: "10px",
+              }}
+              onClick={() => {
+                if (isCloud) {
+                  ReactGA.event({
+                    category: "navbar",
+                    action: "home_click",
+                    label: "shuffle_logo",
+                  });
+                }
+              }}
+            >
+              <img
+                src={"/images/logos/topleft_logo.svg"}
+                alt="shuffle logo"
+                style={{ height: 25 }}
+              />
+            </Link>
+          </Box>
+
+          {isMobile ? (
+            /* Mobile Navigation Icons */
+            <Box sx={{ display: "flex", alignItems: "center", gap: 1 }}>
+              <IconButton 
+                sx={{ color: "white" }}
+                onClick={() => {
+                  setSearchBarModalOpen(true);
+                  setIsDocSearchModalOpen(false);
+                }}
+              >
+                <SearchIcon sx={{ fontSize: 22 }} />
+              </IconButton>
+              <IconButton 
+                onClick={
+                  (e) => {
+                    if(Boolean(anchorElNav)) {
+                      handleCloseNavMenu();
+                    }else{
+                      handleOpenNavMenu(e);
+                    }
+                  }
+                } 
+                sx={{ color: "white" }}
+              >
+                {Boolean(anchorElNav) ? (
+                  <CloseIcon sx={{ fontSize: 24 }} />
+                ) : (
+                  <MenuIcon sx={{ fontSize: 24 }} />
+                )}
+              </IconButton>
+              <MobileMenu 
+                anchorEl={anchorElNav}
+                handleClose={handleCloseNavMenu}
+                isLoggedIn={isLoggedIn}
+                navigate={navigate}
+                isCloud={isCloud}
+              />
+            </Box>
+          ) : (
+            <>
+              {modalView}
+              {pricingModal}
+              {renderDesktopMenu()}
+              {/* Right Side Buttons */}
+              <Box sx={{ display: "flex", gap: 2, alignItems: "center" }}>
+                {!isLoaded ? (
+                  <LoadingSkeleton />
+                ) : isLoggedIn ? (
+                  <>
+                    {isOrgChanging ? (
+                      <LoadingSkeleton />
+                    ) : (
+                      <>
+                         <Tooltip 
+                           title={
+                             <div style={{ display: 'flex', flexDirection: 'row', alignItems: 'center', gap: 4, color : "#FF8544" }}>
+                                 <KeyboardCommandKeyIcon style={{ width: 15 }} />
+                                 + K
+                             </div>
+                           } 
+                           placement="bottom"
+                           arrow  
+                           componentsProps={{
+                             tooltip: {
+                               sx: {
+                                 backgroundColor: "rgba(33, 33, 33, 1)",
+                                 color: "rgba(241, 241, 241, 1)",
+                                 fontSize: 12,
+                                 border: "1px solid rgba(73, 73, 73, 1)",
+                                 fontFamily: theme?.typography?.fontFamily,
+                               }
+                             },
+                             popper: {
+                               sx: {
+                                 zIndex: 1000019,
+                               }
+                             }
+                           }}
+                         >
+                           <IconButton
+                           sx={searchIconButtonStyles}
+                           onClick={() => {
+                             if (isCloud) {
+                               ReactGA.event({
+                                 category: "navbar",
+                                 action: "search_icon_click",
+                                 label: "search_icon_click",
+                               })
+                             }
+                             setSearchBarModalOpen(true);
+                             setIsDocSearchModalOpen(false);
+                           }}
+                         >
+                           <SearchIcon sx={{ fontSize: 24 }} />
+                         </IconButton>
+                         </Tooltip>
+                        {isCloud && (userdata.org_status === undefined || userdata.org_status === null || userdata.org_status.length === 0) ? 
+                         <Button
+                          variant="contained"
+                          sx={{
+                            ...sharedButtonStyles,
+                            backgroundColor: "#FF8544",
+                            border: "1px solid #FF8544",
+                            color: "#1A1A1A",
+                            borderRadius: "8px",
+                            padding: "8px 24px",
+                            "&:hover": {
+                              backgroundColor: "#FF955C",
+                            },
+                          }}
+                          onClick={() => {
+                            if (isCloud) {
+                              ReactGA.event({
+                                category: "navbar",
+                                action: "upgrade_click",
+                                label: "upgrade_button_click",
+                              })
+                            }
+                            setPricingModalOpen(true)
+                          }}
+                        >
+                          Upgrade
+                        </Button>
+                        : null}
+                        <Button
+                          variant="contained"
+                          sx={{
+                            ...sharedButtonStyles,
+                            backgroundColor: "#2F2F2F",
+                            border: "1px solid #2F2F2F",
+                            color: "white",
+                            borderRadius: "8px",
+                            padding: "8px 20px",
+                            "&:hover": {
+                              backgroundColor: "#494949",
+                              color: "white",
+                              border: "1px solid white",
+                            },
+                          }}
+                          onClick={() => {
+                            if (isCloud) {
+                              ReactGA.event({
+                                category: "navbar",
+                                action: "go_to_product",
+                                label: "go_to_product_click",
+                              })
+                            }
+                            navigate("/workflows");
+                          }}
+                        >
+                          {isTabletOrMobile ? "Product" : "Go to Product"}
+                        </Button>
+
+                        {/* Organization Dropdown */}
+                        {/* <Select
+                          open={orgSelectOpen}
+                          value={userdata?.active_org?.id || ''}
+                          onClick={handleOrgSelectClick}
+                          onChange={(e) => {
+                            if (e.target.value === "create_new_suborgs") {
+                              return;
+                            }
+                            handleClickChangeOrg(e.target.value);
+                            setOrgSelectOpen(false);
+                          }}
+                          onClose={() => setOrgSelectOpen(false)}
+                          renderValue={(selected) => {
+                            const selectedOrg = userdata?.orgs?.find(org => org.id === selected);
+                            return (
+                              <Box sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
+                                <img
+                                  src={selectedOrg?.image || theme.palette.defaultImage}
+                                  alt={selectedOrg?.name}
+                                  style={{
+                                    width: 22,
+                                    height: 22,
+                                    borderRadius: '4px',
+                                  }}
+                                />
+                                <span>{selectedOrg?.name?.slice(0, 3) + '...'}</span>
+                              </Box>
+                            );
+                          }}
+                          sx={{
+                            display: {
+                              xs:"none",
+                              xl: "flex",
+                            },
+                            height: 45,
+                            backgroundColor: "#212121",
+                            borderRadius: "8px",
+                            color: "white",
+                            '.MuiSelect-select': {
+                              padding: "9px 14px",
+                              display: 'flex',
+                              alignItems: 'center',
+                              backgroundColor: '#212121',
+                              gap: 1,
+                            },
+                            '.MuiOutlinedInput-notchedOutline': {
+                              border: 'none',
+                            },
+                            '&:hover': {
+                              backgroundColor: "rgba(47, 47, 47, 0.5)",
+                            },
+                            '& .MuiPaper-root': {
+                              backgroundColor: '#212121',
+                            },
+                            '& .MuiMenu-paper': {
+                              backgroundColor: '#212121',
+                            },
+                          }}
+                          MenuProps={{
+                            PaperProps: {
+                              sx: {
+                                backgroundColor: "#212121 !important",
+                                color: "white",
+                                marginTop: 1,
+                                maxHeight: '400px',
+                                boxShadow: "0 8px 16px rgba(0, 0, 0, 0.25)",
+                                '& .MuiMenu-list': {
+                                  backgroundColor: "#212121",
+                                },
+                                '& .MuiMenuItem-root': {
+                                  backgroundColor: "#212121",
+                                },
+                                zIndex: 50004,
+                              }
+                            },
+                            disableScrollLock: true,
+                            BackdropProps: {
+                              invisible: true,
+                              sx: { 
+                                backgroundColor: 'transparent',
+                              }
+                            },
+                            anchorOrigin: {
+                              vertical: 'bottom',
+                              horizontal: 'right',
+                            },
+                            transformOrigin: {
+                              vertical: 'top',
+                              horizontal: 'right',
+                            },
+                          }}
+                        >
+                          {userdata?.orgs?.map((data, index) => {
+                            if (!data.name) return null;
+
+                            const imagesize = 22;
+                            const skipOrg = data.creator_org && userdata.child_orgs?.some(
+                              childOrg => childOrg.id === data.creator_org
+                            );
+
+                            if (skipOrg) return null;
+
+                            const regiontag = getRegionTag(data.region_url);
+                            const flagUrl = getRegionFlag(data.region_url);
+
+                            return (
+                              <MenuItem
+                                key={index}
+                                value={data.id}
+                                disabled={data.id === userdata?.active_org?.id}
+                                sx={{
+                                  height: 40,
+                                  backgroundColor: data.id === userdata?.active_org?.id ? 
+                                    'rgba(255, 133, 68, 0.1) !important' : 
+                                    '#212121 !important',
+                                  '&:hover': {
+                                    backgroundColor: 'rgba(255, 255, 255, 0.1) !important',
+                                  },
+                                }}
+                              >
+                                <Tooltip 
+                                  title={data.creator_org ? `Suborg of ${data.creator_org}` : ''}
+                                  placement="left"
+                                  disableInteractive
+                                  enterTouchDelay={0}
+                                  leaveTouchDelay={0}
+                                  componentsProps={{
+                                    tooltip: {
+                                      sx: {
+                                        backgroundColor: '#2F2F2F',
+                                        fontSize: '12px',
+                                        padding: '8px 12px',
+                                        borderRadius: '4px'
+                                      }
+                                    }
+                                  }}
+                                >
+                                  <Box sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
+                                    {isCloud && (
+                                      <Box sx={{ display: 'flex', alignItems: 'center', gap: 1, mr: 2, flexShrink: 0 }}>
+                                        <img
+                                          src={flagUrl}
+                                          alt={regiontag}
+                                          style={{
+                                            width: 20,
+                                            height: 15,
+                                            borderRadius: '2px',
+                                          }}
+                                        />
+                                      </Box>
+                                    )}
+                                    <img
+                                      src={data.image || theme.palette.defaultImage}
+                                      alt={data.name}
+                                      style={{
+                                        width: imagesize,
+                                        height: imagesize,
+                                        marginLeft: data.creator_org ? 20 : 0,
+                                        borderRadius: '4px',
+                                        flexShrink: 0,
+                                      }}
+                                    />
+                                    <Typography 
+                                      sx={{ 
+                                        fontSize: '16px',
+                                        maxWidth: '200px',
+                                        overflow: 'auto',
+                                        whiteSpace: 'nowrap',
+                                        scrollbarWidth: 'thin',
+                                        '&::-webkit-scrollbar': {
+                                          height: '4px',
+                                        },
+                                        '&::-webkit-scrollbar-track': {
+                                          background: 'transparent',
+                                        },
+                                        '&::-webkit-scrollbar-thumb': {
+                                          background: 'rgba(255, 255, 255, 0.1)',
+                                          borderRadius: '4px',
+                                        },
+                                        '&::-webkit-scrollbar-thumb:hover': {
+                                          background: 'rgba(255, 255, 255, 0.2)',
+                                        },
+                                      }}
+                                    >
+                                      {data.name}
+                                    </Typography>
+                                  </Box>
+                                </Tooltip>
+                              </MenuItem>
+                            );
+                          })}
+                          <Divider sx={{ backgroundColor: 'rgba(255,255,255,0.1)' }} />
+                          <MenuItem
+                            value="create_new_suborgs"
+                            component={Link}
+                            to="/admin?tab=tenants"
+                            sx={{
+                              height: 40,
+                              justifyContent: 'center',
+                              '&:hover': {
+                                backgroundColor: 'rgba(255, 255, 255, 0.1)',
+                              },
+                            }}
+                          >
+                            <AddIcon sx={{ mr: 1 }} />
+                            Add suborgs
+                          </MenuItem>
+                        </Select> */}
+
+                        {/* User Avatar Menu */}
+                        <IconButton
+                          onClick={(e) => {
+                            if (isCloud) {
+                              ReactGA.event({
+                                category: "navbar",
+                                action: "click_user_menu",
+                                label: "open_user_dropdown"
+                              });
+                            }
+                            handleOpenUserMenu(e);
+                          }}
+                          sx={{
+                            padding: 0,
+                            "&:hover": {
+                              backgroundColor: "rgba(47, 47, 47, 0.5)",
+                            },
+                          }}
+                        >
+                          <Box sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
+                            <Avatar
+                              src={userdata?.avatar}
+                              alt="avatar"
+                              sx={{ width: 32, height: 32 }}
+                            />
+                          </Box>
+                        </IconButton>
+
+                        <Menu
+						  disabledPortal={serverside === true ? true : false}
+                          anchorEl={anchorElUser}
+                          open={Boolean(anchorElUser)}
+                          onClose={handleCloseUserMenu}
+                          disableScrollLock
+                          sx={{ zIndex: 50004 }}
+                          MenuListProps={{
+                            sx: {
+                              py: 0,
+                              fontFamily: theme.typography.fontFamily,
+                              backgroundColor: "#212121 !important",
+                            }
+                          }}
+                          PaperProps={{
+                            sx: {
+                              backgroundColor: "#212121 !important", 
+                              color: "white",
+                              marginTop: "16px",
+                              minWidth: 200,
+                              maxWidth: 200,
+                              boxShadow: "0 8px 16px rgba(0, 0, 0, 0.25)",
+                              fontFamily: theme.typography.fontFamily,
+                            }
+                          }}
+                          BackdropProps={{
+                            invisible: true,
+                            sx: { 
+                              backgroundColor: 'transparent',
+                            }
+                          }}
+                          anchorOrigin={{
+                            vertical: 'bottom',
+                            horizontal: 'right',
+                          }}
+                          transformOrigin={{
+                            vertical: 'top',
+                            horizontal: 'right',
+                          }}
+                        >
+                          {/* User Info Section */}
+                          <Box sx={{ px: 2, py: 1, fontFamily: theme.typography.fontFamily }}>
+                            <Box sx={{ display: 'flex', alignItems: 'center', gap: 1.5, py: 0.5 }}>
+                              <Avatar
+                                src={userdata?.avatar}
+                                alt="avatar"
+                                sx={{ width: 40, height: 40 }}
+                              />
+                              <Box sx={{ width: '100%', minWidth: 0 }}>
+                                <Typography sx={{ 
+                                  fontWeight: 500, 
+                                  fontSize: '14px',
+                                  fontFamily: theme.typography.fontFamily,
+                                  whiteSpace: 'nowrap',
+                                  overflow: 'hidden',
+                                  textOverflow: 'ellipsis'
+                                }}>
+                                  {userdata?.username}
+                                </Typography>
+                              </Box>
+                            </Box>
+                          </Box>
+
+                          <Divider sx={{ backgroundColor: "rgba(255,255,255,0.1)" }} />
+
+                          {/* Menu Items */}
+                          <MenuItem
+                            onClick={() => {
+                              if (isCloud) {
+                                ReactGA.event({
+                                  category: "navbar",
+                                  action: "user_dropdown_click", 
+                                  label: "go_to_admin"
+                                });
+                              }
+                              handleCloseUserMenu();
+                              navigate("/admin");
+                            }}
+                            onMouseEnter={() => setIsHovered("organization")}
+                            onMouseLeave={() => setIsHovered("")}
+                            sx={{
+                              py: 1.5,
+                              px: 2,
+                              fontFamily: theme.typography.fontFamily,
+                              transition: "color 0.1s ease",
+                              '&:hover': {
+                                backgroundColor: 'rgba(255, 255, 255, 0.1)',
+                                color: isHovered === "organization" ? "#FF8544" : "white",
+                              },
+                            }}
+                          >
+                            <Box sx={{ display: 'flex', alignItems: 'center', gap: 1.5 }}>
+                              <Box 
+                                component="img"
+                                src={isHovered === "organization" ? "/images/icons/Org_hover.svg" : "/images/icons/Org.svg"}
+                                sx={{ width: 20, height: 20 }}
+                              />
+                              <Typography sx={{ 
+                                color: "inherit",
+                                fontSize: '14px',
+                                fontFamily: theme.typography.fontFamily 
+                              }}>
+                                Organization
+                              </Typography>
+                            </Box>
+                          </MenuItem>
+
+                          <MenuItem
+                            onClick={() => {
+                              if (isCloud) {
+                                ReactGA.event({
+                                  category: "navbar",
+                                  action: "user_dropdown_click",
+                                  label: "go_to_settings",
+                                })
+                              }
+                              handleCloseUserMenu();
+                              navigate("/settings");
+                            }}
+                            onMouseEnter={() => setIsHovered("settings")}
+                            onMouseLeave={() => setIsHovered("")}
+                            sx={{
+                              py: 1.5,
+                              px: 2,
+                              fontFamily: theme.typography.fontFamily,
+                              transition: "color 0.1s ease",
+                              '&:hover': {
+                                backgroundColor: 'rgba(255, 255, 255, 0.1)',
+                                color: isHovered === "settings" ? "#FF8544" : "white",
+                              },
+                            }}
+                          >
+                            <Box sx={{ display: 'flex', alignItems: 'center', gap: 1.5 }}>
+                              <Box 
+                                component="img"
+                                src={isHovered === "settings" ? "/images/icons/settings_hover.svg" : "/images/icons/settings.svg"}
+                                sx={{ width: 20, height: 20 }}
+                              />
+                              <Typography sx={{ 
+                                fontSize: '14px',
+                                color: "inherit",
+                                fontFamily: theme.typography.fontFamily 
+                              }}>
+                                Settings
+                              </Typography>
+                            </Box>
+                          </MenuItem>
+
+                          <MenuItem
+                            onClick={() => {
+                              if (isCloud) {
+                                ReactGA.event({
+                                  category: "navbar",
+                                  action: "user_dropdown_click",
+                                  label: "go_to_notifications",
+                                })
+                              }
+                              handleCloseUserMenu();
+                              navigate("/admin?admin_tab=notifications");
+                            }}
+                            onMouseEnter={() => setIsHovered("notifications")}
+                            onMouseLeave={() => setIsHovered("")}
+                            sx={{
+                              py: 1.5,
+                              px: 2,
+                              fontFamily: theme.typography.fontFamily,
+                              transition: "color 0.1s ease",
+                              '&:hover': {
+                                backgroundColor: 'rgba(255, 255, 255, 0.1)',
+                                color: isHovered === "notifications" ? "#FF8544" : "white",
+                              },
+                            }}
+                          >
+                            <Box sx={{ display: 'flex', alignItems: 'center', gap: 1.5 }}>
+                              <Box 
+                                component="img"
+                                src={isHovered === "notifications" ? "/images/icons/notifications_hover.svg" : "/images/icons/notifications.svg"}
+                                sx={{ width: 20, height: 20 }}
+                              />
+                              <Typography sx={{ 
+                                fontSize: '14px',
+                                color: "inherit",
+                                fontFamily: theme.typography.fontFamily 
+                              }}>
+                                Notifications ({notifications === undefined || notifications === null ? 0 : 
+                                notifications?.filter((notification) => notification.read === false).length})
+                              </Typography>
+                            </Box>
+                          </MenuItem>
+
+
+                          <Divider sx={{ backgroundColor: "rgba(255,255,255,0.1)" }} />
+
+                          <MenuItem
+                            onClick={() => {
+                              if (isCloud) {
+                                ReactGA.event({
+                                  category: "navbar",
+                                  action: "user_dropdown_click",
+                                  label: "go_to_about",
+                                })
+                              }
+                              handleCloseUserMenu();
+                              navigate("/docs/about");
+                            }}
+                            onMouseEnter={() => setIsHovered("about")}
+                            onMouseLeave={() => setIsHovered("")}
+                            sx={{
+                              py: 1.5,
+                              px: 2,
+                              fontFamily: theme.typography.fontFamily,
+                              transition: "color 0.1s ease",
+                              '&:hover': {
+                                backgroundColor: 'rgba(255, 255, 255, 0.1)',
+                                color: isHovered === "about" ? "#FF8544" : "white",
+                              },
+                            }}
+                          >
+                            <Box sx={{ display: 'flex', alignItems: 'center', gap: 1.5 }}>
+                              <Box 
+                                component="img"
+                                src={isHovered === "about" ? "/images/icons/about_hover.svg" : "/images/icons/about.svg"}
+                                sx={{ width: 20, height: 20, marginLeft: -0.2 }}
+                              />
+                              <Typography sx={{ 
+                                fontSize: '14px',
+                                color: "inherit",
+                                fontFamily: theme.typography.fontFamily 
+                              }}>
+                                About
+                              </Typography>
+                            </Box>
+                          </MenuItem>
+
+                          <MenuItem
+                            onClick={() => {
+                              if (isCloud) {
+                                ReactGA.event({
+                                  category: "navbar",
+                                  action: "user_dropdown_click",
+                                  label: "logout_click",
+                                })
+                              }
+                              handleCloseUserMenu();
+                              handleClickLogout();
+                            }}
+                            onMouseEnter={() => setIsHovered("logout")}
+                            onMouseLeave={() => setIsHovered("")}
+                            sx={{
+                              py: 1.5,
+                              px: 2,
+                              fontFamily: theme.typography.fontFamily,
+                              '&:hover': {
+                                backgroundColor: 'rgba(255, 255, 255, 0.1)',
+                                color: isHovered === "logout" ? "#FD4C62" : "white",
+                              },
+                            }}
+                          >
+                            <Box sx={{ display: 'flex', alignItems: 'center', gap: 1.5 }}>
+                              <Box 
+                                component="img"
+                                src={isHovered === "logout" ? "/images/icons/logout_hover.svg" : "/images/icons/logout.svg"}
+                                sx={{ width: 20, height: 20 }}
+                              />
+                              <Typography sx={{ 
+                                fontSize: '14px',
+                                color: "inherit",
+                                fontFamily: theme.typography.fontFamily 
+                              }}>
+                                Logout
+                              </Typography>
+                            </Box>
+                          </MenuItem>
+
+                          <Divider sx={{ backgroundColor: "rgba(255,255,255,0.1)" }} />
+                          
+                          <Box 
+                            sx={{ 
+                              py: 1.5,
+                              px: 2,
+                              backgroundColor: 'rgba(255, 255, 255, 0.03)',
+                              display: 'flex',
+                              alignItems: 'center',
+                              justifyContent: 'center',
+                              mt: -1
+                            }}
+                          >
+                            <Typography 
+                              variant="caption"
+                              sx={{ 
+                                color: 'rgba(255, 255, 255, 0.5)',
+                                fontSize: '12px',
+                                fontFamily: theme.typography.fontFamily,
+                                letterSpacing: '0.2px',
+                                margin: 0
+                              }}
+                            >
+                              Version 2.0.2
+                            </Typography>
+                          </Box>
+                        </Menu>
+                      </>
+                    )}
+                  </>
+                ) : (
+                  <>
+                    <Tooltip 
+                     title={
+                        <div style={{ display: 'flex', flexDirection: 'row', alignItems: 'center', gap: 4, color : "#FF8544" }}>
+                            <KeyboardCommandKeyIcon style={{ width: 15 }} />
+                              + K
+                       </div>
+                          } 
+                      placement="bottom"
+                      arrow  
+                      componentsProps={{
+                        tooltip: {
+                            sx: {
+                              backgroundColor: "rgba(33, 33, 33, 1)",
+                              color: "rgba(241, 241, 241, 1)",
+                              fontSize: 12,
+                              border: "1px solid rgba(73, 73, 73, 1)",
+                              fontFamily: theme?.typography?.fontFamily,
+                              }
+                            },
+                        popper: {
+                            sx: {
+                              zIndex: 1000019,
+                              }
+                            }
+                        }}
+                        >
+                        <IconButton
+                           sx={searchIconButtonStyles}
+                           onClick={() => {
+                             if (isCloud) {
+                               ReactGA.event({
+                                 category: "navbar",
+                                 action: "search_icon_click",
+                                 label: "search_icon_click",
+                               })
+                             }
+                             setSearchBarModalOpen(true);
+                             setIsDocSearchModalOpen(false);
+                           }}
+                         >
+                           <SearchIcon sx={{ fontSize: 24 }} />
+                        </IconButton>
+                    </Tooltip>
+                    <Divider orientation="vertical" sx={{ height: 24, bgcolor: '#494949'}} />
+                    <Button
+                      variant="outlined"
+                      disableRipple
+                      sx={{
+                        ...sharedButtonStyles,
+                        px: 0,
+                        color: "white",
+                        backgroundColor: "transparent",
+                        border: "none",
+                        "&:hover": {
+                          border: "none",
+                          backgroundColor: "transparent",
+                          color: "#FF8544",
+                        },
+                        "&:active": {
+                          backgroundColor: "transparent",
+                        },
+                      }}
+                      onClick={() => {
+                        if (isCloud) {
+                          ReactGA.event({
+                            category: "navbar",
+                            action: "signin_click",
+                            label: "signin_click",
+                          });
+                        }
+                        navigate("/login");
+                      }}
+                    >
+                      Login
+                    </Button>
+
+					{isCloud && 
+						<Button
+						  variant="contained"
+              color="secondary"
+						  sx={{
+							...sharedButtonStyles,
+							display: {
+							  xs: "none",
+							  lg: "block"
+							},
+							backgroundColor: "#2F2F2F",
+							border: "1px solid #2F2F2F",
+							borderRadius: "8px",
+							"&:hover": {
+							  border: "1px solid white",
+							  backgroundColor: "#2F2F2F",
+							},
+						  }}
+						  onClick={() => {
+							if (isCloud) {
+							  ReactGA.event({
+								category: "navbar",
+								action: "signup_click",
+								label: "signup_click",
+							  });
+							}
+							navigate("/register");
+						  }}
+						>
+						  Sign Up
+						</Button>
+					}
+
+                    <Button
+                      variant="contained"
+                      sx={{
+                        ...sharedButtonStyles,
+                        backgroundColor: "#FF8544",
+                        borderRadius: "6px",
+                        color: "#1A1A1A",
+                        "&:hover": {
+                          backgroundColor: "#FF955C",
+                        },
+                      }}
+                      onClick={() => {
+                        if (isCloud) {
+                          ReactGA.event({
+                            category: "navbar",
+                            action: "Book a Demo",
+                            label: "Book a Demo",
+                          });
+                          navigate("/contact?category=book_a_demo");
+                        }else{
+                          window.open("https://shuffler.io/contact?category=book_a_demo", '_blank');
+                          return;
+                        }
+                      }}
+                    >
+                     {isTabletOrMobile ? "Demo" : "Book a Demo"}
+                    </Button>
+                  </>
+                )}
+              </Box>
+            </>
+          )}
+        </Toolbar>
+      </Container>
+    </AppBar>
+  );
+};
+
+export default Navbar;
diff --git a/frontend/src/components/Oauth2Auth.jsx b/frontend/src/components/Oauth2Auth.jsx
index a3abe710..24d04adf 100755
--- a/frontend/src/components/Oauth2Auth.jsx
+++ b/frontend/src/components/Oauth2Auth.jsx
@@ -1,7 +1,8 @@
-import React, { useRef, useState, useEffect, useLayoutEffect } from "react";
+import React, { useRef, useState, useEffect, useLayoutEffect, useContext } from "react";
+import { Context } from "../context/ContextApi.jsx";
 import { toast } from 'react-toastify';
 import { useParams, useNavigate, Link } from "react-router-dom";
-import theme from '../theme.jsx';
+import { getTheme } from '../theme.jsx';
 //import { useAlert 
 
 import { v4 as uuidv4 } from "uuid";
@@ -112,6 +113,8 @@ const AuthenticationOauth2 = (props) => {
       authenticationType.client_secret !== null &&
       authenticationType.client_secret.length > 0
   );	
+  const {themeMode, brandColor} = useContext(Context);
+  const theme = getTheme(themeMode, brandColor);
 
   const [clientId, setClientId] = React.useState(defaultConfigSet ? authenticationType.client_id : "");
   const [clientSecret, setClientSecret] = React.useState(defaultConfigSet ? authenticationType.client_secret : "");
@@ -724,7 +727,7 @@ const AuthenticationOauth2 = (props) => {
 							style={{ margin: 4, minHeight: 30, maxHeight: 30, borderRadius: theme.palette?.borderRadius, }}
 							src={selectedAction.large_image}
 						/>
-						<Typography style={{ margin: 0, marginLeft: 10, marginTop: 5,}} variant="body1">
+						<Typography style={{ margin: 0, marginLeft: 10, marginTop: 5, color: "#2f2f2f",}} variant="body1">
 							One-click Login
 						</Typography>
 					</span>
@@ -738,7 +741,7 @@ const AuthenticationOauth2 = (props) => {
   return (
     <div>
       <DialogTitle>
-        <div style={{ color: "white" }}>
+        <div style={{ color: theme.palette.text.primary }}>
           Authenticate {selectedApp.name.replaceAll("_", " ")}
         </div>
       </DialogTitle>
@@ -749,7 +752,7 @@ const AuthenticationOauth2 = (props) => {
             target="_blank"
             rel="norefferer"
             href="/docs/apps#authentication"
-            style={{ textDecoration: "none", color: "#f85a3e" }}
+            style={{ textDecoration: "none", color: theme.palette.linkColor}}
           >
             {" "}
             Learn more about Oauth2 with Shuffle
diff --git a/frontend/src/components/OrgHeaderNew.jsx b/frontend/src/components/OrgHeaderNew.jsx
index b319f3f3..1d8cbe82 100644
--- a/frontend/src/components/OrgHeaderNew.jsx
+++ b/frontend/src/components/OrgHeaderNew.jsx
@@ -1,8 +1,8 @@
-import React, { useEffect, useState } from "react";
-import theme from "../theme.jsx";
+import React, { useEffect, useState, useContext } from "react";
+import {getTheme} from "../theme.jsx";
 import { makeStyles } from "@mui/styles";
 import { toast } from 'react-toastify';
-
+import { Context } from "../context/ContextApi.jsx";
 import {
   Tooltip,
   TextField,
@@ -69,6 +69,8 @@ const OrgHeader = (props) => {
     selectedOrganization.description
   );
 
+  const { themeMode } = useContext(Context)
+  const {theme} = getTheme(themeMode)
 
   const [file, setFile] = React.useState("");
   const [fileBase64, setFileBase64] = React.useState(
@@ -364,10 +366,10 @@ const OrgHeader = (props) => {
     >
       <FormControl>
         <DialogTitle>
-          <div style={{ color: "rgba(255, 255, 255, 0.9)" }}>Upload Organization Image</div>
+          <div style={{ color: theme?.palette?.textColor}}>Upload Organization Image</div>
         </DialogTitle>
         {errorText}
-        <DialogContent style={{ color: "rgba(255, 255, 255, 0.65)" }}>
+        <DialogContent style={{ color: theme?.palette?.textColor }}>
           <AvatarEditor
             ref={setEditorRef}
             image={croppedData}
@@ -389,7 +391,7 @@ const OrgHeader = (props) => {
                 style={appIconStyle}
                 onClick={() => { upload.click(); }}
               >
-                <AddAPhotoOutlinedIcon style={{ color: "rgba(255, 255, 255, 0.9)" }} />
+                <AddAPhotoOutlinedIcon style={{ color: theme?.palette?.textColor }} />
               </Button>
             </Tooltip>
             <Tooltip title="Zoom In">
@@ -399,7 +401,7 @@ const OrgHeader = (props) => {
                 style={appIconStyle}
                 onClick={zoomIn}
               >
-                <ZoomInOutlinedIcon style={{ color: "rgba(255, 255, 255, 0.9)" }} />
+                <ZoomInOutlinedIcon style={{ color: theme?.palette?.textColor }} />
               </Button>
             </Tooltip>
             <Tooltip title="Zoom Out">
@@ -409,7 +411,7 @@ const OrgHeader = (props) => {
                 style={appIconStyle}
                 onClick={zoomOut}
               >
-                <ZoomOutOutlinedIcon style={{ color: "rgba(255, 255, 255, 0.9)" }} />
+                <ZoomOutOutlinedIcon style={{ color: theme?.palette?.textColor }} />
               </Button>
             </Tooltip>
             <Tooltip title="Rotate">
@@ -419,7 +421,7 @@ const OrgHeader = (props) => {
                 style={appIconStyle}
                 onClick={rotation}
               >
-                <LoopIcon style={{ color: "rgba(255, 255, 255, 0.9)" }} />
+                <LoopIcon style={{ color: theme?.palette?.textColor }} />
               </Button>
             </Tooltip>
           </div>
@@ -427,7 +429,7 @@ const OrgHeader = (props) => {
         </DialogContent>
         <DialogActions>
           <Button
-            style={{ borderRadius: "2px", fontSize: 16, textTransform: "none", color: "rgba(255, 255, 255, 0.9)" }}
+            style={{ borderRadius: "2px", fontSize: 16, textTransform: "none", color: theme?.palette?.textColor }}
             onClick={onCancelSaveAppIcon}
           >
             Cancel
@@ -491,7 +493,7 @@ const OrgHeader = (props) => {
         <div style={{ marginLeft: 16, alignContent: "center" }}>
           <div >
             <Button
-              style={{ backgroundColor: '#ff8544', fontSize: 16, textTransform: 'capitalize', color: "#212121", boxShadow: "none", borderRadius: 4, width: 128, height: 40 }}
+              style={{ fontSize: 16, textTransform: 'capitalize',  boxShadow: "none", borderRadius: 4, width: 128, height: 40 }}
               variant="contained"
               color="primary"
               onClick={() => {
@@ -503,9 +505,9 @@ const OrgHeader = (props) => {
           </div>
           <div>
             <Button
-              style={{ backgroundColor: '#494949', fontSize: 16, textTransform: 'capitalize', color: "#ffffff", boxShadow: "none", marginTop: 20, borderRadius: 4, width: 128, height: 40 }}
               variant="contained"
-              color="primary"
+              color="secondary"
+              style={{ fontSize: 16, textTransform: 'capitalize', boxShadow: "none", marginTop: 20, borderRadius: 4, width: 128, height: 40 }}
               onClick={() => removeImage()}
             >
               Remove
diff --git a/frontend/src/components/OrgHeaderexpandedNew.jsx b/frontend/src/components/OrgHeaderexpandedNew.jsx
index 9a3cda99..525491e6 100644
--- a/frontend/src/components/OrgHeaderexpandedNew.jsx
+++ b/frontend/src/components/OrgHeaderexpandedNew.jsx
@@ -1,8 +1,9 @@
-import React, { memo, useEffect, useState } from "react";
+import React, { memo, useEffect, useState, useContext } from "react";
 
 import { makeStyles } from "@mui/styles";
 import { toast } from "react-toastify"
-import theme from '../theme.jsx';
+import { getTheme } from '../theme.jsx';
+import { Context } from "../context/ContextApi.jsx";
 //import { useAlert 
 
 import {
@@ -89,6 +90,8 @@ const OrgHeaderexpandedNew = (props) => {
 	);
 
 	const [openNotification, setOpenNotification] = React.useState(false);
+	const { themeMode, supportEmail, brandColor } = useContext(Context);
+	const theme = getTheme(themeMode, brandColor);
 
 	const handleStatusChange = (event) => {
 		const { value } = event.target;
@@ -178,7 +181,7 @@ const OrgHeaderexpandedNew = (props) => {
 	const [uploadRepo, setUploadRepo] = React.useState(selectedOrganization.defaults === undefined ? "" : selectedOrganization.defaults.workflow_upload_repo === undefined || selectedOrganization.defaults.workflow_upload_repo.length === 0 ? "" : selectedOrganization.defaults.workflow_upload_repo)
 	const [uploadBranch, setUploadBranch] = React.useState(selectedOrganization.defaults === undefined ? defaultBranch : selectedOrganization.defaults.workflow_upload_branch === undefined || selectedOrganization.defaults.workflow_upload_branch.length === 0 ? defaultBranch : selectedOrganization.defaults.workflow_upload_branch)
 	const [uploadUsername, setUploadUsername] = React.useState(selectedOrganization.defaults === undefined ? "" : selectedOrganization.defaults.workflow_upload_username === undefined || selectedOrganization.defaults.workflow_upload_username.length === 0 ? "" : selectedOrganization.defaults.workflow_upload_username)
-	const [uploadToken, setUploadToken] = React.useState(selectedOrganization.defaults === undefined ? "" : selectedOrganization.defaults.workflow_upload_token === undefined || selectedOrganization.defaults.workflow_upload_token.length === 0 ? "" : selectedOrganization.defaults.workflow_upload_token)
+	const [uploadToken, setUploadToken] = React.useState("")
 	const [regionStatus, setRegionStatus] = useState();
 
 	useEffect(() => {
@@ -199,9 +202,10 @@ const OrgHeaderexpandedNew = (props) => {
 			setUploadUsername(selectedOrganization?.defaults?.workflow_upload_username)
 		}
 
-		if (uploadToken !== selectedOrganization?.defaults?.workflow_upload_token) {
-			setUploadToken(selectedOrganization?.defaults?.workflow_upload_token)
-		}
+		// Not showing the token in the UI (cause it's in plain text)
+		// if (uploadToken !== selectedOrganization?.defaults?.workflow_upload_token) {
+		// 	setUploadToken(selectedOrganization?.defaults?.workflow_upload_token)
+		// }
 	}, [selectedOrganization])
 
 	useEffect(() => {
@@ -264,7 +268,7 @@ const OrgHeaderexpandedNew = (props) => {
 
 	const handleSendChangeRegionMail = (region) => {
 		if (selectedOrganization === undefined || selectedOrganization === null) {
-			toast.error("Failed to send request for changing region. Please contact support@shuffler.io.")
+			toast.error(`Failed to send request for changing region. Please contact ${supportEmail}`)
 			return
 		}
 
@@ -294,30 +298,29 @@ const OrgHeaderexpandedNew = (props) => {
 			body: JSON.stringify(data),
 		}).then((response) => {
 			if (response.status !== 200) {
-				toast.error("Failed to send request for changing region. Please contact support@shuffler.io.")
+				toast.error(`Failed to send request for changing region. Please contact ${supportEmail}`)
 			} else {
 				toast.success("Successfully sent request for region change. We will process the move and contact you shortly.")
 			}
 		}).catch((err) => {
 			console.log(err)
-			toast.error("Failed to send request for changing region. Please contact support@shuffler.io.")
+			toast.error(`Failed to send request for changing region. Please contact ${supportEmail}`)
 		})
 	}
 
 	const setSelectedRegion = (region) => {
 
 		// send a POST request to /api/v1/orgs/{org_id}/region with the region as the body
-		if (region === "US") {
-			region = "us-west2"
-		} else if (region === "EU") {
-			region = "europe-west2"
-		} else if (region === "CA") {
-			region = "northamerica-northeast1"
-		} else if (region === "UK") {
-			region = "europe-west2"
-		} else if (region === "EU-2") {
-			region = "europe-west3"
-		}
+		const regionMap = {
+			"US": "us-west2",
+			"EU": "europe-west2",
+			"CA": "northamerica-northeast1",
+			"UK": "europe-west2",
+			"EU-2": "europe-west3",
+			"AUS": "australia-southeast1"
+		  };
+
+		region = regionMap[region] || region;
 
 		var data = {
 			dst_region: region
@@ -336,7 +339,11 @@ const OrgHeaderexpandedNew = (props) => {
 			timeOut: 1000
 		}).then((response) => {
 			if (response.status !== 200) {
-				toast("Failed to change region!")
+				response.json().then((reason) => {
+					toast.error("Failed to change region: " + reason.reason)
+				}).catch((err) => {
+					toast.error("Failed to change region")
+				});
 			}
 			else {
 				toast("Region changed successfully! Reloading in 5 seconds..")
@@ -347,7 +354,7 @@ const OrgHeaderexpandedNew = (props) => {
 
 			}
 
-			return response.json();
+			// return responseJson
 		})
 	}
 
@@ -355,7 +362,7 @@ const OrgHeaderexpandedNew = (props) => {
 	const orgSaveButton = (
 		<Tooltip title="Save any unsaved data" placement="bottom">
 			<Button
-				style={{ width: 244, height: 51, display: 'flex', justifyContent: 'center', textTransform: 'capitalize', padding: "16px, 24px, 16px, 24px", borderRadius: 4, backgroundColor: "#ff8544", color: "#1a1a1a", fontSize: 16, }}
+				style={{ width: 244, height: 51, display: 'flex', justifyContent: 'center', textTransform: 'capitalize', padding: "16px, 24px, 16px, 24px", borderRadius: 4, fontSize: 16, }}
 				variant="contained"
 				color="primary"
 				disabled={
@@ -441,11 +448,11 @@ const OrgHeaderexpandedNew = (props) => {
 				<Grid item xs={12} style={{}}>
 					<span>
 						<div style={{}}>
-							<div style={{ flex: "3", color: "white" }}>
+							<div style={{ flex: "3", color: theme.palette.text.primary }}>
 								<div style={{ marginTop: 8, display: "flex" }} />
 								<div style={{ display: "flex" }}>
 									<div style={{ width: "100%", maxWidth: 434, marginRight: 10 }}>
-										Name
+										<Typography variant="text" style={{color: theme.palette.text.primary}}>Name</Typography>
 										<TextField
 											required
 											style={{
@@ -456,7 +463,8 @@ const OrgHeaderexpandedNew = (props) => {
 												maxWidth: 434,
 												marginTop: "5px",
 												marginRight: "15px",
-												backgroundColor: isEditOrgTab ? "#212121" : theme.palette.inputColor,
+												color: theme.palette.textFieldStyle.color,
+												backgroundColor: isEditOrgTab ? theme.palette.textFieldStyle.backgroundColor : theme.palette.inputColor,
 											}}
 											fullWidth={true}
 											placeholder="Name"
@@ -510,10 +518,11 @@ const OrgHeaderexpandedNew = (props) => {
 											color="primary"
 											InputProps={{
 												style: {
-													color: "white",
+													color: theme.palette.textFieldStyle.color,
 													height: "35px",
 													fontSize: "1em",
 													borderRadius: 4,
+													backgroundColor: theme.palette.textFieldStyle.backgroundColor,
 												},
 												classes: {
 													notchedOutline: isEditOrgTab ? null : classes.notchedOutline,
@@ -523,10 +532,10 @@ const OrgHeaderexpandedNew = (props) => {
 									</div>
 									{userdata?.support ? (
 										<div style={{ alignItems: 'center' }}>
-											<div style={{ marginRight: '12px', color: 'white' }}>Status</div>
+											<div style={{ marginRight: '12px', color: theme.palette.text.primary }}>Status</div>
 											<FormControl style={{ width: 220, height: 35 }}>
 												<Select
-													style={{ minWidth: 220, marginTop: 5, maxWidth: 220, height: 35, borderRadius: 4 }}
+													style={{ minWidth: 220, marginTop: 5, maxWidth: 220, height: 35, borderRadius: 4, color: theme.palette.textFieldStyle.color}}
 													id="multiselect-status"
 													multiple
 													value={selectedStatus}
@@ -535,7 +544,7 @@ const OrgHeaderexpandedNew = (props) => {
 													renderValue={(selected) => selected.join(', ')}
 													MenuProps={MenuProps}
 												>
-													{["contacted", "lead", "demo done", "pov", "customer", "open source", "student", "internal", "creator", "tech partner", "old customer", "old lead"].map((name) => (
+													{["contacted", "lead", "demo done", "pov", "customer", "open source", "student", "internal", "creator", "tech partner", "integration partner", "distribution partner", "service partner", "old customer", "old lead"].map((name) => (
 														<MenuItem key={name} value={name}>
 															<Checkbox checked={selectedStatus.indexOf(name) > -1} />
 															<ListItemText primary={name} />
@@ -549,13 +558,13 @@ const OrgHeaderexpandedNew = (props) => {
 
 									{isCloud ? (
 										<div style={{ marginLeft: 13, fontSize: 16, color: "#9E9E9E" }} >
-											Change Region
+											<Typography variant="text" style={{color: theme.palette.text.primary}}>Change Region</Typography>
 											<RegionChangeModal selectedOrganization={selectedOrganization} setSelectedRegion={setSelectedRegion} userdata={userdata} handleSendChangeRegionMail={handleSendChangeRegionMail} />
 										</div>
 									) : null}
 								</div>
 								<div style={{ marginTop: "10px" }} />
-								About
+								<Typography variant="text" style={{color: theme.palette.text.primary}}>Description</Typography>
 								<div style={{ display: "flex" }}>
 									<TextField
 										required
@@ -565,7 +574,8 @@ const OrgHeaderexpandedNew = (props) => {
 											flex: "1",
 											marginTop: "5px",
 											marginRight: "15px",
-											backgroundColor: isEditOrgTab ? "#212121" : theme.palette.inputColor,
+											color: theme.palette.textFieldStyle.color,
+											backgroundColor: isEditOrgTab ? theme.palette.textFieldStyle.backgroundColor : theme.palette.inputColor,
 											height: 89,
 											borderRadius: 4,
 										}}
@@ -618,7 +628,7 @@ const OrgHeaderexpandedNew = (props) => {
 												notchedOutline: isEditOrgTab ? null : classes.notchedOutline,
 											},
 											style: {
-												color: "white",
+												color: theme.palette.textFieldStyle.color,
 												height: 89,
 												borderRadius: 4,
 											},
@@ -629,7 +639,7 @@ const OrgHeaderexpandedNew = (props) => {
 
 								</div>
 							</div>
-							<Typography variant="h5" style={{ color: "rgba(241, 241, 241, 1)", fontSize: 24, fontWeight: 600, marginTop: 40, textAlign: "left" }}>
+							<Typography variant="h5" style={{ fontSize: 24, fontWeight: 500, marginTop: 40, textAlign: "left" }}>
 								Preferences
 							</Typography>
 
@@ -650,7 +660,7 @@ const OrgHeaderexpandedNew = (props) => {
 				</Grid>
 				<Grid item xs={12}>
 					<span>
-						<Typography style={{ fontWeight: 400, fontSize: 16 }}>Org Documentation reference</Typography>
+						<Typography style={{ fontWeight: 400, fontSize: 18, color: theme.palette.text.primary }}>Org Documentation reference</Typography>
 
 						<Typography variant="body2" color="textSecondary" style={{ fontWeight: 400, fontSize: 16, marginTop: 8 }}>
 							Add a URL that is added as a link, pointing to any external documentation page you want.
@@ -665,7 +675,8 @@ const OrgHeaderexpandedNew = (props) => {
 								height: 35,
 								fontSize: 16,
 								borderRadius: 4,
-								backgroundColor: isEditOrgTab ? "rgba(33, 33, 33, 1)" : theme.palette.inputColor,
+								color: theme.palette.textFieldStyle.color,
+								backgroundColor: isEditOrgTab ? theme.palette.textFieldStyle.backgroundColor : theme.palette.inputColor,
 							}}
 							fullWidth={true}
 							type="name"
@@ -706,6 +717,13 @@ const OrgHeaderexpandedNew = (props) => {
 											auto_provision: selectedOrganization?.sso_config?.auto_provision,
 										}
 									)
+									
+									if (userdata.org_status.includes("integration_partner")) {
+										toast.info("Reloading page to update the changes everywhere")
+										setTimeout(() => {
+											window.location.reload()
+										}, 5000)
+									}
 								}
 							}}
 							onChange={(e) => {
@@ -716,8 +734,7 @@ const OrgHeaderexpandedNew = (props) => {
 									notchedOutline: isEditOrgTab ? null : classes.notchedOutline,
 								},
 								style: {
-									color: "white",
-
+									color: theme.palette.textFieldStyle.color,
 									fontWeight: 400,
 									fontSize: 16,
 									borderRadius: 4,
@@ -733,9 +750,9 @@ const OrgHeaderexpandedNew = (props) => {
 					serverside={false}
 				/>
 				<Grid item xs={12} style={{ marginTop: 20, }}>
-					<Typography variant="h4" style={{ textAlign: "left", color: "rgba(241, 241, 241, 1)", fontSize: 24, fontWeight: 600, }}>Workflow Backup Repository</Typography>
-					<Typography variant="body2" style={{ textAlign: "left", marginTop: 8, color: "#9E9E9E", fontSize: 16, fontWeight: 400 }}>
-						Decide where workflows are backed up in a Git repository. Will create logs and notifications if upload fails. The repository and branch must already have been initialized. Files will show up in the repo root in the /orgId/workflow-status/workflowId.json format. <b>MSSP:</b> If suborg exists, this will automatically be applied for them as well (not retroactive). <a href="/docs/configuration#environment-variables" style={{ textDecoration: "none", color: "#f86a3e" }} target="_blank">Credentials are encrypted.</a>
+					<Typography variant="h5" style={{ textAlign: "left", fontWeight: 500, }}>Workflow Backup Repository</Typography>
+					<Typography variant="body2" style={{ textAlign: "left", marginTop: 8, color: theme.palette.text.secondary, fontSize: 16, fontWeight: 400 }}>
+						Decide where workflows are backed up in a Git repository. Will create logs and notifications if upload fails. The repository and branch must already have been initialized. Files will show up in the repo root in the /orgId/workflow-status/workflowId.json format. <b>MSSP:</b> If suborg exists, this will automatically be applied for them as well (not retroactive). <a href="/docs/configuration#environment-variables" style={{ textDecoration: "none", color: theme.palette.linkColor }} target="_blank">Credentials are encrypted.</a>
 					</Typography>
 					<Grid container style={{ marginTop: 10, }} spacing={2}>
 						<Grid item xs={6} style={{}}>
@@ -748,7 +765,7 @@ const OrgHeaderexpandedNew = (props) => {
 										marginTop: "8px",
 										marginRight: "16px",
 										height: 35,
-										backgroundColor: isEditOrgTab ? "rgba(33, 33, 33, 1)" : theme.palette.inputColor,
+										backgroundColor: isEditOrgTab ? theme.palette.textFieldStyle.backgroundColor : theme.palette.inputColor,
 									}}
 									fullWidth={true}
 									type="name"
@@ -767,7 +784,7 @@ const OrgHeaderexpandedNew = (props) => {
 											notchedOutline: isEditOrgTab ? null : classes.notchedOutline,
 										},
 										style: {
-											color: "white",
+											color: theme.palette.textFieldStyle.color,
 
 											fontWeight: 400,
 											fontSize: 16,
@@ -788,7 +805,7 @@ const OrgHeaderexpandedNew = (props) => {
 										marginTop: "8px",
 										marginRight: "16px",
 										height: 35,
-										backgroundColor: isEditOrgTab ? "rgba(33, 33, 33, 1)" : theme.palette.inputColor,
+										backgroundColor: isEditOrgTab ? theme.palette.textFieldStyle.backgroundColor : theme.palette.inputColor,
 									}}
 									fullWidth={true}
 									type="name"
@@ -807,7 +824,7 @@ const OrgHeaderexpandedNew = (props) => {
 											notchedOutline: isEditOrgTab ? null : classes.notchedOutline,
 										},
 										style: {
-											color: "white",
+											color: theme.palette.textFieldStyle.color,
 
 											fontWeight: 400,
 											fontSize: 16,
@@ -830,7 +847,7 @@ const OrgHeaderexpandedNew = (props) => {
 										marginTop: "8px",
 										marginRight: "16px",
 										height: 35,
-										backgroundColor: isEditOrgTab ? "rgba(33, 33, 33, 1)" : theme.palette.inputColor,
+										backgroundColor: isEditOrgTab ? theme.palette.textFieldStyle.backgroundColor : theme.palette.inputColor,
 									}}
 									fullWidth={true}
 									type="name"
@@ -849,8 +866,7 @@ const OrgHeaderexpandedNew = (props) => {
 											notchedOutline: isEditOrgTab ? null : classes.notchedOutline,
 										},
 										style: {
-											color: "white",
-
+											color: theme.palette.textFieldStyle.color,
 											fontWeight: 400,
 											fontSize: 16,
 											borderRadius: 4,
@@ -862,7 +878,7 @@ const OrgHeaderexpandedNew = (props) => {
 						</Grid>
 						<Grid item xs={6} style={{}}>
 							<span>
-								<Typography style={{ fontWeight: 400, fontSize: 16 }}>Git token/password</Typography>
+								<Typography style={{ fontWeight: 400, fontSize: 16 }}>New Git token/password</Typography>
 								<TextField
 									required
 									style={{
@@ -870,7 +886,7 @@ const OrgHeaderexpandedNew = (props) => {
 										marginTop: "8px",
 										marginRight: "16px",
 										height: 35,
-										backgroundColor: isEditOrgTab ? "rgba(33, 33, 33, 1)" : theme.palette.inputColor,
+										backgroundColor: isEditOrgTab ? theme.palette.textFieldStyle.backgroundColor : theme.palette.inputColor,
 									}}
 									fullWidth={true}
 									id="outlined-with-placeholder"
@@ -888,7 +904,7 @@ const OrgHeaderexpandedNew = (props) => {
 											notchedOutline: isEditOrgTab ? null : classes.notchedOutline,
 										},
 										style: {
-											color: "white",
+											color: theme.palette.textFieldStyle.color,
 
 											fontWeight: 400,
 											fontSize: 16,
@@ -915,7 +931,7 @@ const OrgHeaderexpandedNew = (props) => {
 									marginTop: "8px",
 									marginRight: "16px",
 									height: 35,
-									backgroundColor: isEditOrgTab ? "rgba(33, 33, 33, 1)" : theme.palette.inputColor,
+									backgroundColor: isEditOrgTab ? theme.palette.textFieldStyle.backgroundColor : theme.palette.inputColor,
 								}}
 								fullWidth={true}
 								type="name"
@@ -932,7 +948,8 @@ const OrgHeaderexpandedNew = (props) => {
 										notchedOutline: isEditOrgTab ? null : classes.notchedOutline,
 									},
 									style: {
-										color: "white",
+										color: theme.palette.textFieldStyle.color,
+										backgroundColor: theme.palette.textFieldStyle.backgroundColor,
 
 										fontWeight: 400,
 										fontSize: 16,
@@ -954,7 +971,7 @@ const OrgHeaderexpandedNew = (props) => {
 									flex: "1",
 									marginTop: "8px",
 									marginRight: "15px",
-									backgroundColor: isEditOrgTab ? "rgba(33, 33, 33, 1)" : theme.palette.inputColor,
+									backgroundColor: isEditOrgTab ? theme.palette.textFieldStyle.backgroundColor : theme.palette.inputColor,
 									height: 35,
 								}}
 								fullWidth={true}
@@ -972,7 +989,7 @@ const OrgHeaderexpandedNew = (props) => {
 										notchedOutline: isEditOrgTab ? null : classes.notchedOutline,
 									},
 									style: {
-										color: "white",
+										color: theme.palette.textFieldStyle.color,
 
 										fontWeight: 400,
 										fontSize: 16,
@@ -994,7 +1011,7 @@ const OrgHeaderexpandedNew = (props) => {
 									flex: "1",
 									marginTop: "5px",
 									marginRight: "15px",
-									backgroundColor: isEditOrgTab ? "rgba(33, 33, 33, 1)" : theme.palette.inputColor,
+									backgroundColor: isEditOrgTab ? theme.palette.textFieldStyle.backgroundColor : theme.palette.inputColor,
 									height: 35,
 								}}
 								fullWidth={true}
@@ -1012,7 +1029,7 @@ const OrgHeaderexpandedNew = (props) => {
 										notchedOutline: isEditOrgTab ? null : classes.notchedOutline,
 									},
 									style: {
-										color: "white",
+										color: theme.palette.textFieldStyle.color,
 
 										fontWeight: 400,
 										fontSize: 16,
@@ -1034,7 +1051,7 @@ const OrgHeaderexpandedNew = (props) => {
 									flex: "1",
 									marginTop: "5px",
 									marginRight: "15px",
-									backgroundColor: isEditOrgTab ? "rgba(33, 33, 33, 1)" : theme.palette.inputColor,
+									backgroundColor: isEditOrgTab ? theme.palette.textFieldStyle.backgroundColor : theme.palette.inputColor,
 									height: 35,
 								}}
 								fullWidth={true}
@@ -1052,7 +1069,7 @@ const OrgHeaderexpandedNew = (props) => {
 										notchedOutline: isEditOrgTab ? null : classes.notchedOutline,
 									},
 									style: {
-										color: "white",
+										color: theme.palette.textFieldStyle.color,
 
 										fontWeight: 400,
 										fontSize: 16,
@@ -1091,6 +1108,7 @@ const RegionChangeModal = memo(({ selectedOrganization, setSelectedRegion, userd
 		"EU-2": "eu",
 		"CA": "ca",
 		"UK": "gb",
+		"AUS": "au",
 	};
 
 	//let regiontag = "UK";
@@ -1112,6 +1130,9 @@ const RegionChangeModal = memo(({ selectedOrganization, setSelectedRegion, userd
 		} else if (regiontag === "ca") {
 			regiontag = "CA";
 			regionCode = "ca";
+		} else if (regiontag === "au") {
+			regiontag = "AUS";
+			regionCode = "au"
 		}
 	}
 
@@ -1124,11 +1145,12 @@ const RegionChangeModal = memo(({ selectedOrganization, setSelectedRegion, userd
 				value={regiontag}
 				style={{ minWidth: 120, height: 35, borderRadius: 4 }}
 				onChange={(e) => {
-					if (userdata?.support) {
-						setSelectedRegion(e.target.value)
-					} else {
-						handleSendChangeRegionMail(e.target.value)
-					}
+					// if (userdata?.support) {
+					// 	setSelectedRegion(e.target.value)
+					// } else {
+					// 	handleSendChangeRegionMail(e.target.value)
+					// }
+					setSelectedRegion(e.target.value)
 				}}
 			>
 				{Object.keys(regionMapping).map((region, index) => {
@@ -1138,6 +1160,7 @@ const RegionChangeModal = memo(({ selectedOrganization, setSelectedRegion, userd
 						selectedOrganization.region = "europe-west2";
 					}
 
+
 					// Check if the current region matches the selected region
 					if (region === selectedOrganization.region) {
 						// If the region matches, set the MenuItem as selected
@@ -1145,7 +1168,7 @@ const RegionChangeModal = memo(({ selectedOrganization, setSelectedRegion, userd
 							<MenuItem value={region} key={index} disabled>
 								{/* show region image through cdn */}
 								<img src={`https://flagcdn.com/48x36/${regionImageCode}.png`} alt={region} style={{ marginRight: 10 }} />
-								{region}
+								{region === "AUS" ? "AUS (test)" : region}
 							</MenuItem>
 						);
 					} else {
@@ -1155,7 +1178,7 @@ const RegionChangeModal = memo(({ selectedOrganization, setSelectedRegion, userd
 								alt={region}
 								style={{ marginRight: 10, width: 20, height: 18, }}
 							/>
-							{region}
+							{region === "AUS" ? "AUS (test)" : region}
 						</MenuItem>;
 					}
 				})}
diff --git a/frontend/src/components/OrganizationTab.jsx b/frontend/src/components/OrganizationTab.jsx
index 3fc2cbee..d7f2acc3 100644
--- a/frontend/src/components/OrganizationTab.jsx
+++ b/frontend/src/components/OrganizationTab.jsx
@@ -1,15 +1,15 @@
-import React, { useEffect, useState, useCallback } from 'react';
+import React, { useEffect, useState, useCallback, useContext } from 'react';
 import { Link, useNavigate, useLocation } from "react-router-dom";
 import Billing from "../components/Billing.jsx";
 import Priorities from "../components/Priorities.jsx";
 import Branding from "../components/Branding.jsx";
-import AnalyticsTab from '../components/AnalyticsTab.jsx';
 import EditOrgTab from '../components/EditOrgTab.jsx';
 import CloudSyncTab from '../components/CloudSyncTab.jsx';
 import   SSOTab from "../components/ssoTab.jsx"
 import { ToastContainer, toast } from "react-toastify";
 import { Button, Tooltip } from '@mui/material';
-
+import { getTheme } from '../theme.jsx';
+import { Context } from '../context/ContextApi.jsx';
 const OrganizationTab = (props) => {
     const location = useLocation();
     const navigate = useNavigate();
@@ -26,7 +26,9 @@ const OrganizationTab = (props) => {
         selectedOrganization, handleGetOrg, 
         handleStatusChange, handleEditOrg,
         isLoaded,
-        removeCookie
+        removeCookie,
+        isIntegrationPartner, isChildOrg,
+        isGlobalUser
     } = props;
 
     const [selectedTab, setSelectedTab] = useState('org_config');
@@ -34,10 +36,28 @@ const OrganizationTab = (props) => {
     const [billingInfo, setBillingInfo] = useState({});
     const [orgRequest, setOrgRequest] = React.useState(true);
     const [curIndex, setCurIndex] = React.useState(0);
+    const items = ['Org Configuration', "SSO", "Notifications", 'Billing & Stats', 'Branding'];
+    const [visibleTabs, setVisibleTabs] = useState(items);
     const [unreadNotifications, setUnreadNotifications] = React.useState(
         notifications?.filter((notification) => notification.read === false)?.length
     );
 
+    const { themeMode, brandColor, brandName } = useContext(Context);
+    const theme = getTheme(themeMode, brandColor); 
+
+
+    useEffect(() => {
+        if (isIntegrationPartner && isChildOrg && !isGlobalUser) {
+            setVisibleTabs(items.filter((item) => item !== 'Branding' && item !== 'SSO'));
+        }else {
+            if (userdata && userdata.active_org && userdata.active_org.role === 'admin') {
+                setVisibleTabs(items);
+            }else {
+                setVisibleTabs(items.filter((item) => item !== 'SSO'));
+            }
+        }
+    },[isIntegrationPartner, isChildOrg, isGlobalUser, userdata]);
+
     useEffect(() => {
         const queryParams = new URLSearchParams(location.search);
         const tabName = queryParams.get('admin_tab');
@@ -49,10 +69,26 @@ const OrganizationTab = (props) => {
             } else if(decodedTabName === 'sso'){
                 setCurIndex(1)
             }else if (decodedTabName === 'notifications' || decodedTabName === 'priorities') {
-                setCurIndex(2);
+                if (isIntegrationPartner && isChildOrg && !isGlobalUser) {
+                    setCurIndex(1);
+                }else {
+                    if (userdata && userdata.active_org && userdata.active_org.role === 'admin') {
+                        setCurIndex(2);
+                    }else {
+                        setCurIndex(1);
+                    }
+                }
             } else if (decodedTabName === 'billingstats' || decodedTabName === 'billing') {
-                setCurIndex(3);
-            } else if (decodedTabName === 'branding(beta)') {
+                if (isIntegrationPartner && isChildOrg && !isGlobalUser) {
+                    setCurIndex(2);
+                } else {
+                    if (userdata && userdata?.active_org && userdata?.active_org?.role === 'admin') {
+                        setCurIndex(3);
+                    } else {
+                        setCurIndex(2);
+                    }
+                }
+            } else if (decodedTabName === 'branding') {
                 setCurIndex(4);
             }
             //  else if (decodedTabName === 'analytics') {
@@ -65,7 +101,7 @@ const OrganizationTab = (props) => {
         const formattedTabName = tabName.toLowerCase().replace(/[\s&]+/g, '');
         const encodedTabName = encodeURIComponent(formattedTabName);
         setSelectedTab(formattedTabName);
-        document.title = `Shuffle - admin - ${formattedTabName}`;
+        document.title = brandName?.length > 0 ? `${brandName} - admin - ${formattedTabName}` : `Shuffle - admin - ${formattedTabName}`;
         navigate(`?admin_tab=${encodedTabName}`);
     };
 
@@ -121,7 +157,7 @@ const OrganizationTab = (props) => {
                         isLoaded={isLoaded}
                     />
                 );
-            case 'branding(beta)':
+            case 'branding':
                 return <Branding
                     isCloud={isCloud}
                     userdata={userdata}
@@ -137,11 +173,12 @@ const OrganizationTab = (props) => {
                 return <EditOrgTab isCloud={isCloud} selectedStatus={selectedStatus} setSelectedStatus={setSelectedStatus} handleStatusChange={handleStatusChange} handleEditOrg={handleEditOrg} userdata={userdata} globalUrl={globalUrl} serverside={serverside} handleGetOrg={handleGetOrg} setSelectedOrganization={setSelectedOrganization} selectedOrganization={selectedOrganization} />;
         }
     };
-   
+    
+
     return (
-        <div style={{ height: "100%", width: "100%", color: '#FFFFFF', backgroundColor: '#212121', borderTopRightRadius: '8px', borderBottomRightRadius: 8, borderLeft: "1px solid #494949", boxSizing: 'border-box' }}>
-            <div style={{ display: 'flex', justifyContent: 'space-around', width: "100%", borderBottom: '1px solid #494949' ,boxSizing: 'border-box' }}>
-                {['Org Configuration', "sso", "Notifications", 'Billing & Stats', 'Branding (Beta)'].map((tabName, index) => (
+        <div style={{ height: "100%", width: "100%", color: theme.palette.platformColor, backgroundColor: theme.palette.platformColor, borderTopRightRadius: '8px', borderBottomRightRadius: 8, borderLeft: theme.palette.defaultBorder, boxSizing: 'border-box' }}>
+            <div style={{ display: 'flex', justifyContent: 'space-around', width: "100%", borderBottom: theme.palette.defaultBorder ,boxSizing: 'border-box' }}>
+                {visibleTabs.map((tabName, index) => (
                     <Tooltip
                         key={index}
                         title={
@@ -162,10 +199,10 @@ const OrganizationTab = (props) => {
                                 sx={{
                                     "&.MuiButton-root": {
                                         padding: '28px 0',
-                                        borderBottom: index === curIndex ? '2px solid #FF8444' : 'none',
+                                        borderBottom: index === curIndex ? `2px solid ${theme.palette.primary.main}`: 'none',
                                         cursor: 'pointer',
                                         fontWeight: index === curIndex ? 'bold' : 'normal',
-                                        color: index === curIndex ? "#FF8444" : "#FFFFFF",
+                                        color: index === curIndex ? theme.palette.primary.main : theme.palette.text.primary,
                                         textTransform: 'none',
                                         fontSize: 16,
                                         width: "100%",
@@ -173,7 +210,7 @@ const OrganizationTab = (props) => {
                                         borderRadius: 0,
                                     },
                                     "&: hover": {
-                                        backgroundColor: "#323232"
+                                        backgroundColor: theme.palette.hoverColor
                                     },
                                     "&.Mui-disabled": {
                                         color: "#6F6F6F",
@@ -183,7 +220,7 @@ const OrganizationTab = (props) => {
                                     ((tabName === "sso")) && !(userdata?.support || userdata?.active_org?.role === "admin")
                                 }
                             >
-                                {index === 2 && unreadNotifications > 0 ? (
+                                {tabName.toLowerCase() === "notifications" && unreadNotifications > 0 ? (
                                     <div style={{ position: 'relative' }}>
                                         <div style={{
                                             position: 'absolute',
@@ -192,7 +229,7 @@ const OrganizationTab = (props) => {
                                             width: 20,
                                             height: 20,
                                             borderRadius: 10,
-                                            backgroundColor: '#FF8444',
+                                            backgroundColor: theme.palette.primary.main,
                                             color: '#FFFFFF',
                                             fontSize: 12,
                                             display: 'flex',
@@ -204,7 +241,7 @@ const OrganizationTab = (props) => {
                                         {tabName}
                                     </div>
                                 ) : (
-                                    <>{index === 1 ? "SSO" : tabName}</>
+                                    <>{tabName}</>
                                 )}
                             </Button>
                         </div>
diff --git a/frontend/src/components/ParsedAction.jsx b/frontend/src/components/ParsedAction.jsx
index e035724d..fe7b5649 100755
--- a/frontend/src/components/ParsedAction.jsx
+++ b/frontend/src/components/ParsedAction.jsx
@@ -1,17 +1,17 @@
-import React, { useState, useEffect, useLayoutEffect, useMemo } from "react";
+import React, { useState, useEffect, useContext, useMemo } from "react";
 import { toast } from 'react-toastify';
 import { makeStyles, createStyles } from "@mui/styles";
-import theme from '../theme.jsx';
+import {getTheme} from '../theme.jsx';
 
 import { useNavigate, Link, useParams } from "react-router-dom";
-import { validateJson, GetIconInfo } from "../views/Workflows.jsx";
+import { validateJson, GetIconInfo } from "../views/Workflows2.jsx";
 import { GetParsedPaths } from "../views/Apps.jsx";
 import { sortByKey } from "../views/AngularWorkflow.jsx";
 import { NestedMenuItem } from "mui-nested-menu";
 import { parsedDatatypeImages } from "../components/AppFramework.jsx";
 import { green, yellow, red } from "../views/AngularWorkflow.jsx"
 //import { useAlert 
-
+import { Context } from "../context/ContextApi.jsx";
 import {
 	Chip,
 	ButtonGroup,
@@ -179,6 +179,7 @@ const ParsedAction = (props) => {
 
 		suborgWorkflows,
 		originalWorkflow,
+		runFromHere,
 	} = props;
 
 	let navigate = useNavigate()
@@ -214,6 +215,9 @@ const ParsedAction = (props) => {
 		}
 	}, [expansionModalOpen])
 
+	const {themeMode, supportEmail} = useContext(Context)
+	const theme = getTheme(themeMode)
+
 	/*
 	useEffect(() => {
 		// This will have the OLD selectedAction, not the new one huh?
@@ -233,11 +237,16 @@ const ParsedAction = (props) => {
 		// auth, required, optional
 		var changed = false
 		if (selectedActionParameters === undefined || selectedActionParameters === null || selectedActionParameters.length === 0) {
+			console.log("Returning because no params")
 			return
 		}
 
 		if (selectedApp !== undefined && selectedApp !== null && selectedApp.generated !== true) {
-			return
+
+			if (isAgent || isIntegration) {
+			} else {
+				return
+			}
 		}
 
 		// Fixing required fields with a shitty structure :)
@@ -346,13 +355,23 @@ const ParsedAction = (props) => {
 		// 3. generated fields & all else
 
 
-		const newparams = auth
+		var newparams = auth
 			.concat(bodyfield)
 			.concat(required)
 			.concat(generated_optional)
 			.concat(special_optional)
 			.concat(optional)
 
+		const dedupedParams = []
+		for (var paramKey in newparams) {
+			const param = newparams[paramKey]
+			if (dedupedParams.find(item => item.name === param.name) === undefined) {
+				dedupedParams.push(param)
+			}
+		}
+
+		newparams = dedupedParams
+
 		var newkeyorder = []
 		for (let paramkey in newparams) {
 			//console.log("Param: ", newparams[paramkey])
@@ -361,7 +380,7 @@ const ParsedAction = (props) => {
 		}
 
 		if (keyorder.join(",") !== newkeyorder.join(",")) {
-			console.log("KEYORDER CHANGED! DID ACTION AS WELL?", keyorder, newkeyorder)
+			//console.log("KEYORDER CHANGED! DID ACTION AS WELL?", keyorder, newkeyorder)
 
 			setSelectedActionParameters(newparams)
 			selectedAction.parameters = newparams
@@ -666,11 +685,14 @@ const ParsedAction = (props) => {
 
 		// Process workflowExecutions
 		if (workflowExecutions.length > 0) {
+			var appended = false
+			var foundvalue = ""
 			for (let execution of workflowExecutions) {
 				const execArg = execution.execution_argument;
 				if (execArg && execArg.length > 0) {
 					const valid = validateJson(execArg);
 					if (valid.valid) {
+						appended = true 
 						newActionList.push({
 							type: "Runtime Argument",
 							name: "Runtime Argument",
@@ -681,9 +703,23 @@ const ParsedAction = (props) => {
 						})
 
 						break
+					} else {
+						foundvalue = execArg
 					}
 				}
 			}
+
+			if (!appended && foundvalue !== undefined && foundvalue !== "") {
+				newActionList.push({
+					type: "Runtime Argument",
+					name: "Runtime Argument",
+					highlight: "exec",
+					autocomplete: "exec",
+
+					value: foundvalue,
+					example: foundvalue,
+				})
+			}
 		}
 
 		// Add default Runtime Argument if none were added
@@ -772,6 +808,8 @@ const ParsedAction = (props) => {
 					}
 
 					labels.push(parentNode.label);
+
+					var secondaryExample = ""
 					let exampleData = parentNode.example ?? "";
 					if (parentNode?.app_name === "http") {
 						exampleData = ""
@@ -782,9 +820,22 @@ const ParsedAction = (props) => {
 							const foundResult = exec.results?.find(result => result?.action?.id === parentNode?.id);
 							if (foundResult) {
 								const valid = validateJson(foundResult.result);
-								if (valid.valid && valid.result.success !== false) {
-									exampleData = valid.result
-									break
+								if (valid.valid) {
+
+									// Check if array, and if first item is object + success
+									if (Array.isArray(valid.result) && valid.result.length > 0 && typeof valid.result[0] === "object") {
+										if (valid.result[0].success !== false) {
+											exampleData = valid.result
+											break
+										}
+									} else {
+										if (valid.result.success !== false) {
+											exampleData = valid.result
+											break
+										}
+									}
+								} else {
+									secondaryExample = foundResult.result
 								}
 							}
 						}
@@ -818,6 +869,10 @@ const ParsedAction = (props) => {
 								}
 							}
 						}
+					} 
+
+					if (exampleData === "" && secondaryExample !== "") {
+						exampleData = secondaryExample
 					}
 
 					if (parentNode.label === undefined) {
@@ -855,14 +910,48 @@ const ParsedAction = (props) => {
 				if (newActionList?.length > 0) {
 					let appParentActions = parentActionList?.map(action => "$" + action.name.toLowerCase());
 					let notPresentAction = actions?.filter((action) => !appParentActions?.includes(action))
+					
+					// Extract all variable references from paramvalue
+					// Examples of what it matches:
+					//   - Simple variables: $test, $myVar, $x
+					//   - Variables with underscores: $my_variable, $ok_ok, $testing_nice, $nice_try_man
+					//   - Workflow data access patterns: $not_customer_copy.body.subject.#, $not_customer.body.subject.text
+					//   - Deep nested properties: $email_action.response.items[0].sender.address
+
+					const variablePattern = /\$[a-zA-Z0-9_]+(?=\.|,|;|:|\s|"|'|`|\)|\]|\}|$)/g;
+					const foundVariables = paramvalue.match(variablePattern) || [];
+
 					notPresentAction?.forEach((action) => {
 						action = action.replace(" ", "_");
-						if (paramvalue.includes(action)) {
+						
+						// Check if the exact action is in the foundVariables list
+						if (foundVariables.includes(action)) {
 							errorVars.push(action);
-							// paramvalue = paramvalue.replace(action, "")
-							// paramvalue = paramvalue.replace(/^\s*[\r\n]/gm, "");
 						}
-					})
+					});
+					
+					// Check for variables that don't exist in the workflow at all
+					foundVariables.forEach(variable => {
+						// Skip checking for $ followed by system vars as exec and shuffle_cache.
+						if (variable.match(/\$(exec|shuffle_cache)/)) {
+							return;
+						}
+						// Create list of all valid action variables from newActionList
+						const newActionNames = newActionList?.map(action => "$" + action.name.toLowerCase()) || [];
+						
+						// Extract workflow and execution variables from newActionList
+						const workflowVars = newActionList
+							.filter(item => item.type === "workflow_variable" || item.type === "execution_variable")
+							.map(item => "$" + item.autocomplete.toLowerCase());
+						
+						// If the variable doesn't exist in any workflow actions, parent actions, newActionList, or extracted variables, show error
+						if (!actions.includes(variable) && 
+							!appParentActions.includes(variable) && 
+							!newActionNames.includes(variable) && 
+							!workflowVars.includes(variable.toLowerCase())) {
+							errorVars.push(variable);
+						}
+					});
 				}
 			}
 
@@ -1160,6 +1249,14 @@ const ParsedAction = (props) => {
 
 					selectedActionParameters[1].value = splitparsed[1]
 					selectedAction.parameters[1].value = splitparsed[1]
+
+					if (splitparsed.length >= 2) {
+						toast.warn("Filter list only supports filtering on the first list. If you want multi-level filtering, please use the 'execute python' action with the 'filter a list' function in the code editor.", {
+							autoClose: 10000,
+						})
+					} else if (selectedAction.parameters[1].value.includes(".#")) {
+						toast.warn("This filter may not work due to using .# indexing. Please use the 'execute python' action and try the 'filter a list' function in the code editor.")
+					}
 				} else {
 					// Remove .# and after
 					const splitparsed = parsedvalue.split(".#")
@@ -1431,7 +1528,7 @@ const ParsedAction = (props) => {
 
 		// Helpertext for openapi fields
 		//if (helperText === "" && name === "body" && selectedApp.generated && selectedApp.activated) {
-		//	helperText = <span style={{color: "white", marginBottom: 5, marginleft: 5}}>
+		//	helperText = <span style={{color: theme.palette.text.primary, marginBottom: 5, marginleft: 5}}>
 		//}
 
 		return helperText
@@ -1500,7 +1597,7 @@ const ParsedAction = (props) => {
 		}
 
 		return <Paper style={{ padding: 10, backgroundColor: theme.palette.surfaceColor, border: "1px solid red", }}>
-			<Typography variant="body" style={{ color: "white", }}>
+			<Typography variant="body" style={{ color: theme.palette.text.primary, }}>
 				<b>Tip:</b> {suggestionText}
 			</Typography>
 		</Paper>
@@ -1566,7 +1663,7 @@ const ParsedAction = (props) => {
 					padding: 8,
 					paddingLeft: 14,
 					paddingBottom: 4,
-					backgroundColor: hover ? theme.palette.surfaceColor : theme.palette.inputColor,
+					backgroundColor: hover ? theme.palette.hoverColor : theme.palette.textFieldStyle.backgroundColor,
 				}} onMouseEnter={() => setHover(true)} onMouseLeave={() => setHover(false)}
 					onClick={(event) => {
 						// event.preventDefault()
@@ -1604,7 +1701,7 @@ const ParsedAction = (props) => {
 						<span style={{ marginBottom: 0, marginTop: 3, }}>{newActionname}</span>
 					</div>
 					{extraDescription.length > 0 ?
-						<Typography variant="body2" color="textSecondary" style={{ marginTop: 0, overflow: "hidden", whiteSpace: "nowrap", display: "block", }}>
+						<Typography variant="body2" style={{ marginTop: 0, overflow: "hidden", whiteSpace: "nowrap", display: "block", color: theme.palette.textPrimary}}>
 							{extraDescription}
 						</Typography>
 						: null}
@@ -1678,14 +1775,14 @@ const ParsedAction = (props) => {
 								}}
 							>
 								<Tooltip title={"App: " + selectedAction.app_name + ". Click to open in new tab"} placement="top">
-									<a href={"/apps/" + selectedAction?.app_id} target="_blank" style={{ textDecoration: "none", color: "white", }}>
+									<a href={"/apps/" + selectedAction?.app_id} target="_blank" style={{ textDecoration: "none", color: theme.palette.textPrimary, }}>
 										<img src={selectedAppIcon} style={{
 											width: 30,
 											height: 30,
 											marginRight: 10,
 											borderRadius: 5,
 											marginTop: 13,
-											border: "2px solid rgba(255,255,255,0.3)",
+											border: themeMode === "dark" ? "2px solid rgba(255,255,255,0.3)" : "2px solid rgba(0, 0, 0, 0.1)",
 										}} />
 									</a>
 								</Tooltip>
@@ -1749,7 +1846,7 @@ const ParsedAction = (props) => {
 										title="See previous results for this action"
 										placement="top"
 									>
-										<ArrowLeftIcon style={{ color: "rgba(255,255,255,0.7)" }} />
+										<ArrowLeftIcon style={{ color: theme.palette.textPrimary }} />
 									</Tooltip>
 								</IconButton>
 								<IconButton
@@ -1769,7 +1866,7 @@ const ParsedAction = (props) => {
 										title="Find app documentation"
 										placement="top"
 									>
-										<DescriptionIcon style={{ color: "rgba(255,255,255,0.7)" }} />
+										<DescriptionIcon style={{ color: theme.palette.textPrimary }} />
 									</Tooltip>
 								</IconButton>
 
@@ -1803,11 +1900,43 @@ const ParsedAction = (props) => {
 										{autoCompleting ?
 											<CircularProgress style={{ height: 20, width: 20, }} />
 											:
-											<AutoFixHighIcon style={{ color: "rgba(255,255,255,0.7)", height: 24, }} />
+											<AutoFixHighIcon style={{ color: theme.palette.textPrimary, height: 24, }} />
 										}
 									</Tooltip>
 								</IconButton>
 
+								<Tooltip
+									title={
+										<Typography variant="body2" style={{margin: 3, }}>
+											Rerun this action with results from previous executions. Built for testing individual actions in the middle of workflows.
+										</Typography>
+									}
+									placement="top"
+								>
+									<Button
+										color="secondary"
+										variant="outlined"
+										style={{
+											marginTop: "auto",
+											marginBottom: "auto",
+											height: 30,
+											marginLeft: 98,
+											textTransform: "none",
+										}}
+										disabled={autoCompleting}
+										onClick={() => {
+											if (runFromHere !== undefined) {
+												runFromHere(selectedAction)
+											} else {
+												toast.error(`Function not available. Please contact ${supportEmail}`)
+											}
+										}}
+									>
+										<PlayArrowIcon style={{marginRight: 5, }}/>
+										Rerun	
+									</Button>
+								</Tooltip>
+
 								{(selectedAction?.generated === true && selectedAction?.app_version === "1.0.0") || (selectedAction?.app_name === "Shuffle Tools" && selectedAction?.app_version !== "1.2.0")  ? 
 									<Button
 										variant="contained"
@@ -1847,6 +1976,12 @@ const ParsedAction = (props) => {
 								<Select
 									MenuProps={{
 										disableScrollLock: true,
+										PaperProps: {
+											sx: {
+												"&. MuiList-root": {
+													backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+												}
+											}}
 									}}
 									value={selectedAction.app_version}
 									onChange={(event) => {
@@ -1869,12 +2004,11 @@ const ParsedAction = (props) => {
 										toast.success("Changed version of all nodes to " + event.target.value)
 									}}
 									style={{
-										marginTop: 10,
-										backgroundColor: theme.palette.surfaceColor,
-										backgroundColor: theme.palette.inputColor,
-										color: "white",
+										position: "absolute", 
+										top: 10, right: 10, 
+										backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+										color: theme.palette.textFieldStyle.color,
 										height: 35,
-										marginleft: 10,
 										borderRadius: theme.palette?.borderRadius,
 									}}
 									SelectDisplayProps={{
@@ -1886,9 +2020,12 @@ const ParsedAction = (props) => {
 										return (
 											<MenuItem
 												key={index}
-												style={{
-													backgroundColor: theme.palette.inputColor,
-													color: "white",
+												sx={{
+													backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+													color: theme.palette.textFieldStyle.color,
+													"&:hover": {
+														backgroundColor: theme.palette.hoverColor,
+													},
 												}}
 												value={data.version}
 											>
@@ -1902,12 +2039,16 @@ const ParsedAction = (props) => {
 					</div>
 					<div style={{ display: "flex" }}>
 						<div style={{ flex: 5 }}>
-							<Typography style={{ color: "rgba(255,255,255,0.7)" }}>Name</Typography>
+							<Typography style={{ color: theme.palette.textPrimary,}}>Name</Typography>
 							<TextField
 								style={theme.palette.textFieldStyle}
 								InputProps={{
-									style: theme.palette.innerTextfieldStyle,
 									disableUnderline: true,
+									style: {
+										backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+										color: theme.palette.textFieldStyle.color,
+										height: 40,
+									},
 								}}
 								fullWidth
 								color="primary"
@@ -2126,10 +2267,10 @@ const ParsedAction = (props) => {
 								placement="top"
 							>
 								<span>
-									<Typography style={{ color: "rgba(255,255,255,0.7)" }}>Delay</Typography>
+									<Typography style={{ color: theme.palette.textPrimary }}>Delay</Typography>
 									<TextField
 										InputProps={{
-											style: theme.palette.innerTextfieldStyle,
+											style: theme.palette.textFieldStyle,
 											disableUnderline: true,
 										}}
 										disabled={selectedAction?.parent_controlled === true && workflow?.parentorg_workflow?.length > 0}
@@ -2188,7 +2329,7 @@ const ParsedAction = (props) => {
 
 				<div style={{ marginTop: 15, position: "relative", }}>
 					<div style={{display: "flex", }}>
-						<Typography style={{ color: "rgba(255,255,255,0.7)", flex: 10, }}>
+						<Typography style={{ color: theme.palette.textPrimary, flex: 10, }}>
 							Authentication
 						</Typography>
 
@@ -2241,7 +2382,7 @@ const ParsedAction = (props) => {
 						title={
 						workflow?.suborg_distribution?.length > 0 && Object.getOwnPropertyNames(selectedAction?.selectedAuthentication).length !== 0 ? (
 							<React.Fragment>
-								<div style={{padding: 10, backgroundColor: theme.palette.inputColor, borderRadius: theme.palette.borderRadius, border: "1px solid rgba(255,255,255,0)"}}>
+								<div style={{padding: 10, backgroundColor: theme.palette.textFieldStyle.backgroundColor, borderRadius: theme.palette.borderRadius, border: theme.palette.defaultBorder}}>
 									<FormControlLabel
 										control={
 											<Checkbox
@@ -2259,10 +2400,18 @@ const ParsedAction = (props) => {
 							</React.Fragment>
 						) : null
 					} placement="left">
-						<div style={{ display: "flex" }}>
+						<div style={{ display: "flex", }}>
 							<Select
 								MenuProps={{
 									disableScrollLock: true,
+									PaperProps: {
+										sx: {
+											'& .MuiList-root': {
+											  backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+											  color: theme.palette.textFieldStyle.color,
+											},
+										},
+									},
 								}}
 								labelId="select-app-auth"
 								value={
@@ -2344,17 +2493,20 @@ const ParsedAction = (props) => {
 									}
 								}}
 								style={{
-									backgroundColor: theme.palette.inputColor,
-									color: "white",
+									backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+									color: theme.palette.textFieldStyle.color,
 									height: 35,
 									maxWidth: rightsidebarStyle.maxWidth - 80,
 									borderRadius: theme.palette?.borderRadius,
 								}}
 							>
 								<MenuItem
-									style={{
-										backgroundColor: theme.palette.inputColor,
-										color: "white",
+									sx={{ 
+										backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+										color: theme.palette.textFieldStyle.color,
+										'&:hover': {
+											backgroundColor: theme.palette.textFieldStyle.hoverBackgroundColor, // you define this in your theme
+										  },
 									}}
 									value="No selection"
 								>
@@ -2368,11 +2520,14 @@ const ParsedAction = (props) => {
 									return (
 										<MenuItem
 											key={data.id}
-											style={{
-												backgroundColor: theme.palette.inputColor,
-												color: "white",
+											sx={{
+												backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+												color: theme.palette.textFieldStyle.color,
 												maxWidth: 500,
 												overflowX: "auto",
+												'&:hover': {
+													backgroundColor: theme.palette.hoverColor 
+												},
 											}}
 											value={data}
 										>
@@ -2380,7 +2535,7 @@ const ParsedAction = (props) => {
 											{data?.validation?.valid === true ?
 												<Tooltip title="Authentication has been validated" placement="top">
 													<Chip
-														style={{ marginLeft: 0, padding: 0, marginRight: 10, cursor: "pointer", borderColor: green, maxHeight: 25, }}
+														style={{ marginLeft: 0, padding: 0, marginRight: 10, cursor: "pointer", borderColor: green, maxHeight: 25, color: theme.palette.chipStyle.color, backgroundColor: theme.palette.chipStyle.backgroundColor }}
 														label={"Valid"}
 														variant="outlined"
 														color="secondary"
@@ -2389,7 +2544,7 @@ const ParsedAction = (props) => {
 												: null}
 											{data?.last_modified === true ?
 												<Chip
-													style={{ marginLeft: 0, padding: 0, marginRight: 10, cursor: "pointer", maxHeight: 25, }}
+													style={{ marginLeft: 0, padding: 0, marginRight: 10, cursor: "pointer", maxHeight: 25, color: theme.palette.chipStyle.color, backgroundColor: theme.palette.chipStyle.backgroundColor }}
 													label={"Latest"}
 													variant="outlined"
 													color="secondary"
@@ -2411,9 +2566,12 @@ const ParsedAction = (props) => {
 								<Divider style={{ marginTop: 10, marginBottom: 10, }} />
 
 								<MenuItem
-									style={{
-										backgroundColor: theme.palette.inputColor,
-										color: "white",
+									sx={{
+										backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+										color: theme.palette.textPrimary,
+										'&:hover': {
+											backgroundColor: theme.palette.hoverColor 
+										},
 									}}
 									value="authgroups"
 									disabled
@@ -2482,7 +2640,7 @@ const ParsedAction = (props) => {
             }}
             style={{
               backgroundColor: theme.palette.inputColor,
-              color: "white",
+              color: theme.palette.text.primary,
               height: "50px",
               borderRadius: theme.palette?.borderRadius,
             }}
@@ -2499,7 +2657,7 @@ const ParsedAction = (props) => {
                   key={data.Name}
                   style={{
                     backgroundColor: theme.palette.inputColor,
-                    color: "white",
+                    color: theme.palette.text.primary,
                   }}
                   value={data.Name}
                 >
@@ -2545,7 +2703,7 @@ const ParsedAction = (props) => {
 
 			{workflow.execution_variables !== undefined && workflow.execution_variables !== null && workflow.execution_variables.length > 0 ? (
 				<div style={{ marginTop: "20px" }}>
-					<Typography>Execution variable (optional)</Typography>
+					<Typography style={{color: theme.palette.textPrimary}}>Runtime variable (optional)</Typography>
 					<Select
 						MenuProps={{
 							disableScrollLock: true,
@@ -2578,7 +2736,7 @@ const ParsedAction = (props) => {
 						}}
 						style={{
 							backgroundColor: theme.palette.inputColor,
-							color: "white",
+							color: theme.palette.text.primary,
 							height: "50px",
 							borderRadius: theme.palette?.borderRadius,
 						}}
@@ -2586,7 +2744,7 @@ const ParsedAction = (props) => {
 						<MenuItem
 							style={{
 								backgroundColor: theme.palette.inputColor,
-								color: "white",
+								color: theme.palette.text.primary,
 							}}
 							value="No selection"
 						>
@@ -2597,7 +2755,7 @@ const ParsedAction = (props) => {
 							<MenuItem
 								style={{
 									backgroundColor: theme.palette.inputColor,
-									color: "white",
+									color: theme.palette.text.primary,
 								}}
 								value={data.name}
 							>
@@ -2650,8 +2808,8 @@ const ParsedAction = (props) => {
 						options={renderedActionOptions}
 						ListboxProps={{
 							style: {
-								backgroundColor: theme.palette.surfaceColor,
-								color: "white",
+								backgroundColor: theme.palette.platformColor,
+								color: theme.palette.textColor,
 							},
 						}}
 						filterOptions={(options, { inputValue }) => {
@@ -2682,7 +2840,7 @@ const ParsedAction = (props) => {
 						}}
 
 						style={{
-							backgroundColor: theme.palette.backgroundColor,
+							backgroundColor: theme.palette.cardBackgroundColor,
 							height: 35,
 							borderRadius: theme.palette?.borderRadius,
 						}}
@@ -2798,7 +2956,8 @@ const ParsedAction = (props) => {
 							const actionDescription = null
 
 							return (
-								<Tooltip title={actionDescription}
+								<Tooltip 
+									title={actionDescription}
 									placement="right"
 									open={!hiddenDescription}
 									PopperProps={{
@@ -2821,10 +2980,18 @@ const ParsedAction = (props) => {
 										dataLPIgnore="true"
 										autoComplete="off"
 
-										color="primary"
+										
 										id="checkbox-search"
-										variant="body1"
-										style={theme.palette.textFieldStyle}
+										style={{
+											...theme.palette.textFieldStyle,
+											border: selectedAction?.parent_controlled === true && workflow?.parentorg_workflow?.length > 0 ? `1px dotted ${theme.palette.distributionColor}` : "inherit",
+										}}
+										inputProps={{
+											...params.inputProps,
+											style: {
+												color: theme.palette.textFieldStyle.color,
+											},
+										}}
 										label={isIntegration ? "Choose a category" : "Find Actions"}
 										variant="outlined"
 										name={`disable_autocomplete_${Math.random()}`}
@@ -2838,12 +3005,12 @@ const ParsedAction = (props) => {
 
 				{selectedAction?.app_name === "Shuffle AI" && selectedAction?.name === "run_llm" ?
 					selectedAction?.environment === "Cloud" && isCloud ? (
-						<Typography color="textSecondary" variant="body2" style={{ paddingTop: 25, }}>
+						<Typography  variant="body2" style={{color: theme.palette.textPrimary, paddingTop: 25, }}>
 							Info: Cloud Inference processing runs with Shuffle's GPUs in EU, Netherlands, and may be unstable. Your data is NOT stored there.
 						</Typography> 
 					)
 					:
-					<Typography color="textSecondary" variant="body2" style={{ paddingTop: 25, color: red, }}>
+					<Typography variant="body2" style={{ paddingTop: 25, color: red, color: theme.palette.textPrimary}}>
 						This action is slow without GPU's. Use Shuffle's Cloud Runtime location for faster processing.
 					</Typography> 
 					:
@@ -2853,7 +3020,7 @@ const ParsedAction = (props) => {
 				<div
 					style={{
 						marginTop: "10px",
-						borderColor: "white",
+						borderColor: theme.palette.text.primary,
 						borderWidth: "2px",
 						marginBottom: hideExtraTypes ? 50 : 200,
 					}}
@@ -2864,7 +3031,6 @@ const ParsedAction = (props) => {
 									apps !== undefined && apps !== null && apps.length > 0 ?
 										<div style={{ display: "flex", maxWidth: 335, overflowX: "auto", overflowY: "hidden", }}>
 											<div onClick={() => {
-
 												selectedAction.example = "noapp"
 												selectedAction.large_image = newimage
 												if (cy !== undefined && cy !== null) {
@@ -2934,7 +3100,13 @@ const ParsedAction = (props) => {
 
 												var found = false
 												for (var key in app.categories) {
-													if (app.categories[key].toLowerCase() !== newactionname) {
+
+													var localnewactionname = newactionname
+													if (newactionname == "comms") {
+														localnewactionname = "communication"
+													}
+
+													if (app.categories[key].toLowerCase() !== localnewactionname) {
 														continue
 													}
 
@@ -3041,7 +3213,7 @@ const ParsedAction = (props) => {
 											ListboxProps={{
 												style: {
 													backgroundColor: theme.palette.inputColor,
-													color: "white",
+													color: theme.palette.text.primary,
 												},
 											}}
 											getOptionLabel={(option) => {
@@ -3609,41 +3781,46 @@ const ParsedAction = (props) => {
 											boxShadow={2}
 											backgroundColor={theme.palette.textFieldStyle}
 											display="flex"
+											height={"100%"}
 											flexDirection="column"
 										>
 											<Box display="flex" alignItems="center" justifyContent="space-between">
-												<Typography variant="body1" style={{ flexGrow: 1 }}>
+												<Typography sx={{fontSize: "16px"}} style={{ flexGrow: 1 }}>
 													{tmpitem.charAt(0).toUpperCase() + tmpitem.slice(1)}
 												</Typography>
-												<IconButton size="small"
+												{/* <IconButton size="small"
 													onClick={() => {
 														setUiBox("closed")
 													}}
 												>
 													<CloseIcon fontSize="small" />
-												</IconButton>
+												</IconButton> */}
 											</Box>
-											<Divider sx={{ backgroundColor: theme.palette.surfaceColor, marginTop: "5px", marginBottom: "10px", height: "3px" }} />
+											<Divider sx={{ backgroundColor: theme.palette.surfaceColor, marginTop: "5px", marginBottom: "10px", height: "1px" }} />
 											<Box display="flex" flexDirection="column">
-												<Typography variant="body2" mb={0.5}>
+												<Typography sx={{fontSize: "14px"}} mb={0.5}>
 													<strong>Required:</strong> {data.required === true || data.configuration === true ? "True" : "False"}
 												</Typography>
-												<Typography variant="body2" mb={0.5}>
-													<strong>Description:</strong> {description}
-												</Typography>
-												<Typography variant="body2">
+												{
+													data.description !== undefined && data.description !== null && data.description.length > 0 ?
+														<Typography sx={{fontSize: "14px"}} mb={0.5}>
+															<strong>Description:</strong> {description}
+														</Typography>
+														: null
+												}
+												<Typography sx={{fontSize: "14px"}}>
 													<strong>Ex. :</strong> {data?.example?.length > 0 ? data.example : "No example available"}
 												</Typography>
 												{
 													data?.configuration === true ?
 														(
-															<Typography variant="body2" mt={0.5}>
+															<Typography sx={{fontSize: "14px"}} mt={0.5}>
 																<strong>Auth: </strong>Use "\$" instead of "$"
 															</Typography>
 														) : null
 												}
 
-												<div onClick={(e) => {
+												{/* <div onClick={(e) => {
 													e.preventDefault()
 													e.stopPropagation()
 
@@ -3653,11 +3830,17 @@ const ParsedAction = (props) => {
 													<Typography style={{ marginTop: 10, color: "#FF8544", cursor: "pointer", }} variant="body2">
 														Don't show again
 													</Typography>
-												</div>
+												</div> */}
 											</Box>
 										</Box>
 									);
 
+									if (selectedApp.name === "email") {
+										//hideBody = false
+										showButtonField = false
+										hideBodyButtonValue = null
+									}
+
 
 									if ((multiline === undefined || multiline === false) && ((data?.autocompleted === true || data?.field_active === true) || data.name.startsWith("${") && data.name.endsWith("}"))) {
 										multiline = true
@@ -3693,8 +3876,8 @@ const ParsedAction = (props) => {
 												id={clickedFieldId}
 												disabled={disabled}
 												style={{
-													backgroundColor: theme.palette.inputColor,
-													borderRadius: theme.palette?.borderRadius,
+													backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+													borderRadius: theme.palette?.textFieldStyle.borderRadius,
 													width: "100%",
 													maxHeight: multiline === true ? undefined : 40,
 													minHeight: 40,
@@ -3715,7 +3898,7 @@ const ParsedAction = (props) => {
 															<ButtonGroup color="secondary" orientation={multiline ? "vertical" : "horizontal"}>
 																<Tooltip title="Autocomplete text" placement="bottom">
 																	<AddCircleOutlineIcon
-																		style={{ color: "rgba(255,255,255,0.7)", cursor: "pointer", margin: multiline ? 5 : 0, }}
+																		style={{ color: theme.palette.textPrimary, cursor: "pointer", margin: multiline ? 5 : 0, }}
 																		onClick={(event) => {
 																			event.preventDefault()
 
@@ -4031,15 +4214,15 @@ const ParsedAction = (props) => {
 										datafield = (
 											<TextField
 												style={{
-													backgroundColor: theme.palette.inputColor,
-													borderRadius: theme.palette?.borderRadius,
+													backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+													borderRadius: theme.palette?.textFieldStyle.borderRadius,
 												}}
 												InputProps={{
 													endAdornment: hideExtraTypes ? null : (
 														<InputAdornment position="end">
 															<Tooltip title="Autocomplete text" placement="top">
 																<AddCircleOutlineIcon
-																	style={{ cursor: "pointer" }}
+																	style={{ cursor: "pointer", color: theme.palette.textPrimary }}
 																	onClick={(event) => {
 																		setMenuPosition({
 																			top: event.pageY + 10,
@@ -4098,6 +4281,14 @@ const ParsedAction = (props) => {
 											<Select
 												MenuProps={{
 													disableScrollLock: true,
+													PaperProps: {
+														sx: {
+															'& .MuiList-root': {
+																backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+																color: theme.palette.textFieldStyle.color,
+															},
+														},
+													},
 												}}
 												SelectDisplayProps={{
 													style: {
@@ -4108,15 +4299,12 @@ const ParsedAction = (props) => {
 												fullWidth
 												id={"rightside_field_" + count}
 												onChange={(e) => {
-													console.log("MULTI SELECT: ", multi, e.target.value)
-
 													changeActionParameter(e, count, data);
 													setUpdate(Math.random());
 												}}
 												style={{
-													backgroundColor: theme.palette.surfaceColor,
-													color: "white",
-													height: "50px",
+													backgroundColor: theme.palette.platformColor,
+													height: 40,
 													borderRadius: theme.palette?.borderRadius,
 												}}
 											>
@@ -4139,9 +4327,12 @@ const ParsedAction = (props) => {
 														return (
 															<MenuItem
 																key={data}
-																style={{
+																sx={{
 																	backgroundColor: selected ? theme.palette.backgroundColor : theme.palette.inputColor,
-																	color: "white",
+																	color: theme.palette.textFieldStyle.color,
+																	"&:hover": {
+																		backgroundColor: theme.palette.hoverColor 
+																	},
 																}}
 																value={data}
 															>
@@ -4267,7 +4458,7 @@ const ParsedAction = (props) => {
 												}}
 												open={!!menuPosition}
 												style={{
-													color: "white",
+													color: theme.palette.text.primary,
 													marginTop: 2,
 													maxHeight: 650,
 												}}
@@ -4395,7 +4586,7 @@ const ParsedAction = (props) => {
 															}
 															parentMenuOpen={!!menuPosition}
 															style={{
-																color: "white",
+																color: theme.palette.text.primary,
 																minWidth: 250,
 																maxWidth: 250,
 																maxHeight: 50,
@@ -4411,7 +4602,7 @@ const ParsedAction = (props) => {
 																	key={innerdata.name}
 																	style={{
 																		marginLeft: 15,
-																		color: "white",
+																		color: theme.palette.text.primary,
 																		minWidth: 250,
 																		maxWidth: 250,
 																		padding: 0,
@@ -4452,7 +4643,7 @@ const ParsedAction = (props) => {
 																		<MenuItem
 																			key={pathdata.name}
 																			style={{
-																				color: "white",
+																				color: theme.palette.text.primary,
 																				minWidth: 250,
 																				maxWidth: 250,
 																				padding: boxPadding,
@@ -4509,10 +4700,11 @@ const ParsedAction = (props) => {
 															key={innerdata.name}
 															style={{
 																backgroundColor: theme.palette.inputColor,
-																color: "white",
+																color: theme.palette.text.primary,
 																minWidth: 250,
 																maxWidth: 250,
 																marginRight: 0,
+																paddingLeft: 12, 
 															}}
 															value={innerdata}
 															onMouseOver={() => handleMouseover()}
@@ -4578,8 +4770,9 @@ const ParsedAction = (props) => {
 											{isFirstOptional ? <Divider style={{ backgroundColor: "rgba(255,255,255,0.1)", marginBottom: 20, }} /> : null}
 											{showButtonField === true ? hideBodyButtonValue : null}
 											<div
-												style={{ marginTop: 18, marginBottom: 0, display: "flex" }}
+												style={{ marginTop: 18, marginBottom: "4px", display: "flex", width: "100%", justifyContent: "space-between", alignItems: "center"}}
 											>
+												<div style={{display: "flex", alignItems: "center", justifyContent: "flex-start"}}>
 												{data.configuration === true ? (
 													<Tooltip
 														title={buttonTitle}
@@ -4591,7 +4784,7 @@ const ParsedAction = (props) => {
 																width: 24,
 																height: 24,
 																marginRight: 10,
-																color: "rgba(255,255,255,0.6)",
+																color: theme.palette.textPrimary,
 															}}
 															onClick={() => {
 																setAuthenticationModalOpen(true);
@@ -4609,7 +4802,7 @@ const ParsedAction = (props) => {
 														>
 															<PriorityHighIcon
 																style={{
-																	color: "rgba(255,255,255,0.5)",
+																	color: theme.palette.textPrimary,
 																	marginRight: 0,
 																}} />
 														</Tooltip>
@@ -4621,7 +4814,7 @@ const ParsedAction = (props) => {
 															placement="top"
 														>
 															<AutoFixHighIcon style={{
-																color: "rgba(255,255,255,0.7)",
+																color: theme.palette.textPrimary,
 																marginRight: 10,
 															}} />
 														</Tooltip>
@@ -4638,28 +4831,59 @@ const ParsedAction = (props) => {
 															<StorageIcon style={{
 																color: "#FF8544",
 																marginRight: 10,
+																marginBottom: "-5px",
 															}} />
 														</a>
 													</Tooltip>
 													: null}
 
-												<div
-													style={{
-														flex: "10",
-														marginTop: "auto",
-														marginBottom: "auto",
-														color: "#C5C5C5",
+												<Tooltip
+													title={tooltipDescription}
+													placement="left"
+													sx={{
+														zIndex: 0,
+													}}
+													PopperProps={{
+														sx: {
+															'& .MuiTooltip-tooltip': {
+																backgroundColor: 'transparent',
+																boxShadow: 'none',
+															},
+															'& .MuiTooltip-arrow': {
+																color: 'transparent',
+															},
+														},
+														modifiers: [
+															{
+																name: 'offset',
+																options: {
+																	offset: (data?.configuration || showCacheConfig || hasAutocomplete) ? [0, 31] : [0,0]
+																},
+															},
+														],
 													}}
 												>
-													{tmpitem} <span style={{ color: theme.palette.main }}>{selectedActionParameters[count].required || selectedActionParameters[count].configuration ? "*" : ""}</span>
-												</div>
+													<Typography
+														sx={{
+															marginTop: "auto",
+															width: "fit-content",
+															cursor: "pointer",
+															color: theme.palette.textPrimary,
+															fontFamily: theme.typography.fontFamily,
+															"&:hover": {
+																color: theme.palette.main,
+															},
+														}}
+													>
+														{tmpitem} <span style={{ color: theme.palette.main }}>{selectedActionParameters[count].required || selectedActionParameters[count].configuration ? "*" : ""}</span>
+													</Typography>
+												</Tooltip>
 
 												{parentParamValue !== undefined && parentParamValue !== null && parentParamValue !== "" && parentParamValue !== data.value ?
 													<Tooltip title={`Parent value is different. Click to reset.`} placement="top" arrow>
 														<RestoreIcon 
 															style={{
 																marginRight: 10, 
-																marginBottom: 5, 
 																cursor: "pointer", 
 																color: theme.palette.distributionColor,
 															}}
@@ -4672,23 +4896,28 @@ const ParsedAction = (props) => {
 														/>
 													</Tooltip>
 												: null}
+												</div>
 
+												{((data.options !== undefined && data.options !== null && data.options.length > 0) || (selectedActionParameters[count].options !== undefined && selectedActionParameters[count].options !== null && selectedActionParameters[count].options.length > 0)) ? null : 
 												<Tooltip title="Expand editor window" placement="top">
-
 													<OpenInFullIcon
-														style={{ color: "rgba(255,255,255,0.7)", cursor: "pointer", margin: multiline ? 5 : 0, height: 20, width: 20, }}
+														style={{ color: theme.palette.textPrimary, cursor: "pointer", margin: multiline ? 5 : 0, height: 20, width: 20, }}
 														onMouseOver={(event) => {
-															const clickedField = document.getElementById(clickedFieldId)
-															if (clickedField !== null) {
-																clickedField.focus()
+															if(selectedAction?.name !== "filter_list"){
+																const clickedField = document.getElementById(clickedFieldId)
+																if (clickedField !== null) {
+																	clickedField.focus()
+																}
 															}
 														}}
 														onClick={(event) => {
 															// Set focus to the Textfield we just clicked
 															// This is to ensure focus is set correctly at all times with blur
-															const clickedField = document.getElementById(clickedFieldId)
-															if (clickedField !== null) {
-																clickedField.focus()
+															if(selectedAction?.name !== "filter_list"){
+																const clickedField = document.getElementById(clickedFieldId)
+																if (clickedField !== null) {
+																	clickedField.focus()
+																}
 															}
 
 															event.preventDefault()
@@ -4716,6 +4945,7 @@ const ParsedAction = (props) => {
 														}}
 													/>
 												</Tooltip>
+											}
 
 
 											</div>
@@ -4725,10 +4955,11 @@ const ParsedAction = (props) => {
 												showDropdownNumber === count &&
 												data.variant === "STATIC_VALUE" &&
 												jsonList.length > 0 ? (
+
 												<FormControl fullWidth style={{ marginTop: 0 }}>
 													<InputLabel
 														id="action-autocompleter"
-														style={{ marginLeft: 10, color: "white" }}
+														style={{ marginLeft: 10, color: theme.palette.text.primary }}
 													>
 														Autocomplete
 													</InputLabel>
@@ -4756,7 +4987,7 @@ const ParsedAction = (props) => {
 														fullWidth
 														open={showAutocomplete}
 														style={{
-															color: "white",
+															color: theme.palette.text.primary,
 															height: 35,
 															marginTop: 2,
 															borderRadius: theme.palette?.borderRadius,
@@ -4795,7 +5026,7 @@ const ParsedAction = (props) => {
 																	key={data.name}
 																	style={{
 																		backgroundColor: theme.palette.inputColor,
-																		color: "white",
+																		color: theme.palette.text.primary,
 																	}}
 																	value={data}
 																	onMouseOver={() => { }}
diff --git a/frontend/src/components/PartnerApps.jsx b/frontend/src/components/PartnerApps.jsx
new file mode 100644
index 00000000..60e6e1b5
--- /dev/null
+++ b/frontend/src/components/PartnerApps.jsx
@@ -0,0 +1,21 @@
+import { Box, Typography } from '@mui/material'
+import React from 'react'
+
+const PartnerApps = () => {
+  return (
+    <Box
+    sx={{
+      display: "flex",
+      alignItems: "center",
+      justifyContent: "center",
+      width: "100%",
+      height: "100%",
+      minHeight: "500px",
+    }}
+    >
+      <Typography>Partner Apps</Typography>
+    </Box>
+  )
+}
+
+export default PartnerApps
diff --git a/frontend/src/components/PartnerDetails.jsx b/frontend/src/components/PartnerDetails.jsx
new file mode 100644
index 00000000..755e187d
--- /dev/null
+++ b/frontend/src/components/PartnerDetails.jsx
@@ -0,0 +1,987 @@
+import React, { memo, useEffect, useState, useContext } from "react";
+
+import { makeStyles } from "@mui/styles";
+import { toast } from "react-toastify";
+import { getTheme } from "../theme.jsx";
+import { Context } from "../context/ContextApi.jsx";
+import countries from "./Countries.jsx";
+
+import {
+  FormControl,
+  InputLabel,
+  Paper,
+  OutlinedInput,
+  Checkbox,
+  Card,
+  Tooltip,
+  FormControlLabel,
+  Chip,
+  Link,
+  Typography,
+  Switch,
+  Select,
+  MenuItem,
+  Divider,
+  ListItemText,
+  TextField,
+  Button,
+  Tabs,
+  Tab,
+  Grid,
+  Autocomplete,
+  Skeleton,
+  Box,
+} from "@mui/material";
+const useStyles = makeStyles({
+  notchedOutline: {
+    borderColor: "#f85a3e !important",
+  },
+});
+
+const PartnerDetails = (props) => {
+  const {
+    userdata,
+    selectedOrganization,
+    setSelectedOrganization,
+    globalUrl,
+    isCloud,
+    adminTab,
+    isEditOrgTab,
+    partnerData,
+    loadingPartnerData,
+    setPartnerData,
+  } = props;
+
+  const classes = useStyles();
+  const defaultBranch = "main";
+  const ITEM_HEIGHT = 48;
+  const ITEM_PADDING_TOP = 8;
+  const MenuProps = {
+    PaperProps: {
+      style: {
+        maxHeight: ITEM_HEIGHT * 4.5 + ITEM_PADDING_TOP,
+        width: 400,
+        borderRadius: 10,
+        overflowY: "scroll",
+      },
+    },
+    getContentAnchorEl: () => null,
+  };
+
+  const expertiseOptions = [
+    "Cybersecurity",
+    "Cloud Security",
+    "Managed Detection and Response (MDR)",
+    "Incident Response",
+    "Penetration Testing",
+    "Compliance and Governance",
+    "Network Security",
+    "Endpoint Security",
+    "Identity and Access Management (IAM)",
+    "SIEM",
+  ];
+  const servicesOptions = [
+    "Cybersecurity Consulting",
+    "Managed Security",
+    "Incident Response",
+    "Penetration Testing",
+    "Cloud Security",
+    "Managed Detection",
+    "Endpoint Security",
+    "Network Security",
+    "Identity Management",
+    "Compliance",
+    "Security Training",
+    "Security Management",
+    "Threat Intelligence",
+    "Web Security",
+    "Database Security",
+    "Disaster Recovery",
+    "IT Security Audit",
+    "Cybersecurity Training",
+    "Security Automation",
+    "AI Security",
+    "IoT Security",
+    "Cloud Security Broker",
+    "Security Service",
+    "Managed Security Provider",
+    "Cybersecurity Service",
+  ]
+
+  const solutionsOptions = [
+    "EDR",
+    "MDR",
+    "XDR",
+    "Case Management",
+    "SIEM",
+    "Vulnerability Management",
+    "IPS",
+    "IDS",
+    "Threat Intelligence",
+    "IAM",
+    "Data Security",
+    "Incident Response",
+    "Cloud Security",
+    "Network Security",
+  ]
+  
+  const { themeMode } = useContext(Context);
+  const theme = getTheme(themeMode);
+  const [isDisabled, setIsDisabled] = useState(isCloud ? userdata?.active_org?.is_partner ? false : true : true);
+  const handleExpertiseChange = (event) => {
+    const { value } = event.target;
+    setPartnerData({
+      ...partnerData,
+      expertise: value,
+    });
+  };
+
+  useEffect(() => {
+    setIsDisabled(isCloud ? userdata?.active_org?.is_partner ? false : true : true);
+    if(userdata?.support) {
+      setIsDisabled(false);
+    }
+  }, [userdata, isCloud]);
+
+  const handleServicesChange = (event) => {
+    const { value } = event.target;
+    setPartnerData({
+      ...partnerData,
+      services: Array.isArray(value) ? value : [],
+    });
+  };
+
+  const handleSolutionsChange = (event) => {
+    const { value } = event.target;
+    setPartnerData({
+      ...partnerData,
+      solutions: Array.isArray(value) ? value : [],
+    });
+  };
+
+  const setSelectedRegion = (region) => {
+    // send a POST request to /api/v1/orgs/{org_id}/region with the region as the body
+    const regionMap = {
+      US: "us-west2",
+      EU: "europe-west2",
+      CA: "northamerica-northeast1",
+      UK: "europe-west2",
+      "EU-2": "europe-west3",
+      AUS: "australia-southeast1",
+    };
+
+    region = regionMap[region] || region;
+
+    var data = {
+      dst_region: region,
+    };
+
+    toast.info(
+      "Changing region to " + region + "...This may take a few minutes."
+    );
+
+    fetch(`${globalUrl}/api/v1/orgs/${selectedOrganization.id}/change/region`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Accept: "application/json",
+      },
+      credentials: "include",
+      body: JSON.stringify(data),
+      timeOut: 1000,
+    }).then((response) => {
+      if (response.status !== 200) {
+        response
+          .json()
+          .then((reason) => {
+            toast.error("Failed to change region: " + reason.reason);
+          })
+          .catch((err) => {
+            toast.error("Failed to change region");
+          });
+      } else {
+        toast("Region changed successfully! Reloading in 5 seconds..");
+        // Reload the page in 2 seconds
+        setTimeout(() => {
+          window.location.reload();
+        }, 5000);
+      }
+
+      // return responseJson
+    });
+  };
+
+  if (loadingPartnerData) {
+    return (
+      <div style={{ textAlign: "left", maxWidth: "95%" }}>
+        <Grid container spacing={3} style={{ textAlign: "left", marginTop: 5 }}>
+          <Grid item xs={12}>
+            <span>
+              <div>
+                <div style={{ flex: "3", color: "white" }}>
+                  <div style={{ marginTop: 8, display: "flex" }} />
+                  <div style={{ display: "flex" }}>
+                    <div style={{ width: "100%", maxWidth: 434, marginRight: 10 }}>
+                      <Typography variant="text" style={{ color: theme?.palette?.text?.primary }}>
+                        Name
+                      </Typography>
+                      <Skeleton 
+                        variant="rounded" 
+                        height={35} 
+                        width="100%" 
+                        style={{ 
+                          marginTop: 5,
+                          borderRadius: 4 
+                        }}
+                        animation="wave"
+                      />
+                    </div>
+                    {/* <div style={{ alignItems: "center" }}>
+                      <div style={{ marginRight: "12px", color: theme?.palette?.text?.primary }}>
+                        Expertise
+                      </div>
+                      <Skeleton 
+                        variant="rounded" 
+                        height={35} 
+                        width={220}
+                        style={{ 
+                          marginTop: 5,
+                          borderRadius: 4 
+                        }}
+                        animation="wave"
+                      />
+                    </div>
+                    <div style={{ alignItems: "center", marginLeft: 12 }}>
+                      <div style={{ marginRight: "12px", color: theme?.palette?.text?.primary }}>
+                        Services
+                      </div>
+                      <Skeleton 
+                        variant="rounded" 
+                        height={35} 
+                        width={220}
+                        style={{ 
+                          marginTop: 5,
+                          borderRadius: 4 
+                        }}
+                        animation="wave"
+                      />
+                    </div> */}
+                    <div style={{ alignItems: "center" }}>
+                      <div style={{ marginRight: "12px", color: theme?.palette?.text?.primary }}>
+                        Solutions
+                      </div>
+                      <Skeleton 
+                        variant="rounded" 
+                        height={35} 
+                        width={220}
+                        style={{ 
+                          marginTop: 5,
+                          borderRadius: 4 
+                        }}
+                        animation="wave"
+                      />
+                    </div>
+                    <div style={{ marginLeft: 13, fontSize: 16, color: "#9E9E9E" }}>
+                        <Typography variant="text" style={{ color: theme?.palette?.text?.primary }}>
+                          Region
+                        </Typography>
+                        <Skeleton 
+                          variant="rounded" 
+                          height={35} 
+                          width={190}
+                          style={{ 
+                            marginTop: 5,
+                            borderRadius: 4 
+                          }}
+                          animation="wave"
+                        />
+                    </div>
+                    <div style={{ alignItems: "center", marginLeft: 12 }}>
+                      <div style={{ marginRight: "12px", color: theme?.palette?.text?.primary }}>
+                        Country
+                      </div>
+                      <Skeleton 
+                        variant="rounded" 
+                        height={35} 
+                        width={220}
+                        style={{ 
+                          marginTop: 5,
+                          borderRadius: 4 
+                        }}
+                        animation="wave"
+                      />
+                    </div>
+                  </div>
+                  <div style={{ marginTop: "10px" }}>
+                    <Typography variant="text" style={{ color: theme?.palette?.text?.primary }}>
+                      Description
+                    </Typography>
+                    <Skeleton 
+                      variant="rounded" 
+                      height={89} 
+                      width="100%"
+                      style={{ 
+                        marginTop: 5,
+                        borderRadius: 4 
+                      }}
+                      animation="wave"
+                    />
+                  </div>
+                  <div>
+                    <div style={{ width: "100%", maxWidth: 500, marginRight: 10, marginTop: 10 }}>
+                      <Typography variant="text" style={{ color: theme?.palette?.text?.primary }}>
+                        Website URL
+                      </Typography>
+                      <Skeleton 
+                        variant="rounded" 
+                        height={35} 
+                        width="100%"
+                        style={{ 
+                          marginTop: 5,
+                          borderRadius: 4 
+                        }}
+                        animation="wave"
+                      />
+                    </div>
+                    <div style={{ width: "100%", maxWidth: 500, marginRight: 10, marginTop: 20 }}>
+                      <Typography variant="text" style={{ color: theme?.palette?.text?.primary }}>
+                        Article URL
+                      </Typography>
+                      <Skeleton 
+                        variant="rounded" 
+                        height={35} 
+                        width="100%"
+                        style={{ 
+                          marginTop: 5,
+                          borderRadius: 4 
+                        }}
+                        animation="wave"
+                      />
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </span>
+          </Grid>
+        </Grid>
+      </div>
+    );
+  }
+
+  return (
+    <div style={{ textAlign: "left", maxWidth: "95%" }}>
+      <Grid container spacing={3} style={{ textAlign: "left", marginTop: 5 }}>
+        <Grid item xs={12} style={{}}>
+          <span>
+            <div style={{}}>
+              <div style={{ flex: "3", color: "white" }}>
+                <div style={{ marginTop: 8, display: "flex" }} />
+                <div style={{ display: "flex" }}>
+                  <div
+                    style={{ width: "100%", maxWidth: 434, marginRight: 10 }}
+                  >
+                    <Typography
+                      variant="text"
+                      style={{ color: theme.palette.text.primary }}
+                    >
+                      Name
+                    </Typography>
+                    <TextField
+                      required
+                      disabled={isDisabled}
+                      style={{
+                        flex: "1",
+                        display: "flex",
+                        height: 35,
+                        width: "100%",
+                        maxWidth: 434,
+                        marginTop: "5px",
+                        marginRight: "15px",
+                        color: theme.palette.textFieldStyle.color,
+                        backgroundColor: isEditOrgTab
+                          ? theme.palette.textFieldStyle.backgroundColor
+                          : theme.palette.inputColor,
+                        cursor: isDisabled ? "not-allowed" : "pointer",
+                      }}
+                      fullWidth={true}
+                      placeholder="Name"
+                      type="name"
+                      id="standard-required"
+                      margin="normal"
+                      variant="outlined"
+                      value={partnerData?.name}
+                      onBlur={() => {}}
+                      onChange={(e) => {
+                        if (e.target.value.length > 100) {
+                          toast("Choose a shorter name.");
+                          return;
+                        }
+
+                        setPartnerData({
+                          ...partnerData,
+                          name: e.target.value,
+                        });
+                      }}
+                      color="primary"
+                      InputProps={{
+                        style: {
+                          color: theme.palette.textFieldStyle.color,
+                          height: "35px",
+                          fontSize: "1em",
+                          borderRadius: 4,
+                          backgroundColor:
+                            theme.palette.textFieldStyle.backgroundColor,
+                        },
+                        classes: {
+                          notchedOutline: isEditOrgTab
+                            ? null
+                            : classes.notchedOutline,
+                        },
+                      }}
+                    />
+                  </div>
+                    {/* <div style={{ alignItems: "center" }}>
+                      <div
+                        style={{
+                          marginRight: "12px",
+                          color: theme.palette.text.primary,
+                        }}
+                      >
+                        Expertise
+                      </div>
+                      <FormControl style={{ width: 220, height: 35 }}>
+                        <Select
+                          style={{
+                            minWidth: 220,
+                            marginTop: 5,
+                            maxWidth: 220,
+                            height: 35,
+                            borderRadius: 4,
+                            color: theme.palette.textFieldStyle.color,
+                            cursor: isDisabled ? "not-allowed" : "pointer",
+                          }}
+                          disabled={isDisabled}
+                          id="multiselect-status"
+                          multiple
+                          value={partnerData?.expertise}
+                          onChange={(event) => {
+                            handleExpertiseChange(event);
+                          }}
+                          input={<OutlinedInput />}
+                          renderValue={(selected) => selected.join(", ")}
+                          MenuProps={MenuProps}
+                        >
+                          {expertiseOptions?.map((name) => (
+                            <MenuItem key={name} value={name}>
+                              <Checkbox
+                                checked={partnerData?.expertise?.indexOf(name) > -1}
+                              />
+                              <ListItemText primary={name} />
+                            </MenuItem>
+                          ))}
+                        </Select>
+                      </FormControl>
+                    </div>
+                    <div style={{ alignItems: "center", marginLeft: 12 }}>
+                      <div
+                        style={{
+                          marginRight: "12px",
+                          color: theme.palette.text.primary,
+                        }}
+                      >
+                        Services
+                      </div>
+                      <FormControl style={{ width: 220, height: 35 }}>
+                        <Select
+                          style={{
+                            minWidth: 220,
+                            marginTop: 5,
+                            maxWidth: 220,
+                            height: 35,
+                            borderRadius: 4,
+                            color: theme.palette.textFieldStyle.color,
+                            cursor: isDisabled ? "not-allowed" : "pointer",
+                          }}
+                          disabled={isDisabled}
+                          id="multiselect-status"
+                          multiple
+                          value={partnerData?.services || []}
+                          onChange={(event) => {
+                            handleServicesChange(event);
+                          }}
+                          input={<OutlinedInput />}
+                          renderValue={(selected) => selected.join(", ")}
+                          MenuProps={MenuProps}
+                        >
+                          {servicesOptions?.map((name) => (
+                            <MenuItem key={name} value={name}>
+                              <Checkbox
+                                checked={(partnerData?.services || []).indexOf(name) > -1}
+                              />
+                              <ListItemText primary={name} />
+                            </MenuItem>
+                          ))}
+                        </Select>
+                      </FormControl>
+                    </div> */}
+                    <div style={{ alignItems: "center" }}>
+                      <div
+                        style={{
+                          marginRight: "12px",
+                          color: theme.palette.text.primary,
+                        }}
+                      >
+                        Solutions
+                      </div>
+                      <FormControl style={{ width: 190, height: 35 }}>
+                        <Select
+                          style={{
+                            minWidth: 190,
+                            marginTop: 5,
+                            maxWidth: 190,
+                            height: 35,
+                            borderRadius: 4,
+                            color: theme.palette.textFieldStyle.color,
+                            cursor: isDisabled ? "not-allowed" : "pointer",
+                          }}
+                          disabled={isDisabled}
+                          id="multiselect-status"
+                          multiple
+                          value={partnerData?.solutions || []}
+                          onChange={(event) => {
+                            handleSolutionsChange(event);
+                          }}
+                          input={<OutlinedInput />}
+                          renderValue={(selected) => selected.join(", ")}
+                          MenuProps={MenuProps}
+                        >
+                          {solutionsOptions?.map((name) => (
+                            <MenuItem key={name} value={name}>
+                              <Checkbox
+                                checked={(partnerData?.solutions || []).indexOf(name) > -1}
+                              />
+                              <ListItemText primary={name} />
+                            </MenuItem>
+                          ))}
+                        </Select>
+                      </FormControl>
+                    </div>
+                    <div
+                      style={{ marginLeft: 13, fontSize: 16, color: "#9E9E9E" }}
+                    >
+                      <Typography
+                        variant="text"
+                        style={{ color: theme.palette.text.primary }}
+                      >
+                        Region
+                      </Typography>
+                      <RegionChangeModal
+                        isDisabled={isDisabled}
+                        selectedOrganization={selectedOrganization}
+                        setSelectedRegion={setSelectedRegion}
+						            partnerData={partnerData}
+						            setPartnerData={setPartnerData}
+                        userdata={userdata}
+                      />
+                    </div>
+                    <div style={{ alignItems: "flex-start", marginLeft: 13, display: "flex", flexDirection: "column" }}>
+                      <Typography
+                        variant="text"
+                        style={{ color: theme.palette.text.primary }}
+                      >
+                        Country
+                      </Typography>
+                      <FormControl style={{ width: 210, height: 35 }}>
+                        <Autocomplete
+                          id="country-select"
+                          value={countries.find(country => country.label === partnerData?.country)}
+                          style={{
+                            minWidth: 210,
+                            marginTop: 5,
+                            maxWidth: 210,
+                            height: 35,
+                            borderRadius: 4,
+                            color: theme.palette.textFieldStyle.color,
+                            cursor: isDisabled ? "not-allowed" : "pointer",
+                          }}
+                          disabled={isDisabled}
+                          options={countries}
+                          autoHighlight
+                          onClear={() => {
+                            setPartnerData({
+                              ...partnerData,
+                              country: "",
+                            });
+                          }}
+                          getOptionLabel={(option) => option?.label || ""}
+                          onChange={(event, newValue) => {
+                            setPartnerData({
+                              ...partnerData,
+                              country: newValue?.label,
+                            });
+                          }}
+                          renderOption={(props, option) => (
+                            <Box
+                              component="li"
+                              sx={{ "& > img": { mr: 2, flexShrink: 0 } }}
+                              {...props}
+                            >
+                              <img
+                                loading="lazy"
+                                width="20"
+                                src={`https://flagcdn.com/48x36/${option.code.toLowerCase()}.png`}
+                                alt=""
+                              />
+                              {option.label}
+                            </Box>
+                          )}
+                          renderInput={(params) => (
+                            <TextField
+                              {...params}
+                              placeholder="Select country"
+                              variant="outlined"
+                              InputProps={{
+                                ...params.InputProps,
+                                startAdornment: partnerData?.country ? (
+                                  <img
+                                    loading="lazy"
+                                    width="20"
+                                    src={`https://flagcdn.com/48x36/${countries.find(country => country.label === partnerData.country)?.code.toLowerCase()}.png`}
+                                    alt=""
+                                    style={{ marginRight: 8 }}
+                                  />
+                                ) : null,
+                                style: {
+                                  color: theme.palette.textFieldStyle.color,
+                                  height: "35px",
+                                  fontSize: "1em",
+                                  borderRadius: 4,
+                                  backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                                },
+                                classes: {
+                                  notchedOutline: isEditOrgTab ? null : classes.notchedOutline,
+                                },
+                              }}
+                            />
+                          )}
+                        />
+                      </FormControl>
+                    </div>
+                </div>
+                <div style={{ marginTop: "10px", }} />
+                <Typography
+                  variant="text"
+                  style={{ color: theme.palette.text.primary }}
+                >
+                  Description
+                </Typography>
+                <div style={{ display: "flex" }}>
+                  <TextField
+                    required
+                    disabled={isDisabled}
+                    multiline
+                    rows={3}
+                    style={{
+                      flex: "1",
+                      marginTop: "5px",
+                      color: theme.palette.textFieldStyle.color,
+                      backgroundColor: isEditOrgTab
+                        ? theme.palette.textFieldStyle.backgroundColor
+                        : theme.palette.inputColor,
+                      height: 89,
+                      borderRadius: 4,
+                      cursor: isDisabled ? "not-allowed" : "pointer",
+                    }}
+                    fullWidth={true}
+                    type="name"
+                    id="outlined-with-placeholder"
+                    margin="normal"
+                    variant="outlined"
+                    placeholder="A description for the organization"
+                    value={partnerData?.description}
+                    onBlur={(e) => {
+                      setPartnerData({
+                        ...partnerData,
+                        description: e.target.value,
+                      });
+                    }}
+                    onChange={(e) => {
+                      setPartnerData({
+                        ...partnerData,
+                        description: e.target.value,
+                      });
+                    }}
+                    InputProps={{
+                      classes: {
+                        notchedOutline: isEditOrgTab
+                          ? null
+                          : classes.notchedOutline,
+                      },
+                      style: {
+                        color: theme.palette.textFieldStyle.color,
+                        height: 89,
+                        borderRadius: 4,
+                      },
+                    }}
+                  />
+                </div>
+                <div>
+                <div
+                    style={{ width: "100%", maxWidth: 500, marginRight: 10, marginTop: 10 }}
+                  >
+                    <Typography
+                      variant="text"
+                      style={{ color: theme.palette.text.primary }}
+                    >
+                      Website URL
+                    </Typography>
+                    <TextField
+                      required
+                      disabled={isDisabled}
+                      style={{
+                        flex: "1",
+                        display: "flex",
+                        height: 35,
+                        width: "100%",
+                        maxWidth: 500,
+                        marginTop: "5px",
+                        marginRight: "15px",
+                        color: theme.palette.textFieldStyle.color,
+                        backgroundColor: isEditOrgTab
+                          ? theme.palette.textFieldStyle.backgroundColor
+                          : theme.palette.inputColor,
+                        cursor: isDisabled ? "not-allowed" : "pointer",
+                      }}
+                      fullWidth={true}
+                      placeholder="https://www.example.com"
+                      type="name"
+                      id="standard-required"
+                      margin="normal"
+                      variant="outlined"
+                      value={partnerData?.website_url}
+                      onBlur={() => {}}
+                      onChange={(e) => {
+                        if (e.target.value.length > 100) {
+                          toast("Choose a shorter website URL.");
+                          return;
+                        }
+
+                        setPartnerData({
+                          ...partnerData,
+                          website_url: e.target.value,
+                        });
+                      }}
+                      color="primary"
+                      InputProps={{
+                        style: {
+                          color: theme.palette.textFieldStyle.color,
+                          height: "35px",
+                          fontSize: "1em",
+                          borderRadius: 4,
+                          backgroundColor:
+                            theme.palette.textFieldStyle.backgroundColor,
+                        },
+                        classes: {
+                          notchedOutline: isEditOrgTab
+                            ? null
+                            : classes.notchedOutline,
+                        },
+                      }}
+                    />
+                </div>
+                <div
+                    style={{ width: "100%", maxWidth: 500, marginRight: 10, marginTop: 20 }}
+                  >
+                    <Typography
+                      variant="text"
+                      style={{ color: theme.palette.text.primary }}
+                    >
+                      Article URL
+                    </Typography>
+                    <TextField
+                      required
+                      disabled={isDisabled}
+                      style={{
+                        flex: "1",
+                        display: "flex",
+                        height: 35,
+                        width: "100%",
+                        maxWidth: 500,
+                        marginTop: "5px",
+                        marginRight: "15px",
+                        color: theme.palette.textFieldStyle.color,
+                        backgroundColor: isEditOrgTab
+                          ? theme.palette.textFieldStyle.backgroundColor
+                          : theme.palette.inputColor,
+                        cursor: isDisabled ? "not-allowed" : "pointer",
+                      }}
+                      fullWidth={true}
+                      placeholder="https://www.example.com"
+                      type="name"
+                      id="standard-required"
+                      margin="normal"
+                      variant="outlined"
+                      value={partnerData?.article_url}
+                      onBlur={() => {}}
+                      onChange={(e) => {
+                        if (e.target.value.length > 100) {
+                          toast("Choose a shorter article URL.");
+                          return;
+                        }
+
+                        setPartnerData({
+                          ...partnerData,
+                          article_url: e.target.value,
+                        });
+                      }}
+                      color="primary"
+                      InputProps={{
+                        style: {
+                          color: theme.palette.textFieldStyle.color,
+                          height: "35px",
+                          fontSize: "1em",
+                          borderRadius: 4,
+                          backgroundColor:
+                            theme.palette.textFieldStyle.backgroundColor,
+                        },
+                        classes: {
+                          notchedOutline: isEditOrgTab
+                            ? null
+                            : classes.notchedOutline,
+                        },
+                      }}
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </span>
+        </Grid>
+      </Grid>
+    </div>
+  );
+};
+
+export default PartnerDetails;
+
+const RegionChangeModal = memo(
+  ({
+    isDisabled,
+    selectedOrganization,
+    setSelectedRegion,
+    userdata,
+    partnerData,
+    setPartnerData,
+  }) => {
+    // Show from options: "us-west2", "europe-west2", "europe-west3", "northamerica-northeast1"
+    // var regions = ["us-west2", "europe-west2", "europe-west3", "northamerica-northeast1"]
+
+    const regionMapping = {
+      "Africa": "af",
+      "Asia Pacific (APAC)": "",
+      "Europe": "eu",
+      "Latin America": "la",
+      "Middle East": "me",
+      "North America": "na",
+      "Global": ""
+    };
+
+    //let regiontag = "UK";
+    let regiontag = partnerData?.region || "UK";
+    let regionCode = "gb";
+
+    const regionsplit = selectedOrganization?.region_url?.split(".");
+
+    if (regionsplit?.length > 2 && !regionsplit[0]?.includes("shuffler")) {
+      const namesplit = regionsplit[0]?.split("/");
+      regiontag = namesplit[namesplit.length - 1];
+
+      if (regiontag === "california") {
+        regiontag = "US";
+        regionCode = "us";
+      } else if (regiontag === "frankfurt") {
+        regiontag = "EU-2";
+        regionCode = "eu";
+      } else if (regiontag === "ca") {
+        regiontag = "CA";
+        regionCode = "ca";
+      } else if (regiontag === "austrailia") {
+        regiontag = "AUS";
+        regionCode = "au";
+      }
+    }
+
+    return (
+      <FormControl
+        disabled={isDisabled}
+        style={{
+          display: "flex",
+          flexDirection: "column",
+          marginTop: 5,
+          alignItems: "center",
+          cursor: isDisabled ? "not-allowed" : "pointer",
+        }}
+      >
+        {/* <InputLabel id="demo-simple-select-label">Region</InputLabel> */}
+        <Select
+          labelId="demo-simple-select-label"
+          id="demo-simple-select"
+          value={partnerData?.region || "Europe"}
+          style={{ minWidth: 190, height: 35, borderRadius: 4 }}
+          onChange={(e) => {
+            // if (userdata?.support) {
+            // 	setSelectedRegion(e.target.value)
+            // } else {
+            // 	handleSendChangeRegionMail(e.target.value)
+            // }
+            setPartnerData({
+              ...partnerData,
+              region: e.target.value,
+            })
+
+            // setSelectedRegion(e.target.value)
+          }}
+        >
+          {Object.keys(regionMapping).map((region, index) => {
+            const regionImageCode = regionMapping[region];
+            // Set the default region if selectedOrganization.region is not set
+            if (selectedOrganization.region === undefined) {
+              selectedOrganization.region = "europe-west2";
+            }
+
+            if (region === "AUS") {
+              region = "AUS (test)";
+            }
+
+            // Check if the current region matches the selected region
+            if (region === selectedOrganization.region) {
+              // If the region matches, set the MenuItem as selected
+              return (
+                <MenuItem value={region} key={index} disabled>
+                  {/* show region image through cdn */}
+                  {/* <img
+                    src={`https://flagcdn.com/48x36/${regionImageCode}.png`}
+                    alt={region}
+                    style={{ marginRight: 10 }}
+                  /> */}
+                  {region}
+                </MenuItem>
+              );
+            } else {
+              return (
+                <MenuItem sx={{ display: "flex" }} key={index} value={region}>
+                  {/* <img
+                    src={`https://flagcdn.com/48x36/${regionImageCode}.png`}
+                    alt={region}
+                    style={{ marginRight: 10, width: 20, height: 18 }}
+                  /> */}
+                  {region}
+                </MenuItem>
+              );
+            }
+          })}
+        </Select>
+      </FormControl>
+    );
+  }
+);
diff --git a/frontend/src/components/PartnerHeader.jsx b/frontend/src/components/PartnerHeader.jsx
new file mode 100644
index 00000000..8cb84c0a
--- /dev/null
+++ b/frontend/src/components/PartnerHeader.jsx
@@ -0,0 +1,845 @@
+import React, { memo, useEffect, useState, useContext } from "react";
+import {getTheme} from "../theme.jsx";
+import { makeStyles } from "@mui/styles";
+import { toast } from 'react-toastify';
+import { Context } from "../context/ContextApi.jsx";
+import {
+  Tooltip,
+  TextField,
+  FormControl,
+  InputLabel,
+  OutlinedInput,
+  Checkbox,
+  Select,
+  MenuItem,
+  Button,
+  ListItemText,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  Divider,
+  DialogTitle,
+  Skeleton,
+} from "@mui/material";
+
+import AvatarEditor from "react-avatar-editor";
+
+
+import {
+  AddAPhotoOutlined as AddAPhotoOutlinedIcon,
+  ZoomInOutlined as ZoomInOutlinedIcon,
+  ZoomOutOutlined as ZoomOutOutlinedIcon,
+  Loop as LoopIcon,
+  AddPhotoAlternate as AddPhotoAlternateIcon,
+} from "@mui/icons-material";
+
+import {
+  ExpandLess as ExpandLessIcon,
+  ExpandMore as ExpandMoreIcon,
+  Save as SaveIcon,
+} from "@mui/icons-material";
+
+const useStyles = makeStyles({
+  notchedOutline: {
+    borderColor: "#f85a3e !important",
+  },
+});
+
+const defaultImage =
+  "data:image/png;base64,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";
+
+  const defaultLandscapeImage = 
+  "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIMAAAAcCAYAAABCrQzwAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAARPSURBVHgB7VpdUtswEF4zvJOeAHECwgnqzNDnpifAPQHhmc4QZtrnhBNgTlD63HZiTpD0BLgnIL1A3f3Qqiiu/0KcOC76ZnYkSxtLWq1WuxsTOTg4OKThJR+PE1ojvA/fPHJoBXbIwUGwSy8ASZL4XCjUPc8LqQHIHEB7TD+YIp5LnOLpcBEw7TP9Ep5I+vpcoD82bXWj1crAAlJczFk48xLWgOlE6iFtEDLHCYkyWnjHFFt8F1wMUzxvmY6kPpJ3hEwRrQFZyjCncuE2Ajk5p6RPmG+1Y763TDfrOjUrAJuspB4x3TEdkrWhojBDecRabqQe0waRpQwz7/xrj7YMBScMMOY1YL4xK8QZbQ/6UoY8r/clPECP+WbUANrkQNqKcMkEhT0gbUYh5Fj6BqwQ17Q96Ej5swIPNaUIQCt8BtsBZODkD1MsEGDIfCFp36A0nJUrRzF1tvBqWQliRZU8zryK135bLIOy6nd5TLzogIszKTMBJWCClXlgmjJN+PlBHLgs/vtEY5LTP0yeoKTNNw0W60WyCFxpE+G5sN5n456WACIOmSd+NxHC2q7N3IpQyTIkn94ERL9fL7bu3LFvES7yHfOiFgf1zr/n3ZPPBeZxm9fJijCmYkBAXdKOGkiRNtPY1M6W+RuVkYpGsK6Y9LoUaX8KCtpLh7M2qlmGhD33hE+bTf8oRx5fLcDmG1M3kNM6kOtjWSjS1uMVE3wOUGy9u0MrAteOJ7CaQ28ReO4Jz6XFd2DxHFQZj+cM5R7K442840h+jxDWKH2hL9WKa0LuPFgYoxCKdNw9MSacaVRROS5t6yEn5crq71P7YK4ZJKQC20fgOg6SWZ9fpOytSTphUbwQOIpD0nF61+r2hQbiRJ4VOE1hRltjHnxN8KWc5RwIWxaQW5TB064MpJziAHXRcF/okJ4Egn5FOvTMesdWJtSeC5GDOe19KrdsBZbBezxJFjIcDA+alKT+3dzJ9eo3AdnUWyETTiE6eFQScQb/q42vgJjKs5a5/btVvH2JGkJqEAjhSOcYMjcYVoN54DydShOUYhPKsE8NAvKQdDzW+4WfB/RMtMKBlIwinKRRibe/Z9XrVgSV0+5T8zA+z0mWfGA1kdcoeUdrkk5mgQHTVBI2ynTKYkfSD4Q1XhHmOlSJlZiS5BWUVNFmoTLaTGgKOV2nZIO2z9I+pQK0JbRErGzCI0U6Xr63snzIuBnzGNNi3L4qxlZ9KNlKjIcMZkAFCbCaYU6/L3mWx1wLGiSdbtYMBxJ9U2ueJvK6Khpgl7OLS6U8C1FDwiYPuAt5cRA8fIIsjxmWAIsd1+k44o8jHhfKaL4nMN47xsAGRLSZ3AQyo12Zg5K2mTVPKGpMWj5dWgy9I9L5lahogNZ+AylZN6N8cVGadQ1jbmS8gjmQzGGew4M5mpR7XPVwtPZLpyb+6vUa/Ht5mTnI5ke0JNwHsQ5/4ZTBwcHBwaEAfwCepixlSVZHRgAAAABJRU5ErkJggg==";
+
+const PartnerHeader = (props) => {
+  const {
+    userdata,
+    globalUrl,
+    isPublishing,
+    isCloud,
+    partnerData,
+    setPartnerData,
+    loadingPartnerData
+  } = props;
+
+  const classes = useStyles();
+
+  var upload = "";
+  var landScapeUpload = "";
+
+  const { themeMode } = useContext(Context)
+  const {theme} = getTheme(themeMode)
+  const [isDisabled, setIsDisabled] = useState(isCloud ? userdata?.active_org?.is_partner ? false : true : true);
+  const [file, setFile] = React.useState("");
+  const [landscapeFile, setLandscapeFile] = React.useState("");
+  const [fileBase64, setFileBase64] = React.useState(
+    partnerData.image_url
+  );
+  const [landscapeFileBase64, setLandscapeFileBase64] = React.useState(
+    partnerData.landscape_image_url
+  );
+
+  useEffect(() => {
+    setIsDisabled(isCloud ? userdata?.active_org?.is_partner ? false : true : true);
+    if(userdata?.support){
+      setIsDisabled(false);
+    }
+  }, [isCloud, userdata]);
+  useEffect(() => {
+    if (partnerData.image_url !== undefined && partnerData.image_url !== null && partnerData.image_url.length > 0) {
+      setFileBase64(partnerData.image_url);
+      setFile(partnerData.image_url);
+    }
+    if (partnerData.landscape_image_url !== undefined && partnerData.landscape_image_url !== null && partnerData.landscape_image_url.length > 0) {
+      setLandscapeFileBase64(partnerData.landscape_image_url);
+      setLandscapeFile(partnerData.landscape_image_url);
+    }
+  }, [partnerData]);
+
+  useEffect(() => {
+    if(partnerData?.image_url === undefined) {
+      setPartnerData({
+        ...partnerData,
+        image_url: defaultImage,
+      })
+    } 
+    if(partnerData?.landscape_image_url === undefined) {
+      setPartnerData({
+        ...partnerData,
+        landscape_image_url: defaultLandscapeImage,
+      })
+    }
+  }, []);
+
+  const removeImage = () => {
+    setFile("");
+    setFileBase64("");
+    setCroppedData(defaultImage);
+    setPartnerData({
+      ...partnerData,
+      image_url: defaultImage,
+    })
+  };
+
+  const removeLandscapeImage = () => {
+    setLandscapeFile("");
+    setLandscapeFileBase64("");
+    setLandscapeCroppedData(defaultLandscapeImage);
+    setPartnerData({
+      ...partnerData,
+      landscape_image_url: defaultLandscapeImage,
+    })
+  }
+
+  const surfaceColor = "#27292D";
+  const inputColor = "#383B40";
+
+  const bodyDivStyle = {
+    margin: "auto",
+    width: "900px",
+  };
+
+  const appIconStyle = {
+    marginLeft: "5px",
+  };
+
+  const dividerStyle = {
+    marginBottom: "10px",
+    marginTop: "10px",
+    height: "1px",
+    width: "100%",
+    backgroundColor: "grey",
+  };
+
+  useEffect(() => {
+    if (file !== "") {
+      const img = document.getElementById("logo");
+      if (img) {  // Add check to ensure img exists
+        var canvas = document.createElement("canvas");
+        canvas.width = 174;
+        canvas.height = 174;
+        var ctx = canvas.getContext("2d");
+
+        img.onload = function () {
+          ctx.drawImage(
+            img,
+            0,
+            0,
+            img.width,
+            img.height,
+            0,
+            0,
+            canvas.width,
+            canvas.height
+          );
+
+          const canvasUrl = canvas.toDataURL();
+          if (canvasUrl !== fileBase64) {
+            setFileBase64(canvasUrl);
+            setPartnerData(prevData => ({
+              ...prevData,
+              image_url: canvasUrl
+            }));
+          }
+        };
+      }
+    }
+  }, [file]); // Add file as dependency
+
+  useEffect(() => {
+    if (landscapeFile !== "") {
+      const landscapeImg = document.getElementById("landscape_logo");
+      if (landscapeImg) {  // Add check to ensure landscapeImg exists
+        var landscapeCanvas = document.createElement("canvas");
+        landscapeCanvas.width = 350;
+        landscapeCanvas.height = 120;
+        var landscapeCtx = landscapeCanvas.getContext("2d");
+        
+        landscapeImg.onload = function () {
+          landscapeCtx.drawImage(
+            landscapeImg,
+            0,
+            0,
+            landscapeImg.width,
+            landscapeImg.height,
+            0,
+            0,
+            landscapeCanvas.width,
+            landscapeCanvas.height
+          );
+
+          const landscapeCanvasUrl = landscapeCanvas.toDataURL();
+          if (landscapeCanvasUrl !== landscapeFileBase64) {
+            setLandscapeFileBase64(landscapeCanvasUrl);
+            setPartnerData(prevData => ({
+              ...prevData,
+              landscape_image_url: landscapeCanvasUrl
+            }));
+          }
+        };
+      }
+    }
+  }, [landscapeFile]); // Add landscapeFile as dependency
+
+  var image = "";
+  const editHeaderImage = (event) => {
+    const file = event.target.value;
+    const actualFile = event.target.files[0];
+    const fileObject = URL.createObjectURL(actualFile);
+    setFile(fileObject);
+  };
+
+  //console.log("USER: ", userdata)
+  const orgSaveButton = (
+    <Tooltip title="Save any unsaved data" placement="bottom">
+      <Button
+        style={{ width: 150, height: 55, flex: 1 }}
+        variant="outlined"
+        color="primary"
+        disabled={
+          userdata === undefined || userdata === null || userdata.admin !== "true"
+        }
+        onClick={() =>
+            console.log("save")
+        }
+      >
+        <SaveIcon />
+      </Button>
+    </Tooltip>
+  );
+
+  const [imageUploadError, setImageUploadError] = React.useState("");
+  const [openImageModal, setOpenImageModal] = React.useState(false);
+  const [openLandscapeImageModal, setOpenLandscapeImageModal] = React.useState(false);
+  const [scale, setScale] = React.useState(1);
+  const [rotate, setRotation] = React.useState(0);
+  const [disableImageUpload, setDisableImageUpload] = React.useState(true);
+  const [croppedData, setCroppedData] = React.useState(
+    partnerData?.image_url || defaultImage
+  );
+  const [landscapeCroppedData, setLandscapeCroppedData ] = React.useState(
+    partnerData?.landscape_image_url || defaultLandscapeImage
+  )
+
+
+  React.useEffect(() => {
+    if (file.length > 0) {
+      setCroppedData(file);
+    } else if (fileBase64 !== undefined && fileBase64 !== null && fileBase64.length > 0) {
+      setCroppedData(fileBase64);
+    } else {
+      setCroppedData(partnerData?.image_url || defaultImage);
+    }
+
+    if (landscapeFile.length > 0) {
+      setLandscapeCroppedData(landscapeFile);
+    } else if (landscapeFileBase64 !== undefined && landscapeFileBase64 !== null && landscapeFileBase64.length > 0) {
+      setLandscapeCroppedData(landscapeFileBase64);
+    } else {
+      setLandscapeCroppedData(partnerData?.landscape_image_url || defaultLandscapeImage);
+    }
+
+  }, [partnerData, file, landscapeFile]);
+
+
+  const alternateImg = (
+    <AddPhotoAlternateIcon
+      style={{
+        maxWidth: 174,
+        maxHeight: 174,
+        minWidth: 174,
+        minHeight: 174,
+        flex: "1",
+        display: "flex",
+        flexDirection: "row",
+        margin: "auto",
+        marginTop: 30,
+        marginLeft: 40,
+      }}
+      onClick={() => {
+        upload.click();
+      }}
+    />
+  );
+
+  const zoomIn = () => {
+    setScale(scale + 0.1);
+  };
+
+  const zoomOut = () => {
+    setScale(scale - 0.1);
+  };
+
+  const rotation = () => {
+    setRotation(rotate + 10);
+  };
+
+  const onPositionChange = () => {
+    setDisableImageUpload(false);
+  };
+
+  const onCancelSaveAppIcon = () => {
+    setOpenImageModal(false);
+    setOpenLandscapeImageModal(false);
+    setImageUploadError("");
+  };
+
+  let editor;
+  let landscapeEditor;
+  const setEditorRef = (imgEditor) => {
+    editor = imgEditor;
+  };
+  const setLandscapeEditorRef = (imgEditor) => {
+    landscapeEditor = imgEditor;
+  };
+
+
+  const onSaveAppIcon = () => {
+        const canvas = editor.getImageScaledToCanvas();
+        const newImageData = canvas.toDataURL();
+        setCroppedData(newImageData);  // Update croppedData with the new image data
+        setOpenImageModal(false);
+        setDisableImageUpload(true);
+        setPartnerData({
+          ...partnerData,
+          image_url: newImageData,
+        })
+  };
+
+  const onSaveLandscapeImage = () => {
+    const canvas = landscapeEditor.getImageScaledToCanvas();
+    const newImageData = canvas.toDataURL();
+    setLandscapeCroppedData(newImageData);
+    setOpenLandscapeImageModal(false);
+    setDisableImageUpload(true);
+    setPartnerData({
+      ...partnerData,
+      landscape_image_url: newImageData,
+    })
+  }
+
+  const imageInfo = (
+    <img
+      src={partnerData?.image_url || defaultImage}
+      alt="Click to upload an image (174x174)"
+      id="logo"
+      disabled={isDisabled}
+      style={{
+        maxWidth: 174,
+        maxHeight: 174,
+        minWidth: 174,
+        minHeight: 174,
+        objectFit: "contain",
+        borderRadius: 16,
+        cursor: isDisabled ? "not-allowed" : "pointer",
+      }}
+    />
+  );
+
+    const landScapeImageInfo = (
+    <img
+      src={partnerData?.landscape_image_url || defaultLandscapeImage}
+      alt="Click to upload an image (350x120)"
+      id="landscape_logo"
+      disabled={isDisabled}
+      style={{
+        maxWidth: 350,
+        maxHeight: 120,
+        minWidth: 350,
+        minHeight: 120,
+        objectFit: "contain",
+        borderRadius: 16,
+        cursor: isDisabled ? "not-allowed" : "pointer",
+      }}
+    />
+  );
+
+  const errorText = imageUploadError.length > 0 ? (
+    <div style={{ marginTop: 10 }}>Error: {imageUploadError}</div>
+  ) : null;
+
+
+  const imageUploadModalView = openImageModal && !isDisabled ? (
+    <Dialog
+      open={openImageModal}
+      onClose={onCancelSaveAppIcon}
+      PaperProps={{
+        sx: {
+            borderRadius: theme?.palette?.DialogStyle?.borderRadius,
+            border: theme?.palette?.DialogStyle?.border,
+            minWidth: "300px",
+            minHeight: "300px",
+            fontFamily: theme?.typography?.fontFamily,
+            backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+            zIndex: 1000,
+            '& .MuiDialogContent-root': {
+              backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+            },
+            '& .MuiDialogTitle-root': {
+              backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+            },
+            '& .MuiDialogActions-root': {
+              backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+            },
+        },
+    }}
+    >
+      <FormControl>
+        <DialogTitle>
+          <div style={{ color: theme?.palette?.textColor}}>Upload Partner Image</div>
+        </DialogTitle>
+        {errorText}
+        <DialogContent style={{ color: theme?.palette?.textColor }}>
+          <AvatarEditor
+            ref={setEditorRef}
+            image={croppedData}
+            width={174}
+            height={174}
+            border={50}
+            color={[0, 0, 0, 0.6]} // RGBA
+            scale={scale}
+            rotate={rotate}
+            onImageChange={onPositionChange}
+            onLoadSuccess={() => setRotation(0)}
+          />
+          <Divider style={dividerStyle} />
+          <div style={{ display: "flex", justifyContent: "space-between", margin: "10px 0" }}>
+            <Tooltip title="New Icon">
+              <Button
+                variant="outlined"
+                component="label"
+                style={appIconStyle}
+                onClick={() => { 
+                  upload.click(); 
+                }}
+              >
+                <AddAPhotoOutlinedIcon style={{ color: theme?.palette?.textColor }} />
+              </Button>
+            </Tooltip>
+            <Tooltip title="Zoom In">
+              <Button
+                variant="outlined"
+                component="label"
+                style={appIconStyle}
+                onClick={zoomIn}
+              >
+                <ZoomInOutlinedIcon style={{ color: theme?.palette?.textColor }} />
+              </Button>
+            </Tooltip>
+            <Tooltip title="Zoom Out">
+              <Button
+                variant="outlined"
+                component="label"
+                style={appIconStyle}
+                onClick={zoomOut}
+              >
+                <ZoomOutOutlinedIcon style={{ color: theme?.palette?.textColor }} />
+              </Button>
+            </Tooltip>
+            <Tooltip title="Rotate">
+              <Button
+                variant="outlined"
+                component="label"
+                style={appIconStyle}
+                onClick={rotation}
+              >
+                <LoopIcon style={{ color: theme?.palette?.textColor }} />
+              </Button>
+            </Tooltip>
+          </div>
+          <Divider style={dividerStyle} />
+        </DialogContent>
+        <DialogActions>
+          <Button
+            style={{ borderRadius: "2px", fontSize: 16, textTransform: "none", color: theme?.palette?.textColor }}
+            onClick={onCancelSaveAppIcon}
+          >
+            Cancel
+          </Button>
+          <Button
+            variant="contained"
+            style={{ borderRadius: "2px", fontSize: 16, color: "#1a1a1a", backgroundColor: disableImageUpload ? "" : "#ff8544", textTransform: 'none' }}
+            disabled={disableImageUpload}
+            onClick={onSaveAppIcon}
+            color="primary"
+          >
+            Upload
+          </Button>
+        </DialogActions>
+      </FormControl>
+    </Dialog>
+  ) : null;
+
+  const imageUploadModalViewLandscape = openLandscapeImageModal && !isDisabled ? (
+    <Dialog
+      open={openLandscapeImageModal}
+      onClose={onCancelSaveAppIcon}
+      PaperProps={{
+        sx: {
+            borderRadius: theme?.palette?.DialogStyle?.borderRadius,
+            border: theme?.palette?.DialogStyle?.border,
+            minWidth: "300px",
+            minHeight: "300px",
+            fontFamily: theme?.typography?.fontFamily,
+            backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+            zIndex: 1000,
+            '& .MuiDialogContent-root': {
+              backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+            },
+            '& .MuiDialogTitle-root': {
+              backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+            },
+            '& .MuiDialogActions-root': {
+              backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+            },
+        },
+    }}
+    >
+      <FormControl>
+        <DialogTitle>
+          <div style={{ color: theme?.palette?.textColor}}>Upload Partner Landscape Image</div>
+        </DialogTitle>
+        {errorText}
+        <DialogContent style={{ color: theme?.palette?.textColor }}>
+          <AvatarEditor
+            ref={setLandscapeEditorRef}
+            image={landscapeCroppedData}
+            width={350}
+            height={120}
+            border={50}
+            color={[0, 0, 0, 0.6]} // RGBA
+            scale={scale}
+            rotate={rotate}
+            onImageChange={onPositionChange}
+            onLoadSuccess={() => setRotation(0)}
+          />
+          <Divider style={dividerStyle} />
+          <div style={{ display: "flex", justifyContent: "space-between", margin: "10px 0" }}>
+            <Tooltip title="New Icon">
+              <Button
+                variant="outlined"
+                component="label"
+                style={appIconStyle}
+                onClick={() => { 
+                  landScapeUpload.click(); 
+                }}
+              >
+                <AddAPhotoOutlinedIcon style={{ color: theme?.palette?.textColor }} />
+              </Button>
+            </Tooltip>
+            <Tooltip title="Zoom In">
+              <Button
+                variant="outlined"
+                component="label"
+                style={appIconStyle}
+                onClick={zoomIn}
+              >
+                <ZoomInOutlinedIcon style={{ color: theme?.palette?.textColor }} />
+              </Button>
+            </Tooltip>
+            <Tooltip title="Zoom Out">
+              <Button
+                variant="outlined"
+                component="label"
+                style={appIconStyle}
+                onClick={zoomOut}
+              >
+                <ZoomOutOutlinedIcon style={{ color: theme?.palette?.textColor }} />
+              </Button>
+            </Tooltip>
+            <Tooltip title="Rotate">
+              <Button
+                variant="outlined"
+                component="label"
+                style={appIconStyle}
+                onClick={rotation}
+              >
+                <LoopIcon style={{ color: theme?.palette?.textColor }} />
+              </Button>
+            </Tooltip>
+          </div>
+          <Divider style={dividerStyle} />
+        </DialogContent>
+        <DialogActions>
+          <Button
+            style={{ borderRadius: "2px", fontSize: 16, textTransform: "none", color: theme?.palette?.textColor }}
+            onClick={onCancelSaveAppIcon}
+          >
+            Cancel
+          </Button>
+          <Button
+            variant="contained"
+            style={{ borderRadius: "2px", fontSize: 16, color: "#1a1a1a", backgroundColor: disableImageUpload ? "" : "#ff8544", textTransform: 'none' }}
+            disabled={disableImageUpload}
+            onClick={onSaveLandscapeImage}
+            color="primary"
+          >
+            Upload
+          </Button>
+        </DialogActions>
+      </FormControl>
+    </Dialog>
+  ) : null;
+
+
+
+  if (loadingPartnerData) {
+    return (
+      <div style={{
+        display: "flex",
+        flexDirection: "row",
+        alignItems: "center",
+        justifyContent: "space-between",
+        width: "100%",
+      }}>
+        <div style={{
+          backgroundColor: theme?.palette?.loaderColor,
+          flex: "1",
+          display: "flex",
+          flexDirection: "row",
+          borderRadius: 16
+        }}>
+          <div style={{ margin: 10 }}>
+            <Skeleton 
+              variant="rectangular" 
+              width={174} 
+              height={174} 
+              style={{ borderRadius: 16 }}
+              animation="wave"
+            />
+          </div>
+          <div style={{ marginLeft: 16, alignContent: "center" }}>
+            <div>
+              <Skeleton variant="rectangular" width={128} height={40} style={{ borderRadius: 4 }} animation="wave" />
+            </div>
+            <div style={{ marginTop: 20 }}>
+              <Skeleton variant="rectangular" width={128} height={40} style={{ borderRadius: 4 }} animation="wave" />
+            </div>
+          </div>
+        </div>
+        <div style={{
+          backgroundColor: theme?.palette?.loaderColor,
+          flex: "1",
+          display: "flex",
+          flexDirection: "row",
+          borderRadius: 16
+        }}>
+          <div style={{ margin: 10 }}>
+            <Skeleton 
+              variant="rectangular" 
+              width={350} 
+              height={120} 
+              style={{ borderRadius: 16 }}
+              animation="wave"
+            />
+          </div>
+          <div style={{ marginLeft: 16, alignContent: "center" }}>
+            <div>
+              <Skeleton variant="rectangular" width={128} height={40} style={{ borderRadius: 4 }} animation="wave" />
+            </div>
+            <div style={{ marginTop: 20 }}>
+              <Skeleton variant="rectangular" width={128} height={40} style={{ borderRadius: 4 }} animation="wave" />
+            </div>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div
+    style={{
+      display: "flex",
+      flexDirection: "row",
+      alignItems: "center",
+      justifyContent: "space-between",
+      width: "90%",
+    }}
+    >
+      <div
+        style={{
+          color: "white",
+          display: "flex",
+          flexDirection: "row",
+          borderRadius: 16
+        }}
+        disabled={isDisabled}
+      >
+        <Tooltip title="Click to edit the partner's image (174x174)" placement="bottom">
+          <div
+            style={{
+              margin: 10,
+              cursor: "pointer",
+              // backgroundColor: inputColor,
+              maxWidth: 174,
+              maxHeight: 174,
+              borderRadius: 16,
+            }}
+            disabled={isDisabled}
+            onClick={() => {
+              setOpenImageModal(true);
+            }}
+          >
+            <input
+              hidden
+              type="file"
+              disabled={isDisabled}
+              ref={(ref) => (upload = ref)}
+              onChange={(e) => {
+                const reader = new FileReader();
+                reader.onload = (event) => {
+                  setCroppedData(event.target.result);
+                };
+                reader.readAsDataURL(e.target.files[0]);
+              }}
+            />
+            {imageInfo}
+          </div>
+          {imageUploadModalView}
+        </Tooltip>
+        <div style={{ marginLeft: 16, alignContent: "center" }}>
+          <div >
+            <Button
+              style={{ fontSize: 16, textTransform: 'capitalize',  boxShadow: "none", borderRadius: 4, width: 128, height: 40 }}
+              variant="contained"
+              color="primary"
+              disabled={isDisabled || isPublishing}
+              onClick={() => {
+                setOpenImageModal(true);
+              }}
+            >
+              {partnerData?.image_url === null ? "Upload" : "Update"}
+            </Button>
+          </div>
+          <div>
+            <Button
+              variant="contained"
+              color="secondary"
+              style={{ fontSize: 16, textTransform: 'capitalize', boxShadow: "none", marginTop: 20, borderRadius: 4, width: 128, height: 40 }}
+              disabled={isDisabled || isPublishing}
+              onClick={() => {
+                removeImage();
+                setOpenImageModal(false);
+              }}
+            >
+              Remove
+            </Button>
+          </div>
+        </div>
+      </div>
+      <div
+        style={{
+          color: "white",
+          display: "flex",
+          flexDirection: "row",
+          borderRadius: 16
+        }}
+      >
+        <Tooltip title="Click to edit the partner's landscape image (350x120)" placement="bottom">
+          <div
+            style={{
+              margin: 10,
+              cursor: "pointer",
+              backgroundColor: inputColor,
+              maxWidth: 350,
+              maxHeight: 120,
+              borderRadius: 16,
+              display: "flex",
+            }}
+            disabled={isDisabled}
+            onClick={() => {
+              setOpenLandscapeImageModal(true);
+            }}
+          >
+            <input
+              hidden
+              type="file"
+              disabled={isDisabled}
+              ref={(ref) => (landScapeUpload = ref)}
+              onChange={(e) => {
+                const reader = new FileReader();
+                reader.onload = (event) => {
+                  setLandscapeCroppedData(event.target.result);
+                };
+                reader.readAsDataURL(e.target.files[0]);
+              }}
+            />
+            {landScapeImageInfo}
+          </div>
+          {imageUploadModalViewLandscape}
+        </Tooltip>
+        <div style={{ marginLeft: 16, alignContent: "center" }}>
+          <div >
+            <Button
+              style={{ fontSize: 16, textTransform: 'capitalize',  boxShadow: "none", borderRadius: 4, width: 128, height: 40 }}
+              variant="contained"
+              color="primary"
+              disabled={isDisabled || isPublishing}
+              onClick={() => {
+                setOpenLandscapeImageModal(true);
+              }}
+            >
+              {partnerData?.landscape_image_url === null ? "Upload" : "Update"}
+            </Button>
+          </div>
+          <div>
+            <Button
+              variant="contained"
+              color="secondary"
+              style={{ fontSize: 16, textTransform: 'capitalize', boxShadow: "none", marginTop: 20, borderRadius: 4, width: 128, height: 40 }}
+              disabled={isDisabled || isPublishing}
+              onClick={() => {
+                removeLandscapeImage();
+                setOpenLandscapeImageModal(false);
+              }}
+            >
+              Remove
+            </Button>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default PartnerHeader;
diff --git a/frontend/src/components/PartnerSettings.jsx b/frontend/src/components/PartnerSettings.jsx
new file mode 100644
index 00000000..a979c7d7
--- /dev/null
+++ b/frontend/src/components/PartnerSettings.jsx
@@ -0,0 +1,391 @@
+import React, { useEffect, useState, useContext } from 'react';
+import { toast } from "react-toastify";
+import { Context } from '../context/ContextApi.jsx';
+import { getTheme  } from '../theme.jsx';
+import {
+    Button,
+    Typography,
+    Box,
+    IconButton,
+    Tooltip,
+} from "@mui/material";
+import OpenInNewIcon from '@mui/icons-material/OpenInNew';
+import { useNavigate } from 'react-router';
+import PartnerHeader from '../components/PartnerHeader.jsx';
+import PartnerDetails from '../components/PartnerDetails.jsx';
+
+const PartnerSettings = (props) => {
+    const {
+        isCloud,
+        userdata,
+        globalUrl,
+        serverside,
+        loadingPartnerData,
+        selectedOrganization,
+        setSelectedOrganization, 
+        handleGetOrg, 
+        partnerData,
+        setPartnerData,
+    } = props;
+
+    const [isPartner, setIsPartner] = React.useState(isCloud ? userdata?.active_org?.is_partner ? true : false : false);
+    const [partnerTypes, setPartnerTypes] = React.useState({});
+    const [isPublishing, setIsPublishing] = React.useState(false);
+    const [isToggling, setIsToggling] = React.useState(false);
+    
+    useEffect(() => {
+        setIsPartner(isCloud ? userdata?.active_org?.is_partner ? true : false : false);
+        if(userdata?.support){
+            setIsPartner(true);
+        }
+    }, [userdata, isCloud]);
+    // Partner Types handling : Getting from org status
+    useEffect(() => {
+        const partnerTypes = {};
+        userdata?.org_status.forEach(status => {
+            if (status.includes("_partner")) {
+                partnerTypes[status] = true;
+            }
+        });
+        setPartnerTypes(partnerTypes);
+    }, [selectedOrganization]);
+    // Partner Type Colors
+    const partnerTypeColors = {
+        "tech_partner": "#ff8544",
+        "distribution_partner": "#2BC07E",
+        "service_partner": "#a99cf9",
+        "integration_partner": "#fb47a0"
+    }
+
+    const handleSendUpdateRequest = () => {
+        toast("Your request has been sent to the support team. They will review your request and get back to you as soon as possible.")
+    }
+
+    // Open partner page in new tab
+    const handleOpenPartnerPage = () => {
+        if (partnerData?.id) {
+            if(partnerData?.public){
+                window.open(`${window.location.origin}/partners/${partnerData.name.toLowerCase().replaceAll(" ", "_")}`)
+            }else{
+                window.open(`${window.location.origin}/partners/${partnerData?.id}`, "_blank");
+            }
+        } else {
+            toast.error("Partner ID not found");
+        }
+    }
+
+    // Update Partner Details
+    const handleUpdatePartnerDetails = () => {
+        // Validate required fields before publishing
+        const requiredStringFields = [
+            { field: partnerData?.name, name: "Partner Name" },
+            { field: partnerData?.description, name: "Description" },
+            { field: selectedOrganization?.id, name: "Organization Id" },
+            { field: partnerData?.image_url, name: "Logo Image" },
+            { field: partnerData?.landscape_image_url, name: "Landscape Image" },
+            { field: partnerData?.website_url, name: "Website URL" },
+            { field: partnerData?.article_url, name: "Article URL" },
+            { field: partnerData?.country, name: "Country" },
+            { field: partnerData?.region, name: "Region" },
+        ];
+        
+        // Required array fields (multi-select dropdowns)
+        const requiredArrayFields = [
+            { field: partnerData?.solutions, name: "Solutions" },
+        ];
+        
+        // Check if any required string fields are empty
+        const emptyStringFields = requiredStringFields.filter(item => 
+            !item.field || item.field.trim() === ""
+        );
+        
+        // Check if any required array fields are empty
+        const emptyArrayFields = requiredArrayFields.filter(item => 
+            !item.field || !Array.isArray(item.field) || item.field.length === 0
+        );
+        
+        // Combine all empty fields
+        const allEmptyFields = [...emptyStringFields, ...emptyArrayFields];
+        
+        // If there are empty required fields, show error and return
+        if (allEmptyFields.length > 0) {
+            const missingFields = allEmptyFields.map(item => item.name).join(", ");
+            toast.error(`Please fill in all required fields: ${missingFields}`);
+            return;
+        }
+        
+        // Check if at least one partner type is selected
+        if (Object.keys(partnerTypes).length === 0) {
+            toast.error("There should be at least one partner type");
+            return;
+        }
+       
+        setIsPublishing(true);
+        const url = globalUrl + "/api/v1/partners/" + userdata?.active_org?.id;
+        const data = {
+            id: partnerData.id?.trim() || null,
+            name: partnerData.name?.trim(),
+            org_id: selectedOrganization?.id?.trim(),
+            description: partnerData.description?.trim(),
+            website_url: partnerData.website_url?.trim(),
+            article_url: partnerData.article_url?.trim(),
+            partner_type: partnerTypes,
+            expertise: partnerData?.expertise || [],
+            services: partnerData?.services || [],
+            solutions: partnerData?.solutions || [],
+            country: partnerData?.country || "",
+            region: partnerData?.region || "",
+            image_url: partnerData?.image_url?.trim(),
+            landscape_image_url: partnerData?.landscape_image_url?.trim(),
+            public: partnerData?.public
+        }
+        fetch(url, {
+            mode: "cors",
+			method: "POST",
+			body: JSON.stringify(data),
+			credentials: "include",
+			headers: {
+				"Content-Type": "application/json; charset=utf-8",
+			},
+        })
+        .then((response) => {
+            setIsPublishing(false);
+            if (response.status !== 200) {
+                toast.error("Failed to publish partner");
+            }
+            return response.json();
+        })
+        .then((responseJson) => {
+            toast.success("Partner details successfully updated");
+        })
+        .catch((error) => {
+            setIsPublishing(false);
+            toast.error("Failed to update partner details: " + error?.message);
+        })
+    }
+
+    // Toggle Partner Publish Status
+    const handleTogglePublishStatus = () => {
+        setIsToggling(true);
+        const newPublishStatus = !partnerData?.public;
+        const url = globalUrl + "/api/v1/partners/" + userdata?.active_org?.id;
+        
+        const data = {
+            id: partnerData.id?.trim() || null,
+            name: partnerData.name?.trim(),
+            org_id: selectedOrganization?.id?.trim(),
+            description: partnerData.description?.trim(),
+            website_url: partnerData.website_url?.trim(),
+            article_url: partnerData.article_url?.trim(),
+            partner_type: partnerTypes,
+            usecases: partnerData?.usecases || [],
+            expertise: partnerData?.expertise || [],
+            services: partnerData?.services || [],
+            solutions: partnerData?.solutions || [],
+            country: partnerData?.country || "",
+            region: partnerData?.region || "",
+            image_url: partnerData?.image_url?.trim(),
+            landscape_image_url: partnerData?.landscape_image_url?.trim(),
+            public: newPublishStatus
+        }
+        
+        fetch(url, {
+            mode: "cors",
+            method: "POST",
+            body: JSON.stringify(data),
+            credentials: "include",
+            headers: {
+                "Content-Type": "application/json; charset=utf-8",
+            },
+        })
+        .then((response) => {
+            setIsToggling(false);
+            if (response.status !== 200) {
+                toast.error("Failed to update publish status");
+            }
+            return response.json();
+        })
+        .then((responseJson) => {
+            // Update local state
+            setPartnerData(prev => ({
+                ...prev,
+                public: newPublishStatus
+            }));
+            toast.success(`Partner ${newPublishStatus ? 'published' : 'unpublished'} successfully`);
+        })
+        .catch((error) => {
+            setIsToggling(false);
+            toast.error("Failed to update publish status: " + error?.message);
+        })
+    }
+
+    const { themeMode } = useContext(Context);
+    const theme = getTheme(themeMode);
+    const navigate = useNavigate();
+
+    return (
+        <div style={{ width: "100%", boxSizing: 'border-box', padding: "27px 10px 19px 27px", height:"100%", backgroundColor: theme.palette.platformColor, borderRadius: '16px',  }}>
+            <div style={{ height: "100%", width: "100%", overflowX: 'hidden', scrollbarColor: theme.palette.scrollbarColorTransparent, scrollbarWidth: 'thin'}} >
+            <div style={{ marginBottom: 40 }}>
+                <div style={{display:"flex", alignItems:"center", justifyContent:"space-between"}}>
+                <div style={{width:'100%'}}>
+                <Box
+                sx={{display:"flex", alignItems:"flex-start", gap:2, justifyContent:"flex-start"
+                }}>
+                <Typography variant='h3' sx={{ marginBottom: "15px", marginTop: 0, }}>Configuration</Typography>
+                {Object?.entries(partnerTypes)?.map(([key, value]) => (
+                    <Box
+                        sx={{
+                        display: "flex",
+                        alignItems: "center",
+                        justifyContent: "center",
+                        borderRadius: "999px",
+                        py: 1.2,
+                        px: 2.5,
+                        fontSize: "13px",
+                        fontWeight: 500,
+                        fontFamily: theme.typography.fontFamily,
+                        color: "#fff",
+                        backgroundColor: "transparent",
+                        border: `1.5px solid ${
+                            partnerTypeColors[key]
+                        }`,
+                        transition: "all 0.2s ease",
+                        textAlign: "center",
+                        whiteSpace: "nowrap",
+                        color: partnerTypeColors[key],
+                    }}
+                    >
+                    {key.replace("_", " ").replace(/\b\w/g, char => char.toUpperCase())}
+                </Box>
+                ))}
+                </Box>
+                <Box
+                sx={{
+                    display: "flex",
+                    alignItems: "center",
+                    justifyContent: "space-between",
+                    width: "100%",
+                    marginTop: 0.5,
+                }}>
+                <Typography variant="body2" style={{ color: theme.palette.text.secondary, fontSize: 16, maxWidth: "60%" }}>
+                Set up and manage partner details and information to be displayed on the Partners page.
+                </Typography>
+                <Box sx={{ display: "flex", gap: 2, alignItems: "center" }}>
+                    {isPartner && (
+                        <>  
+                            {/* View Partner Page Button */}
+                            <Tooltip title="View Partner Page">
+                                <IconButton
+                                    sx={{ 
+                                        color: theme.palette.primary.main,
+                                        backgroundColor: theme.palette.action.hover,
+                                        "&:hover": {
+                                            backgroundColor: theme.palette.action.selected,
+                                        }
+                                    }}
+                                    onClick={handleOpenPartnerPage}
+                                    disabled={!partnerData?.id}
+                                >
+                                    <OpenInNewIcon />
+                                </IconButton>
+                            </Tooltip>
+                            
+                            {/* Update Details Button */}
+                            <Button
+                                sx={{ 
+                                    fontSize: 16, 
+                                    textTransform: 'capitalize',  
+                                    boxShadow: "none", 
+                                    px: 4,
+                                }}
+                                variant="contained"
+                                color="primary"
+                                disabled={isPublishing || isToggling}
+                                onClick={handleUpdatePartnerDetails}
+                            >
+                                {isPublishing ? "Updating..." : "Update Details"}
+                            </Button>
+                                {/* Toggle Publish/Unpublish Button */}
+                                <Button
+                                sx={{ 
+                                    fontSize: 16, 
+                                    textTransform: 'capitalize',  
+                                    boxShadow: "none", 
+                                    marginRight: 4,
+                                    px: 3,
+                                    backgroundColor: partnerData?.public ? "#FD4C62" : "#4caf50",
+                                    "&:hover": {
+                                        backgroundColor: partnerData?.public ? "#FD4C62" : "#4caf50"
+                                    }
+                                }}
+                                variant="contained"
+                                disabled={isToggling || isPublishing}
+                                onClick={handleTogglePublishStatus}
+                            >
+                                {isToggling ? (partnerData?.public ? "Unpublishing..." : "Publishing...") : (partnerData?.public ? "Unpublish" : "Publish")}
+                            </Button>
+                        </>
+                    )}
+                    
+                    {!isPartner && (
+                        <Button
+                            sx={{ 
+                                fontSize: 16, 
+                                textTransform: 'capitalize',  
+                                boxShadow: "none", 
+                                px: 5, 
+                                textDecoration: "none", 
+                                marginRight: 4 
+                            }}
+                            variant="contained"
+                            color="primary"
+                            onClick={() => {
+                                if(!isCloud){
+                                    navigate("/become-partner")
+                                }else{
+                                    window.open("https://shuffler.io/become-partner")
+                                }
+                            }}
+                        >
+                            Become a partner
+                        </Button>
+                    )}
+                </Box>
+                </Box>
+                </div>
+                </div>
+            </div>
+            <PartnerHeader
+                isCloud={isCloud}
+                userdata={userdata}
+                isPublishing={isPublishing}
+                setSelectedOrganization={setSelectedOrganization}
+                globalUrl={globalUrl}
+                selectedOrganization={selectedOrganization}
+                isEditOrgTab={true}
+                loadingPartnerData={loadingPartnerData}
+                partnerData={partnerData}
+                setPartnerData={setPartnerData}
+                handleGetOrg={handleGetOrg}
+            />
+            <PartnerDetails
+                isCloud={isCloud}
+                userdata={userdata}
+                partnerData={partnerData}
+                isPublishing={isPublishing}
+                loadingPartnerData={loadingPartnerData}
+                setPartnerData={setPartnerData}
+                setSelectedOrganization={setSelectedOrganization}
+                globalUrl={globalUrl}
+                selectedOrganization={selectedOrganization}
+                isEditOrgTab={true}
+                handleGetOrg={handleGetOrg}
+                serverside={serverside}
+            />
+            </div>
+        </div >
+    )
+}
+
+export default PartnerSettings;
diff --git a/frontend/src/components/PartnerTab.jsx b/frontend/src/components/PartnerTab.jsx
new file mode 100644
index 00000000..10c21f06
--- /dev/null
+++ b/frontend/src/components/PartnerTab.jsx
@@ -0,0 +1,245 @@
+import React, { useEffect, useState, useCallback, useContext } from 'react';
+import { useNavigate, useLocation } from "react-router-dom";
+import Branding from "../components/Branding.jsx";
+import { ToastContainer, toast } from "react-toastify";
+import { Button } from '@mui/material';
+import { getTheme } from '../theme.jsx';
+import { Context } from '../context/ContextApi.jsx';
+import PartnerSettings from '../components/PartnerSettings.jsx';
+import PartnersUsecasesTab from '../components/PartnersUsecasesTab.jsx';
+import PartnersApps from '../components/PartnerApps.jsx';
+import PartnerArticles from '../components/PartnersArticles.jsx';
+const PartnerTab = (props) => {
+    const location = useLocation();
+    const navigate = useNavigate();
+    const {
+        userdata,
+        globalUrl,
+        serverside,
+        isCloud,
+        setSelectedOrganization,
+        selectedOrganization, handleGetOrg, 
+        handleStatusChange,
+        isLoaded,
+        removeCookie
+    } = props;
+
+    
+    const [selectedTab, setSelectedTab] = useState('partner_settings');
+    const [loadingPartnerData, setLoadingPartnerData] = useState(false);
+    const [curIndex, setCurIndex] = React.useState(0);
+    const [partnerData, setPartnerData] = React.useState({
+        name: "",
+        description: "",
+        image_url: "",
+        landscape_image_url: "",
+        website_url: "",
+        article_url: "",
+        expertise: [],
+        usecases: [],
+        services: [],
+        solutions: [],
+        country: "",
+        region: "",
+        partner_type: {},
+    });
+
+    const tabsOnPartnerTab = [ 'Partner Settings', 'Usecases', 'Apps', 'AI Agents', 'Articles', 'Branding'];
+
+    const { themeMode } = useContext(Context);
+    const theme = getTheme(themeMode);
+
+    useEffect(() => {
+        if(!isCloud || !userdata?.active_org?.is_partner) {
+            // If the user is not a partner or if it's not a cloud environment do not make api call :)
+            return;
+        }
+        setLoadingPartnerData(true);
+        const url = globalUrl + "/api/v1/partners/" + userdata?.active_org?.id;
+        fetch(url, {
+            method: "GET",
+            headers: {
+                "Content-Type": "application/json",
+                Accept: "application/json",
+            },
+            credentials: "include",
+        })
+        .then((response) => {
+            if (response.status !== 200) {
+                toast("Failed to get partner data")
+            }
+            return response.json();
+        })
+        .then((responseJson) => {
+            if(responseJson.success) {
+                setPartnerData(responseJson?.partner);
+                console.log("responseJson", responseJson)
+                setLoadingPartnerData(false);
+            }else{  
+                setLoadingPartnerData(false);
+                toast(responseJson?.reason)
+            }
+        })
+        .catch((error) => {
+            setLoadingPartnerData(false);
+        })
+    }, [globalUrl]);
+
+    // Used to auto select the tab based on the url : partner_tab
+    useEffect(() => {
+      const queryParams = new URLSearchParams(location.search);
+      const tabName = queryParams.get('partner_tab');
+      if (tabName) {
+          const decodedTabName = decodeURIComponent(tabName);
+          setSelectedTab(decodedTabName);
+          if (decodedTabName === 'partner_settings') {
+              setCurIndex(0);
+          } else if(decodedTabName === 'usecases'){
+              setCurIndex(1)
+          }else if (decodedTabName === 'apps'){
+              setCurIndex(2);
+          } else if (decodedTabName === 'aiagents') {
+              setCurIndex(3);
+          } else if (decodedTabName === 'articles') {
+              setCurIndex(4);
+          } else if (decodedTabName === 'branding') {
+              setCurIndex(5);
+          }
+      }
+    }, [location.search]);
+
+    // Tab click on partner tab
+    const handleTabClick = (tabName) => {
+        const formattedTabName = tabName.toLowerCase().replace(/[\s&]+/g, '');
+        const encodedTabName = encodeURIComponent(formattedTabName);
+        setSelectedTab(formattedTabName);
+        document.title = `Shuffle - partner - ${formattedTabName}`;
+        navigate(`?partner_tab=${encodedTabName}`);
+    };
+
+    // Rendering the content based on the selected tab
+    const renderContent = () => {
+        switch (selectedTab) {
+            case 'partner_settings':
+                return <PartnerSettings isCloud={isCloud} loadingPartnerData={loadingPartnerData} partnerData={partnerData} setPartnerData={setPartnerData} handleStatusChange={handleStatusChange} userdata={userdata} globalUrl={globalUrl} serverside={serverside} handleGetOrg={handleGetOrg} setSelectedOrganization={setSelectedOrganization} selectedOrganization={selectedOrganization} selectedTab={selectedTab} />;
+            case 'usecases': 
+                return <PartnersUsecasesTab isCloud={isCloud} partnerData={partnerData} setPartnerData={setPartnerData} handleStatusChange={handleStatusChange} userdata={userdata} globalUrl={globalUrl} serverside={serverside} handleGetOrg={handleGetOrg} setSelectedOrganization={setSelectedOrganization} selectedOrganization={selectedOrganization} selectedTab={selectedTab} />;
+            case `apps`:
+                return <PartnersApps isCloud={isCloud} partnerData={partnerData} setPartnerData={setPartnerData} handleStatusChange={handleStatusChange} userdata={userdata} globalUrl={globalUrl} serverside={serverside} handleGetOrg={handleGetOrg} setSelectedOrganization={setSelectedOrganization} selectedOrganization={selectedOrganization} selectedTab={selectedTab} />;
+            case 'articles' :
+                return <PartnerArticles isCloud={isCloud} partnerData={partnerData} setPartnerData={setPartnerData} handleStatusChange={handleStatusChange} userdata={userdata} globalUrl={globalUrl} serverside={serverside} handleGetOrg={handleGetOrg} setSelectedOrganization={setSelectedOrganization} selectedOrganization={selectedOrganization} selectedTab={selectedTab} />;
+            case `ai_agents`:
+                return <PartnerArticles isCloud={isCloud} partnerData={partnerData} setPartnerData={setPartnerData} handleStatusChange={handleStatusChange} userdata={userdata} globalUrl={globalUrl} serverside={serverside} handleGetOrg={handleGetOrg} setSelectedOrganization={setSelectedOrganization} selectedOrganization={selectedOrganization} selectedTab={selectedTab} />;
+            case 'branding':
+                return <Branding
+                    isCloud={isCloud}
+                    userdata={userdata}
+                    globalUrl={globalUrl}
+                    handleGetOrg={handleGetOrg}
+                    selectedOrganization={selectedOrganization}
+                    clickedFromOrgTab={true}
+                    setSelectedOrganization={setSelectedOrganization}
+                />;
+            default:
+                return <PartnerSettings isCloud={isCloud} partnerData={partnerData} setPartnerData={setPartnerData} handleStatusChange={handleStatusChange} userdata={userdata} globalUrl={globalUrl} serverside={serverside} handleGetOrg={handleGetOrg} setSelectedOrganization={setSelectedOrganization} selectedOrganization={selectedOrganization} />;
+        }
+    };
+
+    const isTabDisabled = (tabName) => {
+        // If user is a support user, enable all tabs
+        if (userdata?.support) {
+            return false;
+        }
+        
+        // For non-support users, apply the following restrictions:
+        
+        // For onPrem only partner settings and branding are enabled
+        if (
+            !isCloud &&
+            (tabName === "Usecases" ||
+            tabName === "Apps" ||
+            tabName === "AI Agents" ||
+            tabName === "Articles")
+        ) {
+            return true;
+        }
+
+        // Disable Apps, Articles, and AI Agents for all non-support users
+        if (
+            tabName === "Apps" ||
+            tabName === "Articles" ||
+            tabName === "AI Agents"
+        ) {
+            return true;
+        }
+
+        // Disable Usecases tab for cloud users if not a partner or is in a sub-org
+        if (isCloud && tabName === "Usecases") {
+            if (
+                !userdata?.active_org?.is_partner ||
+                userdata?.active_org?.is_sub_org
+            ) {
+                return true;
+            }
+        }
+
+        // Disable Branding tab if not an integration partner
+        const isIntegrationPartner =
+            userdata &&
+            userdata?.org_status?.includes("integration_partner") &&
+            !userdata?.org_status?.includes("sub_org");
+        if (tabName === "Branding" && !isIntegrationPartner) {
+            return true;
+        }
+
+        // Enable the tab by default
+        return false;
+    }
+   
+    return (
+        <div style={{ height: "100%", width: "100%", color: theme.palette.platformColor, backgroundColor: theme.palette.platformColor, borderTopRightRadius: '8px', borderBottomRightRadius: 8, borderLeft: theme.palette.defaultBorder, boxSizing: 'border-box' }}>
+            <div style={{ display: 'flex', justifyContent: 'space-around', width: "100%", borderBottom: theme.palette.defaultBorder ,boxSizing: 'border-box' }}>
+                {tabsOnPartnerTab?.map((tabName, index) => (
+                        <div style={{ pointerEvents: 'auto', width: '100%',}}>
+                            <Button
+                                key={tabName}
+                                onClick={() => {
+                                    setCurIndex(index); 
+                                    handleTabClick(index === 0 ? "partner_settings" : tabName.toLowerCase().replace(/[\s&]+/g, ''));
+                                }}
+                                disabled={isTabDisabled(tabName)}
+                                variant="text"
+                                sx={{
+                                    "&.MuiButton-root": {
+                                        padding: '28px 0',
+                                        borderBottom: index === curIndex ? '2px solid #FF8444' : 'none',
+                                        cursor: 'pointer',
+                                        fontWeight: index === curIndex ? 'bold' : 'normal',
+                                        color: index === curIndex ? "#FF8444" : theme.palette.text.primary,
+                                        textTransform: 'none',
+                                        fontSize: 16,
+                                        width: "100%",
+                                        height: "100%",
+                                        borderRadius: 0,
+                                    },
+                                    "&: hover": {
+                                        backgroundColor: theme.palette.hoverColor
+                                    },
+                                    "&.Mui-disabled": {
+                                        color: "#6F6F6F",
+                                    },
+                                }}
+                            >
+                              {tabName}
+                            </Button>
+                        </div>
+                ))}
+            </div>
+            <div style={{ display: 'flex', justifyContent: 'center', width: "100%", height: "100%", paddingBottom: 200, boxSizing:'border-box'}}>
+                {renderContent()}
+            </div>
+        </div>
+    );
+};
+
+export default PartnerTab;
diff --git a/frontend/src/components/PartnersArticles.jsx b/frontend/src/components/PartnersArticles.jsx
new file mode 100644
index 00000000..80653231
--- /dev/null
+++ b/frontend/src/components/PartnersArticles.jsx
@@ -0,0 +1,21 @@
+import { Box, Typography } from '@mui/material'
+import React from 'react'
+
+const PartnersArticles = () => {
+  return (
+    <Box
+    sx={{
+      display: "flex",
+      alignItems: "center",
+      justifyContent: "center",
+      width: "100%",
+      height: "100%",
+      minHeight: "500px",
+    }}
+    >
+      <Typography>Partner Articles</Typography>
+    </Box>
+  )
+}
+
+export default PartnersArticles
diff --git a/frontend/src/components/PartnersUsecasesTab.jsx b/frontend/src/components/PartnersUsecasesTab.jsx
new file mode 100644
index 00000000..87e34b52
--- /dev/null
+++ b/frontend/src/components/PartnersUsecasesTab.jsx
@@ -0,0 +1,1761 @@
+import {
+  Box,
+  Tooltip,
+  Typography,
+  Switch,
+  Button,
+  Dialog,
+  DialogTitle,
+  DialogContent,
+  DialogActions,
+  TextField,
+  Select,
+  MenuItem,
+  FormControl,
+  InputLabel,
+  IconButton,
+  Menu,
+  ListItemIcon,
+  ListItemText,
+  Checkbox,
+  CircularProgress,
+  Skeleton,
+} from "@mui/material";
+import React, { useContext, useEffect, useState } from "react";
+import { getTheme } from "../theme.jsx";
+import { Context } from "../context/ContextApi.jsx";
+import AddIcon from "@mui/icons-material/Add";
+import CloseIcon from "@mui/icons-material/Close";
+import { toast } from "react-toastify";
+import MoreVertIcon from "@mui/icons-material/MoreVert";
+import EditIcon from "@mui/icons-material/Edit";
+import StarIcon from "@mui/icons-material/Star";
+import DeleteIcon from "@mui/icons-material/Delete";
+import AddCircleOutlineIcon from "@mui/icons-material/AddCircleOutline";
+import DeleteOutlineIcon from "@mui/icons-material/DeleteOutline";
+import KeyboardArrowUpIcon from "@mui/icons-material/KeyboardArrowUp";
+import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown";
+import { Link, useNavigate } from "react-router-dom";
+
+// Helper function to get the correct image path based on app category
+export const getCategoryImagePath = (category) => {
+  if (!category) return "/images/appCategories/other.svg";
+  
+  const lowerCategory = category.toLowerCase();
+  
+  if (lowerCategory.includes("communication")) {
+    return "/images/appCategories/cases.svg";
+  } else if (lowerCategory.includes("cases")) {
+    return "/images/appCategories/cases.svg";
+  } else if (lowerCategory.includes("network")) {
+    return "/images/appCategories/network.svg";
+  } else if (lowerCategory.includes("siem")) {
+    return "/images/appCategories/siem.svg";
+  } else if (lowerCategory.includes("edr") || lowerCategory.includes("eradication")) {
+    return "/images/appCategories/edr.svg";
+  } else if (lowerCategory.includes("iam")) {
+    return "/images/appCategories/iam.svg";
+  } else if (lowerCategory.includes("assets")) {
+    return "/images/appCategories/assets.svg";
+  } else if (lowerCategory.includes("intel")) {
+    return "/images/appCategories/intel.svg";
+  } else if (lowerCategory.includes("email")) {
+    return "/images/appCategories/email.svg";
+  } else {
+    return "/images/appCategories/other.svg";
+  }
+};
+
+// Skeleton component for loading state
+const UsecaseCardSkeleton = () => {
+  const { themeMode } = useContext(Context);
+  const theme = getTheme(themeMode);
+  
+  return (
+    <Box
+      sx={{
+        textDecoration: "none",
+        backgroundColor: theme.palette.usecaseCardColor,
+        borderRadius: "16px",
+        padding: {
+          xs: "15px 20px",
+          sm: "20px 20px",
+          lg: "28px 20px",
+        },
+        paddingRight: {
+          xs: "12px",
+          lg: "14px",
+        },
+        paddingLeft: {
+          xs: "12px",
+          lg: "24px",
+        },
+        display: "flex",
+        alignItems: "start",
+        flexDirection: "column",
+        width: {
+          xs: "130px",
+          sm: "300px",
+        },
+        minWidth: {
+          xs: "130px",
+          sm: "300px",
+        },
+        gap: "20px",
+        position: "relative",
+      }}
+    >
+      <Box
+        sx={{
+          width: "100%",
+          height: "100%",
+          display: "flex",
+          alignItems: "flex-start",
+          justifyContent: "space-between",
+        }}
+      >
+        <div
+          style={{
+            display: "flex",
+            gap: "0px",
+            position: "relative",
+          }}
+        >
+          {/* Source App Icon Skeleton */}
+          <Skeleton
+            variant="circular"
+            width={40}
+            height={40}
+            sx={{ 
+              bgcolor: themeMode === "dark" ? 'rgba(255, 255, 255, 0.1)' : 'rgba(0, 0, 0, 0.1)',
+              position: "relative",
+              zIndex: 1,
+            }}
+          />
+          
+          {/* Destination App Icon Skeleton */}
+          <Skeleton
+            variant="circular"
+            width={40}
+            height={40}
+            sx={{ 
+              bgcolor: themeMode === "dark" ? 'rgba(255, 255, 255, 0.1)' : 'rgba(0, 0, 0, 0.1)',
+              marginLeft: "-12px",
+            }}
+          />
+        </div>
+        <div style={{ display: "flex", alignItems: "center", gap: "5px" }}>
+          <Skeleton 
+            variant="rectangular" 
+            width={40} 
+            height={20} 
+            sx={{ 
+              bgcolor: themeMode === "dark" ? 'rgba(255, 255, 255, 0.1)' : 'rgba(0, 0, 0, 0.1)', 
+              borderRadius: "16px"
+            }}
+          />
+          <Skeleton 
+            variant="circular" 
+            width={24} 
+            height={24} 
+            sx={{ 
+              bgcolor: themeMode === "dark" ? 'rgba(255, 255, 255, 0.1)' : 'rgba(0, 0, 0, 0.1)' 
+            }}
+          />
+        </div>
+      </Box>
+      <Skeleton 
+        variant="text" 
+        width="80%" 
+        height={30} 
+        sx={{ 
+          bgcolor: themeMode === "dark" ? 'rgba(255, 255, 255, 0.1)' : 'rgba(0, 0, 0, 0.1)' 
+        }}
+      />
+    </Box>
+  );
+};
+
+const UsecaseCard = ({ usecase, handleToggle, handleOpenDialog, handleDeleteUsecase }) => {
+  const [anchorEl, setAnchorEl] = useState(null);
+  const open = Boolean(anchorEl);
+  const { themeMode } = useContext(Context);
+  const theme = getTheme(themeMode);
+  const navigate = useNavigate();
+
+  const handleClick = (event) => {
+    event.stopPropagation();
+    event.preventDefault();
+    setAnchorEl(event.currentTarget);
+  };
+
+  const handleClose = () => {
+    setAnchorEl(null);
+  };
+
+  const handleEdit = () => {
+    console.log("Edit usecase:", usecase.id);
+    handleClose();
+  };
+
+  const handleStar = () => {
+    console.log("Star usecase:", usecase.id);
+    handleClose();
+  };
+
+  const handleCardClick = (e) => {
+    // Navigate to usecase detail page
+    navigate(`/usecases/${usecase.id}`);
+  };
+
+  return (
+    <Box
+      onClick={handleCardClick}
+      sx={{
+        textDecoration: "none",
+        backgroundColor: theme.palette.usecaseCardColor,
+        borderRadius: "16px",
+        padding: {
+          xs: "15px 20px",
+          sm: "20px 20px",
+          lg: "28px 20px",
+        },
+        paddingRight: {
+          xs: "12px",
+          lg: "14px",
+        },
+        paddingLeft: {
+          xs: "12px",
+          lg: "24px",
+        },
+        display: "flex",
+        alignItems: "start",
+        flexDirection: "column",
+        width: {
+          xs: "130px",
+          sm: "300px",
+        },
+        minWidth: {
+          xs: "130px",
+          sm: "300px",
+        },
+        gap: "20px",
+        cursor: "pointer",
+        "&:hover": {
+          backgroundColor: theme.palette.usecaseCardHoverColor,
+        },
+        position: "relative",
+      }}
+    >
+      <Box
+        sx={{
+          width: "100%",
+          height: "100%",
+          display: "flex",
+          alignItems: "flex-start",
+          justifyContent: "space-between",
+        }}
+      >
+        <div
+          style={{
+            display: "flex",
+            gap: "0px",
+            position: "relative",
+          }}
+        >
+          {/* Source App Icon */}
+            <Tooltip
+              title={usecase.srcapp}
+              placement="top"
+            >
+              <img
+                src={usecase.srcImg}
+                alt="Source"
+                style={{
+                  width: "40px",
+                  height: "40px",
+                  borderRadius: "100%",
+                  position: "relative",
+                  border: `1.5px solid ${themeMode === "dark" ? "#f1f1f1" : "#333333"}`,
+                  zIndex: 1,
+                }}
+              />
+            </Tooltip>
+          
+          {/* Destination App Icon */}
+            <Tooltip
+              title={usecase.dstapp}
+              placement="top"
+            >
+              <img
+                src={usecase.dstImg || getCategoryImagePath(usecase.dstapp)}
+                alt="Destination"
+                style={{
+                  width: "40px",
+                  height: "40px",
+                  borderRadius: "100%",
+                  marginLeft: "-12px",
+                  border: `1.5px solid ${themeMode === "dark" ? "#f1f1f1" : "#333333"}`,
+                }}
+              />
+            </Tooltip>
+        </div>
+        <div style={{ display: "flex", alignItems: "center", gap: "5px" }}>
+          <Switch
+            checked={usecase.public}
+            onClick={(e) => {
+              e.stopPropagation();
+            }}
+            onChange={(e) => {
+              e.preventDefault();
+              e.stopPropagation();
+              handleToggle(usecase.id);
+            }}
+            size="medium"
+            sx={{
+              "& .MuiSwitch-switchBase.Mui-checked": {
+                color: "#4CAF50",
+              },
+              "& .MuiSwitch-switchBase.Mui-checked + .MuiSwitch-track": {
+                backgroundColor: "#4CAF50",
+              },
+            }}
+          />
+          <IconButton
+            onClick={(e) => {
+              e.stopPropagation();
+              handleClick(e);
+            }}
+            size="small"
+            sx={{
+              color: theme.palette.text.primary,
+              zIndex: 20,
+              "&:hover": {
+                backgroundColor: themeMode === "dark" ? "rgba(255, 255, 255, 0.1)" : "rgba(0, 0, 0, 0.05)",
+              },
+            }}
+          >
+            <MoreVertIcon fontSize="small" />
+          </IconButton>
+          <Menu
+            anchorEl={anchorEl}
+            open={open}
+            onClose={handleClose}
+            onClick={(e) => e.stopPropagation()}
+            PaperProps={{
+              sx: {
+                backgroundColor: theme.palette.DialogStyle.backgroundColor,
+                border: theme.palette.defaultBorder,
+                borderRadius: "8px",
+                boxShadow: theme.palette.DialogStyle.boxShadow,
+                "& .MuiMenuItem-root": {
+                  fontSize: "14px",
+                  color: theme.palette.text.primary,
+                  "&:hover": {
+                    backgroundColor: themeMode === "dark" ? "rgba(255, 255, 255, 0.1)" : "rgba(0, 0, 0, 0.05)",
+                  },
+                },
+              },
+            }}
+            transformOrigin={{ horizontal: "right", vertical: "top" }}
+            anchorOrigin={{ horizontal: "right", vertical: "bottom" }}
+          >
+            <MenuItem
+              onClick={(e) => {
+                e.stopPropagation();
+                handleOpenDialog(usecase);
+                setAnchorEl(null);
+              }}
+            >
+              <ListItemIcon>
+                <EditIcon
+                  fontSize="small"
+                  sx={{
+                    color: theme.palette.text.primary,
+                    fontFamily: theme.typography.fontFamily,
+                  }}
+                />
+              </ListItemIcon>
+              <ListItemText>Edit Usecase</ListItemText>
+            </MenuItem>
+            <MenuItem onClick={(e) => {
+              e.stopPropagation();
+              handleDeleteUsecase(usecase.id);
+            }}>
+              <ListItemIcon>
+                <DeleteIcon
+                  fontSize="small"
+                  sx={{
+                    color: theme.palette.text.primary,
+                    fontFamily: theme.typography.fontFamily,
+                  }}
+                />
+              </ListItemIcon>
+              <ListItemText>Delete Usecase</ListItemText>
+            </MenuItem>
+          </Menu>
+        </div>
+      </Box>
+      <Typography
+        sx={{
+          color: theme.palette.text.primary,
+          fontSize: {
+            xs: "14px",
+            lg: "16px",
+          },
+          fontWeight: 600,
+          fontFamily: theme.typography.fontFamily,
+        }}
+      >
+        {usecase.name}
+      </Typography>
+    </Box>
+  );
+};
+
+const PartnersUsecasesTab = ({ isCloud, globalUrl, userdata, partnerData, setPartnerData }) => {
+  const { themeMode } = useContext(Context);
+  const theme = getTheme(themeMode);
+
+  // Dialog state
+  const [openDialog, setOpenDialog] = useState(false);
+  const [publicWorkflows, setPublicWorkflows] = useState([]);
+  const [usecaseData, setUsecaseData] = useState([]);
+  const [isSubmitting, setIsSubmitting] = useState(false);
+  const [isLoading, setIsLoading] = useState(true);
+  const [isWorkflowLoading, setIsWorkflowLoading] = useState(false);
+  const [formData, setFormData] = useState({
+    id: "",
+    mainContent: {
+      title: "",
+      description: "",
+      categories: [],
+      publicWorkflowId: "",
+      sourceAppType: "",
+      destinationAppType: "",
+    },
+    navigation: {
+      items: [
+        {
+          name: "About Usecase",
+          content: [""],
+        },
+      ],
+    },
+    public: false,
+  });
+  
+  // App categories for dropdowns
+  const appCategories = [
+    { value: "communication", label: "Communication" },
+    { value: "cases", label: "Cases" },
+    { value: "network", label: "Network" },
+    { value: "siem", label: "SIEM" },
+    { value: "edr", label: "EDR" },
+    { value: "eradication", label: "Eradication" },
+    { value: "iam", label: "IAM" },
+    { value: "assets", label: "Assets" },
+    { value: "intel", label: "Intel" },
+    { value: "email", label: "Email" },
+    { value: "other", label: "Other" }
+  ];
+
+  // Sample workflow options
+  const workflowOptions = [
+    "Email Analysis Workflow",
+    "Incident Response Workflow",
+    "Alert Triage Workflow",
+    "Threat Hunting Workflow",
+    "Vulnerability Management",
+  ];
+
+  useEffect(() => {
+    // Set loading state to true when fetching starts
+    setIsLoading(true);
+    if(!isCloud || !userdata?.active_org?.is_partner) {
+      // If the user is not a partner or if it's not a cloud environment do not make api call :)
+      return;
+    }
+    // Load usecase data from API
+    fetch(`${globalUrl}/api/v1/partners/${partnerData?.id}/usecases`, {
+      method: "GET",
+      headers: {
+        "Content-Type": "application/json",
+        Accept: "application/json",
+      },
+      credentials: "include",
+    })
+      .then((response) => {
+        if (response.status !== 200) {
+          console.log("Status not 200 for PARTNER USECASES :O!");
+        }
+        return response.json();
+      })
+      .then((responseJson) => {
+        if (responseJson.success !== false) {
+          const usecases = responseJson.usecases.map((usecase) => ({
+            id: usecase.id,
+            sourceAppType: usecase.mainContent?.sourceAppType || "",
+            destinationAppType: usecase.mainContent?.destinationAppType || "",
+            srcImg: getCategoryImagePath(usecase.mainContent?.sourceAppType),
+            dstImg: getCategoryImagePath(usecase.mainContent?.destinationAppType),
+            publicWorkflowId: usecase.mainContent?.publicWorkflowId || "",
+            name: usecase.mainContent?.title,
+            description: usecase.mainContent?.description,
+            navigation: usecase.navigation || { items: [] },
+            categories: usecase.mainContent?.categories || [],
+            public: usecase?.public || false,  
+          }));
+          if (usecases.length > 0) {
+            setUsecaseData(usecases);
+          } else {
+            setUsecaseData([]);
+          }
+        }
+      })
+      .catch((error) => {
+        console.log(error);
+      })
+      .finally(() => {
+        // Set loading state to false when fetching completes (success or error)
+        setIsLoading(false);
+      });
+  }, [partnerData?.id]);
+
+  // Sample categories
+  const categoryOptions = ["Collect","Enrich", "Detect", "Respond", "Verify"];
+
+  const getUserProfileWorkflows = (orgId) => {
+    setIsWorkflowLoading(true);
+		fetch(`${globalUrl}/api/v1/partners/${orgId}/workflows`, {
+			method: "GET",
+			headers: {
+				"Content-Type": "application/json",
+				Accept: "application/json",
+			},
+			credentials: "include",
+		})
+			.then((response) => {
+				if (response.status !== 200) {
+					console.log("Status not 200 for WORKFLOW EXECUTION :O!");
+				}
+
+				return response.json();
+			})
+			.then((responseJson) => {
+				if (responseJson.success !== false) {
+					setPublicWorkflows(responseJson || []);
+          setIsWorkflowLoading(false);
+				}else {
+          toast.info(responseJson.message || "No public workflows found for this organization.");
+          setPublicWorkflows([]);
+        }
+			})
+			.catch((error) => {
+				console.log(error);
+        setIsWorkflowLoading(false);
+			});
+	}
+
+  useEffect(() => {
+    const orgId = userdata?.active_org?.id;
+    if(!isCloud || !userdata?.active_org?.is_partner) {
+      // If the user is not a partner or if it's not a cloud environment do not make api call :)
+      return;
+    }
+    getUserProfileWorkflows(orgId);
+  }, []);
+
+
+  const handleUpdateUsecase = async (usecaseId, updatedData) => {
+    try {
+      // Transform the frontend data structure to match the backend expected structure
+      const backendUsecaseData = {
+        id: updatedData.id,
+        companyInfo: {
+          id: partnerData?.id.trim(),
+          name: partnerData?.name.trim(),
+        },
+        mainContent: {
+          title: updatedData.name.trim(),
+          description: updatedData.description.trim(),
+          categories: updatedData.categories,
+          publicWorkflowId: updatedData.publicWorkflowId.trim(),
+          sourceAppType: updatedData.sourceAppType.trim(),
+          destinationAppType: updatedData.destinationAppType.trim(),
+        },
+        navigation: updatedData.navigation,
+        public: updatedData.public,
+        edited: Date.now(),
+      };
+
+
+      // return
+      const response = await fetch(`${globalUrl}/api/v1/usecases/${usecaseId}`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          Accept: "application/json",
+        },
+        credentials: "include",
+        body: JSON.stringify(backendUsecaseData),
+      });
+
+      if (response.status !== 200) {
+        console.error("Failed to update usecase");
+        toast.error("Failed to update usecase");
+        return false;
+      }
+
+      const responseData = await response.json();
+      toast.success("Usecase published status updated successfully");
+      return true;
+    } catch (error) {
+      console.error("Error updating usecase:", error);
+      toast.error("Error updating usecase");
+      return false;
+    }
+  };
+
+  const handleDeleteUsecase = async (usecaseId) => {
+    try {
+      const response = await fetch(
+        `${globalUrl}/api/v1/usecases/${usecaseId}`,
+        {
+          method: "DELETE",
+          headers: {
+            "Content-Type": "application/json",
+            Accept: "application/json",
+          },
+          credentials: "include",
+        }
+      );
+      if (response.status !== 200) {
+        console.error("Failed to delete usecase");
+        toast.error("Failed to delete usecase");
+        return false;
+      }
+      const responseData = await response.json();
+      toast.success("Usecase deleted successfully");
+      // Remove the deleted usecase from the state
+      setUsecaseData((prevData) =>
+        prevData?.filter((usecase) => usecase.id !== usecaseId)
+      );
+      // Remove the usecase ID from partnerData
+      setPartnerData((prevData) => ({
+        ...prevData,
+        usecases: prevData.usecases?.filter((id) => id !== usecaseId),
+      }));
+      return true;
+    } catch (error) {
+      console.error("Error deleting usecase:", error);
+      toast.error("Error deleting usecase");
+      return false;
+    }
+  };
+
+  const handleToggle = async (currentId) => {
+    // Find the current usecase
+    const currentUsecase = usecaseData.find(usecase => usecase.id === currentId);
+    if (!currentUsecase) return;
+
+    // Optimistically update the UI
+    setUsecaseData((prevData) =>
+      prevData.map((usecase) =>
+        usecase.id === currentId
+          ? { ...usecase, public: !usecase.public }
+          : usecase
+      )
+    );
+
+    // Prepare the updated data
+    const updatedPublishedStatus = !currentUsecase.public;
+    
+    // Create a copy of the usecase with updated published status
+    const updatedUsecase = {
+      ...currentUsecase,
+      public: updatedPublishedStatus
+    };
+    toast.info(`Updating usecase ${updatedUsecase.name}...`,{
+      autoClose: 1000,
+    })
+    // Send the update to the server
+    const success = await handleUpdateUsecase(currentId, updatedUsecase);
+    
+    // If the update failed, revert the UI change
+    if (!success) {
+      setUsecaseData((prevData) =>
+        prevData.map((usecase) =>
+          usecase.id === currentId
+            ? { ...usecase, public: currentUsecase.public }
+            : usecase
+        )
+      );
+    }
+  };
+
+  const handleOpenDialog = (usecase) => {
+    setFormData({
+      id: usecase?.id || undefined,
+      companyInfo: {
+        id: usecase.companyInfo?.id || "",
+        name: usecase.companyInfo?.name || "",
+      },
+      mainContent: {
+        title: usecase?.name,
+        description: usecase?.description,
+        categories: usecase?.categories || [],
+        publicWorkflowId: usecase?.publicWorkflowId || "",
+        sourceAppType: usecase?.sourceAppType || "",
+        destinationAppType: usecase?.destinationAppType || "",
+      },
+      navigation: usecase?.navigation || {
+        items: [ 
+          {
+            name: "About Usecase",
+            content: [""],
+          },
+        ],
+      },
+      public: usecase?.public || false,
+    });
+    setOpenDialog(true);
+  };
+
+  const handleCloseDialog = () => {
+    setOpenDialog(false);
+    setIsSubmitting(false); // Reset loading state when closing dialog
+    setFormData({
+      id: "",
+      mainContent: {
+        title: "",
+        description: "",
+        categories: [],
+        publicWorkflowId: "",
+        sourceAppType: "",
+        destinationAppType: "",
+      },
+      navigation: {
+        items: [
+          {
+            name: "About Usecase",
+            content: [""],
+          },
+        ],
+      },
+      public: false,
+    });
+  };
+
+  const handleSubmit = () => {
+    // Validate required fields
+    const validationErrors = [];
+
+    // Check for public workflow selection
+    if (!formData.mainContent.publicWorkflowId || formData.mainContent.publicWorkflowId.trim() === "") {
+      validationErrors.push("Please select a public workflow");
+    }
+
+    if (!formData.mainContent.sourceAppType || formData.mainContent.sourceAppType.trim() === "") {
+      validationErrors.push("Source app type is required");
+    }
+
+    if (!formData.mainContent.destinationAppType || formData.mainContent.destinationAppType.trim() === "") {
+      validationErrors.push("Destination app type is required");
+    }
+
+    // Validate that source and destination are different
+    if (formData.mainContent.sourceAppType && formData.mainContent.destinationAppType && 
+        formData.mainContent.sourceAppType.trim() === formData.mainContent.destinationAppType.trim()) {
+      validationErrors.push("Source and destination app types must be different");
+    }
+
+    // Check main content fields
+    if (!formData.mainContent.title || formData.mainContent.title.trim() === "") {
+      validationErrors.push("Title is required");
+    } else if (formData.mainContent.title.length < 5) {
+      validationErrors.push("Title must be not be less than 5 characters");
+    }
+
+    if (!formData.mainContent.description || formData.mainContent.description.trim() === "") {
+      validationErrors.push("Description is required");
+    }
+
+    // Check categories
+    if (!formData.mainContent.categories || !Array.isArray(formData.mainContent.categories) || formData.mainContent.categories.length === 0) {
+      validationErrors.push("At least one category must be selected");
+    }
+
+    // Check navigation items
+    if (!formData.navigation.items || !Array.isArray(formData.navigation.items) || formData.navigation.items.length === 0) {
+      validationErrors.push("Please add at least one section");
+    } else {
+      // Validate each section
+      for (let i = 0; i < formData.navigation.items.length; i++) {
+        const item = formData.navigation.items[i];
+        
+        if (!item.name || item.name.trim() === "") {
+          validationErrors.push(`Section ${i+1} must have a name`);
+        }
+        
+        if (!item.content || !Array.isArray(item.content) || item.content.length === 0 || 
+            !item.content.some(content => content && content.trim() !== "")) {
+          validationErrors.push(`Section "${item.name || i+1}" must have content`);
+        }
+      }
+    }
+
+    // If there are validation errors, show the first one and return
+    if (validationErrors.length > 0) {
+      toast.error(validationErrors[0]);
+      return;
+    }
+
+    // Set loading state to true
+    setIsSubmitting(true);
+
+    // Get the image paths for source and destination app types
+    const srcImg = getCategoryImagePath(formData.mainContent.sourceAppType);
+    const dstImg = getCategoryImagePath(formData.mainContent.destinationAppType);
+    
+    const response = {
+      ...formData,
+      companyInfo: {
+        id: partnerData?.id,
+        name: partnerData?.name,
+      },
+    }
+
+    fetch(`${globalUrl}/api/v1/usecases/${formData.id}`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Accept: "application/json",
+      },
+      credentials: "include",
+      body: JSON.stringify(response),
+    })
+    .then((res) => {
+      if (res.status !== 200) {
+        console.error("Failed to submit usecase");
+        toast.error("Failed to submit usecase");
+        setIsSubmitting(false);
+        return null;
+      }
+      return res.json();
+    })
+    .then((responseData) => {
+      console.log("Response data:", responseData);
+      // Reset loading state
+      setIsSubmitting(false);
+      
+      if (responseData) {
+        // Only close the dialog if the request was successful
+        const usecaseData = {
+          id: responseData.usecaseId.trim(),
+          sourceAppType: formData.mainContent?.sourceAppType.trim() || "",
+          destinationAppType: formData.mainContent?.destinationAppType.trim() || "",
+          srcImg: getCategoryImagePath(formData.mainContent?.sourceAppType.trim()),
+          dstImg: getCategoryImagePath(formData.mainContent?.destinationAppType.trim()),
+          publicWorkflowId: formData.mainContent?.publicWorkflowId.trim() || "",
+          name: formData.mainContent?.title.trim(),
+          description: formData.mainContent?.description.trim(),
+          categories: formData.mainContent?.categories || [],
+          navigation: formData.navigation || {},
+          public: formData?.public || false,  
+        }
+
+        setUsecaseData((prevData) => {
+          // Handle case when prevData is null or undefined
+          if (!prevData) {
+            return [usecaseData];
+          }
+          
+          // Check if the usecase already exists
+          const existingIndex = prevData.findIndex(
+            (usecase) => usecase.id === responseData.usecaseId
+          );
+          if (existingIndex !== -1) {
+            // Update existing usecase
+            const updatedData = [...prevData];
+            updatedData[existingIndex] = usecaseData;
+            return updatedData;
+          } else {
+            // Add new usecase
+            return [...prevData, usecaseData];
+          }
+        });
+
+        setPartnerData((prevData) => {
+          // Handle case when prevData is null or undefined
+          if (!prevData) {
+            return {
+              usecases: [responseData.usecaseId.trim()]
+            };
+          }
+          
+          return {
+            ...prevData,
+            usecases: [
+              ...(prevData.usecases || []),
+              responseData.usecaseId.trim(),
+            ],
+          };
+        });
+
+        // Show success message
+        if(formData?.id){
+          toast.success("Usecase updated successfully");
+        }else{
+          toast.success("Usecase created successfully, publish it with toggle button");
+        }
+        handleCloseDialog();
+      }
+    })
+    .catch((error) => {
+      console.error("Error submitting usecase:", error);
+      toast.error("Error submitting usecase");
+      // Reset loading state on error
+      setIsSubmitting(false);
+    });
+  };
+
+  return (
+    <Box
+      sx={{
+        width: "100%",
+        minHeight: "500px",
+        display: "flex",
+        flexDirection: "column",
+        alignItems: "flex-start",
+        padding: "20px",
+        paddingLeft: "40px",
+        justifyContent: "flex-start",
+      }}
+    >
+      {/* Add Usecase Button */}
+      <Box
+        sx={{
+          width: "100%",
+          display: "flex",
+          alignItems: "center",
+          justifyContent: "space-between",
+          mb: 2,
+          pr: 4,
+        }}
+      >
+        <Typography sx={{ fontSize: 20, fontWeight: 500, color: "#FFFFFF" }}>
+          Usecases
+        </Typography>
+        <Button
+          variant="contained"
+          color="primary"
+          startIcon={<AddIcon />}
+          disabled={isWorkflowLoading}
+          onClick={handleOpenDialog}
+          sx={{
+            px: 3,
+            textTransform: "none",
+            fontSize: "16px",
+            fontWeight: 600,
+          }}
+        >
+          Add Usecase
+        </Button>
+      </Box>
+
+      {/* Usecases Grid */}
+      {isLoading ? (
+        // Skeleton loading state
+        <Box
+          sx={{
+            display: "flex",
+            flexDirection: "row",
+            flexWrap: "wrap",
+            alignItems: "flex-start",
+            justifyContent: "flex-start",
+            gap: 2,
+            pt: 4,
+          }}
+        >
+          {/* Display 4 skeleton cards while loading */}
+          {[...Array(4)].map((_, index) => (
+            <UsecaseCardSkeleton key={index} />
+          ))}
+        </Box>
+      ) : usecaseData.length > 0 ? (
+        // Actual data display
+        <Box
+          sx={{
+            display: "flex",
+            flexDirection: "row",
+            flexWrap: "wrap",
+            alignItems: "flex-start",
+            justifyContent: "flex-start",
+            gap: 2,
+            pt: 4,
+          }}
+        >
+          {usecaseData.map((usecase) => (
+            <UsecaseCard
+              handleOpenDialog={handleOpenDialog}
+              key={usecase.id}
+              usecase={usecase}
+              handleToggle={handleToggle}
+              handleDeleteUsecase={handleDeleteUsecase}
+            />
+          ))}
+        </Box>
+      ) : (
+        // Empty state
+        <Box
+          sx={{
+            width: "100%",
+            height: "100%",
+            display: "flex",
+            flexDirection: "column",
+            alignItems: "center",
+            justifyContent: "center",
+            gap: 2,
+          }}
+        >
+          <Typography
+            sx={{
+              fontSize: 18,
+              fontWeight: 500,
+              color: "#FFFFFF",
+            }}
+          >
+            No usecases found
+          </Typography>
+        </Box>
+      )}
+
+      {/* Add Usecase Dialog */}
+      <Dialog
+        open={openDialog}
+        onClose={handleCloseDialog}
+        maxWidth="md"
+        fullWidth
+        PaperProps={{
+          style: {
+            background: theme.palette.backgroundColor,
+            overflow: "hidden",
+            margin: 0,
+            borderRadius: 8,
+            border: theme.palette.defaultBorder,
+          },
+        }}
+      >
+        <DialogTitle
+          sx={{
+            background: theme.palette.backgroundColor,
+            borderBottom: theme.palette.defaultBorder,
+            p: "24px",
+            display: "flex",
+            alignItems: "center",
+            justifyContent: "space-between",
+          }}
+        >
+          <Typography sx={{ fontSize: 20, fontWeight: 500, color: theme.palette.text.primary }}>
+            {formData?.id ? "Update" : "Add New"} Usecase : {formData?.public ? "Published" : "Draft"}
+          </Typography>
+          <IconButton
+            onClick={handleCloseDialog}
+            sx={{
+              color: theme.palette.text.secondary,
+              "&:hover": {
+                background: themeMode === "dark" ? "rgba(255, 255, 255, 0.1)" : "rgba(0, 0, 0, 0.05)",
+              },
+            }}
+          >
+            <CloseIcon fontSize="small" />
+          </IconButton>
+        </DialogTitle>
+
+        <DialogContent sx={{ background: theme.palette.backgroundColor, p: "24px" }}>
+          <Box
+            sx={{
+              display: "flex",
+              flexDirection: "column",
+              gap: 3,
+              paddingTop: 3,
+            }}
+          >
+            <FormControl>
+              <Typography
+                sx={{
+                  color: theme.palette.accentColor,
+                  mb: 2,
+                  fontSize: "16px",
+                  fontWeight: 600,
+                }}
+              >
+                Public Workflow
+              </Typography>
+              <Select
+                displayEmpty
+                value={
+                  publicWorkflows?.find(
+                    (workflow) =>
+                      workflow.objectID ===
+                      formData.mainContent.publicWorkflowId
+                  )?.name || ""
+                }
+                onChange={(e) => {
+                  setFormData({
+                    ...formData,
+                    mainContent: {
+                      ...formData.mainContent,
+                      publicWorkflowId: e.target.value,
+                    },
+                  });
+                }}
+                renderValue={(selected) => {
+                  if (!selected) {
+                    return (
+                      <span style={{ color: themeMode === "dark" ? "#666666" : "#999999" }}>
+                        Select Public Workflow
+                      </span>
+                    );
+                  }
+                  // Find the workflow with the matching ID and display its name
+                  if (
+                    Array.isArray(publicWorkflows) &&
+                    publicWorkflows.length > 0
+                  ) {
+                    const selectedWorkflow = publicWorkflows.find(
+                      (w) => w.id === selected
+                    );
+                    return selectedWorkflow ? selectedWorkflow.name : selected;
+                  }
+                  return selected;
+                }}
+                sx={{
+                  backgroundColor: theme.palette.usecaseDialogFieldColor,
+                  height: 40,
+                  color: theme.palette.text.primary,
+                  "& .MuiOutlinedInput-notchedOutline": {
+                    border: theme.palette.defaultBorder,
+                  },
+                  "& .MuiSelect-icon": {
+                    color: theme.palette.text.secondary,
+                  },
+                  "& .MuiSelect-select": {
+                    "&.MuiInputBase-input": {
+                      color: theme.palette.text.primary,
+                    },
+                    "&.Mui-focused": {
+                      backgroundColor: "transparent",
+                    },
+                  },
+                }}
+              >
+                {Array.isArray(publicWorkflows) &&
+                publicWorkflows.length > 0 ? (
+                  publicWorkflows.map((workflow) => (
+                    <MenuItem
+                      key={workflow.id}
+                      value={workflow.objectID}
+                      sx={{
+                        fontSize: "16px",
+                        "&.Mui-selected": {
+                          backgroundColor: themeMode === "dark" ? "rgba(255, 133, 68, 0.08)" : "rgba(255, 133, 68, 0.15)",
+                        },
+                        "&:hover": {
+                          backgroundColor: themeMode === "dark" ? "rgba(255, 133, 68, 0.04)" : "rgba(255, 133, 68, 0.1)",
+                        },
+                      }}
+                    >
+                      {workflow.name}
+                    </MenuItem>
+                  ))
+                ) : (
+                  <MenuItem disabled value="" sx={{ fontSize: "16px" }}>
+                    No workflows available
+                  </MenuItem>
+                )}
+              </Select>
+            </FormControl>
+
+            {/* App Type Selection */}
+            <Box sx={{ display: "flex", flexDirection: "row", gap: 2, mt: 2 }}>
+              <FormControl fullWidth>
+                <Typography
+                  sx={{
+                    color: "#ff8544",
+                    mb: 1,
+                    fontSize: "16px",
+                    fontWeight: 600,
+                  }}
+                >
+                  Source App Type
+                </Typography>
+                <Select
+                  displayEmpty
+                  value={formData.mainContent.sourceAppType}
+                  onChange={(e) => {
+                    setFormData({
+                      ...formData,
+                      mainContent: {
+                        ...formData.mainContent,
+                        sourceAppType: e.target.value,
+                      },
+                    });
+                  }}
+                  renderValue={(selected) => {
+                    if (!selected) {
+                      return (
+                        <span style={{ color: themeMode === "dark" ? "#666666" : "#999999" }}>
+                          Select Source App Type
+                        </span>
+                      );
+                    }
+                    const selectedCategory = appCategories.find(
+                      (cat) => cat.value === selected
+                    );
+                    return selectedCategory ? selectedCategory.label : selected;
+                  }}
+                  sx={{
+                    backgroundColor: theme.palette.usecaseDialogFieldColor,
+                    height: 40,
+                    color: theme.palette.text.primary,
+                    "& .MuiSelect-icon": {
+                      color: "#ff8544",
+                    },
+                    "& .MuiSelect-select": {
+                      "&.MuiInputBase-input": {
+                        color: theme.palette.text.primary,
+                      },
+                      "&.Mui-focused": {
+                        backgroundColor: "transparent",
+                      },
+                    },
+                  }}
+                >
+                  <MenuItem value="" sx={{ fontSize: "16px" }}>
+                    <em>None</em>
+                  </MenuItem>
+                  {appCategories.map((category) => (
+                    <MenuItem
+                      key={category.value}
+                      value={category.value}
+                      sx={{
+                        fontSize: "16px",
+                        "&.Mui-selected": {
+                          backgroundColor: "rgba(255, 133, 68, 0.08)",
+                        },
+                        "&:hover": {
+                          backgroundColor: "rgba(255, 133, 68, 0.04)",
+                        },
+                      }}
+                    >
+                      {category.label}
+                    </MenuItem>
+                  ))}
+                </Select>
+              </FormControl>
+
+              <FormControl fullWidth>
+                <Typography
+                  sx={{
+                    color: "#ff8544",
+                    mb: 1,
+                    fontSize: "16px",
+                    fontWeight: 600,
+                  }}
+                >
+                  Destination App Type
+                </Typography>
+                <Select
+                  displayEmpty
+                  value={formData.mainContent.destinationAppType}
+                  onChange={(e) => {
+                    setFormData({
+                      ...formData,
+                      mainContent: {
+                        ...formData.mainContent,
+                        destinationAppType: e.target.value,
+                      },
+                    });
+                  }}
+                  renderValue={(selected) => {
+                    if (!selected) {
+                      return (
+                        <span style={{ color: themeMode === "dark" ? "#666666" : "#999999" }}>
+                          Select Destination App Type
+                        </span>
+                      );
+                    }
+                    const selectedCategory = appCategories.find(
+                      (cat) => cat.value === selected
+                    );
+                    return selectedCategory ? selectedCategory.label : selected;
+                  }}
+                  sx={{
+                    backgroundColor: theme.palette.usecaseDialogFieldColor,
+                    height: 40,
+                    color: theme.palette.text.primary,
+                    "& .MuiSelect-icon": {
+                      color: "#ff8544",
+                    },
+                    "& .MuiSelect-select": {
+                      "&.MuiInputBase-input": {
+                        color: theme.palette.text.primary,
+                      },
+                      "&.Mui-focused": {
+                        backgroundColor: "transparent",
+                      },
+                    },
+                  }}
+                >
+                  <MenuItem value="" sx={{ fontSize: "16px" }}>
+                    <em>None</em>
+                  </MenuItem>
+                  {appCategories.map((category) => (
+                    <MenuItem
+                      key={category.value}
+                      value={category.value}
+                      sx={{
+                        fontSize: "16px",
+                        "&.Mui-selected": {
+                          backgroundColor: "rgba(255, 133, 68, 0.08)",
+                        },
+                        "&:hover": {
+                          backgroundColor: "rgba(255, 133, 68, 0.04)",
+                        },
+                      }}
+                    >
+                      {category.label}
+                    </MenuItem>
+                  ))}
+                </Select>
+              </FormControl>
+            </Box>
+
+            <Box sx={{ mb: 2, mt: 2 }}>
+              <Typography
+                sx={{
+                  color: "#ff8544",
+                  mb: 2,
+                  fontSize: "16px",
+                  fontWeight: 600,
+                }}
+              >
+                Main Content
+              </Typography>
+              <Box sx={{ display: "flex", flexDirection: "column", gap: 2 }}>
+                <FormControl>
+                  <Typography
+                    sx={{ color: theme.palette.text.primary, mb: 1, fontSize: "14px" }}
+                  >
+                    Title
+                  </Typography>
+                  <TextField
+                    placeholder="Enter Title"
+                    value={formData.mainContent.title}
+                    onChange={(e) =>
+                      setFormData({
+                        ...formData,
+                        mainContent: {
+                          ...formData.mainContent,
+                          title: e.target.value,
+                        },
+                      })
+                    }
+                    sx={{
+                      "& .MuiOutlinedInput-root": {
+                        height: 40,
+                        backgroundColor: theme.palette.usecaseDialogFieldColor,
+                        color: theme.palette.text.primary,
+                        "& fieldset": { border: theme.palette.defaultBorder },
+                      },
+                    }}
+                  />
+                </FormControl>
+                <FormControl>
+                  <Typography
+                    sx={{ color: theme.palette.text.primary, mb: 1, fontSize: "14px" }}
+                  >
+                    Description
+                  </Typography>
+                  <TextField
+                    placeholder="Enter Description"
+                    multiline
+                    rows={5}
+                    value={formData.mainContent.description}
+                    onChange={(e) =>
+                      setFormData({
+                        ...formData,
+                        mainContent: {
+                          ...formData.mainContent,
+                          description: e.target.value,
+                        },
+                      })
+                    }
+                    sx={{
+                      "& .MuiOutlinedInput-root": {
+                        backgroundColor: theme.palette.usecaseDialogFieldColor,
+                        p: 1.5,
+                        color: theme.palette.text.primary,
+                        "& fieldset": { border: theme.palette.defaultBorder },
+                      },
+                    }}
+                  />
+                </FormControl>
+                <FormControl>
+                  <Typography
+                    sx={{ color: theme.palette.text.primary, mb: 1, fontSize: "14px" }}
+                  >
+                    Categories
+                  </Typography>
+                  <Select
+                    multiple
+                    displayEmpty
+                    value={formData.mainContent.categories || []}
+                    onChange={(e) =>
+                      setFormData({
+                        ...formData,
+                        mainContent: {
+                          ...formData.mainContent,
+                          categories: e.target.value,
+                        },
+                      })
+                    }
+                    renderValue={(selected) => {
+                      if (
+                        !selected ||
+                        (Array.isArray(selected) && selected.length === 0)
+                      ) {
+                        return (
+                          <span style={{ color: themeMode === "dark" ? "#666666" : "#999999" }}>
+                            Select Categories
+                          </span>
+                        );
+                      }
+                      return selected.join(", ");
+                    }}
+                    sx={{
+                      backgroundColor: theme.palette.usecaseDialogFieldColor,
+                      height: 40,
+                      color: theme.palette.text.primary,
+                      "& .MuiSelect-icon": {
+                        color: "#ff8544",
+                      },
+                      "& .MuiChip-root": {
+                        color: theme.palette.text.primary,
+                        backgroundColor: theme.palette.chipStyle.backgroundColor,
+                        margin: "2px",
+                      },
+                      "& .MuiSelect-select": {
+                        "&.MuiInputBase-input": {
+                          color: theme.palette.text.primary,
+                        },
+                        "&.Mui-focused": {
+                          backgroundColor: "transparent",
+                        },
+                      },
+                    }}
+                  >
+                    {categoryOptions.map((category) => (
+                      <MenuItem
+                        key={category}
+                        value={category}
+                        sx={{
+                          fontSize: "14px",
+                          "&.Mui-selected": {
+                            backgroundColor: "rgba(255, 133, 68, 0.08)",
+                          },
+                          "&:hover": {
+                            backgroundColor: "rgba(255, 133, 68, 0.04)",
+                          },
+                        }}
+                      >
+                        <Checkbox
+                          size="small"
+                          checked={
+                            Array.isArray(formData.mainContent.categories) &&
+                            formData.mainContent.categories.includes(category)
+                          }
+                        />
+                        {category}
+                      </MenuItem>
+                    ))}
+                  </Select>
+                </FormControl>
+              </Box>
+            </Box>
+
+            {/* Navigation Items Section */}
+            <Box>
+              <Typography
+                sx={{
+                  color: "#ff8544",
+                  mb: 2,
+                  fontSize: "16px",
+                  fontWeight: 600,
+                }}
+              >
+                Navigation Items
+              </Typography>
+              {formData.navigation.items.map((item, itemIndex) => (
+                <Box
+                  key={itemIndex}
+                  sx={{
+                    mb: 2,
+                    p: 2,
+                    backgroundColor: theme.palette.usecaseDialogFieldColor,
+                    borderRadius: 1,
+                    border: theme.palette.defaultBorder,
+                  }}
+                >
+                  <Box
+                    sx={{
+                      display: "flex",
+                      alignItems: "center",
+                      mb: 2,
+                      gap: 1,
+                    }}
+                  >
+                    <TextField
+                      value={item.name}
+                      onChange={(e) => {
+                        const newItems = [...formData.navigation.items];
+                        newItems[itemIndex].name = e.target.value;
+                        setFormData({
+                          ...formData,
+                          navigation: { items: newItems },
+                        });
+                      }}
+                      placeholder="Section Name"
+                      sx={{
+                        flex: 1,
+                        "& .MuiOutlinedInput-root": {
+                          height: 40,
+                          backgroundColor: theme.palette.usecaseDialogFieldColor,
+                          color: theme.palette.text.primary,
+                          "& fieldset": { border: theme.palette.defaultBorder },
+                        },
+                      }}
+                    />
+                    <Box sx={{ display: "flex", gap: 0.5 }}>
+                      <IconButton
+                        onClick={() => {
+                          if (itemIndex > 0) {
+                            const newItems = [...formData.navigation.items];
+                            [newItems[itemIndex - 1], newItems[itemIndex]] = [
+                              newItems[itemIndex],
+                              newItems[itemIndex - 1],
+                            ];
+                            setFormData({
+                              ...formData,
+                              navigation: { items: newItems },
+                            });
+                          }
+                        }}
+                        disabled={itemIndex === 0}
+                        sx={{
+                          color: theme.palette.text.secondary,
+                          "&:not(:disabled):hover": {
+                            backgroundColor: themeMode === "dark" ? "rgba(255, 255, 255, 0.08)" : "rgba(0, 0, 0, 0.05)",
+                          },
+                        }}
+                      >
+                        <KeyboardArrowUpIcon />
+                      </IconButton>
+                      <IconButton
+                        onClick={() => {
+                          if (
+                            itemIndex <
+                            formData.navigation.items.length - 1
+                          ) {
+                            const newItems = [...formData.navigation.items];
+                            [newItems[itemIndex], newItems[itemIndex + 1]] = [
+                              newItems[itemIndex + 1],
+                              newItems[itemIndex],
+                            ];
+                            setFormData({
+                              ...formData,
+                              navigation: { items: newItems },
+                            });
+                          }
+                        }}
+                        disabled={
+                          itemIndex === formData.navigation.items.length - 1
+                        }
+                        sx={{
+                          color: theme.palette.text.secondary,
+                          "&:not(:disabled):hover": {
+                            backgroundColor: themeMode === "dark" ? "rgba(255, 255, 255, 0.08)" : "rgba(0, 0, 0, 0.05)",
+                          },
+                        }}
+                      >
+                        <KeyboardArrowDownIcon />
+                      </IconButton>
+                      <IconButton
+                        onClick={() => {
+                          const newItems = formData.navigation.items?.filter(
+                            (_, i) => i !== itemIndex
+                          );
+                          setFormData({
+                            ...formData,
+                            navigation: { items: newItems },
+                          });
+                        }}
+                        sx={{
+                          color: "#ff4444",
+                          "&:hover": {
+                            backgroundColor: themeMode === "dark" ? "rgba(255, 68, 68, 0.08)" : "rgba(255, 68, 68, 0.15)",
+                          },
+                        }}
+                      >
+                        <DeleteOutlineIcon fontSize="small" />
+                      </IconButton>
+                    </Box>
+                  </Box>
+
+                  {item.content.map((content, contentIndex) => (
+                    <Box key={contentIndex} sx={{ mb: 1 }}>
+                      <TextField
+                        multiline
+                        rows={5}
+                        value={content}
+                        onChange={(e) => {
+                          const newItems = [...formData.navigation.items];
+                          newItems[itemIndex].content[contentIndex] =
+                            e.target.value;
+                          setFormData({
+                            ...formData,
+                            navigation: { items: newItems },
+                          });
+                        }}
+                        placeholder="Content"
+                        fullWidth
+                        sx={{
+                          "& .MuiOutlinedInput-root": {
+                            backgroundColor: theme.palette.usecaseDialogFieldColor,
+                            color: theme.palette.text.primary,
+                            "& fieldset": { border: theme.palette.defaultBorder },
+                          },
+                        }}
+                      />
+                      {item.content.length > 1 && (
+                        <Button
+                          size="small"
+                          onClick={() => {
+                            const newItems = [...formData.navigation.items];
+                            newItems[itemIndex].content = newItems[
+                              itemIndex
+                            ].content?.filter((_, i) => i !== contentIndex);
+                            setFormData({
+                              ...formData,
+                              navigation: { items: newItems },
+                            });
+                          }}
+                          sx={{
+                            color: "#ff4444",
+                            "&:hover": {
+                              textDecoration: "underline",
+                              textUnderlineOffset: "4px",
+                              backgroundColor: "transparent",
+                            },
+                          }}
+                        >
+                          Remove Paragraph
+                        </Button>
+                      )}
+                    </Box>
+                  ))}
+
+                  <Button
+                    startIcon={<AddCircleOutlineIcon />}
+                    onClick={() => {
+                      const newItems = [...formData.navigation.items];
+                      newItems[itemIndex].content.push("");
+                      setFormData({
+                        ...formData,
+                        navigation: { items: newItems },
+                      });
+                    }}
+                    sx={{
+                      color: "#4CAF50",
+                      "&:hover": { backgroundColor: themeMode === "dark" ? "rgba(76, 175, 80, 0.08)" : "rgba(76, 175, 80, 0.15)" },
+                    }}
+                  >
+                    Add Paragraph
+                  </Button>
+                </Box>
+              ))}
+
+              <Button
+                startIcon={<AddCircleOutlineIcon />}
+                onClick={() => {
+                  setFormData({
+                    ...formData,
+                    navigation: {
+                      items: [
+                        ...formData.navigation.items,
+                        { name: "", content: [""] },
+                      ],
+                    },
+                  });
+                }}
+                sx={{
+                  color: theme.palette.accentColor,
+                  "&:hover": { backgroundColor: themeMode === "dark" ? "rgba(255, 133, 68, 0.08)" : "rgba(255, 133, 68, 0.15)" },
+                }}
+              >
+                Add New Section
+              </Button>
+            </Box>
+          </Box>
+        </DialogContent>
+
+        <DialogActions
+          sx={{
+            p: "16px 24px",
+            background: theme.palette.backgroundColor,
+            borderTop: theme.palette.defaultBorder,
+            gap: 2,
+          }}
+        >
+          <Button
+            onClick={handleCloseDialog}
+            sx={{
+              textTransform: "none",
+              color: theme.palette.text.secondary,
+              fontSize: "14px",
+              fontWeight: 500,
+              "&:hover": {
+                background: themeMode === "dark" ? "rgba(255, 255, 255, 0.1)" : "rgba(0, 0, 0, 0.05)",
+              },
+            }}
+          >
+            Cancel
+          </Button>
+          <Button
+            variant="contained"
+            color="primary"
+            startIcon={isSubmitting ? <CircularProgress size={16} sx={{color: "inherit"}}/> : <AddIcon />}
+            onClick={handleSubmit}
+            disabled={isSubmitting}
+            sx={{
+              px: 3,
+              textTransform: "none",
+              fontSize: "14px",
+              fontWeight: 600,
+              opacity: isSubmitting ? 0.7 : 1,
+            }}
+          >
+            {isSubmitting 
+              ? (formData?.id ? "Updating..." : "Adding...") 
+              : (formData?.id ? "Update Usecase" : "Add Usecase")
+            }
+          </Button>
+        </DialogActions>
+      </Dialog>
+    </Box>
+  );
+};
+
+export default PartnersUsecasesTab;
diff --git a/frontend/src/components/Priorities.jsx b/frontend/src/components/Priorities.jsx
index 5102b72b..639c6263 100644
--- a/frontend/src/components/Priorities.jsx
+++ b/frontend/src/components/Priorities.jsx
@@ -1,27 +1,38 @@
-import React, { useState, useEffect, useContext, memo } from "react";
-
+import React, { useState, useEffect, useContext, memo, useCallback } from "react";
 import { toast } from "react-toastify";
-import theme from "../theme.jsx";
+import { getTheme } from "../theme.jsx";
 import { v4 as uuidv4, v5 as uuidv5, validate as isUUID, } from "uuid";
 import {
 	Paper,
 	Tooltip,
-  	Typography,
+	Typography,
 	Divider,
 	Button,
 	ButtonGroup,
 	Grid,
 	Card,
-	Chip,
-  	Switch,
+	Switch,
 	Autocomplete,
 	TextField,
 	MenuItem,
 	IconButton,
+	Dialog,
+	FormControl,
+	DialogContent,
+	DialogActions,
+	DialogTitle,
+	InputLabel,
+	Box,
+	Select
 } from "@mui/material";
 
+import AuthenticationData from "../components/AuthenticationWindow.jsx";
+import Stack from "@mui/material/Stack";
+import Chip from "@mui/material/Chip";
+
 import {
 	OpenInNew as OpenInNewIcon,
+	Info as InfoIcon,
 } from "@mui/icons-material";
 
 import { makeStyles } from "@mui/styles";
@@ -40,19 +51,20 @@ const useStyles = makeStyles({
 });
 
 const Priorities = memo((props) => {
-  const { globalUrl, userdata,clickedFromOrgTab,selectedOrganization, handleEditOrg, serverside, billingInfo, stripeKey, checkLogin, setAdminTab, setCurTab, notifications, setNotifications, } = props;
-  
-  const [showDismissed, setShowDismissed] = React.useState(false);
-  const [showRead, setShowRead] = React.useState(false);
-  const [appFramework, setAppFramework] = React.useState({});
-  const [selectedWorkflow, setSelectedWorkflow] = React.useState("NO HIGHLIGHT");
-  const [selectedExecutionId, setSelectedExecutionId] = React.useState("NO HIGHLIGHT");
-  const [highlightKMS, setHighlightKMS] = React.useState(false)
+	const { globalUrl, userdata, clickedFromOrgTab, selectedOrganization, handleEditOrg, serverside, billingInfo, stripeKey, checkLogin, setAdminTab, setCurTab, notifications, setNotifications, } = props;
+	const { themeMode, brandColor } = useContext(Context);
+	const theme = getTheme(themeMode, brandColor);
+	const [showDismissed, setShowDismissed] = React.useState(false);
+	const [showRead, setShowRead] = React.useState(false);
+	const [appFramework, setAppFramework] = React.useState({});
+	const [selectedWorkflow, setSelectedWorkflow] = React.useState("NO HIGHLIGHT");
+	const [selectedExecutionId, setSelectedExecutionId] = React.useState("NO HIGHLIGHT");
+	const [highlightKMS, setHighlightKMS] = React.useState(false)
 
-  const [workflows, setWorkflows] = React.useState([])
-  const [openNotification, setOpenNotification] = React.useState(false);
-  const [workflow, setWorkflow] = React.useState({})
-  const [notificationWorkflow, setNotificationWorkflow] = React.useState(
+	const [workflows, setWorkflows] = React.useState([])
+	const [openNotification, setOpenNotification] = React.useState(false);
+	const [workflow, setWorkflow] = React.useState({})
+	const [notificationWorkflow, setNotificationWorkflow] = React.useState(
 		selectedOrganization.defaults === undefined
 			? ""
 			: selectedOrganization.defaults.notification_workflow === undefined ||
@@ -60,9 +72,973 @@ const Priorities = memo((props) => {
 				? ""
 				: selectedOrganization.defaults.notification_workflow
 	);
-  
-  let navigate = useNavigate();
-  const classes = useStyles();
+
+
+	//  notification workflow
+	const [notificationWorkflowModal, setNotificationWorkflowModal] = React.useState(false);
+	const [selectedAppDetails, setSelectedAppDetails] = React.useState({});
+	const [notificationWorkflowTestModal, setNotificationWorkflowTestModal] = React.useState(false);
+	const [selectedAuth, setSelectedAuth] = React.useState('');
+	const [emailData, setEmailData] = React.useState([]);
+	const [notificationAppsDetails, setnotificationAppsDetails] = React.useState({});
+	const [generatedWorkflow, setGeneatedWorkflow] = React.useState({});
+
+	// for jira & email modal
+	const [textFieldValue, setTextFieldValue] = React.useState("");
+	const [textFieldOneValue, setTextFieldOneValue] = React.useState("");
+
+	useEffect(() => {
+		prepareNotificationAppList()
+
+		if (notifications === undefined || notifications === null || notifications.length === 0) {
+			getNotifications() 
+		}
+	}, []);
+
+	let navigate = useNavigate();
+	const classes = useStyles();
+
+
+	// getting comms & cases app from app framework
+	var notificationAppList = [];
+	const mergeAuthData = (result, responseJson) => {
+		// result is only getting: Jira AND discord.
+
+		const updatedResult = result.map(item => {
+			const matches = responseJson.filter(authItem => (authItem.app.name === item.name)
+			);
+			return {
+				...item,
+				authentication_data: matches.length > 0 ? matches : null
+			};
+		});
+		return updatedResult;
+	};
+
+	const prepareNotificationAppList = () => {
+		// getting App ID,Authentication fields and saved auths for each app
+		var result = []
+		fetch(globalUrl + "/api/v1/apps", {
+			method: "GET",
+			headers: {
+				"Content-Type": "application/json",
+				Accept: "application/json",
+			},
+			credentials: "include",
+		}).then((response) => {
+			if (response.status !== 200) {
+				toast("Failed getting app ids: ", response.reason);
+				console.log("Status not 200 for app ids :O!");
+				return;
+			}
+			return response.json();
+		}).then((responseJson) => {
+			if (responseJson !== undefined) {
+				const filteredApps = responseJson.filter(app => app.categories?.includes("Communication") || app.categories?.includes("Cases"));
+				const emailData = responseJson.filter(app => app.name === "email")
+				setEmailData(emailData)
+				const appDetails = filteredApps.map(app => ({ name: app.name, id: app.id })); //mapped apps with IDs as sometime Ids were not correct in security framework
+				// console.log("appDetails: ", appDetails)
+				// result = appDetails
+
+				fetch(globalUrl + "/api/v1/apps/authentication", {
+					method: "GET",
+					headers: {
+						"Content-Type": "application/json",
+						Accept: "application/json",
+					},
+					credentials: "include",
+				})
+					.then((response) => {
+						if (response.status !== 200) {
+							toast(`Failed getting auth for : `, response.reason);
+							console.log("Status not 200 for app auth :O!");
+							return;
+						}
+						return response.json();
+					}).then((responseJson) => {
+						if (!responseJson.success) {
+							console.log("Could not get app auth")
+							return;
+						}
+						// console.log("responseJson of auth: ", responseJson.data)
+						result = mergeAuthData(appDetails, responseJson.data)
+						// console.log("merged auth data: ", result)
+						// console.log("result", result)
+
+						result.map(item => {
+							fetch(globalUrl + `/api/v1/apps/${item.id}/config`, {
+								method: "GET",
+								headers: {
+									"Content-Type": "application/json",
+									Accept: "application/json",
+								},
+								credentials: "include",
+							}).then((response) => {
+								if (response.status !== 200) {
+									toast(`Failed getting config for ${item.id}: `, response.reason);
+									console.log("Status not 200 for app config :O!");
+									return;
+								}
+								return response.json();
+							}).then((responseJson) => {
+								if (!responseJson.success) {
+									console.log("Could not get app config")
+									return;
+								}
+								var decodedString = JSON.parse(atob(responseJson.app));
+
+								// why is auth_config appearing like this? 
+								// this is not very clean.	
+								item.auth_config = decodedString.authentication
+								item.large_image = decodedString.large_image
+								item.categories = decodedString.categories
+
+								let newJSON = notificationAppList;
+
+
+								// keeping state changes to a minimum
+								if ((newJSON[item.name] === undefined) && (item?.authentication_data !== null)) {
+									newJSON[item.name] = item;
+									setnotificationAppsDetails(newJSON);
+									console.log("notificationAppsDetails: ", newJSON)
+								}
+							}).then(() => {
+								// removing this for now,
+								// checkIfAlreadyGenerated(filteredApps, workflows);
+
+							}).catch((error) => {
+								console.log("Error getting app config: " + error);
+								toast("Error getting app config: " + error);
+							})
+						})
+					})
+			}
+		}).catch((error) => {
+			console.log("Error getting app ids: " + error);
+		})
+	}
+
+
+	const executeTestWorkflow = async (workflowid) => {
+		const data = { "execution_argument": '{"title":"THIS IS TEST ALERT","description":"TEST ALERT FROM SHUFFLE","reference_url": "shuffler.io"}' }
+		fetch(globalUrl + `/api/v1/workflows/${workflowid}/execute`, {
+			method: "POST",
+			headers: {
+				"Content-Type": "application/json",
+				Accept: "application/json",
+			},
+			body: JSON.stringify(data),
+			credentials: "include",
+		})
+			.then((response) => {
+				if (response.status !== 200) {
+					toast("Failed setting notification workflow: ", response.reason);
+					console.log("Status not 200 for workflows :O!");
+					return;
+				}
+				toast("Notification workflow ran successfully");
+				return response.json();
+			}).catch((error) => {
+				console.log("Error getting workflows: " + error);
+			})
+	}
+
+	useEffect(() => {
+		console.log("Apps: ", notificationAppsDetails);
+	}, [notificationAppsDetails])
+
+	const generateCommsNotificationWorkflow = async (app, sender, recepient) => {
+		var appname = app.name
+		var appImage = app.large_image
+
+		//currently only supports  figure out a way to support more apps
+		var workflowName = `[GENERATED] ${appname} notification workflow`
+		var workflowDescription = "Generated by Shuffle for sending info/error notifications."
+		var data = {
+			"name": workflowName,
+			"description": workflowDescription,
+		}
+
+		fetch(globalUrl + "/api/v1/workflows", {
+			method: "POST",
+			headers: {
+				"Content-Type": "application/json",
+				Accept: "application/json",
+			},
+			body: JSON.stringify(data),
+			credentials: "include",
+		})
+			.then((response) => {
+				if (response.status !== 200) {
+					toast("Failed setting notification workflow: ", response.reason);
+					console.log("Status not 200 for workflows :O!");
+					return;
+				}
+				return response.json();
+			}).then((responseJson) => {
+				toast("Trying to create notification workflow..")
+				if (responseJson !== undefined) {
+					console.log("Notification workflow created successfully")
+
+					var commsParameter = [
+						{
+							"key": "recipient",
+							"value": recepient
+						},
+						{
+							"key": "sender",
+							"value": sender
+						},
+						{
+							"key": "subject",
+							"value": "$exec.title"
+						},
+						{
+							"key": "body",
+							"value": "$exec.description"
+						}
+					]
+
+					if (app.name.toLowerCase() === "gmail") {
+						// this is a special case and we know it
+						commsParameter = `[
+{
+"key": "content",
+"value": {% python %}
+import base64
+
+# Set your email variables
+sender = "${sender}"
+recipient = "${recepient}"
+subject = "$exec.title"
+body = "$exec.description"
+
+raw_email = f"""FROM: {sender}\\nTO: {recipient}\\nsubject: {subject}\\n{body}"""
+
+# Encode for Gmail API
+encoded = base64.urlsafe_b64encode(raw_email.encode()).decode()
+
+print('"' + encoded + '"')
+{% endpython %}, 
+},
+{
+"key": "userId",
+"value": "me"
+}]`
+					}
+
+					var workflow_id = responseJson.id;
+
+
+					var commsAction = {
+						"app_name": "Singul",
+						"app_version": "1.0.0",
+						"description": "Available actions for communication",
+						"app_id": "integration",
+						"errors": [],
+						"is_valid": true,
+						"isStartNode": true,
+						"label": "Send Notification Message",
+						"public": false,
+						"generated": false,
+						"large_image": app.large_image,
+						"environment": "Cloud",
+						"name": "Communication",
+						"parameters": [
+							{
+								"description": "",
+								"id": "",
+								"name": "action",
+								"example": "",
+								"value": "send_message",
+								"multiline": false,
+								"multiselect": false,
+								"options": [
+									"list_messages",
+									"get_message",
+									"send_message",
+									"search_messages",
+									"list_attachments",
+									"get_attachment",
+									"create_contact",
+									"get_contact"
+								],
+								"action_field": "",
+								"variant": "",
+								"required": true,
+								"configuration": false,
+								"tags": null,
+								"schema": {
+									"type": ""
+								},
+								"skip_multicheck": false,
+								"value_replace": null,
+								"unique_toggled": false,
+								"error": "",
+								"hidden": false
+							},
+							{
+								"description": "",
+								"id": "",
+								"name": "fields",
+								"example": "",
+								"value": `${commsParameter}`,
+								"multiline": true,
+								"multiselect": false,
+								"options": null,
+								"action_field": "",
+								"variant": "",
+								"required": false,
+								"configuration": false,
+								"tags": null,
+								"schema": {
+									"type": ""
+								},
+								"skip_multicheck": false,
+								"value_replace": null,
+								"unique_toggled": false,
+								"error": "",
+								"hidden": false
+							},
+							{
+								"description": "",
+								"id": "",
+								"name": "app_name",
+								"example": "",
+								"value": app.name,
+								"multiline": false,
+								"multiselect": false,
+								"options": null,
+								"action_field": "",
+								"variant": "",
+								"required": false,
+								"configuration": false,
+								"tags": null,
+								"schema": {
+									"type": ""
+								},
+								"skip_multicheck": false,
+								"value_replace": null,
+								"unique_toggled": false,
+								"error": "",
+								"hidden": false
+							}
+						],
+						"execution_variable": {
+							"description": "",
+							"id": "",
+							"name": "",
+							"value": ""
+						},
+						"position": {
+							"x": 67.96428571428578,
+							"y": 263.14385714285714
+						},
+						"authentication_id": "",
+						"category": "",
+						"reference_url": "",
+						"sub_action": false,
+						"run_magic_output": false,
+						"run_magic_input": false,
+						"execution_delay": 0,
+						"category_label": null,
+						"suggestion": false,
+						"parent_controlled": false,
+						"source_workflow": "",
+						"source_execution": ""
+					}
+
+					console.log("updating workflow for email")
+					var workflowBody = {
+						"name": workflowName,
+						"Description": workflowDescription,
+						"id": workflow_id,
+						"actions": [
+							commsAction,
+						]
+					}
+
+					fetch(globalUrl + `/api/v1/workflows/${workflow_id}`, {
+						method: "PUT",
+						headers: {
+							"Content-Type": "application/json",
+							Accept: "application/json",
+						},
+						body: JSON.stringify(workflowBody),
+						credentials: "include",
+					})
+						.then((response) => {
+							if (response.status !== 200) {
+								toast("Failed setting notification workflow: ", response.reason);
+								console.log("Status not 200 for workflows :O!");
+								return;
+							}
+							return response.json();
+						}).then((responseJson) => {
+							if (responseJson !== undefined) {
+								toast("Saving as notification workflow now..")
+								handleEditOrg(
+									selectedOrganization.name,
+									selectedOrganization.description,
+									selectedOrganization.id,
+									selectedOrganization.image,
+									{
+										documentation_reference: selectedOrganization?.defaults?.documentation_reference,
+										workflow_upload_repo: selectedOrganization?.defaults?.workflow_upload_repo,
+										workflow_upload_branch: selectedOrganization?.defaults?.workflow_upload_branch,
+										workflow_upload_username: selectedOrganization?.defaults?.workflow_upload_username,
+										workflow_upload_token: selectedOrganization?.defaults?.workflow_upload_token,
+										newsletter: selectedOrganization?.defaults?.newsletter,
+										weekly_recommendations: selectedOrganization?.defaults?.weekly_recommendations,
+										notification_workflow: workflow_id,
+									},
+									{
+										sso_entrypoint: selectedOrganization?.sso_config?.sso_entrypoint,
+										sso_certificate: selectedOrganization?.sso_config?.sso_certificate,
+										client_id: selectedOrganization?.sso_config?.client_id,
+										client_secret: selectedOrganization?.sso_config?.client_secret,
+										openid_authorization: selectedOrganization?.sso_config?.openid_authorization,
+										openid_token: selectedOrganization?.sso_config?.openid_token,
+										SSORequired: selectedOrganization?.sso_config?.SSORequired,
+										auto_provision: selectedOrganization?.sso_config?.auto_provision,
+									}
+								)
+
+								console.log("Notification workflow updated successfully")
+								toast("Notification workflow updated successfully")
+							}
+						})
+				}
+			}).catch((error) => {
+				console.log("Error setting workflows: " + error);
+			})
+	}
+
+	const generateCasesNotificationWorkflow = async (app, projectId) => {
+		var appname = app.name
+		var appImage = app.large_image
+
+		//currently only supports  figure out a way to support more apps
+		var workflowName = `[GENERATED] ${appname} notification workflow`
+		var workflowDescription = "Generated by Shuffle for sending info/error notifications."
+		var data = {
+			"name": workflowName,
+			"description": workflowDescription,
+		}
+
+		fetch(globalUrl + "/api/v1/workflows", {
+			method: "POST",
+			headers: {
+				"Content-Type": "application/json",
+				Accept: "application/json",
+			},
+			body: JSON.stringify(data),
+			credentials: "include",
+		})
+			.then((response) => {
+				if (response.status !== 200) {
+					toast("Failed setting notification workflow: ", response.reason);
+					console.log("Status not 200 for workflows :O!");
+					return;
+				}
+				return response.json();
+			}).then((responseJson) => {
+				toast("Trying to create notification workflow..")
+				if (responseJson !== undefined) {
+					console.log("Notification workflow created successfully")
+
+					var ticketParameter = [
+						{
+							"key": "project",
+							"value": projectId,
+						},
+						{
+							"key": "content",
+							"value": "$exec.title"
+						},
+						{
+							"key": "title",
+							"value": "$exec.description"
+						}
+					]
+
+					// fields = fields.concat(otherFields)
+
+					var workflow_id = responseJson.id;
+
+					var commsAction = {
+						"app_name": "Singul",
+						"app_version": "1.0.0",
+						"description": "Available actions for case management",
+						"app_id": "integration",
+						"errors": [
+
+						],
+						"is_valid": true,
+						"isStartNode": true,
+						"label": "create_case_from_notification",
+						"public": false,
+						"generated": false,
+						"large_image": app.large_image,
+						"environment": "Cloud",
+						"name": "Cases",
+						"parameters": [
+							{
+								"description": "",
+								"id": "",
+								"name": "action",
+								"example": "",
+								"value": "create_ticket",
+								"multiline": false,
+								"multiselect": false,
+								"options": [
+									"list_tickets",
+									"get_ticket",
+									"create_ticket",
+									"close_ticket",
+									"add_comment",
+									"update_ticket",
+									"search_tickets"
+								],
+								"action_field": "",
+								"variant": "",
+								"required": true,
+								"configuration": false,
+								"tags": null,
+								"schema": {
+									"type": ""
+								},
+								"skip_multicheck": false,
+								"value_replace": null,
+								"unique_toggled": false,
+								"error": "",
+								"hidden": false
+							},
+							{
+								"description": "",
+								"id": "",
+								"name": "fields",
+								"example": "",
+								"value": ticketParameter,
+								"multiline": true,
+								"multiselect": false,
+								"options": null,
+								"action_field": "",
+								"variant": "",
+								"required": false,
+								"configuration": false,
+								"tags": null,
+								"schema": {
+									"type": ""
+								},
+								"skip_multicheck": false,
+								"value_replace": null,
+								"unique_toggled": false,
+								"error": "",
+								"hidden": false
+							},
+							{
+								"description": "",
+								"id": "",
+								"name": "app_name",
+								"example": "",
+								"value": app.name,
+								"multiline": false,
+								"multiselect": false,
+								"options": null,
+								"action_field": "",
+								"variant": "",
+								"required": false,
+								"configuration": false,
+								"tags": null,
+								"schema": {
+									"type": ""
+								},
+								"skip_multicheck": false,
+								"value_replace": null,
+								"unique_toggled": false,
+								"error": "",
+								"hidden": false
+							}
+						],
+						"execution_variable": {
+							"description": "",
+							"id": "",
+							"name": "",
+							"value": ""
+						},
+						"position": {
+							"x": -111.59751960534861,
+							"y": 180.34429863506278
+						},
+						"authentication_id": "",
+						"category": "",
+						"reference_url": "",
+						"sub_action": false,
+						"run_magic_output": false,
+						"run_magic_input": false,
+						"execution_delay": 0,
+						"category_label": null,
+						"suggestion": false,
+						"parent_controlled": false,
+						"source_workflow": "",
+						"source_execution": ""
+					}
+
+					console.log("updating workflow for email")
+					var workflowBody = {
+						"name": workflowName,
+						"Description": workflowDescription,
+						"id": workflow_id,
+						"actions": [
+							commsAction,
+						]
+					}
+
+					fetch(globalUrl + `/api/v1/workflows/${workflow_id}`, {
+						method: "PUT",
+						headers: {
+							"Content-Type": "application/json",
+							Accept: "application/json",
+						},
+						body: JSON.stringify(workflowBody),
+						credentials: "include",
+					})
+						.then((response) => {
+							if (response.status !== 200) {
+								toast("Failed setting notification workflow: ", response.reason);
+								console.log("Status not 200 for workflows :O!");
+								return;
+							}
+							return response.json();
+						}).then((responseJson) => {
+							if (responseJson !== undefined) {
+								handleEditOrg(
+									selectedOrganization.name,
+									selectedOrganization.description,
+									selectedOrganization.id,
+									selectedOrganization.image,
+									{
+										documentation_reference: selectedOrganization?.defaults?.documentation_reference,
+										workflow_upload_repo: selectedOrganization?.defaults?.workflow_upload_repo,
+										workflow_upload_branch: selectedOrganization?.defaults?.workflow_upload_branch,
+										workflow_upload_username: selectedOrganization?.defaults?.workflow_upload_username,
+										workflow_upload_token: selectedOrganization?.defaults?.workflow_upload_token,
+										newsletter: selectedOrganization?.defaults?.newsletter,
+										weekly_recommendations: selectedOrganization?.defaults?.weekly_recommendations,
+										notification_workflow: workflow_id,
+									},
+									{
+										sso_entrypoint: selectedOrganization?.sso_config?.sso_entrypoint,
+										sso_certificate: selectedOrganization?.sso_config?.sso_certificate,
+										client_id: selectedOrganization?.sso_config?.client_id,
+										client_secret: selectedOrganization?.sso_config?.client_secret,
+										openid_authorization: selectedOrganization?.sso_config?.openid_authorization,
+										openid_token: selectedOrganization?.sso_config?.openid_token,
+										SSORequired: selectedOrganization?.sso_config?.SSORequired,
+										auto_provision: selectedOrganization?.sso_config?.auto_provision,
+									}
+								)
+
+								console.log("Notification workflow updated successfully")
+								toast("Notification workflow updated successfully")
+							}
+						})
+				}
+			}).catch((error) => {
+				console.log("Error setting workflows: " + error);
+			})
+	}
+
+	const testWorkflowModal = notificationWorkflowTestModal ?
+		(<Dialog
+			open={notificationWorkflowTestModal}
+			PaperProps={{
+				style: {
+					backgroundColor: theme.palette.surfaceColor,
+					color: "white",
+					minWidth: 500,
+				},
+			}}
+			onClose={() => {
+				setNotificationWorkflowTestModal(false);
+			}}
+		>
+			<FormControl>
+				{/* <DialogTitle>
+		  <div style={{ color: "rgba(255,255,255,0.9)" }}>
+			Notification workflow
+		  </div>
+		</DialogTitle> */}
+				<DialogContent style={{ color: "rgba(255,255,255,0.65)" }}>
+					We have updated the Notification workflow. Do you want to test it?
+				</DialogContent>
+				<DialogActions>
+					<Button
+						style={{ borderRadius: "0px" }}
+						onClick={() => {
+							setNotificationWorkflowTestModal(false);
+						}}
+						color="primary"
+					>
+						No
+					</Button>
+					<Button
+						variant="contained"
+						style={{ borderRadius: "0px" }}
+						onClick={() => {
+							executeTestWorkflow(selectedOrganization.defaults.notification_workflow);
+							setNotificationWorkflowTestModal(false);
+						}}
+						color="primary"
+					>
+						Yes
+					</Button>
+				</DialogActions>
+			</FormControl>
+		</Dialog>) : null
+
+	const modalView = notificationWorkflowModal ? (
+		<Dialog
+			open={notificationWorkflowModal}
+			PaperProps={{
+				style: {
+					backgroundColor: theme.palette.grey,
+					minWidth: 500,
+				},
+			}}
+			onClose={() => {
+				setNotificationWorkflowModal(false);
+			}}
+		>
+			<FormControl>
+				<DialogTitle>
+					<div style={{ color: "rgba(255,255,255,0.9)" }}>
+						{`Configure ${selectedAppDetails?.name?.replaceAll("_", " ")} workflow`}
+					</div>
+				</DialogTitle>
+				<DialogContent style={{ color: "rgba(255,255,255,0.65)", overflowY: 'auto', maxHeight: '450px' }}>
+					<Divider style={{ marginBottom: '1em', backgroundColor: 'rgba(255,255,255,0.12)' }} />
+					{console.log("len Selected app details: ", selectedAppDetails)}
+
+					{(selectedAppDetails.authentication_data || (selectedAppDetails.auth_config && selectedAppDetails.auth_config.required == false) || (selectedAppDetails.authentication && selectedAppDetails.authentication.required == false)) ?
+						<>
+							<Box mb={2}>
+								{true || (selectedAppDetails.auth_config && selectedAppDetails.auth_config.required == false || (selectedAppDetails.authentication && selectedAppDetails.authentication.required == false)) ? "No authentication required" :
+									<>
+										<Typography variant="body1" style={{ marginBottom: '0.5rem' }}>
+											Pick an authentication method from the list
+										</Typography>
+										<FormControl fullWidth style={{ marginBottom: 10 }}>
+											<InputLabel id="demo-simple-select-label">Available authentications</InputLabel>
+											<Select
+												labelId="demo-simple-select-label"
+												id="demo-simple-select"
+												value={selectedAuth}
+												disabled={(selectedAppDetails.auth_config && selectedAppDetails.auth_config.required == false || (selectedAppDetails.authentication && selectedAppDetails.authentication.required == false))}
+												onChange={(event) => {
+													setSelectedAuth(event.target.value)
+													console.log("event.target.value: ", event.target.value)
+													console.log("Selected auth: ", selectedAuth)
+												}}
+												label="Available authentications"
+												required={true}
+											>
+												{(selectedAppDetails.auth_config && selectedAppDetails.auth_config.required == false || (selectedAppDetails.authentication && selectedAppDetails.authentication.required == false)) ? "No authentication required" : selectedAppDetails.authentication_data.map((option) => (
+													<MenuItem key={option.id} value={option.id}>
+														<div style={{ display: 'flex', alignItems: 'center', gap: '10px' }}>
+															<Chip label={option.app.app_version} variant="outlined" />
+															{option.label}
+														</div>
+													</MenuItem>))}
+											</Select>
+										</FormControl></>}
+							</Box>
+							<Box mt={2}>
+								<Typography variant="body1">
+									Provide additional required details:
+								</Typography>
+								<TextField
+									required
+									style={{
+										flex: "1",
+										marginTop: "5px",
+										marginRight: "15px",
+										backgroundColor: theme.palette.inputColor,
+									}}
+									fullWidth={true}
+									type="name"
+									id="outlined-with-placeholder"
+									margin="normal"
+									variant="outlined"
+									placeholder={selectedAppDetails.categories?.includes("Cases") ? "Project key" : "Sender"}
+									// value={webhookInputValue}
+									onChange={(e) => {
+										setTextFieldOneValue(e.target.value)
+									}}
+									InputProps={{
+										classes: {
+											notchedOutline: classes.notchedOutline,
+										},
+										style: {
+											color: "white",
+										},
+									}} />
+								<TextField
+									required
+									style={{
+										flex: "1",
+										marginTop: "5px",
+										marginRight: "15px",
+										backgroundColor: theme.palette.inputColor,
+									}}
+									fullWidth={true}
+									type="name"
+									id="outlined-with-placeholder"
+									margin="normal"
+									variant="outlined"
+									placeholder={selectedAppDetails.categories?.includes("Cases") ? "Issue type" : "Recepient"}
+									// value={webhookInputValue}
+									onChange={(e) => {
+										setTextFieldValue(e.target.value)
+									}}
+									InputProps={{
+										classes: {
+											notchedOutline: classes.notchedOutline,
+										},
+										style: {
+											color: "white",
+										},
+									}} />
+							</Box>
+						</> :
+						<>
+							<AuthenticationData
+								app={selectedAppDetails}
+								// globalUrl={globalUrl}
+								authenticationModalOpen={(selectedAppDetails.authentication_data && selectedAppDetails.authentication_data.length > 0) ? false : true}
+								// // setAuthenticationModalOpen={false}
+								selectedApp={{ ...selectedAppDetails, authentication: selectedAppDetails.auth_config }}
+							// getAppAuthentication={selectedAppDetails.name}
+							/>
+						</>
+					}
+				</DialogContent>
+				<DialogActions>
+					<Button
+						style={{ borderRadius: "0px" }}
+						onClick={() => {
+							setNotificationWorkflowModal(false);
+						}}
+						color="primary"
+					>
+						Cancel
+					</Button>
+					<Button
+						variant="contained"
+						style={{ borderRadius: "0px" }}
+						// disabled={(authOptions.length > 0 ? false : true) || !notificationWorkflowModalValid}
+						onClick={async () => {
+							// var workflowUpdate = await setTeamsWorkflow(webhookInputValue)
+							console.log("Selectedappdetails: ", selectedAppDetails)
+							selectedAppDetails.categories?.includes("Cases") ? generateCasesNotificationWorkflow(selectedAppDetails, textFieldValue)
+								: generateCommsNotificationWorkflow(selectedAppDetails, textFieldOneValue, textFieldValue)
+							setNotificationWorkflowModal(false);
+						}}
+						color="primary"
+					>
+						Submit
+					</Button>
+				</DialogActions>
+			</FormControl>
+		</Dialog >
+	) : null
+
+
+	const checkIfAlreadyGenerated = async (appList, workflows) => { // fixxxxxxxxxxxxxxxxxxxxx	
+
+		var workflowName = workflows.find(workflow => workflow.id === notificationWorkflow)
+		if (workflowName) {
+			workflowName = workflowName.name
+		}
+		else {
+			console.log("no workflow set")
+			return
+		}
+		if (workflowName) {
+			const parts = workflowName.split(' ');
+			console.log("parts", parts)
+			if (parts[0].toString() === "[GENERATED]" && parts.length > 1) {
+				console.log("parts1", parts[1])
+				if ((appList.includes(parts[1]))) {
+					console.log("workflow already generated")
+					setGeneatedWorkflow({ "app_name": parts[1] })
+				}
+			}
+		}
+		else {
+			return
+		}
+	}
+
+	const renderChips = useCallback(() => {
+		const appList = Object.values(notificationAppsDetails);
+
+		return (
+			<Stack spacing={2}>
+				<Stack direction="row" spacing={1}>
+
+					{appList.map((app) => (
+						<Chip
+							key={app.id}
+							label={app?.name.replaceAll("_", " ")}
+							variant={generatedWorkflow.app_name === app.name ? "filled" : "outlined"}
+							disabled={generatedWorkflow.app_name === app.name ? true : false}
+							onClick={() => {
+								console.log(`Clicked ${app.name}`)
+								console.log("app: ", app)
+								setSelectedAppDetails(app)
+								if (app.authentication_data && app.authentication_data.length > 0) { //fixxxxxxxx
+									console.log("authdata: ", app.authentication_data[0])
+									setSelectedAuth(app.authentication_data[app.authentication_data.length - 1].id)
+								}
+								setNotificationWorkflowModal(true)
+								// getAppAuth(app.name)
+								console.log("selectedAppDEtails", selectedAppDetails)
+							}}
+							avatar={<img src={app.large_image} alt={app.name} style={{ width: 24, height: 24, borderRadius: '50%' }} />}
+						/>
+					))}
+
+				</Stack>
+
+				<Box sx={{
+					mt: 2,
+					p: 2,
+					backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+					borderRadius: 1,
+					border: "1px solid black",
+				}}>
+					<Typography variant="body2" color="text.secondary" sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
+						<InfoIcon fontSize="small" color="primary" />
+						Want access to more templates?
+						<Link
+							to="/admin?tab=app_auth"
+							style={{
+								color: theme.palette.linkColor,
+								textDecoration: 'none',
+								fontWeight: 500,
+							}}
+						>
+							Set up app authentication
+						</Link>
+						to show additional workflow options.
+					</Typography>
+				</Box>
+			</Stack>
+		);
+	}, [notificationAppsDetails])
 
 	useEffect(() => {
 		getFramework()
@@ -82,7 +1058,7 @@ const Priorities = memo((props) => {
 			setSelectedExecutionId(execution_id)
 
 			//toast.info("Execution-related notifications are highlighted.")
-		} 
+		}
 
 		if (workflow !== null) {
 			setSelectedWorkflow(workflow)
@@ -96,7 +1072,7 @@ const Priorities = memo((props) => {
 			return
 		}
 
-		if(workflows?.length === 0) {
+		if (workflows?.length === 0) {
 			getAvailableWorkflows()
 		}
 
@@ -106,7 +1082,7 @@ const Priorities = memo((props) => {
 	}, [selectedOrganization])
 
 	if (userdata === undefined || userdata === null) {
-		return 
+		return
 	}
 
 	const getFramework = () => {
@@ -118,67 +1094,95 @@ const Priorities = memo((props) => {
 			},
 			credentials: "include",
 		})
-		.then((response) => {
+			.then((response) => {
+				if (response.status !== 200) {
+					console.log("Status not 200 for framework!");
+				}
+
+				return response.json();
+			})
+			.then((responseJson) => {
+				if (responseJson.success === false) {
+					setAppFramework({})
+					if (responseJson.reason !== undefined) {
+						//toast("Failed loading: " + responseJson.reason)
+					} else {
+						//toast("Failed to load framework for your org.")
+					}
+				} else {
+					setAppFramework(responseJson)
+				}
+			})
+			.catch((error) => {
+				console.log("err in framework: ", error.toString());
+			})
+	}
+
+	const getNotifications = () => {
+		fetch(`${globalUrl}/api/v1/notifications`, {
+			credentials: "include",
+			method: "GET",
+			headers: {
+				"Content-Type": "application/json",
+			},
+		})
+		.then(function (response) {
 			if (response.status !== 200) {
-				console.log("Status not 200 for framework!");
+				console.log("Error in response");
 			}
 
 			return response.json();
 		})
-		.then((responseJson) => {
-			if (responseJson.success === false) {
-				setAppFramework({})
-				if (responseJson.reason !== undefined) {
-					//toast("Failed loading: " + responseJson.reason)
-				} else {
-					//toast("Failed to load framework for your org.")
-				}
+		.then(function (responseJson) {
+			if (responseJson?.success !== false && responseJson?.notifications !== undefined && responseJson?.notifications !== null) { 
+				setNotifications(responseJson.notifications || [])
 			} else {
-				setAppFramework(responseJson)
+				toast("Failed loading notifications. Please try again later.");
 			}
 		})
 		.catch((error) => {
-			console.log("err in framework: ", error.toString());
-		})
+			console.log("error in notification loading: ", error);
+		});
+	
 	}
 
-    const clearNotifications = () => {
-      // Don't really care about the logout
+	const clearNotifications = () => {
+		// Don't really care about the logout
 
-      toast("Clearing notifications")
-      fetch(`${globalUrl}/api/v1/notifications/clear`, {
-        credentials: "include",
-        method: "GET",
-        headers: {
-          "Content-Type": "application/json",
-        },
-      })
-        .then(function (response) {
-          if (response.status !== 200) {
-            console.log("Error in response");
-          }
+		toast.info("Marking all notifications as read. This may take a while.")
+		fetch(`${globalUrl}/api/v1/notifications/clear`, {
+			credentials: "include",
+			method: "GET",
+			headers: {
+				"Content-Type": "application/json",
+			},
+		})
+			.then(function (response) {
+				if (response.status !== 200) {
+					console.log("Error in response");
+				}
 
-          return response.json();
-        })
-        .then(function (responseJson) {
-          if (responseJson.success === true) {
-			  // Reload the UI
-			  const newNotifications = notifications.map((notification) => {
-				  notification.read = true
-				  return notification
-			  })
+				return response.json();
+			})
+			.then(function (responseJson) {
+				if (responseJson.success === true) {
+					// Reload the UI
+					const newNotifications = notifications.map((notification) => {
+						notification.read = true
+						return notification
+					})
 
-			  setNotifications(newNotifications)
-			  setShowRead(true)
-          } else {
-            toast("Failed dismissing notifications. Please try again later.");
-          }
-        })
-        .catch((error) => {
-          console.log("error in notification dismissal: ", error);
-          //removeCookie("session_token", {path: "/"})
-        });
-    };
+					setNotifications(newNotifications)
+					setShowRead(true)
+				} else {
+					toast("Failed dismissing notifications. Please try again later.");
+				}
+			})
+			.catch((error) => {
+				console.log("error in notification dismissal: ", error);
+				//removeCookie("session_token", {path: "/"})
+			});
+	};
 
 	const dismissNotification = (alert_id, disabled) => {
 		var notificationurl = `${globalUrl}/api/v1/notifications/${alert_id}/markasread`
@@ -188,82 +1192,82 @@ const Priorities = memo((props) => {
 			notificationurl += "?disabled=false"
 		}
 
-    	fetch(notificationurl , {
-    	  credentials: "include",
-    	  method: "GET",
-    	  headers: {
-    	    "Content-Type": "application/json",
-    	  },
-    	})
-	    .then(function (response) {
-	      if (response.status !== 200) {
-	        console.log("Error in response");
-	      }
-
-	      return response.json();
-	    })
-	    .then(function (responseJson) {
-	      if (responseJson.success === true) {
-			// Mark current one as read
-			var newNotifications = notifications.map((notification) => {
-				if (notification.id === alert_id) {
-					notification.read = true
+		fetch(notificationurl, {
+			credentials: "include",
+			method: "GET",
+			headers: {
+				"Content-Type": "application/json",
+			},
+		})
+			.then(function (response) {
+				if (response.status !== 200) {
+					console.log("Error in response");
 				}
 
-				return notification
+				return response.json();
 			})
+			.then(function (responseJson) {
+				if (responseJson.success === true) {
+					// Mark current one as read
+					var newNotifications = notifications.map((notification) => {
+						if (notification.id === alert_id) {
+							notification.read = true
+						}
+
+						return notification
+					})
 
 
-			if (disabled === true) {
-				toast("Notification disabled, and will not be shown again.")
+					if (disabled === true) {
+						toast("Notification disabled, and will not be shown again.")
 
-				newNotifications = newNotifications.map((notification) => {
-					if (notification.id === alert_id) {
-						notification.ignored = true
+						newNotifications = newNotifications.map((notification) => {
+							if (notification.id === alert_id) {
+								notification.ignored = true
+							}
+
+							return notification
+						})
+
+						console.log("NEW NOTIFICATIONS: ", newNotifications);
+					} else if (disabled === false) {
+						toast("Notification re-enabled successfully")
+
+						newNotifications = newNotifications.map((notification) => {
+							if (notification.id === alert_id) {
+								notification.ignored = false
+							}
+
+							return notification
+						})
+
+					} else {
+						toast("Notification dismissed successfully")
 					}
 
-					return notification
-				})
+					//const newNotifications = notifications.filter(
+					//	(data) => data.id !== alert_id
+					//)
 
-				console.log("NEW NOTIFICATIONS: ", newNotifications);
-			} else if (disabled === false) {
-				toast("Notification re-enabled successfully")
+					//console.log("NEW NOTIFICATIONS: ", newNotifications);
 
-				newNotifications = newNotifications.map((notification) => {
-					if (notification.id === alert_id) {
-						notification.ignored = false
+					if (setNotifications !== undefined && newNotifications !== undefined) {
+						setNotifications(newNotifications)
 					}
-
-					return notification
-				})
-
-			} else {
-				toast("Notification dismissed successfully")
-			}
-
-	        //const newNotifications = notifications.filter(
-	      	//	(data) => data.id !== alert_id
-	        //)
-
-	        //console.log("NEW NOTIFICATIONS: ", newNotifications);
-
-			if (setNotifications !== undefined && newNotifications !== undefined) {
-	        	setNotifications(newNotifications)
-			}
-	      } else {
-	        toast("Failed dismissing notification. Please try again later.");
-	      }
-		})
-	    .catch((error) => {
-	      console.log("error in notification dismissal: ", error);
-	      //removeCookie("session_token", {path: "/"})
-	    })
+				} else {
+					toast("Failed dismissing notification. Please try again later.");
+				}
+			})
+			.catch((error) => {
+				console.log("error in notification dismissal: ", error);
+				//removeCookie("session_token", {path: "/"})
+			})
 	}
-  	
 
-	const notificationWidth = "100%" 
+
+	const notificationWidth = "100%"
 	const imagesize = 22
-  	const boxColor = "#86c142"
+	const boxColor = "#86c142"
 
 
 	const getAvailableWorkflows = () => {
@@ -353,131 +1357,168 @@ const Priorities = memo((props) => {
 	}
 
 	return (
-		<div style={{width: "100%", height: "100%", boxSizing: 'border-box', transition: 'width 0.3s ease', padding: clickedFromOrgTab ? "27px 10px 19px 27px":null, height: clickedFromOrgTab ? "auto":null, minHeight: 843, backgroundColor: clickedFromOrgTab ? '#212121':null, borderRadius: clickedFromOrgTab ? '16px':null,  }}>
-		  <div style={{ maxHeight: 1700,  overflowY: "auto", width: '100%', scrollbarColor: '#494949 transparent', scrollbarWidth: 'thin'}}>
-			<div style={{maxWidth: "calc(100% - 20px)"}}>
-		  	<Typography variant="h5" style={{ color: "rgba(241, 241, 241, 1)",  fontSize: 24, fontWeight: 600, textAlign: "left" }}>
-			  Notification Workflow
-			</Typography>
-			<Typography style={{ color: "rgba(158, 158, 158, 1)", fontSize: 16, fontWeight: 400, marginTop: 5,  }}>
-				The notification workflow triggers when an error occurs in one of your workflows. Each individual one will only start a workflow once every 2 minutes. <b>You can point child org notifications into the parent org notification by choosing it in the list.</b>
-			</Typography>
-	
-			<div style={{ display: "flex", flexDirection: "row", alignItems: "center", }}>
+		<div style={{ width: "100%", height: "100%", boxSizing: 'border-box', transition: 'width 0.3s ease', padding: clickedFromOrgTab ? "27px 10px 19px 27px" : null, height: clickedFromOrgTab ? "auto" : null, minHeight: 843, backgroundColor: clickedFromOrgTab ? theme.palette.platformColor : null, borderRadius: clickedFromOrgTab ? '16px' : null, }}>
+			<div style={{ maxHeight: 1700, overflowY: "auto", width: '100%', scrollbarColor: theme.palette.scrollbarColorTransparent, scrollbarWidth: 'thin' }}>
+				<div style={{ maxWidth: "calc(100% - 20px)" }}>
+					<Typography variant="h5" style={{ fontSize: 24, fontWeight: 500, textAlign: "left" }}>
+						Notification Workflow
+					</Typography>
+					<Typography color="textSecondary" style={{ fontSize: 16, fontWeight: 400, marginTop: 5, }}>
+						The notification workflow triggers when an error occurs in one of your workflows. Each individual one will only start a workflow once every 2 minutes. <b>You can point child org notifications into the parent org notification by choosing it in the list.</b>
+					</Typography>
 
-			{workflows !== undefined && workflows !== null && workflows.length > 0 ?
-				<Autocomplete
-					id="notification_workflow_search"
-					autoHighlight
-					open={openNotification}
-					onOpen={() => {
-						setOpenNotification(true);
-					}}
-					onClose={() => {
-						setOpenNotification(false);
-					}}
-					freeSolo
-					//autoSelect
-					value={workflows?.find(w => w.id === notificationWorkflow) || null}
-					classes={{ inputRoot: classes.inputRoot }}
-					ListboxProps={{
-						style: {
-							backgroundColor: "#212121",
-							color: "white",
-						},
-					}}
-					getOptionLabel={(option) => {
-						if (
-							option === undefined ||
-							option === null ||
-							option.name === undefined ||
-							option.name === null
-						) {
-							return "No Workflow Selected";
-						}
+					{modalView}
+					{/*{testWorkflowModal} */}
+					<div style={{ marginBottom: '10px', marginTop: 20, }}>
+						{renderChips()}
+					</div>
 
-						const newname = (
-							option.name.charAt(0).toUpperCase() + option.name.substring(1)
-						).replaceAll("_", " ");
-						return newname;
-					}}
-					options={workflows}
-					fullWidth
-					style={{
-						backgroundColor:  "#212121",
-						borderRadius: theme.palette?.borderRadius,
-						height: 35,
-						marginBottom: 40,
-					}}
-					onChange={(event, newValue) => {
-						console.log("Found value: ", newValue)
+					<div style={{ display: "flex", flexDirection: "row", alignItems: "center", }}>
 
-						var parsedinput = { target: { value: newValue } }
-
-						// For variables
-						if (typeof newValue === 'string' && newValue.startsWith("$")) {
-							parsedinput = {
-								target: {
-									value: {
-										"name": newValue,
-										"id": newValue,
-										"actions": [],
-										"triggers": [],
-									}
-								}
-							}
-						}
-
-						handleWorkflowSelectionUpdate(parsedinput)
-					}}
-					renderOption={(props, data, state) => {
-						if (data.id === workflow.id) {
-							data = workflow;
-						}
-
-						return (
-							<Tooltip arrow placement="right" title={
-								<span style={{}}>
-									{data.image !== undefined && data.image !== null && data.image.length > 0 ?
-										<img src={data.image} alt={data.name} style={{ backgroundColor: theme.palette.surfaceColor, maxHeight: 200, minHeigth: 200, borderRadius: theme.palette?.borderRadius, }} />
-										: null}
-									<Typography>
-										Choose {data.name}
-									</Typography>
-								</span>
-							} placement="bottom">
-								<MenuItem
-									{...props}
-									style={{
-										// backgroundColor: theme.palette.inputColor,
-										color: data.id === workflow.id ? "red" : "white",
-										borderBottom: data.id === "parent" ? "2px solid rgba(255,255,255,0.5)" : null
-									}}
-									value={data}
-									onClick={(e) => {
-										props.onMouseDown?.(null);
-										var parsedinput = { target: { value: data } }
-										handleWorkflowSelectionUpdate(parsedinput)
-									}}
-								>
-									{data.name}
-								</MenuItem>
-							</Tooltip>
-						)
-					}}
-					renderInput={(params) => {
-						return (
-							<TextField
-								{...params}
-								style={{
-									backgroundColor: "rgba(33, 33, 33, 1)",
-									borderRadius: 4,
-									height: 35,
-									fontSize: 16,
-									marginTop: "16px"
+						{workflows !== undefined && workflows !== null && workflows.length > 0 ?
+							<Autocomplete
+								id="notification_workflow_search"
+								autoHighlight
+								open={openNotification}
+								onOpen={() => {
+									setOpenNotification(true);
 								}}
+								onClose={() => {
+									setOpenNotification(false);
+								}}
+								freeSolo
+								//autoSelect
+								value={workflows?.find(w => w.id === notificationWorkflow) || null}
+								classes={{ inputRoot: classes.inputRoot }}
+								ListboxProps={{
+									style: {
+										backgroundColor: theme.palette.surfaceColor,
+										color: theme.palette.text.primary,
+										borderRadius: theme.palette.borderRadius,
+									},
+								}}
+								getOptionLabel={(option) => {
+									if (
+										option === undefined ||
+										option === null ||
+										option.name === undefined ||
+										option.name === null
+									) {
+										return "No Workflow Selected";
+									}
+
+									const newname = (
+										option.name.charAt(0).toUpperCase() + option.name.substring(1)
+									).replaceAll("_", " ");
+									return newname;
+								}}
+								options={workflows}
+								fullWidth
+								style={{
+									backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+									borderRadius: theme.palette.textFieldStyle.borderRadius,
+									color: theme.palette.textFieldStyle.color,
+									height: 35,
+									marginBottom: 40,
+								}}
+								onChange={(event, newValue) => {
+									console.log("Found value: ", newValue)
+
+									var parsedinput = { target: { value: newValue } }
+
+									// For variables
+									if (typeof newValue === 'string' && newValue.startsWith("$")) {
+										parsedinput = {
+											target: {
+												value: {
+													"name": newValue,
+													"id": newValue,
+													"actions": [],
+													"triggers": [],
+												}
+											}
+										}
+									}
+
+									handleWorkflowSelectionUpdate(parsedinput)
+								}}
+								renderOption={(props, data, state) => {
+									if (data.id === workflow.id) {
+										data = workflow;
+									}
+
+									return (
+										<Tooltip arrow placement="right" title={
+											<span style={{}}>
+												{data.image !== undefined && data.image !== null && data.image.length > 0 ?
+													<img src={data.image} alt={data.name} style={{ backgroundColor: theme.palette.surfaceColor, maxHeight: 200, minHeigth: 200, borderRadius: theme.palette?.borderRadius, }} />
+													: null}
+												<Typography>
+													Choose {data.name}
+												</Typography>
+											</span>
+										} placement="bottom">
+											<MenuItem
+												{...props}
+												style={{
+													backgroundColor: theme.palette.surfaceColor,
+													color: data.id === workflow.id ? "red" : theme.palette.text.primary,
+													borderBottom: data.id === "parent" ? "2px solid rgba(255,255,255,0.5)" : null
+												}}
+												value={data}
+												onClick={(e) => {
+													props.onMouseDown?.(null);
+													var parsedinput = { target: { value: data } }
+													handleWorkflowSelectionUpdate(parsedinput)
+												}}
+											>
+												{data.name}
+											</MenuItem>
+										</Tooltip>
+									)
+								}}
+								renderInput={(params) => {
+									return (
+										<TextField
+											{...params}
+											style={{
+												backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+												color: theme.palette.textFieldStyle.color,
+												borderRadius: theme.palette.textFieldStyle.borderRadius,
+												height: 35,
+												fontSize: 16,
+												marginTop: "16px"
+											}}
+											InputProps={{
+												...params.InputProps,
+												style: {
+													height: 35,
+													display: "flex",
+													alignItems: "center",
+													padding: "0px 8px",
+													fontSize: 16,
+													borderRadius: 4,
+												},
+												inputProps: {
+													...params.inputProps,
+													style: {
+														height: "100%",
+														boxSizing: "border-box",
+													}
+
+												}
+											}}
+											// label="Find a notification workflow"
+											variant="outlined"
+											placeholder="Select a notification workflow"
+										/>
+									);
+								}}
+							/>
+							:
+							<TextField
+								required
 								InputProps={{
-									...params.InputProps,
 									style: {
 										height: 35,
 										display: "flex",
@@ -487,7 +1528,6 @@ const Priorities = memo((props) => {
 										borderRadius: 4,
 									},
 									inputProps: {
-										...params.inputProps,
 										style: {
 											height: "100%",
 											boxSizing: "border-box",
@@ -495,197 +1535,171 @@ const Priorities = memo((props) => {
 
 									}
 								}}
-								// label="Find a notification workflow"
-								variant="outlined"	
-								placeholder="Select a notification workflow"
+								style={{
+									backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+									color: theme.palette.textFieldStyle.color,
+									borderRadius: 4,
+									height: 35,
+									fontSize: 16,
+									marginBottom: 30
+								}}
+								fullWidth={true}
+								type="name"
+								id="outlined-with-placeholder"
+								margin="normal"
+								variant="outlined"
+								placeholder="ID of the workflow to receive notifications"
+								value={notificationWorkflow}
+								onChange={(e) => {
+									setNotificationWorkflow(e.target.value);
+								}}
 							/>
-						);
-					}}
-				/>
-				:
-				<TextField
-					required
-					InputProps={{
-						style: {
-							height: 35,
-							display: "flex",
-							alignItems: "center",
-							padding: "0px 8px",
-							fontSize: 16,
-							borderRadius: 4,
-						},
-						inputProps: {
-							style: {
-								height: "100%",
-								boxSizing: "border-box",
-							}
-
 						}
-					}}
-					style={{
-						backgroundColor: "rgba(33, 33, 33, 1)",
-						borderRadius: 4,
-						height: 35,
-						fontSize: 16,
-						marginBottom: 30
-					}}
-					fullWidth={true}
-					type="name"
-					id="outlined-with-placeholder"
-					margin="normal"
-					variant="outlined"
-					placeholder="ID of the workflow to receive notifications"
-					value={notificationWorkflow}
-					onChange={(e) => {
-						setNotificationWorkflow(e.target.value);
-					}}
-				/>
-			}
-			{/* <div style={{ minWidth: 150, maxWidth: 150, marginTop: 5, marginLeft: 10, }}>
+						{/* <div style={{ minWidth: 150, maxWidth: 150, marginTop: 5, marginLeft: 10, }}>
 				{orgSaveButton}
 			</div> */}
-		</div>
+					</div>
 
-		{notificationWorkflow === undefined || notificationWorkflow === null || notificationWorkflow.length === 0 ? null :
-			<div>
-				<Button variant="outlined" color="secondary" style={{marginTop: 5, textTransform: "none", }} onClick={() => {
-					if (notificationWorkflow === "parent") {
-						toast.error("Can't send test notifications to the parent org's notification workflow.")
-						return
+					{notificationWorkflow === undefined || notificationWorkflow === null || notificationWorkflow.length === 0 ? null :
+						<div>
+							<Button disableElevation variant="outlined" color="secondary" style={{ marginTop: 5, textTransform: "none", }} onClick={() => {
+								if (notificationWorkflow === "parent") {
+									toast.error("Can't send test notifications to the parent org's notification workflow.")
+									return
+								}
+
+								fetch(`${globalUrl}/api/v1/workflows/${notificationWorkflow}/execute`, {
+									method: "POST",
+									headers: {
+										"Content-Type": "application/json",
+										"Accept": "application/json",
+									},
+									credentials: "include",
+									body: JSON.stringify({
+										"title": "Test Notification",
+										"description": "This is a test notification to check if the notification workflow is working correctly.",
+										"org_id": selectedOrganization.id,
+										"id": uuidv4(),
+										"reference_url": "/admin?type=test&admin_tab=notifications",
+										"created_at": Math.floor(new Date().getTime() / 1000),
+										"updated_at": Math.floor(new Date().getTime() / 1000),
+									})
+								})
+									.then((response) => {
+										if (response.status === 200) {
+											toast.success("Test notification sent successfully.")
+										} else {
+											toast.error("Failed to send test notification. Please contact support if this persists")
+										}
+									}).catch((error) => {
+										toast.error("Failed to send test notification (2). Please contact support if this persists")
+									})
+							}}>
+								Send test notification
+							</Button>
+							<IconButton
+								style={{ marginLeft: 10, }}
+								onClick={() => {
+									if (notificationWorkflow === "parent") {
+										toast.error("Can't open parent org's notification workflow from here.")
+										return
+									}
+
+									window.open(`/workflows/${notificationWorkflow}?view=executions`, "_blank")
+								}}
+							>
+								<OpenInNewIcon color="primary" />
+							</IconButton>
+						</div>
 					}
 
-					fetch(`${globalUrl}/api/v1/workflows/${notificationWorkflow}/execute`, {
-						method: "POST",
-						headers: {
-							"Content-Type": "application/json",
-							"Accept": "application/json",
-						},
-						credentials: "include",
-      					body: JSON.stringify({
-							"title": "Test Notification",
-							"description": "This is a test notification to check if the notification workflow is working correctly.",
-							"org_id": selectedOrganization.id,
-							"id": uuidv4(),
-							"reference_url": "/admin?type=test&admin_tab=notifications",
-							"created_at": Math.floor(new Date().getTime() / 1000),
-							"updated_at": Math.floor(new Date().getTime() / 1000),
+					<Typography variant="h5" style={{ marginTop: 50, fontSize: 24, display: clickedFromOrgTab ? null : "inline", marginBottom: clickedFromOrgTab ? 8 : null, }}>Notifications ({
+						notifications?.filter((notification) => showRead === true || notification.read === false).length
+					})</Typography>
+
+					<Typography variant="body2" color="textSecondary" style={{ fontSize: 16, marginLeft: clickedFromOrgTab ? null : 25, color: clickedFromOrgTab ? "#9E9E9E" : null, }}>
+						Notifications help you find potential problems with your workflows and apps.&nbsp;
+						<a
+							target="_blank"
+							rel="noopener noreferrer"
+							href="/docs/organizations#notifications"
+							style={{ textDecoration: clickedFromOrgTab ? null : "none", color: theme.palette.linkColor }}
+						>
+							Learn more
+						</a>
+					</Typography>
+					<div />
+					<div style={{ display: "flex", marginTop: 10, marginBottom: 10, }}>
+						<Switch
+							checked={showRead}
+							onChange={() => {
+								setShowRead(!showRead);
+							}}
+						/><Typography style={{ marginTop: 5, }}>&nbsp; Show read </Typography>
+						{notifications !== undefined && notifications !== null && notifications.length > 1 ? (
+							<Button
+								color="primary"
+								variant="outlined"
+								disabled={notifications.filter((data) => !data.read).length === 0}
+								onClick={() => {
+									clearNotifications()
+								}}
+								style={{ marginLeft: 50, textTransform: "none", fontSize: 16 }}
+							>
+								Mark all as read
+							</Button>
+						) : null}
+					</div>
+
+					<NotificationComponent notifications={notifications} showRead={showRead} selectedExecutionId={selectedExecutionId} selectedWorkflow={selectedWorkflow} highlightKMS={highlightKMS} userdata={userdata} imagesize={imagesize} boxColor={boxColor} clickedFromOrgTab={clickedFromOrgTab} notificationWidth={notificationWidth} dismissNotification={dismissNotification} />
+
+					{clickedFromOrgTab ? null : <Divider style={{ marginTop: 50, marginBottom: 50, }} />}
+
+					<Typography variant="h5" style={{ display: clickedFromOrgTab ? null : "inline", marginBottom: clickedFromOrgTab ? 8 : null, marginTop: clickedFromOrgTab ? 60 : null, }}>Suggestions</Typography>
+					<Typography variant="body2" color="texSecondary" style={{ fontSize: 16, marginLeft: clickedFromOrgTab ? null : 25, }}>
+						Suggestions are tasks identified by Shuffle to help you discover ways to protect your and customers' company. <br />These range from simple configurations in Shuffle to Usecases you may have missed.&nbsp;
+						<a
+							target="_blank"
+							rel="noopener noreferrer"
+							href="/docs/organizations#priorities"
+							style={{ textDecoration: clickedFromOrgTab ? null : "none", color: clickedFromOrgTab ? theme.palette.linkColor : "#f85a3e" }}
+						>
+							Learn more
+						</a>
+					</Typography>
+					<div style={{ marginTop: 10, }} />
+					<Switch
+						checked={showDismissed}
+						onChange={() => {
+							setShowDismissed(!showDismissed);
+						}}
+					/>&nbsp; Show dismissed
+					{userdata.priorities === null || userdata.priorities === undefined || userdata.priorities.length === 0 ?
+						<Typography variant="h4">
+							No Suggestions found
+						</Typography>
+						:
+						userdata.priorities.map((priority, index) => {
+							if (showDismissed === false && priority.active === false) {
+								return null
+							}
+
+							return (
+								<Priority
+									key={index}
+									globalUrl={globalUrl}
+									priority={priority}
+									checkLogin={checkLogin}
+									clickedFromOrgTab={true}
+									setAdminTab={setAdminTab}
+									setCurTab={setCurTab}
+									appFramework={appFramework}
+								/>
+							)
 						})
-					})
-					.then((response) => {
-						if (response.status === 200) {
-							toast.success("Test notification sent successfully.")
-						} else {
-							toast.error("Failed to send test notification. Please contact support if this persists")
-						}
-					}).catch((error) => {
-						toast.error("Failed to send test notification (2). Please contact support if this persists")
-					})
-				}}>
-					Send test notification
-				</Button>
-				<IconButton
-					style={{marginLeft: 10, }}
-					onClick={() => {
-						if (notificationWorkflow === "parent") {
-							toast.error("Can't open parent org's notification workflow from here.")
-							return
-						}
-
-						window.open(`/workflows/${notificationWorkflow}?view=executions`, "_blank")
-					}}
-				>
-					<OpenInNewIcon color="primary" />
-				</IconButton>
-			</div>
-		}
-
-		  <Typography style={{marginTop: 50, fontSize: 24, fontWeight: 'bold', display: clickedFromOrgTab?null:"inline", marginBottom: clickedFromOrgTab? 8:null, color: clickedFromOrgTab?"#ffffff":null }}>Notifications ({
-				notifications?.filter((notification) => showRead === true || notification.read === false).length
-				})</Typography>
-
-			<span style={{ fontSize: 16,  marginLeft: clickedFromOrgTab?null:25, color: clickedFromOrgTab?"#9E9E9E":null, }}>
-				Notifications help you find potential problems with your workflows and apps.&nbsp;
-				<a
-					target="_blank"
-					rel="noopener noreferrer"
-					href="/docs/organizations#notifications"
-					style={{ textDecoration: clickedFromOrgTab?null:"none", color: clickedFromOrgTab?"#FF8444":"#f85a3e" }}
-				>
-					Learn more
-				</a>
-			</span>
-			<div/>
-			<div style={{display: "flex", marginTop: 10, marginBottom: 10, }}>
-				<Switch
-					checked={showRead}
-					onChange={() => {
-						setShowRead(!showRead);
-					}}
-				/><span style={{marginTop: 5, }}>&nbsp; Show read </span>
-				  {notifications !== undefined && notifications !== null && notifications.length > 1 ? (
-					<Button
-					  color="primary"
-					  variant="outlined"
-					  disabled={notifications.filter((data) => !data.read).length === 0}
-					  onClick={() => {
-						clearNotifications()
-					  }}
-					  style={{marginLeft: 50, textTransform: "none", fontSize: 16}}
-					>
-					  Mark all as read 
-					</Button>
-				  ) : null}
-			</div>
-
-			<NotificationComponent  notifications={notifications} showRead={showRead} selectedExecutionId={selectedExecutionId} selectedWorkflow={selectedWorkflow} highlightKMS={highlightKMS} userdata={userdata} imagesize={imagesize} boxColor={boxColor} clickedFromOrgTab={clickedFromOrgTab} notificationWidth={notificationWidth} dismissNotification={dismissNotification}/>
-
-			{clickedFromOrgTab? null : <Divider style={{marginTop: 50, marginBottom: 50, }} />}
-
-			<h2 style={{ display: clickedFromOrgTab ? null:"inline", marginBottom: clickedFromOrgTab ? 8:null, marginTop: clickedFromOrgTab ? 60 : null, color: clickedFromOrgTab ? "#ffffff" : null }}>Suggestions</h2>
-			<span style={{ fontSize: 16, color: clickedFromOrgTab ?"#9E9E9E":null,marginLeft: clickedFromOrgTab ?null:25,  }}>
-				Suggestions are tasks identified by Shuffle to help you discover ways to protect your and customers' company. <br/>These range from simple configurations in Shuffle to Usecases you may have missed.&nbsp;
-				<a
-					target="_blank"
-					rel="noopener noreferrer"
-					href="/docs/organizations#priorities"
-					style={{ textDecoration: clickedFromOrgTab ?null:"none", color: clickedFromOrgTab ?"#FF8444":"#f85a3e" }}
-				>
-					Learn more
-				</a>
-			</span>
-			<div style={{marginTop: 10, }}/>
-			<Switch
-				checked={showDismissed}
-				onChange={() => {
-					setShowDismissed(!showDismissed);
-				}}
-			/>&nbsp; Show dismissed
-			{userdata.priorities === null || userdata.priorities === undefined || userdata.priorities.length === 0 ? 
-				<Typography variant="h4">
-					No Suggestions found
-				</Typography>
-				: 
-				userdata.priorities.map((priority, index) => {
-					if (showDismissed === false && priority.active === false) {
-						return null
 					}
-
-					return (
-						<Priority
-							key={index}
-							globalUrl={globalUrl}
-							priority={priority}
-							checkLogin={checkLogin}
-							clickedFromOrgTab={true}
-							setAdminTab={setAdminTab}
-							setCurTab={setCurTab}
-  							appFramework={appFramework}
-						/>
-					)
-				})
-			}
-		  </div>
-		  </div>
+				</div>
+			</div>
 		</div>
 	)
 })
@@ -694,14 +1708,15 @@ export default Priorities;
 
 
 const NotificationItem = memo((props) => {
-	const {data, selectedExecutionId, selectedWorkflow, highlightKMS, userdata, imagesize, boxColor, clickedFromOrgTab, notificationWidth, dismissNotification} = props
+	const { data, selectedExecutionId, selectedWorkflow, highlightKMS, userdata, imagesize, boxColor, clickedFromOrgTab, notificationWidth, dismissNotification } = props
 
 	var image = "";
 	var orgName = "";
 	var orgId = "";
+	const { themeMode, brandColor } = useContext(Context);
+	const theme = getTheme(themeMode, brandColor);
 
-	
-	var highlighted = selectedExecutionId === "" && selectedWorkflow === "" ? false : data.reference_url === undefined || data.reference_url === null || data.reference_url.length === 0 ? false : data.reference_url.includes(selectedExecutionId) || data.reference_url.includes(selectedWorkflow) 
+	var highlighted = selectedExecutionId === "" && selectedWorkflow === "" ? false : data.reference_url === undefined || data.reference_url === null || data.reference_url.length === 0 ? false : data.reference_url.includes(selectedExecutionId) || data.reference_url.includes(selectedWorkflow)
 
 	if (!highlighted && highlightKMS) {
 		if (data.title !== undefined && data.title !== null && data.title.toLowerCase().includes("kms")) {
@@ -713,238 +1728,242 @@ const NotificationItem = memo((props) => {
 	}
 
 	if (userdata.orgs !== undefined) {
-	  const foundOrg = userdata.orgs.find((org) => org.id === data["org_id"]);
-	  if (foundOrg !== undefined && foundOrg !== null) {
-		//position: "absolute", bottom: 5, right: -5,
-		const imageStyle = {
-		  width: imagesize,
-		  height: imagesize,
-		  pointerEvents: "none",
-		  marginLeft:
-			data.creator_org !== undefined && data.creator_org.length > 0
-			  ? 20
-			  : 0,
-		  borderRadius: 10,
-		  border:
-			foundOrg.id === userdata.active_org.id
-			  ? `3px solid ${boxColor}`
-			  : null,
-		  cursor: "pointer",
-		  marginRight: 10,
-		};
+		const foundOrg = userdata.orgs.find((org) => org.id === data["org_id"]);
+		if (foundOrg !== undefined && foundOrg !== null) {
+			//position: "absolute", bottom: 5, right: -5,
+			const imageStyle = {
+				width: imagesize,
+				height: imagesize,
+				pointerEvents: "none",
+				marginLeft:
+					data.creator_org !== undefined && data.creator_org.length > 0
+						? 20
+						: 0,
+				borderRadius: 10,
+				border:
+					foundOrg.id === userdata.active_org.id
+						? `3px solid ${boxColor}`
+						: null,
+				cursor: "pointer",
+				marginRight: 10,
+			};
 
-		image =
-		  foundOrg.image === "" ? (
-			<img
-			  alt={foundOrg.name}
-			  src={theme.palette.defaultImage}
-			  style={imageStyle}
-			/>
-		  ) : (
-			<img
-			  alt={foundOrg.name}
-			  src={foundOrg.image}
-			  style={imageStyle}
-			  onClick={() => {}}
-			/>
-		  );
+			image =
+				foundOrg.image === "" ? (
+					<img
+						alt={foundOrg.name}
+						src={theme.palette.defaultImage}
+						style={imageStyle}
+					/>
+				) : (
+					<img
+						alt={foundOrg.name}
+						src={foundOrg.image}
+						style={imageStyle}
+						onClick={() => { }}
+					/>
+				);
 
-		orgName = foundOrg.name;
-		orgId = foundOrg.id;
-	  }
+			orgName = foundOrg.name;
+			orgId = foundOrg.id;
+		}
 	}
 
 	return (
-	  <Paper
-		style={{
-		  backgroundColor: theme.palette.inputColor.backgroundColor,
-		  width: clickedFromOrgTab ? null :notificationWidth,
-		  padding: 30,
-		  borderBottom: "1px solid rgba(255,255,255,0.4)",
-		  marginBottom: 20, 
-		  border: highlighted ? "2px solid #f85a3e" : null,
-		  borderRadius: theme.palette?.borderRadius,
-		}}
-	  >
-		<div style={{display: "flex", }}>
-			{data.amount === 1 && data.read === false ? 
-				<Chip
-					label={"First seen"}
-					variant="contained"
-					color="primary"
-					style={{marginRight: 15, height: 25, }}
-				  />
-			: null}
-			{data.ignored === true ? 
-				<Chip
-					label={"Disabled"}
-					variant="outlined"
-					color="primary"
-					style={{marginRight: 15, height: 25, }}
-				  />
-			: null}
-			{data.read === false ?
-				<Chip
-					label={"Unread"}
-					variant="contained"
-					color="secondary"
-					style={{marginRight: 15, height: 25, }}
-				  />
-			: 
-				<Chip
-					label={"Read"}
-					variant="outlined"
-					color="secondary"
-					style={{marginRight: 15, height: 25, }}
-				  />
-			}
-			<Typography variant="body1" color="textPrimary" style={{ wordWrap: "break-word", overflow: "hidden", textOverflow: "ellipsis" }}>
-				{data.title}
-			</Typography >
-		</div>
-
-		{data.image !== undefined && data.image !== null && data.image.length > 0 ? 
-			<img alt={data.title} src={data.image} style={{height: 100, width: 100, }} />
-			: 
-			null
-		}
-		<Typography variant="body2" color="textSecondary" style={{ marginTop: 10, maxHeight: 200, overflowX: "hidden", overflowY: "auto", wordWrap: "break-word", fontSize: 16 }}>
-			{data.description}
-		</Typography >
-		<div style={{ display: "flex" }}>
-		<ButtonGroup style={{marginTop: 15, minHeight: 50, maxHeight: 50, }}>
-  <Button
-    style={{
-      textTransform: "none",
-      border: "1px solid #ff8544",
-      color: "#ff8544",
-      opacity: data.reference_url ? 1 : 0.5,
-      cursor: data.reference_url ? "pointer" : "not-allowed",
-    }}
-    disabled={
-      !data.reference_url || data.reference_url.length === 0
-    }
-    onClick={() => {
-      window.open(data.reference_url, "_blank");
-    }}
-  >
-    Explore
-  </Button>
-
-  {data.read === false ? (
-    <Button
-	  variant="outlined"
-	  color="secondary"
-	  style={{
-		  height: 50, 
-	  }}
-      onClick={() => {
-        dismissNotification(data.id);
-      }}
-    >
-     	Mark Read 
-    </Button>
-  ) : null}
-
-	  <Tooltip
-		title="Disabling a notification makes it so similar notifications to this one will NOT be re-opened. It will NOT forward notifications to your notification workflow, but WILL still keep counting."
-		placement="top"
-	  >
-		<Button
-		  variant="outlined"
-		  color="secondary"
-		  style={{
-			textTransform: "none",
-			opacity: data.ignored || data.dismissable ? 1 : 0.5,
-			cursor: data.dismissable ? "pointer" : "not-allowed",
-		  }}
-		  disabled={!data.dismissable}
-		  onClick={() => {
-			if (data.ignored) {
-			  dismissNotification(data.id, false);
-			} else {
-			  dismissNotification(data.id, true);
-			}
-		  }}
+		<Box
+			style={{
+				backgroundColor: theme.palette.cardBackgroundColor,
+				width: clickedFromOrgTab ? null : notificationWidth,
+				padding: 30,
+				borderBottom: theme.palette.defaultBorder,
+				marginBottom: 20,
+				border: highlighted ? "2px solid #f85a3e" : null,
+				borderRadius: theme.palette?.borderRadius,
+			}}
+			sx={{
+				"&:hover": {
+					backgroundColor: theme.palette.cardHoverColor,
+				},
+			}}
 		>
-		  {data.ignored ? "Re-enable" : "Disable"}
-		</Button>
-	  </Tooltip>
-  </ButtonGroup> 
+			<div style={{ display: "flex", }}>
+				{data.amount === 1 && data.read === false ?
+					<Chip
+						label={"First seen"}
+						variant="contained"
+						color="primary"
+						style={{ marginRight: 15, height: 25, }}
+					/>
+					: null}
+				{data.ignored === true ?
+					<Chip
+						label={"Disabled"}
+						variant="outlined"
+						color="primary"
+						style={{ marginRight: 15, height: 25, }}
+					/>
+					: null}
+				{data.read === false ?
+					<Chip
+						label={"Unread"}
+						style={{ marginRight: 15, height: 25, }}
+					/>
+					:
+					<Chip
+						label={"Read"}
+						variant="outlined"
+						color="secondary"
+						style={{ marginRight: 15, height: 25, }}
+					/>
+				}
+				<Typography variant="body1" color="textPrimary" style={{ wordWrap: "break-word", overflow: "hidden", textOverflow: "ellipsis" }}>
+					{data.title}
+				</Typography >
+			</div>
 
-  <Typography
-    variant="body2"
-    color="textSecondary"
-    style={{
-      marginLeft: 20,
-      marginTop: 20,
-      wordWrap: "break-word",
-      overflow: "hidden",
-      textOverflow: "ellipsis",
-	  fontSize: 16,
+			{data.image !== undefined && data.image !== null && data.image.length > 0 ?
+				<img alt={data.title} src={data.image} style={{ height: 100, width: 100, }} />
+				:
+				null
+			}
+			<Typography variant="body2" color="textSecondary" style={{ marginTop: 10, maxHeight: 200, overflowX: "hidden", overflowY: "auto", wordWrap: "break-word", fontSize: 16 }}>
+				{data.description}
+			</Typography >
+			<div style={{ display: "flex" }}>
+				<ButtonGroup style={{ marginTop: 15, minHeight: 50, maxHeight: 50, }}>
+					<Button
+						variant="outlined"
+						color="primary"
+						style={{
+							textTransform: "none",
+							opacity: data.reference_url ? 1 : 0.5,
+							cursor: data.reference_url ? "pointer" : "not-allowed",
+						}}
+						disabled={
+							!data.reference_url || data.reference_url.length === 0
+						}
+						onClick={() => {
+							window.open(data.reference_url, "_blank");
+						}}
+					>
+						Explore
+					</Button>
 
-    }}
-  >
-    <b>First seen</b>:{" "}
-    {new Date(data.created_at * 1000).toISOString().slice(0, 19)}
-  </Typography>
+					{data.read === false ? (
+						<Button
+							variant="outlined"
+							color="secondary"
+							style={{
+								height: 50,
+								textTransform: "none",
+							}}
+							onClick={() => {
+								dismissNotification(data.id);
+							}}
+						>
+							Mark as Read
+						</Button>
+					) : null}
 
-  <Typography
-    variant="body2"
-    color="textSecondary"
-    style={{
-      marginLeft: 20,
-      marginTop: 20,
-      wordWrap: "break-word",
-      overflow: "hidden",
-      textOverflow: "ellipsis",
-	  fontSize: 16,
-    }}
-  >
-    <b>Last seen</b>:{" "}
-    {new Date(data.updated_at * 1000).toISOString().slice(0, 19)}
-  </Typography>
+					<Tooltip
+						title="Disabling a notification makes it so similar notifications to this one will NOT be re-opened. It will NOT forward notifications to your notification workflow, but WILL still keep counting."
+						placement="top"
+					>
+						<Button
+							variant="outlined"
+							color="secondary"
+							style={{
+								textTransform: "none",
+								opacity: data.ignored || data.dismissable ? 1 : 0.5,
+								cursor: data.dismissable ? "pointer" : "not-allowed",
+							}}
+							disabled={!data.dismissable}
+							onClick={() => {
+								if (data.ignored) {
+									dismissNotification(data.id, false);
+								} else {
+									dismissNotification(data.id, true);
+								}
+							}}
+						>
+							{data.ignored ? "Re-enable" : "Disable"}
+						</Button>
+					</Tooltip>
+				</ButtonGroup>
 
-  <Typography
-    variant="body2"
-    color="textSecondary"
-    style={{
-      marginLeft: 20,
-      marginTop: 20,
-      wordWrap: "break-word",
-      overflow: "hidden",
-      textOverflow: "ellipsis",
-	  fontSize: 16,
-    }}
-  >
-    <b>Times seen</b>: {data.amount}
-  </Typography>
-</div>
+				<Typography
+					variant="body2"
+					color="textSecondary"
+					style={{
+						marginLeft: 20,
+						marginTop: 20,
+						wordWrap: "break-word",
+						overflow: "hidden",
+						textOverflow: "ellipsis",
+						fontSize: 16,
 
-	  </Paper>
+					}}
+				>
+					<b>First seen</b>:{" "}
+					{new Date(data.created_at * 1000).toISOString().slice(0, 19)}
+				</Typography>
+
+				<Typography
+					variant="body2"
+					color="textSecondary"
+					style={{
+						marginLeft: 20,
+						marginTop: 20,
+						wordWrap: "break-word",
+						overflow: "hidden",
+						textOverflow: "ellipsis",
+						fontSize: 16,
+					}}
+				>
+					<b>Last seen</b>:{" "}
+					{new Date(data.updated_at * 1000).toISOString().slice(0, 19)}
+				</Typography>
+
+				<Typography
+					variant="body2"
+					color="textSecondary"
+					style={{
+						marginLeft: 20,
+						marginTop: 20,
+						wordWrap: "break-word",
+						overflow: "hidden",
+						textOverflow: "ellipsis",
+						fontSize: 16,
+					}}
+				>
+					<b>Times seen</b>: {data.amount}
+				</Typography>
+			</div>
+
+		</Box>
 	);
 })
 
 
-const NotificationComponent = memo(({notifications, showRead, selectedExecutionId, selectedWorkflow, highlightKMS, userdata, imagesize, boxColor, clickedFromOrgTab, notificationWidth, dismissNotification}) => {
+const NotificationComponent = memo(({ notifications, showRead, selectedExecutionId, selectedWorkflow, highlightKMS, userdata, imagesize, boxColor, clickedFromOrgTab, notificationWidth, dismissNotification }) => {
 
-	return(
+	return (
 		<div>
 			{notifications === null || notifications === undefined || notifications?.length === 0 ? (
-			null
-		) : 
-			<div>
-				{notifications?.map((notification, index) => {
-					if (showRead === false && notification.read === true) {
-						return null
-					}
+				null
+			) :
+				<div>
+					{notifications?.map((notification, index) => {
+						if (showRead === false && notification.read === true) {
+							return null
+						}
 
-					return (
-						<NotificationItem data={notification} key={index} selectedExecutionId={selectedExecutionId} selectedWorkflow={selectedWorkflow} highlightKMS={highlightKMS} userdata={userdata} imagesize={imagesize} boxColor={boxColor} clickedFromOrgTab={clickedFromOrgTab} notificationWidth={notificationWidth} dismissNotification={dismissNotification} />
-					)
-				})}
-			</div>
-		}
+						return (
+							<NotificationItem data={notification} key={index} selectedExecutionId={selectedExecutionId} selectedWorkflow={selectedWorkflow} highlightKMS={highlightKMS} userdata={userdata} imagesize={imagesize} boxColor={boxColor} clickedFromOrgTab={clickedFromOrgTab} notificationWidth={notificationWidth} dismissNotification={dismissNotification} />
+						)
+					})}
+				</div>
+			}
 		</div>
 	)
 })
diff --git a/frontend/src/components/Priority.jsx b/frontend/src/components/Priority.jsx
index 4bd3a6f2..7cc0f3da 100644
--- a/frontend/src/components/Priority.jsx
+++ b/frontend/src/components/Priority.jsx
@@ -1,10 +1,10 @@
-import React, { useState, useEffect } from "react";
+import React, { useState, useEffect, useContext } from "react";
 import { toast } from 'react-toastify';
-
+import { getTheme } from "../theme.jsx";
 import ReactGA from 'react-ga4';
-import theme from "../theme.jsx";
 import { useNavigate, Link } from "react-router-dom";
 import { findSpecificApp } from "../components/AppFramework.jsx"
+import { Context } from "../context/ContextApi.jsx";
 import {
 	Paper,
   Typography,
@@ -23,7 +23,8 @@ import {
 
 const Priority = (props) => {
   	const { globalUrl, clickedFromOrgTab,userdata, serverside, priority, checkLogin, setAdminTab, setCurTab, appFramework, } = props;
-
+	const { themeMode, supportEmail } = useContext(Context);
+	const theme = getTheme(themeMode);
   	const isCloud = (window.location.host === "localhost:3002" || window.location.host === "shuffler.io") ? true : (process.env.IS_SSR === "true");
 	let navigate = useNavigate();
 
@@ -113,7 +114,7 @@ const Priority = (props) => {
     	    }
     	  })
     	  .catch((error) => {
-    	    toast("Failed dismissing alert. Please contact support@shuffler.io if this persists.");
+    	    toast(`Failed dismissing alert. Please contact ${supportEmail} if this persists.`);
     	  });
 	}
 
@@ -121,10 +122,10 @@ const Priority = (props) => {
 	const srcSize = realignedSrc ? 35 : 30 
 	const dstSize = realignedDst ? 35 : 30
 	return (
-		<div style={{border: priority.active === false ? "1px solid #000000" :  priority.severity === 1 ? "1px solid #f85a3e" :  clickedFromOrgTab ?null:"1px solid rgba(255,255,255,0.3)", borderRadius: theme.palette?.borderRadius, marginTop: 10, marginBottom: 10, padding:  clickedFromOrgTab ? 24:15, textAlign: "center", minHeight: isCloud ? 70 : 100, maxHeight: isCloud ? 70 : 100, textAlign: "left", backgroundColor: clickedFromOrgTab ?  "#1A1A1A": theme.palette.surfaceColor, display: "flex", }}>
+		<div style={{border: priority.active === false ? "1px solid #000000" :  priority.severity === 1 ? "1px solid #f85a3e" :  clickedFromOrgTab ?null:"1px solid rgba(255,255,255,0.3)", borderRadius: theme.palette?.borderRadius, marginTop: 10, marginBottom: 10, padding:  clickedFromOrgTab ? 24:15, textAlign: "center", minHeight: isCloud ? 70 : 100, maxHeight: isCloud ? 70 : 100, textAlign: "left", backgroundColor: clickedFromOrgTab ?  theme.palette.backgroundColor : theme.palette.surfaceColor, display: "flex", }}>
 			<div style={{flex: 2, overflow: "hidden",}}>
 				<span style={{display: "flex", }}>
-					{priority.type === "usecase" || priority.type == "apps" ? <AutoFixHighIcon style={{height: 19, width: 19, marginLeft: 3, marginRight: 10, }}/> : null} 
+					{priority.type === "usecase" || priority.type == "apps" ? <AutoFixHighIcon style={{height: 19, width: 19, marginLeft: 3, marginRight: 10, color: theme.palette.text.primary}}/> : null} 
 					<Typography variant="body1" >
 						{priority.name}
 					</Typography>
@@ -138,7 +139,7 @@ const Priority = (props) => {
 
 						{newdescription.split("&").length > 3 ?
 							<span style={{display: "flex", }}>
-								<ArrowForwardIcon style={{marginLeft: 15, marginRight: 15, }}/>
+								<ArrowForwardIcon style={{marginLeft: 15, marginRight: 15,  color: theme.palette.text.primary }}/>
 								<img src={newdescription.split("&")[3]} alt={priority.name+"2"} style={{height: dstSize, width: dstSize, marginRight: realignedDst ? -5 : 10,	borderRadius: theme.palette?.borderRadius-3, marginTop: realignedDst ? 5 : 0 }} />
 								<Typography variant="body2" color="textSecondary" style={{marginTop: 3}}>
 									{newdescription.split("&")[2]} 
@@ -154,7 +155,7 @@ const Priority = (props) => {
 				}
 			</div>
 			<div style={{flex: 1, display: "flex", marginLeft: 30, }}>
-				<Button style={{height: 50, borderRadius: 4, fontSize:16, boxShadow: clickedFromOrgTab ? "none":null,textTransform: clickedFromOrgTab ? 'capitalize':null, marginTop: 8, width: 175, marginRight: 10, color: priority.active === false ? "white" :clickedFromOrgTab ?"#ff8544": "black", backgroundColor: priority.active === false ? theme.palette.inputColor :clickedFromOrgTab?"transparent":"rgba(255,255,255,0.8)", border: "1px solid #ff8544"}} variant="contained" color="secondary" onClick={() => {
+				<Button style={{height: 50, borderRadius: 4, fontSize:16, boxShadow: clickedFromOrgTab ? "none":null,textTransform: clickedFromOrgTab ? 'capitalize':null, marginTop: 8, width: 175, marginRight: 10, }} variant="outlined" color="primary" onClick={() => {
 
 					if (isCloud) {
 						ReactGA.event({
@@ -180,10 +181,9 @@ const Priority = (props) => {
 					Explore		
 				</Button>
 				{priority.active === true ?
-					<Button style={{borderRadius: 25, fontSize:16, boxShadow: clickedFromOrgTab ? "none":null,textTransform: clickedFromOrgTab ? 'capitalize':null, width: 100, height: 50, marginTop: 8, }} variant="text" color="secondary" onClick={() => {
+					<Button style={{borderRadius: 4, fontSize:16, boxShadow: clickedFromOrgTab ? "none":null,textTransform: clickedFromOrgTab ? 'capitalize':null, width: 100, height: 50, marginTop: 8, }} variant="outlined" color="secondary" onClick={() => {
 						// dismiss -> get envs
 						changeRecommendation(priority, "dismiss")
-
 						// Check window location if it's /workflows
 						if (window.location.pathname === "/workflows") {
 							// Set local storage to hide priorities for now
diff --git a/frontend/src/components/RecentWorkflow.jsx b/frontend/src/components/RecentWorkflow.jsx
index f61492e2..1ffabd77 100644
--- a/frontend/src/components/RecentWorkflow.jsx
+++ b/frontend/src/components/RecentWorkflow.jsx
@@ -1,4 +1,4 @@
-import React from "react"
+import React, {useContext} from "react"
 
 import { Link } from "react-router-dom";
 import { 
@@ -10,14 +10,20 @@ import {
 } from "@mui/material"
 import { useNavigate } from "react-router";
 import theme from "../theme.jsx";
-
+import { getTheme } from "../theme.jsx";
 import {
 	Lock as LockIcon,
 } from '@mui/icons-material';
+import { Context } from "../context/ContextApi.jsx";
 
 // onclickHandler = function override from parent onclick
 const RecentWorkflow = ({ workflow, onclickHandler, leftNavOpen, currentWorkflowId, }) => {
 
+	const { themeMode } = useContext(Context);
+	const theme = getTheme(themeMode);
+
+
+
     const navigate = useNavigate();
 
 	const [hovered, setHovered] = React.useState(false)
@@ -87,7 +93,7 @@ const RecentWorkflow = ({ workflow, onclickHandler, leftNavOpen, currentWorkflow
 				transition: "opacity 0.1s",
 
 				borderRadius: theme.palette?.borderRadius, 
-				backgroundColor: hovered || currentWorkflowId === workflow.id ? "#1f1f1f" : "transparent",
+				backgroundColor: hovered || currentWorkflowId === workflow.id ? theme.palette.hoverColor : "transparent",
 			  }}
 			  disableRipple
 			>
@@ -127,7 +133,6 @@ const RecentWorkflow = ({ workflow, onclickHandler, leftNavOpen, currentWorkflow
 				))}
 				<Typography
 				  style={{
-					color: "#CDCDCD",
 					fontSize: 16,
 					marginLeft: 8,
 					maxWidth: 180,
diff --git a/frontend/src/components/RenderCytoscape.jsx b/frontend/src/components/RenderCytoscape.jsx
index 7348fdb7..354e49ae 100644
--- a/frontend/src/components/RenderCytoscape.jsx
+++ b/frontend/src/components/RenderCytoscape.jsx
@@ -1,12 +1,16 @@
-import React, { useState, useEffect, useLayoutEffect } from "react";
+import React, { useState, useEffect, useLayoutEffect, useContext, useMemo } from "react";
 import * as cytoscape from "cytoscape";
 import CytoscapeComponent from "react-cytoscapejs";
-import cystyle from "../defaultCytoscapeStyle.jsx";
+import defaultCytoscapeStyle from "../defaultCytoscapeStyle.jsx";
+import { Context } from "../context/ContextApi.jsx";
+import { getTheme } from "../theme.jsx";
 
 const surfaceColor = "#27292D";
 const CytoscapeWrapper = (props) => {
   const { globalUrl, inworkflow, height, width } = props;
-
+  const {themeMode} = useContext(Context)
+  const theme = getTheme(themeMode)
+  const cystyle = useMemo(() => defaultCytoscapeStyle(theme), [themeMode]);
   const [elements, setElements] = useState([]);
   const [workflow, setWorkflow] = useState(inworkflow);
   const [cy, setCy] = React.useState();
diff --git a/frontend/src/components/RuntimeDebugger.jsx b/frontend/src/components/RuntimeDebugger.jsx
index 2209ad4c..9ac474d5 100644
--- a/frontend/src/components/RuntimeDebugger.jsx
+++ b/frontend/src/components/RuntimeDebugger.jsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useContext } from 'react';
 
 import { 
 	TextField,
@@ -17,10 +17,11 @@ import {
 	IconButton,
 	Switch,
 } from '@mui/material';
+import { Context } from '../context/ContextApi.jsx';
 
 import { toast } from "react-toastify" 
 import { makeStyles } from "@mui/styles";
-import theme from '../theme.jsx';
+import {getTheme} from '../theme.jsx';
 import dayjs from 'dayjs';
 import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs'
 import Pagination from '@mui/material/Pagination';
@@ -39,7 +40,8 @@ import {
 	EditNote as EditNoteIcon,
 	AccountTree as AccountTreeIcon,
 	Cached as CachedIcon,
-	FilterAltOff as FilterAltOffIcon 
+	FilterAltOff as FilterAltOffIcon,
+	Send as SendIcon, 
 } from '@mui/icons-material';
 
 import { DataGrid, GridColDef, GridValueGetterParams } from '@mui/x-data-grid'
@@ -69,6 +71,8 @@ const RuntimeDebugger = (props) => {
 	const [endTime, setEndTime] = useState("")
 	const [startTime, setStartTime] = useState("")
 	const [totalCount, setTotalCount] = useState(0)
+	const {themeMode, supportEmail} = useContext(Context)
+	const theme = getTheme(themeMode)
 
 	const [workflow, setWorkflow] = useState({})
 	const [ignoreOrg, setIgnoreOrg] = useState(false)
@@ -107,7 +111,7 @@ const RuntimeDebugger = (props) => {
 
 		var maxworkflows = 5
 
-		console.log("Looking for MAX this amount of workflows: ", maxworkflows)
+		//console.log("Looking for MAX this amount of workflows: ", maxworkflows)
 		for (let key in workflows) {
 			if (key > maxworkflows) {
 				break
@@ -347,6 +351,9 @@ const RuntimeDebugger = (props) => {
 					source = "rerun of a previous run"
 				} else if (source === "form") { 
 					foundSource = <EditNoteIcon style={{color: theme.palette.primary.secondary, height: imageSize, width: imageSize, }} />
+				} else if (source === "single_action" || source == "single_api" || source === "direct_api") { 
+					foundSource = <SendIcon color="secondary" style={{height: imageSize-5, }} />
+					source = "Single API call"
 				} else {
 					source = "manual"
 				}
@@ -354,12 +361,12 @@ const RuntimeDebugger = (props) => {
 				var imageSource = "";
 				if (params?.row?.org?.id?.length > 0) {
 					if (params?.row?.org?.image?.length > 0){
-						imageSource = params?.row.org?.image
+						imageSource = params?.row?.org?.image
 					}else {
 						imageSource = "/images/no_image.png"
 					}
-				}else {
-					if (userdata.active_org.image?.length > 0){
+				} else {
+					if (userdata?.active_org?.image?.length > 0){
 						imageSource = userdata?.active_org?.image
 					}else {
 						imageSource = "/images/no_image.png"
@@ -629,7 +636,7 @@ const RuntimeDebugger = (props) => {
 						  </Link>
 						</span>
 						</Tooltip>
-						<Tooltip arrow title="Force continue workflow. Only workflows for workflows in EXECUTING state. This is NOT a rerun, but way for Shuffle to figure out the next steps automatically. If the execution doesn't finish even after trying this, please contact support@shuffler.io"> 
+						<Tooltip arrow title={`Force continue workflow. Only workflows for workflows in EXECUTING state. This is NOT a rerun, but way for Shuffle to figure out the next steps automatically. If the execution doesn't finish even after trying this, please contact ${supportEmail}`}> 
 						  <IconButton
 							style={{marginLeft: 5, }}
 							disabled={params.row.status !== "EXECUTING"}
@@ -812,7 +819,7 @@ const RuntimeDebugger = (props) => {
 			<div style={{display: "flex", paddingTop: 50, }}>
 				<div style={{display: 'flex', flexDirection: 'column'}}>
 					<div style={{display: "flex", width: "100%", }}>
-							<h1 style={{flex: 3, whiteSpace: "nowrap" }}>Workflow Run Debugger {totalCount !== 0 ? ` (~${totalCount})` : ""}</h1>
+							<Typography  variant="h3" style={{flex: 3, whiteSpace: "nowrap" }}>Workflow Run Debugger {totalCount !== 0 ? ` (~${totalCount})` : ""}</Typography>
 					{selectedWorkflowExecutions.length > 0 ?
 					<ButtonGroup>
 						<Tooltip title="Reruns ALL selected workflows. This will make a new execution for them, and not continue the existing.">
@@ -890,7 +897,8 @@ const RuntimeDebugger = (props) => {
 						fullWidth
 						value={searchQuery}
 						style={{
-							backgroundColor: "#1a1a1a",
+							backgroundColor: theme.palette.backgroundColor,
+						  color: theme.palette.textColor,
 							marginTop: 20,
 							marginLeft: 10,
 							marginRight: 12,
@@ -901,7 +909,8 @@ const RuntimeDebugger = (props) => {
 						}}
 						InputProps={{
 							style: {
-							backgroundColor: "#1a1a1a",
+							backgroundColor: theme.palette.backgroundColor,
+							color: theme.palette.textColor,
 							fontSize: "1em",
 							height: 51,
 							width: 693,
@@ -951,7 +960,7 @@ const RuntimeDebugger = (props) => {
 							}
 							color="secondary"
 						/>
-						<Typography variant="body2" style={{color: "white", }}>Show workflow runs from suborgs</Typography>
+						<Typography variant="body2">Show workflow runs from suborgs</Typography>
 					</div>
 					) : null}
 					</div>
@@ -999,8 +1008,8 @@ const RuntimeDebugger = (props) => {
 				  classes={{ inputRoot: classes.inputRoot }}
 				  ListboxProps={{
 					style: {
-					  backgroundColor: "#1a1a1a",
-					  color: "white",
+					  backgroundColor: theme.palette.backgroundColor,
+					  color: theme.palette.textColor,
 					},
 				  }}
 				  getOptionLabel={(option) => {
@@ -1018,7 +1027,7 @@ const RuntimeDebugger = (props) => {
 				  options={workflows}
 				  fullWidth
 				  style={{
-					backgroundColor: "#1a1a1a",
+					backgroundColor: theme.palette.backgroundColor,
 					height: 50,
 					borderRadius: 4,
 					marginLeft: 5,
@@ -1063,8 +1072,13 @@ const RuntimeDebugger = (props) => {
 					  }>
 						<MenuItem
 						  style={{
-							backgroundColor: "#1a1a1a",
-							color: data.id === workflow.id ? "red" : "white",
+							backgroundColor: theme.palette.backgroundColor,
+							color: data.id === workflow.id ? "red" : theme.palette.textColor,
+						  }}
+						  sx={{
+							"&:hover": {
+								backgroundColor: theme.palette.hoverColor,
+							},
 						  }}
 						  value={data}
 						  onClick={(e) => {
@@ -1082,9 +1096,16 @@ const RuntimeDebugger = (props) => {
 					return (
 					  <TextField
 						style={{
-						  backgroundColor: "#1a1a1a",
+						  backgroundColor: theme.palette.backgroundColor,
+						  color: theme.palette.textColor,
 						  borderRadius: 4,
 						}}
+						inputProps={{
+							style: {
+							backgroundColor: theme.palette.backgroundColor,
+							color: theme.palette.textColor,
+							},
+						}}
 						{...params}
 						label="Workflow"
 						variant="outlined"
@@ -1128,9 +1149,7 @@ const RuntimeDebugger = (props) => {
 
 				<Tooltip title="Clear all filters and search parameters">
 					<Button
-						style={{ marginLeft: 10, minHeight: 60, marginTop: 10, backgroundColor: "#1a1a1a", border: "1px solid #424242", boxShadow: 'none', borderRadius: 4, width: 81, height: 51, marginRight: 15 }}
-						variant="contained"
-						color="primary"
+						style={{ marginLeft: 10, minHeight: 60, marginTop: 10, backgroundColor: theme.palette.backgroundColor, border: "1px solid #424242", boxShadow: 'none', borderRadius: 4, width: 81, height: 51, marginRight: 15 }}
 						onClick={() => {
 							setWorkflowId("")
 							setWorkflow({"id": "", "name": "All Workflows"})
diff --git a/frontend/src/components/SchedulesTab.jsx b/frontend/src/components/SchedulesTab.jsx
index 7ca85f0d..cc91db50 100644
--- a/frontend/src/components/SchedulesTab.jsx
+++ b/frontend/src/components/SchedulesTab.jsx
@@ -1,5 +1,5 @@
 import React, { forwardRef, memo, useContext, useEffect } from 'react';
-import theme from "../theme.jsx";
+import {getTheme} from "../theme.jsx";
 import { toast } from "react-toastify" ;
 import { 
 	Divider, 
@@ -33,6 +33,9 @@ const SchedulesTab = memo((props) => {
   const [pipelineModalOpen, setPipelineModalOpen] = React.useState(false);
   const [newPipelineValue, setNewPipelineValue] = React.useState("export | sigma /tmp/sigma_rules | to SHUFFLE_WEBHOOK");
 
+  const { themeMode, brandColor } = useContext(Context);
+  const theme = getTheme(themeMode, brandColor);
+
   useEffect(() => {
     if (allSchedules.length === 0 && webHooks.length === 0 && pipelines.length === 0) {
       handleGetAllTriggers()
@@ -142,11 +145,11 @@ const SchedulesTab = memo((props) => {
           }}
         >
             <DialogTitle>
-                <span style={{ color: "white" }}>
+                <Typography variant='h5' color="textPrimary" >
 					Run a Tenzir pipeline
-				</span>
+				</Typography>
 				<Typography variant="body2" color="textSecondary" style={{marginTop: 10, }}>
-					Alpha feature. Deploys to the first available Orborus location. <a href="https://docs.tenzir.com/pipelines" target="_blank" rel="noopener noreferrer" style={{ color: "#ff8544" }}>Explore Tenzir Pipelines</a>. The example below exports everything in the Tenzir database, runs Sigma rules on it, and forwards the results to a Shuffle webhook.
+					Alpha feature. Deploys to the first available Orborus location. <a href="https://docs.tenzir.com/pipelines" target="_blank" rel="noopener noreferrer" style={{ color: theme.palette.primary.main }}>Explore Tenzir Pipelines</a>. The example below exports everything in the Tenzir database, runs Sigma rules on it, and forwards the results to a Shuffle webhook.
 				</Typography>
             </DialogTitle>
             <DialogContent>
@@ -173,17 +176,16 @@ const SchedulesTab = memo((props) => {
             </DialogContent>
             <DialogActions>
                 <Button
-                    style={{ borderRadius: "2px", fontSize: 16, textTransform: "none", color: "#ff8544" }}
+                    style={{ borderRadius: "2px", fontSize: 16, textTransform: "none", color: theme.palette.primary.main }}
                     onClick={() => {
 						setPipelineModalOpen(false)
 					}}
-                    color="primary"
                 >
                     Cancel
                 </Button>
                 <Button
                     variant="contained"
-                    style={{ borderRadius: "2px", fontSize: 16, textTransform: "none", backgroundColor: "#ff8544", color: "#1a1a1a" }}
+                    style={{ borderRadius: "2px", fontSize: 16, textTransform: "none",  }}
                     onClick={() => {
                         submitPipelineWrapper(newPipelineValue)
                     }}
@@ -472,7 +474,7 @@ const SchedulesTab = memo((props) => {
       height: "100%",
       transition: 'width 0.3s ease',
       padding: '27px 10px 27px 27px',
-      backgroundColor: '#212121',
+      backgroundColor: theme.palette.platformColor,
       borderTopRightRadius: 8,
       borderBottomRightRadius: 8,
       borderLeft: '1px solid #494949',
@@ -480,36 +482,36 @@ const SchedulesTab = memo((props) => {
 
 	  {NewPipelineView} 
 
-      <div style={{height: "100%", maxHeight: 1700, overflowY: "auto", scrollbarColor: '#494949 transparent', scrollbarWidth: 'thin'}}>
-      <h2 style={{ marginBottom: 8, marginTop: 0, color: "#FFFFFF"  }}>
+      <div style={{height: "100%", maxHeight: 1700, overflowY: "auto", scrollbarColor: theme.palette.scrollbarColorTransparent, scrollbarWidth: 'thin'}}>
+      <Typography variant='h5' color="textPrimary" style={{ marginBottom: 8, marginTop: 0, }}>
 	  	Triggers	
-	  </h2>
-      <Typography variant="body1" style={{ marginBottom: 50, marginTop: 0, }} color="textSecondary">
+	  </Typography>
+      <Typography variant="body2" style={{ marginBottom: 50, marginTop: 0, }} color="textSecondary">
 	  	Triggers are Automatic Workflow starters. <b>Status: Schedules ({allSchedules.length}), Webhooks ({webHooks.length}), Pipelines ({pipelines.length})</b>
 	  </Typography>
 
       <div>
-        <h4 style={{ marginBottom: 8, marginTop: 0, color: "#FFFFFF"  }}>
+        <Typography variant='h6' color="textPrimary" style={{ marginBottom: 8, marginTop: 0, fontWeight: 500}}>
 	  		Schedules
-	  	</h4>
-        <span style={{color:textColor}}>
+	  	</Typography>
+        <Typography variant='body2' color="textSecondary">
           Schedules used in Workflows. Makes locating and control easier.{" "}
           <a
             target="_blank"
             rel="noopener noreferrer"
             href="/docs/organizations#schedules"
-            style={{ color:"#FF8444" }}
+            style={{ color: theme.palette.primary.main }}
           >
             Learn more
           </a>
-        </span>
+        </Typography>
       </div>
-      <div style={{height: "100%", width: "calc(100% - 20px)", scrollbarColor: '#494949 transparent', scrollbarWidth: 'thin'}}>
+      <div style={{height: "100%", width: "calc(100% - 20px)", scrollbarColor: theme.palette.scrollbarColorTransparent, scrollbarWidth: 'thin'}}>
       <div
         style={{
           borderRadius: 4,
           marginTop: 24,
-          border: "1px solid #494949",
+          border: theme.palette.defaultBorder,
           width: "100%",
           overflowX: "auto", 
           paddingBottom: 0,
@@ -525,7 +527,7 @@ const SchedulesTab = memo((props) => {
                 overflowX: "auto",
                 paddingBottom: 0
         }}>
-          <ListItem style={{width: "100%", paddingTop: 10, paddingBottom: 10, paddingRight: 10,  borderBottom: "1px solid #494949", display: 'table-row'}}>
+          <ListItem style={{width: "100%", paddingTop: 10, paddingBottom: 10, paddingRight: 10,  borderBottom: theme.palette.defaultBorder, display: 'table-row'}}>
           {["Name", "Interval", "Environment", "Workflow", "Argument", "Action"].map((header, index) => (
                           <ListItemText
                               key={index}
@@ -535,7 +537,7 @@ const SchedulesTab = memo((props) => {
                                 padding: index === 0 ? "0px 8px 8px 15px": "0px 8px 8px 8px",
                                 whiteSpace: "nowrap",
                                 textOverflow: "ellipsis",
-                                borderBottom: "1px solid #494949",
+                                borderBottom: theme.palette.defaultBorder,
                               }}
                           />
                       ))}
@@ -546,7 +548,7 @@ const SchedulesTab = memo((props) => {
                   key={rowIndex}
                   style={{
                       display: "table-row",
-                      backgroundColor: "#212121",
+                      backgroundColor: theme.palette.platformColor,
                   }}
               >
                   {Array(6)
@@ -563,7 +565,7 @@ const SchedulesTab = memo((props) => {
                                   variant="text"
                                   animation="wave"
                                   sx={{
-                                      backgroundColor: "#1a1a1a",
+                                      backgroundColor: theme.palette.loaderColor,
                                       height: "20px",
                                       borderRadius: "4px",
                                   }}
@@ -575,13 +577,13 @@ const SchedulesTab = memo((props) => {
           ):(
             allSchedules?.length === 0 ? (
               <div style={{ textAlign: 'center'}}>
-                <Typography style={{color: "#FFFFFF", fontSize: 16, padding: 20, textAlign: 'center'}}>No schedules found</Typography>
+                <Typography style={{color: theme.palette.text.primary, fontSize: 16, padding: 20, textAlign: 'center'}}>No schedules found</Typography>
               </div>
             ):(
               allSchedules.map((schedule, index) => {
-                var bgColor = "#212121"
+                var bgColor = themeMode === "dark" ? "#212121" : "#FFFFFF";
                 if (index % 2 === 0) {
-                  bgColor = "#1a1a1a";
+                    bgColor = themeMode === "dark" ? "#1A1A1A" :  "#EAEAEA";
                 }
         
                 return (
@@ -645,7 +647,7 @@ const SchedulesTab = memo((props) => {
                                   rel="noopener noreferrer"
                                   style={{
                                     textDecoration: "none",
-                                    color: "#f85a3e",
+                                    color: theme.palette.primary.main,
                                   }}
                                   href={`/workflows/${schedule.workflow_id}`}
                                   target="_blank"
@@ -658,7 +660,7 @@ const SchedulesTab = memo((props) => {
                                       style={{
                                         color:
                                           schedule.workflow_id !== "global"
-                                            ? "#FF8444"
+                                            ? theme.palette.primary.main
                                             : "grey",
                                       }}
                                     />
@@ -698,8 +700,7 @@ const SchedulesTab = memo((props) => {
                           style={{
                             textTransform: 'none',
                             fontSize: 16,
-                            color: schedule.status === "running" ? '#1a1a1a' : null,
-                            backgroundColor: schedule.status === "running" ? '#ff8544' : null,
+                            width: 150,
                           }}
                           color={schedule.status === "running" ? "secondary" : "primary"}
                           variant={schedule.status === "running" ? "contained" : "outlined"}
@@ -725,23 +726,23 @@ const SchedulesTab = memo((props) => {
       </div>
 
         <div style={{ marginTop: 50, marginBottom: 20 }}>
-          <h4 style={{color: "#FFFFFF"}} >Webhooks</h4>
-          <span> Webhooks used in Shuffle workflows.&nbsp;
+          <Typography variant='h6' color="textPrimary">Webhooks</Typography>
+          <Typography variant='body2' color="textSecondary"> Webhooks used in Shuffle workflows.&nbsp;
             <a
               target="_blank"
               rel="noopener noreferrer"
               href="/docs/triggers#webhooks"
-              style={{ textDecoration: "none", color: "#f85a3e" }}
+              style={{ color: theme.palette.primary.main }}
             >
               Learn more
             </a>
-          </span>
+          </Typography>
         </div>
         <div
               style={{
               borderRadius: 4,
               marginTop: 24,
-              border: "1px solid #494949",
+              border: theme.palette.defaultBorder,
               width: "100%",
               overflowX: "auto", 
               paddingBottom: 0,
@@ -757,7 +758,7 @@ const SchedulesTab = memo((props) => {
                     paddingBottom: 0,
                     minWidth: 600,
             }}>
-        <ListItem style={{width:"100%", borderBottom:"1px solid #494949", display: "table-row"}}>
+        <ListItem style={{width:"100%", borderBottom:theme.palette.defaultBorder, display: "table-row"}}>
         {["Name", "Environment", "Workflow", "URL", "Action"].map((header, index) => (
                 <ListItemText
                     key={index}
@@ -767,7 +768,7 @@ const SchedulesTab = memo((props) => {
                       padding: index === 0 ? "0px 8px 8px 15px": "0px 8px 8px 8px",
                       whiteSpace: "nowrap",
                       textOverflow: "ellipsis",
-                      borderBottom: "1px solid #494949",
+                      borderBottom: theme.palette.defaultBorder,
                       position: "sticky",
                     }}
                 />
@@ -779,7 +780,7 @@ const SchedulesTab = memo((props) => {
                 key={rowIndex}
                 style={{
                     display: "table-row",
-                    backgroundColor: "#212121",
+                    backgroundColor: theme.palette.platformColor,
                 }}
             >
                 {Array(5)
@@ -796,7 +797,7 @@ const SchedulesTab = memo((props) => {
                                 variant="text"
                                 animation="wave"
                                 sx={{
-                                    backgroundColor: "#1a1a1a",
+                                    backgroundColor: theme.palette.loaderColor,
                                     height: "20px",
                                     borderRadius: "4px",
                                 }}
@@ -808,13 +809,13 @@ const SchedulesTab = memo((props) => {
         ):(
            webHooks?.length === 0 ? (
               <div style={{textAlign: "center"}}>
-                  <Typography style={{color: "#FFFFFF", padding: 20, fontSize: 16, textAlign: 'center'}}>No webhooks found</Typography>
+                  <Typography style={{color: theme.palette.text.primary, padding: 20, fontSize: 16, textAlign: 'center'}}>No webhooks found</Typography>
               </div>
           ):(
             webHooks.map((webhook, index) => {
-              var bgColor = "#212121"
+              var bgColor = themeMode === "dark" ? "#212121" : "#FFFFFF";
               if (index % 2 === 0) {
-                bgColor = "#1a1a1a";
+                  bgColor = themeMode === "dark" ? "#1A1A1A" :  "#EAEAEA";
               }
   
               return (
@@ -840,7 +841,7 @@ const SchedulesTab = memo((props) => {
 																rel="noopener noreferrer"
 																style={{
 																	textDecoration: "none",
-																	color: "#f85a3e",
+																	color: theme.palette.primary.main,
 																}}
 																href={`/workflows/${webhook.workflows[0]}`}
 																target="_blank"
@@ -853,7 +854,7 @@ const SchedulesTab = memo((props) => {
 																		style={{
 																			color:
                                       webhook.workflows[0].workflow_id !== "global"
-																					? "#FF8444"
+																					? theme.palette.primary.main
 																					: "grey",
 																		}}
 																	/>
@@ -904,6 +905,7 @@ const SchedulesTab = memo((props) => {
                           fontSize: 16,
                           color:webhook.status === "running" ? '#1a1a1a' : null,
                           backgroundColor: webhook.status === "running" ? '#ff8544' : null,
+                          width: 150,
                         }}
                         color={webhook.status === "running" ? "secondary" : "primary"}
                         variant={webhook.status === "running" ? "contained" : "outlined"}
@@ -928,24 +930,24 @@ const SchedulesTab = memo((props) => {
           </List>
         </div>
         <div style={{ marginTop: 50, marginBottom: 20 }}>
-          <h4 style={{color: "#FFFFFF"}}>Pipelines</h4>
+          <Typography variant='h6' color="textPrimary" >Pipelines</Typography>
 
-          <span>
+          <Typography variant='body2' color="textSecondary" >
             Controls Pipelines on your Orborus Runners, e.g. for Log Ingestion, MQ subscriptions or Sigma Detections.{" "}
             <a
               target="_blank"
               rel="noopener noreferrer"
               href="/docs/triggers#pipelines"
-              style={{ textDecoration: "none", color: "#f85a3e" }}
+              style={{ color: theme.palette.primary.main }}
             >
               Learn more
             </a>
-          </span>
+          </Typography>
 
 	  	  <div style={{marginBottom: 10, marginTop: 10,  }}/>
 
 		  <Button
-		  	style={{ backgroundColor: '#ff8544', color: "#1a1a1a", borderRadius: 4, textTransform: "capitalize", fontSize: 16,  }}
+		  	style={{ borderRadius: 4, textTransform: "capitalize", fontSize: 16,  }}
 		  	variant="contained"
 		  	color="primary"
 		  	onClick={() => setPipelineModalOpen(true)}
@@ -958,7 +960,7 @@ const SchedulesTab = memo((props) => {
               style={{
               borderRadius: 4,
               marginTop: 24,
-              border: "1px solid #494949",
+              border: theme.palette.defaultBorder,
               width: "100%",
               overflowX: pipelines?.length === 0 ? "hidden" : "auto", 
               paddingBottom: 0,
@@ -974,7 +976,7 @@ const SchedulesTab = memo((props) => {
                     overflowX: "auto",
                     paddingBottom: 0
             }}>
-            <ListItem style={{width:"100%", borderBottom:"1px solid #494949", display: "table-row"}}>
+            <ListItem style={{width:"100%", borderBottom:theme.palette.defaultBorder, display: "table-row"}}>
             {["Command", "Environment", "Total Runs", "Actions"].map((header, index) => (
                     <ListItemText
                         key={index}
@@ -984,7 +986,7 @@ const SchedulesTab = memo((props) => {
                           padding: index === 0 ? "0px 8px 8px 15px": "0px 8px 8px 8px",
                           whiteSpace: "nowrap",
                           textOverflow: "ellipsis",
-                          borderBottom: "1px solid #494949",
+                          borderBottom: theme.palette.defaultBorder,
                           position: "sticky",
                         }}
                     />
@@ -997,7 +999,7 @@ const SchedulesTab = memo((props) => {
 						key={rowIndex}
 						style={{
 							display: "table-row",
-							backgroundColor: "#212121",
+							backgroundColor: theme.palette.platformColor,
 						}}
 					>
 						{Array(5)
@@ -1015,7 +1017,7 @@ const SchedulesTab = memo((props) => {
 											variant="text"
 											animation="wave"
 											sx={{
-												backgroundColor: "#1a1a1a",
+												backgroundColor: theme.palette.loaderColor,
 												height: "20px",
 												borderRadius: "4px",
 											}}
@@ -1031,14 +1033,14 @@ const SchedulesTab = memo((props) => {
             ): (
               pipelines?.length === 0 ? ( 
                 <div style={{width: "100%", textAlign: "center", }}>
-                  <Typography style={{color: "#FFFFFF", padding: 20,width: "100%", fontSize: 16, textAlign: 'center'}}>No pipeline trigger found</Typography>
+                  <Typography style={{color: theme.palette.text.primary, padding: 20,width: "100%", fontSize: 16, textAlign: 'center'}}>No pipeline trigger found</Typography>
                 </div>
 
               ):(
                 pipelines.map((pipeline, index) => {
-                  var bgColor = "#212121"
+                  var bgColor = themeMode === "dark" ? "#212121" : "#FFFFFF";
                   if (index % 2 === 0) {
-                    bgColor = "#1a1a1a";
+                      bgColor = themeMode === "dark" ? "#1A1A1A" :  "#EAEAEA";
                   }
 
                   return (
@@ -1094,4 +1096,3 @@ const SchedulesTab = memo((props) => {
 });
 
 export default SchedulesTab;
-
diff --git a/frontend/src/components/SearchData.jsx b/frontend/src/components/SearchData.jsx
index 0a53e7e9..a77560dd 100644
--- a/frontend/src/components/SearchData.jsx
+++ b/frontend/src/components/SearchData.jsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useRef, useContext } from 'react';
 
-import theme from '../theme.jsx';
+import {getTheme} from '../theme.jsx';
 import { useNavigate, Link, useParams } from "react-router-dom";
 import { toast } from "react-toastify" 
 
@@ -47,16 +47,19 @@ const chipStyle = {
     backgroundColor: "#3d3f43", height: 30, marginRight: 5, paddingLeft: 5, paddingRight: 5, height: 28, cursor: "pointer", borderColor: "#3d3f43", color: "white",
 }
 
-const searchClient = algoliasearch("JNSS5CFDZZ", "db08e40265e2941b9a7d8f644b6e5240")
+const searchClient = algoliasearch("JNSS5CFDZZ", "c8f882473ff42d41158430be09ec2b4e")
 const SearchData = props => {
     const { serverside, globalUrl, userdata } = props
     let navigate = useNavigate();
-    const { searchBarModalOpen, setSearchBarModalOpen } = useContext(Context);
+    const { searchBarModalOpen, setSearchBarModalOpen, isDocSearchModalOpen } = useContext(Context);
     const borderRadius = 3
     const node = useRef()
     const [searchOpen, setSearchOpen] = useState(false)
     const [oldPath, setOldPath] = useState("")
     const [value, setValue] = useState("");
+    const isDocSearchModal = isDocSearchModalOpen;
+    const {themeMode, supportEmail} = useContext(Context);
+    const theme = getTheme(themeMode)
 
     const handleLinkClick = () => {
         if (searchBarModalOpen) {
@@ -90,6 +93,8 @@ const SearchData = props => {
         const [inputValue, setInputValue] = useState(currentRefinement);
 
         const textFieldRef = useRef(null);
+        const debounceTimeoutRef = useRef(null);
+
         const keyPressHandler = (e) => {
             if (e.key === "Enter") {
                 e.preventDefault();
@@ -110,10 +115,25 @@ const SearchData = props => {
         }, [searchOpen]);
 
         useEffect(() => {
-            if (currentRefinement !== inputValue) {
-                refine(inputValue);
+            // Clear any existing timeout to prevent multiple executions
+            if (debounceTimeoutRef.current) {
+                clearTimeout(debounceTimeoutRef.current);
             }
-        }, [currentRefinement]);
+
+            // Set a new timeout that will execute the search after a 200ms delay
+            debounceTimeoutRef.current = setTimeout(() => {
+                refine(inputValue);
+                setSearchOpen(inputValue.trim() !== '');
+            }, 200);
+
+            // Cleanup function that runs when component unmounts or when dependencies change
+            // This ensures we don't have any hanging timeouts
+            return () => {
+                if (debounceTimeoutRef.current) {
+                    clearTimeout(debounceTimeoutRef.current);
+                }
+            };
+        }, [inputValue, refine]); // Effect runs when inputValue or refine function changes
 
         return (
 
@@ -122,14 +142,13 @@ const SearchData = props => {
             >
                 <TextField
                     fullWidth
-                    style={{ zIndex: 1100, marginTop: -20, marginBottom: 200, position: "fixed", backgroundColor: theme.palette.inputColor, borderRadius: borderRadius, width: 685, }}
+                    style={{ zIndex: 1100, marginTop: -20, marginBottom: 200, position: "fixed", backgroundColor: theme.palette.textFieldStyle.backgroundColor, borderRadius: borderRadius, width: 690, }}
                     InputProps={{
                         style: {
-                            color: "white",
+                            color: theme.palette.textFieldStyle.color,
                             fontSize: "1em",
                             height: 50,
                             margin: 0,
-                            fontSize: "0.9em",
                             paddingLeft: 10,
                         },
                         disableUnderline: true,
@@ -149,7 +168,7 @@ const SearchData = props => {
                     autoComplete='off'
                     type="search"
                     color="primary"
-                    placeholder="Find Public Apps, Workflows, Documentation..."
+                    placeholder={isDocSearchModal ? "Type to search documentation..." : "Find Public Apps, Workflows, Documentation..."}
                     value={inputValue}
                     id="shuffle_search_field"
                     onClick={(event) => {
@@ -163,12 +182,6 @@ const SearchData = props => {
                     onChange={(event) => {
                         const newValue = event.target.value;
                         setInputValue(newValue);
-                        refine(newValue);
-                        if (newValue.trim() !== '') {
-                            setSearchOpen(true);
-                        } else {
-                            setSearchOpen(false);
-                        }
                     }}
                     onKeyDown={keyPressHandler}
                     inputRef={textFieldRef}
@@ -205,12 +218,12 @@ const SearchData = props => {
         const baseImage = <CodeIcon />
 
         return (
-            <Card elevation={0} style={{ marginRight: 10, marginTop: 50, color: "white", zIndex: 1002, backgroundColor: theme.palette.inputColor, width: "100%", left: 75, boxShadows: "none", }}>
+            <Card elevation={0} style={{ marginRight: 10, marginTop: 50, color: theme.palette.text.primary, zIndex: 1002, backgroundColor: theme.palette.textFieldStyle.backgroundColor, width: "100%", left: 75, boxShadows: "none", }}>
                 <Typography variant="h6" style={{ margin: "10px 10px 0px 20px", color: "#FF8444", borderBottom: "1px solid", width: 105 }}>
                     Workflows
                 </Typography>
 
-                <List style={{ backgroundColor: theme.palette.inputColor, }}>
+                <List style={{ backgroundColor: themeMode === "dark" ? "#2A2A2A" : "#F5F5F5", }}>
                     {hits.length === 0 ?
                         <ListItem style={outerlistitemStyle}>
                             <ListItemAvatar onClick={() => console.log(hits)}>
@@ -230,7 +243,7 @@ const SearchData = props => {
                                 overflowX: "hidden",
                                 overflowY: "hidden",
                                 borderBottom: "1px solid rgba(255,255,255,0.4)",
-                                backgroundColor: mouseHoverIndex === index ? "#1f2023" : "inherit",
+                                backgroundColor: mouseHoverIndex === index ? theme.palette.hoverColor : "inherit",
                                 cursor: "pointer",
                                 marginLeft: 5,
                                 marginRight: 5,
@@ -384,14 +397,14 @@ const SearchData = props => {
       })
         .then((response) => {
           if (response.status !== 200) {
-			toast(`Failed to ${type} the app for your organization. Please try again or contact support@shuffler.io`)
+			toast(`Failed to ${type} the app for your organization. Please try again or contact ${supportEmail}`)
           }
 
           return response.json()
         })
         .then((responseJson) => {
           if (responseJson.success === false) {
-            toast(`Failed to ${type} the app for your organization. Please try again or contact support@shuffler.io for more info`) 
+            toast(`Failed to ${type} the app for your organization. Please try again or contact ${supportEmail} for more info`) 
 		  } else {
 			  toast(`App successfully ${type}d. It may now be used in your workflows.`)
 		  }
@@ -426,7 +439,7 @@ const SearchData = props => {
         const baseImage = <LibraryBooksIcon />
 
         return (
-            <Card elevation={0} style={{ marginRight: 10, color: "white", zIndex: 999, backgroundColor: theme.palette.inputColor, width: 685, boxShadows: "none", }}>
+            <Card elevation={0} style={{ marginRight: 10, color: "white", zIndex: 999, backgroundColor: theme.palette.textFieldStyle.backgroundColor, width: 685, boxShadows: "none", }}>
                 {/* <IconButton style={{ zIndex: 5000, position: "absolute", right: 14, color: "grey" }} onClick={() => {
                     setSearchOpen(false)
                 }}>
@@ -436,7 +449,7 @@ const SearchData = props => {
                     Apps
                 </Typography>
 
-                <List style={{ backgroundColor: theme.palette.inputColor, }}>
+                <List style={{ backgroundColor: themeMode === "dark" ? "#2A2A2A" : "#F5F5F5", }}>
                     {hits.length === 0 ?
                         <ListItem style={outerlistitemStyle}>
                             <ListItemAvatar onClick={() => console.log(hits)}>
@@ -456,7 +469,7 @@ const SearchData = props => {
                                 overflowX: "hidden",
                                 overflowY: "hidden",
                                 borderBottom: "1px solid rgba(255,255,255,0.4)",
-                                backgroundColor: mouseHoverIndex === index ? "#1f2023" : "inherit",
+                                backgroundColor: mouseHoverIndex === index ? theme.palette.hoverColor : "inherit",
                                 cursor: "pointer",
                                 marginLeft: 5,
                                 marginRight: 5,
@@ -605,7 +618,11 @@ const SearchData = props => {
         }
 
         if (hits.length > 4) {
-            hits = hits.slice(0, 4)
+            if(!isDocSearchModal) {
+                hits = hits.slice(0, 4)
+            } else {
+                hits = hits.slice(0, 15)
+            }
         }
 
         const type = "documentation"
@@ -614,15 +631,19 @@ const SearchData = props => {
         //console.log(type, hits.length, hits)
 
         return (
-            <Card elevation={0} style={{ marginRight: 10, marginTop: 50, color: "white", zIndex: 1002, backgroundColor: theme.palette.inputColor, width: "100%", left: 470, boxShadows: "none", }}>
+            <Card elevation={0} style={{ marginRight: 10, marginTop: isDocSearchModal ? 0 : 50, color: "white", zIndex: 1002, backgroundColor: theme.palette.textFieldStyle.backgroundColor, width: "100%", left: 470, boxShadows: "none", }}>
                 {/* <IconButton style={{ zIndex: 5000, position: "absolute", right: 14, color: "grey" }} onClick={() => {
                     setSearchOpen(false)
                 }}>
                     <CloseIcon />
                 </IconButton> */}
-                <Typography variant="h6" style={{ margin: "10px 10px 0px 20px", color: "#FF8444", borderBottom: "1px solid", width: 152 }}>
-                    Documentation
-                </Typography>
+                {
+                    !isDocSearchModal && (
+                        <Typography variant="h6" style={{ margin: "10px 10px 0px 20px", color: "#FF8444", borderBottom: "1px solid", width: 152 }}>
+                            Documentation
+                        </Typography>
+                    )
+                }
                 {/*
 				<IconButton edge="end" aria-label="delete" style={{position: "absolute", top: 5, right: 15,}} onClick={() => {
 					setSearchOpen(false)
@@ -630,7 +651,7 @@ const SearchData = props => {
 					<DeleteIcon />
 				</IconButton>
 				*/}
-                <List style={{ backgroundColor: theme.palette.inputColor, }}>
+                <List style={{ backgroundColor: themeMode === "dark" ? "#2A2A2A" : "#F5F5F5", marginTop: isDocSearchModal ? 35 : 0, }}>
                     {hits.length === 0 ?
                         <ListItem style={outerlistitemStyle}>
                             <ListItemAvatar onClick={() => console.log(hits)}>
@@ -650,12 +671,12 @@ const SearchData = props => {
                                 overflowX: "hidden",
                                 overflowY: "hidden",
                                 borderBottom: "1px solid rgba(255,255,255,0.4)",
-                                backgroundColor: mouseHoverIndex === index ? "#1f2023" : "inherit",
+                                backgroundColor: mouseHoverIndex === index ? theme.palette.hoverColor : "inherit",
                                 cursor: "pointer",
                                 marginLeft: 5,
                                 marginRight: 5,
-                                maxHeight: 75,
-                                minHeight: 75,
+                                maxHeight: isDocSearchModal ? 100 : 75,
+                                minHeight: isDocSearchModal ? 100 : 75,
                                 maxWidth: 420,
                                 minWidth: "100%",
                             }
@@ -666,9 +687,13 @@ const SearchData = props => {
                                 (hit.name.charAt(0).toUpperCase() + hit.name.slice(1)).replaceAll("_", " ")
 
                             if (name.length > 30) {
-                                name = name.slice(0, 30) + "..."
+                                if(isDocSearchModal) {
+                                    name = name.slice(0, 70) + "..."
+                                } else {
+                                    name = name.slice(0, 30) + "..."
+                                }
                             }
-                            const secondaryText = hit.data !== undefined ? hit.data.slice(0, 40) + "..." : ""
+                            const secondaryText = hit.data !== undefined ? hit.data.slice(0, 80) + "..." : ""
                             const avatar = hit.image_url === undefined ?
                                 baseImage
                                 :
@@ -719,7 +744,7 @@ const SearchData = props => {
                                         </ListItemAvatar>
                                         <ListItemText
                                             primary={name}
-                                            secondary={secondaryText}
+                                            secondary={<div style={{ padding: '8px 0' }}>{secondaryText}</div>}
                                         />
                                         {/*
 									<ListItemSecondaryAction>
@@ -763,13 +788,20 @@ const SearchData = props => {
             window.open(modifiedUrl, '_blank');
         };
         return (
-            <Card elevation={0} style={{ marginRight: 10, marginTop: 50, color: "white", zIndex: 1002, backgroundColor: theme.palette.inputColor, width: "100%", left: 470, boxShadows: "none", }}>
+            <Card elevation={0} style={{ marginRight: 10, marginTop: 50, color: "white", zIndex: 1002, backgroundColor: theme.palette.textFieldStyle.backgroundColor, width: "100%", left: 470, boxShadows: "none", }}>
                 <Typography variant="h6" style={{ margin: "10px 10px 0px 20px", color: "#FF8444", borderBottom: "1px solid", width: 152 }}>
                     Discord Chat
                 </Typography>
-                <List style={{ backgroundColor: theme.palette.inputColor, }}>
+                <List style={{ backgroundColor: themeMode === "dark" ? "#2A2A2A" : "#F5F5F5", }}>
                 {hits.length === 0 ?
-                        <ListItem style={outerlistitemStyle}>
+                        <ListItem
+                        sx={{
+                          "&:hover": {
+                            backgroundColor: theme.palette.hoverColor
+                          }
+                        }}
+                        style={outerlistitemStyle}
+                      >                                            
                             <ListItemAvatar onClick={() => console.log(hits)}>
                                 <Avatar>
                                     <FolderIcon />
@@ -781,7 +813,11 @@ const SearchData = props => {
                             />
                         </ListItem>:
                         hits.map((chat, index) => (
-                    <ListItem onClick={() => handleHitClick(chat.url)} key={index} style={{ cursor: "pointer", borderBottom: "1px solid rgba(255,255,255,0.4)" }} onMouseOver={() => setMouseHoverIndex(index)}>
+                    <ListItem  sx={{
+                        "&:hover": {
+                          backgroundColor: theme.palette.hoverColor
+                        }
+                      }} onClick={() => handleHitClick(chat.url)} key={index} style={{ cursor: "pointer", borderBottom: "1px solid rgba(255,255,255,0.4)" }} onMouseOver={() => setMouseHoverIndex(index)}>
                         <ListItemAvatar>
                             <Avatar src="/discord-logo.png" />
                         </ListItemAvatar>
@@ -897,28 +933,38 @@ const SearchData = props => {
 
     const modalView = (
         <div>
-            <Grid container style={{ display: "contents", }}>
-                <Grid item xs="auto" style={{}}>
-                    <Index indexName="appsearch">
-                        <CustomAppHits />
-                    </Index>
+            {
+                !isDocSearchModal ? (
+                <Grid container style={{ display: "contents", }}>
+                    <Grid item xs="auto" style={{}}>
+                        <Index indexName="appsearch">
+                            <CustomAppHits />
+                        </Index>
+                    </Grid>
+                    <Grid item xs="auto" style={{}}>
+                        <Index indexName="workflows">
+                            <CustomWorkflowHits />
+                        </Index>
+                    </Grid>
+                    <Grid item xs="auto" style={{}}>
+                        <Index indexName="documentation">
+                            <CustomDocHits />
+                        </Index>
+                    </Grid>
+                    <Grid item xs="auto" style={{}}>
+                        <Index indexName="discord_chat">
+                            <CustomDiscordHits />
+                        </Index>
+                    </Grid>
                 </Grid>
-                <Grid item xs="auto" style={{}}>
-                    <Index indexName="workflows">
-                        <CustomWorkflowHits />
-                    </Index>
-                </Grid>
-                <Grid item xs="auto" style={{}}>
-                    <Index indexName="documentation">
-                        <CustomDocHits />
-                    </Index>
-                </Grid>
-                <Grid item xs="auto" style={{}}>
-                    <Index indexName="discord_chat">
-                        <CustomDiscordHits />
-                    </Index>
-                </Grid>
-            </Grid>
+                ) : (
+                    <Grid item xs="auto" style={{width: "100%"}}>
+                        <Index indexName="documentation">
+                            <CustomDocHits />
+                        </Index>
+                    </Grid>
+                )
+            }
         </div>
     )
 
@@ -932,7 +978,7 @@ const SearchData = props => {
                 <CustomSearchBox />
                 {modalView}
             </InstantSearch>
-            {gettingStartData}
+            {!isDocSearchModal && gettingStartData}
         </div>
     )
 }
diff --git a/frontend/src/components/Searchfield.jsx b/frontend/src/components/Searchfield.jsx
index ec257cc6..4447c73b 100644
--- a/frontend/src/components/Searchfield.jsx
+++ b/frontend/src/components/Searchfield.jsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useRef, useContext } from 'react';
 
-import theme from '../theme.jsx';
+import {getTheme} from '../theme.jsx';
 import { useNavigate, Link, useParams } from "react-router-dom";
 import SearchBox from "../components/SearchData.jsx";
 
@@ -46,7 +46,8 @@ const chipStyle = {
 
 const SearchField = props => {
 	const { serverside, userdata, isMobile, isLoaded, globalUrl, isHeader, isLoggedIn, small, rounded } = props
-
+	const {themeMode} = useContext(Context);
+	const theme = getTheme(themeMode);
 	const {searchBarModalOpen, setSearchBarModalOpen} = useContext(Context);
 
 	let navigate = useNavigate();
@@ -87,7 +88,7 @@ const SearchField = props => {
 					height: 785,
 					borderRadius: 16,
 					border: "1px solid var(--Container-Stroke, #494949)",
-					background: "var(--Container, #000000)",
+					background: theme.palette.DialogStyle.backgroundColor,
 					boxShadow: "0px 16px 24px 8px rgba(0, 0, 0, 0.25)",
 					zIndex: 13000,
 				},
diff --git a/frontend/src/components/ShuffleCodeEditor1.jsx b/frontend/src/components/ShuffleCodeEditor1.jsx
index 1f713c5a..043c5de2 100644
--- a/frontend/src/components/ShuffleCodeEditor1.jsx
+++ b/frontend/src/components/ShuffleCodeEditor1.jsx
@@ -1,4 +1,4 @@
-import React, { useRef, useState, useEffect, useLayoutEffect, } from 'react';
+import React, { useRef, useState, useEffect, useLayoutEffect, useContext } from 'react';
 import { toast } from 'react-toastify';
 import '../codeeditor-index.css';
 import {
@@ -17,8 +17,8 @@ import {
 	ButtonGroup,
 	Collapse,
 } from '@mui/material';
-
-import theme from '../theme.jsx';
+import { Context } from '../context/ContextApi.jsx';
+import {getTheme} from '../theme.jsx';
 import Checkbox from '@mui/material/Checkbox';
 import { isMobile } from "react-device-detect"
 import { NestedMenuItem } from "mui-nested-menu"
@@ -46,6 +46,7 @@ import {
 	DragIndicator as DragIndicatorIcon,
 	RestartAlt as RestartAltIcon,
 	ArrowForward as ArrowForwardIcon,
+	KeyboardReturn as KeyboardReturnIcon, 
 } from '@mui/icons-material';
 
 
@@ -63,6 +64,7 @@ import AceEditor from "react-ace";
 import ace from "ace-builds";
 import 'ace-builds/src-noconflict/mode-python';
 import 'ace-builds/src-noconflict/mode-json';
+import 'ace-builds/src-noconflict/mode-yaml';
 //import 'ace-builds/src-noconflict/theme-twilight';
 //import 'ace-builds/src-noconflict/theme-solarized_dark';
 import 'ace-builds/src-noconflict/theme-gruvbox';
@@ -89,13 +91,17 @@ const liquidFilters = [
 const pythonFilters = [
 	{ "name": "Hello World", "value": `print("hello world")`, "example": `` },
 	{ "name": "Using Shuffle variables", "value": `import json\nnodevalue = r\"\"\"$exec\"\"\"\nif not nodevalue:\n  nodevalue = r\"\"\"{\"sample\": \"string\", \"int\": 1}\"\"\"\n  \njsondata = json.loads(nodevalue)\nprint(jsondata)`, "example": `` },
+	{ "name": "Filter a list", "value": `import json\nnodevalue = r\"\"\"$exec\"\"\"\nif not nodevalue:\n  nodevalue = r\"\"\"[{\"sample\": \"string\", \"int\": 1, "malicious": "no"}, {\"sample\": \"string2\", \"int\": 1, "malicious": "yes"}]\"\"\"\n  \njsondata = json.loads(nodevalue)\nfiltered = []\nfor item in jsondata:\n  try:\n    if item[\"malicious\"] == \"yes\":\n      filtered.append(item)\n  except:\n    pass\nprint(json.dumps(filtered))`, "example": `` },
 	{ "name": "Print Execution ID", "value": `print(self.current_execution_id)`, "example": `` },
 	{ "name": "Get full execution details", "value": `print(self.full_execution)`, "example": `` },
 	{ "name": "Use files", "value": `# Create a sample file\nfiles = [{\n  \"filename\": \"test.txt\",\n  \"data\": \"Testdata\"\n}]\nret = self.set_files(files)\n\n# Get the content of the file from Shuffle storage\n# Originally a byte string in the \"data\" key\nfile_content = (self.get_file(ret[0])[\"data\"]).decode()\nprint(file_content)`, "example": `` },
 
-	{ "name": "Use datastore", "value": `key = \"testkey\"\nvalue = \"The value of the testkey\"\n\nself.set_cache(key, value)\n\n# Print the details of the key after it's been updated\n# To get the value, use self.get_cache(key)[\"value\"]\nprint(self.get_cache(key))`, "example": `` },
-	{ "name": "Run an App Action", "value": `response = shuffle.run_app(app_id="app", action="action_name", auth="authentication_id", params={})\nprint(response)`, "example": ``, "disabled": true, },
-	{ "name": "Run a Singul AI Action", "value": `response = singul.create_ticket(app="jira/iris/ticketingsystem", fields={"title": "Test ticket!"})\nprint(response)`, "example": ``, "disabled": true, },
+	{ "name": "Use datastore", "value": `key = \"testkey\"\nvalue = \"The value of the testkey\"\n\nself.set_key(key, value)\n\n# Print the details of the key after it's been updated\n# To get the value, use self.get_key(key)[\"value\"]\nprint(self.get_key(key))`, "example": `` },
+
+	{ "name": "Run a Subflow", "value": `response = shuffle.run_workflow(workflow_id="", start_command="Runtime arg here!", wait=True)\nprint(response)`, "example": ``, "disabled": false, },
+	{ "name": "Run an App Action", "value": `response = shuffle.run_app(app_id="app", action="action_name", auth="authentication_id", params={})\nprint(response)`, "example": ``, "disabled": false, },
+	{ "name": "Run a Singul AI Action", "value": `response = singul.cases.create_ticket(app="jira", fields={"title": "Test ticket!"})\nprint(response)`, "example": ``, "disabled": false, },
+
 
 ]
 
@@ -114,6 +120,7 @@ const CodeEditor = (props) => {
 		handleActionParamChange,
 		setcodedata,
 		isFileEditor,
+		isWorkflowEditor,
 		runUpdateText,
 		toolsAppId,
 		parameterName,
@@ -127,7 +134,7 @@ const CodeEditor = (props) => {
 		fieldname,
 		contentLoading,
 		editorData,
-		handleSubflowParamChange,
+		handleTriggerParamChange,
 		setAiQueryModalOpen,
 		fullScreenMode,
 		environment,
@@ -138,12 +145,9 @@ const CodeEditor = (props) => {
 
 	const [localcodedata, setlocalcodedata] = React.useState(codedata === undefined || codedata === null || codedata.length === 0 ? "" : codedata);
 
-	//const { setContainer } = useCodeMirror({
-	//	container: editorRef.current,
-	//	extensions,
-	//	value: localcodedata,
-	//})
 	// const {codelang, setcodelang} = props
+	const {themeMode, supportEmail} = useContext(Context)
+	const theme = getTheme(themeMode)
 
 	const [validation, setValidation] = React.useState(false);
 	const [expOutput, setExpOutput] = React.useState(" ");
@@ -205,7 +209,7 @@ const CodeEditor = (props) => {
 	const triggerField = searchParams.get('trigger_field');
 	const triggerName = searchParams.get('trigger_name');
 	const conditionId = searchParams.get('condition_id');
-	const conditionField = searchParams.get('field');
+	const conditionField = searchParams.get('condition_field');
 
 	useEffect(() => {
 		if (actionId === undefined || actionId === null) {
@@ -244,7 +248,7 @@ const CodeEditor = (props) => {
 		setSelectedCondition(condition);
 		// Update available variables when condition changes
 		updateAvailableVariables(actionlist);
-	}, [conditionId, fieldName])
+	}, [conditionId, conditionField])
 
 	// Extract variable updating logic into a separate function
 	const updateAvailableVariables = (actionlist) => {
@@ -298,8 +302,19 @@ const CodeEditor = (props) => {
 		setMainVariables(tmpVariables)
 	}
 
+    const handleKeyDown = (event) => {
+  		if ((event.metaKey || event.ctrlKey) && event.key === 'Enter') {
+  	  		event.preventDefault()
+			const tryItButton = document.getElementById("try-it-button")
+			if (tryItButton !== undefined && tryItButton !== null) {
+				tryItButton.click()
+			}
+		}
+	}
+
 	// Remove the original useEffect for actionlist since we'll update on action/trigger changes
 	useEffect(() => {
+    	document.addEventListener("keydown", handleKeyDown)
 		updateAvailableVariables(actionlist)
 	}, [])
 
@@ -886,6 +901,8 @@ const CodeEditor = (props) => {
 		// Whelp this is inefficient af. Single loop pls
 		// When the found array is empty.
 		if (found !== null && found !== undefined) {
+
+			//console.log("FOUND: ", found)
 			try {
 				for (var i = 0; i < found.length; i++) {
 					try {
@@ -920,28 +937,72 @@ const CodeEditor = (props) => {
 								}
 							}
 						}
+
+						// Find the location to ensure replacements happen correctly
+						var foundlocation = -1
+						for (var j = 0; j < input.length; j++) {
+							const foundStringSize = fixedVariable.length
+							const foundslice = input.slice(j, j + foundStringSize)
+							//console.log("FOUNDSLICE: ", foundslice)
+							if (fixedVariable !== foundslice) {
+								continue
+							}
+
+							// Check if it matches EXACTLY or not, as there may be more AFTER the found[i]
+							const nextchar = input.slice(j + foundStringSize, j + foundStringSize + 1)
+							if (nextchar === ".") {
+								continue
+							}
+
+							foundlocation = j
+							break
+						}
 	
+						// FIXME: There is something wrong here with: 
+						// $variable.#
+						// vs
+						// $variable.#.subvalue
+						// if you put both of those lines in the same editor, then it will replace both (somehow). Make sure $variable.#.subvalue exists while testing.
+						console.log("FOUNDLOC: ", fixedVariable, foundlocation)
 						for (var j = 0; j < actionlist.length; j++) {
 							if (fixedVariable.slice(1,).toLowerCase() !== actionlist[j].autocomplete.toLowerCase()) {
 								continue
 							}
 
+							// Look for the location of found[i] in the input, as to make sure to skip parts of the input in the replace. Find ALL spots for it
 							valuefound = true
+							var newvalue = ""
 							try {
-								if (typeof actionlist[j].example === "object") {
 
-									input = input.replace(found[i], JSON.stringify(actionlist[j].example), -1);
+								if (typeof actionlist[j].example === "object") {
+									newvalue = JSON.stringify(actionlist[j].example)
 
 								} else if (actionlist[j].example.trim().startsWith("{") || actionlist[j].example.trim().startsWith("[")) {
-									input = input.replace(found[i], JSON.stringify(actionlist[j].example), -1);
+
+									newvalue = JSON.stringify(actionlist[j].example)
 								} else {
 									const newExample = fixStringInput(actionlist[j].example)
-									input = input.replace(found[i], newExample, -1)
+
+									newvalue = newExample
 								}
 							} catch (e) {
-								input = input.replace(found[i], actionlist[j].example, -1)
+								newvalue = actionlist[j].example
 							}
 
+							try {
+								console.log("REPLACE: ", foundlocation, fixedVariable, newvalue)
+								if (newvalue !== "") {
+									if (foundlocation === -1) {
+										input = input.replace(fixedVariable, newvalue, 1)
+									} else {
+										// Ensures we don't just randomly replace the first value we find
+										const replacedSlice = input.slice(foundlocation, input.length).replace(fixedVariable, newvalue, 1)
+										input = input.slice(0, foundlocation) + replacedSlice
+									}
+								} 
+							} catch (e) {
+								console.log("Replace error: ", e)
+							}
 						}
 
 						if (!valuefound) {
@@ -1334,7 +1395,7 @@ const CodeEditor = (props) => {
 
 					  const usedposition = e.offsetY
 					  if (usedposition  === undefined || usedposition === null) {
-						  toast.info("Error: LayerY is undefined or null. Please contact support@shuffler.io")
+						  toast.info(`Error: LayerY is undefined or null. Please contact ${supportEmail}`)
 						  return
 					  }
 
@@ -1461,17 +1522,19 @@ const CodeEditor = (props) => {
 						setActiveDialog("codeeditor")
 					}
 				},
-				style: {
+				sx: {
 					// zIndex: 12501,
 					pointerEvents: "auto",
-					color: "white",
-					minWidth: isMobile ? "100%" : isFileEditor ? 650 : "80%",
-					maxWidth: isMobile ? "100%" : isFileEditor ? 650 : 1100,
-					minHeight: isMobile ? "100%" : "auto",
-					maxHeight: isMobile ? "100%" : 700,
+					color: theme.palette.DialogStyle.color,
+					minWidth: isMobile || isWorkflowEditor ? "100%" : isFileEditor ? "650px" : "80%",
+					maxWidth: isMobile || isWorkflowEditor ? "100%" : isFileEditor ? "650px" : "1100px",
+					minHeight: isMobile || isWorkflowEditor ? "100%" : "auto",
+					maxHeight: isMobile || isWorkflowEditor ? "100%" : "700px",
 					border: "3px solid rgba(255,255,255,0.3)",
-					padding: isMobile ? "25px 10px 25px 10px" : 25,
-					backgroundColor: "black",
+					padding: isMobile ? "25px 10px 25px 10px" : isWorkflowEditor ? "25px 10px 25px 200px" : "25px",
+					backgroundColor: themeMode === "dark" ? "black" : theme.palette.DialogStyle.backgroundColor,
+
+					opacity: isWorkflowEditor ? 0.93 : 1,
 				},
 			}}
 		>
@@ -1522,7 +1585,10 @@ const CodeEditor = (props) => {
 						color: "grey",
 					}}
 					onClick={() => {
-						navigate("")
+						if (isFileEditor !== true) {
+							navigate("")
+						}
+
 						setExpansionModalOpen(false)
 					}}
 				>
@@ -1652,7 +1718,7 @@ const CodeEditor = (props) => {
 									Code Editor
 							</DialogTitle>
 							*/}
-								{isFileEditor ? null :
+								{isFileEditor || isWorkflowEditor ? null :
 									<div style={{ display: "flex", maxHeight: 40, }}>
 										<ButtonGroup style={{ borderRadius: theme.palette.borderRadius, }}>
 											{userdata !== undefined && userdata !== null && userdata.support === true ? 
@@ -1666,6 +1732,7 @@ const CodeEditor = (props) => {
 													style={{
 														textTransform: "none",
 														width: 175,
+														textWrap: 'nowrap'
 													}}
 													onClick={(event) => {
 														setSourceDataOpen(!sourceDataOpen)
@@ -1685,6 +1752,7 @@ const CodeEditor = (props) => {
 												style={{
 													textTransform: "none",
 													width: 120,
+													textWrap: "nowrap"
 												}}
 												onClick={(event) => {
 													setAnchorEl(event.currentTarget);
@@ -1720,13 +1788,14 @@ const CodeEditor = (props) => {
 												color="secondary"
 												style={{
 													textTransform: "none",
-													width: 120,
+													width: 145,
+													textWrap: "nowrap"
 												}}
 												onClick={(event) => {
 													setAnchorEl3(event.currentTarget);
 												}}
 											>
-												Python Code
+												Python Examples 
 											</Button>
 											<Button
 												id="basic-button"
@@ -1738,6 +1807,7 @@ const CodeEditor = (props) => {
 												style={{
 													textTransform: "none",
 													width: 130,
+													textWrap: "nowrap",
 												}}
 												onClick={(event) => {
 													setMenuPosition({
@@ -1761,7 +1831,12 @@ const CodeEditor = (props) => {
 											>
 												{pythonFilters.map((item, index) => {
 													return (
-														<MenuItem key={index} onClick={() => {
+														<MenuItem 
+															style={{
+																borderTop: item.name === "Use files" || (item.name.toLowerCase().includes("run") && item.name.toLowerCase().includes("subflow")) ? "2px solid rgba(255,255,255,0.3)" : "none",
+
+															}}
+															key={index} onClick={() => {
 															if (item.disabled) {
 																toast.error("This feature may not work in your environment until you update your Shuffle Tools app.", { autoClose: 10000 })
 															}
@@ -2114,15 +2189,15 @@ const CodeEditor = (props) => {
 							console.log("DROP: ", e)
 						}}
 					>	
-						{(availableVariables !== undefined && availableVariables !== null && availableVariables.length > 0) || isFileEditor ? (
+						{(availableVariables !== undefined && availableVariables !== null && availableVariables.length > 0) || isFileEditor || isWorkflowEditor ? (
 							<AceEditor
 								id="shuffle-codeeditor"
 								name="shuffle-codeeditor"
 								value={localcodedata}
-								mode={selectedAction === undefined ? "json" : selectedAction.name === "execute_python" ? "python" : selectedAction.name === "execute_bash" ? "bash" : "json"}
+								mode={isWorkflowEditor ? "yaml" : selectedAction === undefined ? "json" : selectedAction.name === "execute_python" ? "python" : selectedAction.name === "execute_bash" ? "bash" : "json"}
 								theme="gruvbox"
-								height={isFileEditor ? 450 : 550}
-								width={isFileEditor ? 650 : "100%"}
+								height={isFileEditor ? 450 : isWorkflowEditor ? "90vh" : 550}
+								width={isFileEditor ? 650 : isWorkflowEditor ? "90vw" : "100%"}
 
 								markers={markers}
 								highlightActiveLine={false}
@@ -2183,7 +2258,7 @@ const CodeEditor = (props) => {
 					</div>
 				</div>
 
-				{isFileEditor  ? null :
+				{isFileEditor || isWorkflowEditor ? null :
 					<div style={{ 
 						flex: sourceDataOpen ? 1.5 : 3, 
 						marginLeft: 5, 
@@ -2199,7 +2274,9 @@ const CodeEditor = (props) => {
 										paddingLeft: 10,
 										paddingTop: 0,
 										display: "flex",
-										cursor: "move"
+										cursor: "move",
+										color: theme.palette.DialogStyle.color,
+										backgroundColor: "transparent",
 									}}
 								>
 									<div>
@@ -2227,7 +2304,7 @@ const CodeEditor = (props) => {
 													{
 														selectedEdge && Object.keys(selectedEdge).length > 0 ?
 														<ArrowForwardIcon style={{ 
-															color: "rgba(255,255,255,0.7)",
+															color: theme.palette.textPrimary,
 															fontSize: 18,
 															marginLeft: -5,
 															marginRight: -5,
@@ -2252,7 +2329,7 @@ const CodeEditor = (props) => {
 													}
 												</div>
 												: 
-												<span style={{ color: "white" }}>
+												<span style={{ color: theme.palette.text.primary }}>
 												{selectedAction.name === "execute_python" || selectedAction.name === "execute_bash" ? 
 													"Code to run" : 
 													triggerId ? 
@@ -2269,9 +2346,8 @@ const CodeEditor = (props) => {
 							<div style={{}}>
 								<Tooltip title="Try it! This runs the Shuffle Tools 'repeat back to me' or 'execute python' action with what you see in the expected output window. Commonly used to test your Python scripts or Liquid filters, not requiring the full workflow to run again." placement="top">
 									<Button
-										variant="outlined"
+										id="try-it-button"
 										disabled={executing}
-										color="primary"
 										style={{
 											border: `1px solid rgba(255, 255, 255, 0.15)`,
 											position: "absolute",
@@ -2282,11 +2358,14 @@ const CodeEditor = (props) => {
 											zIndex: 1200,
 											fontWeight: 500,
 											fontSize: 14,
-											backgroundColor: "rgba(33, 33, 33, 0.95)",
+											textTransform: "none",
+											backgroundColor: theme.palette.platformColor,
 											backdropFilter: "blur(8px)",
 											boxShadow: "0 4px 6px rgba(0, 0, 0, 0.1), 0 1px 3px rgba(0, 0, 0, 0.08)",
 											transition: "all 0.2s ease",
-											borderRadius: "4px",
+											paddingRight: 20, 
+											color: "#FF8544",
+											borderRadius: theme.palette?.borderRadius,
 											"&:hover": {
 												backgroundColor: "rgba(45, 45, 45, 0.95)",
 												transform: "translateY(-1px)",
@@ -2303,7 +2382,23 @@ const CodeEditor = (props) => {
 										{executing ?
 											<CircularProgress style={{ height: 18, width: 18, }} />
 											:
-											<span>{selectedAction === undefined ? "Try it" : selectedAction.name === "execute_python" ? "Run Python Code" : selectedAction.name === "execute_bash" ? "Run Bash" : "Try it"}<PlayArrowIcon style={{ height: 18, width: 18, marginBottom: -4, marginLeft: 5, }} /> </span>
+											<span>
+
+												<PlayArrowIcon style={{ height: 18, width: 18, marginBottom: -4, marginLeft: 5, }} />
+											{selectedAction === undefined ? <Typography style={{color: "inherit"}}>Try it</Typography> : selectedAction.name === "execute_python" ? "Run Python Code" : selectedAction.name === "execute_bash" ? "Run Bash" : "Try it"} 
+                        						<span
+                        						  style={{
+                        						    color: "#C8C8C8",
+                        						    fontSize: "12px",
+                        						    whiteSpace: "nowrap",
+													marginLeft: 5,
+														  marginRight: 10, 
+                        						  }}
+                        						>
+                        						  <kbd>Ctrl</kbd> + <kbd><KeyboardReturnIcon style={{width: 13, position: "absolute", marginLeft: 3, top: 5, }}/></kbd>
+                        						</span>
+
+											</span>
 										}
 									</Button>
 								</Tooltip>
@@ -2428,7 +2523,7 @@ const CodeEditor = (props) => {
 			</div>
 
 
-			<div style={{ display: 'flex' }}>
+			<div style={{ display: 'flex', width: isWorkflowEditor ? "90%" : "100%",  }}>
 				<Button
 					style={{
 						height: 35,
@@ -2451,6 +2546,7 @@ const CodeEditor = (props) => {
 				<Button
 					variant="contained"
 					color="primary"
+					disabled={isWorkflowEditor} 
 					style={{
 						height: 35,
 						flex: 1,
@@ -2458,13 +2554,11 @@ const CodeEditor = (props) => {
 						marginTop: 5,
 					}}
 					onClick={(event) => {
-						/*
-						const clickedFieldId = "rightside_field_" + fieldCount 
-						const clickedField = document.getElementById(clickedFieldId)
-						if (clickedField !== undefined && clickedField !== null) {
-							clickedField.focus()
+						if (isWorkflowEditor === true) {
+							setExpansionModalOpen(false)
+							navigate("")
+							return
 						}
-						*/
 
 						if (isFileEditor !== true) {
 							navigate("")
@@ -2475,7 +2569,8 @@ const CodeEditor = (props) => {
 						var fixedcodedata = localcodedata
 						const valid = validateJson(localcodedata, true)
 						if (valid.valid) {
-							fixedcodedata = JSON.stringify(valid.result, null, 2)
+							//fixedcodedata = JSON.stringify(valid.result, null, 2)
+							fixedcodedata = JSON.stringify(valid.result)
 						}
 
 						// console.log(codedata)
@@ -2491,7 +2586,7 @@ const CodeEditor = (props) => {
 
 						// Handle condition fields
 						if (conditionField !== null && handleConditionFieldChange !== undefined) {
-							handleConditionFieldChange(conditionField, fieldName, fixedcodedata);
+							handleConditionFieldChange(conditionField, fixedcodedata);
 						}
 						// Handle action fields
 						else if (actionId !== undefined && actionId !== null && actionId.length > 0) {
@@ -2499,7 +2594,7 @@ const CodeEditor = (props) => {
 						}
 						// Handle trigger fields
 						else if (triggerId !== undefined && triggerId !== null && triggerId.length > 0) {
-							handleSubflowParamChange(triggerId, triggerField, fixedcodedata)
+							handleTriggerParamChange(triggerId, triggerField, fixedcodedata)
 						}
 
 						setExpansionModalOpen(false)
diff --git a/frontend/src/components/TenantsTab.jsx b/frontend/src/components/TenantsTab.jsx
index 0d8c3df2..ffd15912 100644
--- a/frontend/src/components/TenantsTab.jsx
+++ b/frontend/src/components/TenantsTab.jsx
@@ -1,5 +1,6 @@
 import React, { memo, useContext, useEffect, useState } from 'react';
-import theme from "../theme.jsx";
+import {getTheme} from "../theme.jsx";
+import { Context } from '../context/ContextApi.jsx';
 import {
     FormControl,
     Card,
@@ -20,6 +21,9 @@ import {
     DialogActions,
     DialogContent,
     Skeleton,
+    IconButton,
+    Modal,
+    Checkbox,
   } from "@mui/material";
   
   import {
@@ -30,6 +34,10 @@ import {
     Apps as AppsIcon,
     Business as BusinessIcon,
     Flag,
+	ArrowDropDown as ArrowDropDownIcon,
+    VisibilityOff,
+    Visibility,
+
   } from "@mui/icons-material";
 
 import { toast } from 'react-toastify';
@@ -54,11 +62,17 @@ const TenantsTab = memo((props) => {
     const [cloudSyncModalOpen, setCloudSyncModalOpen] = React.useState(false);
     const [modalOpen, setModalOpen] = React.useState(false);
     const [parentOrg, setParentOrg] = React.useState(null);
-    const [parentOrgFlag, setParentOrgFlag] = React.useState(null);
+    const [parentOrgFlag, setParentOrgFlag] = React.useState("gb");
+    const [parentOrgRegionName, setParentOrgRegionName] = React.useState("UK");
     const [loadOrgs, setLoadOrgs] = React.useState(true);
     const [, forceUpdate] = React.useState();
+    const [suborglistOpen, setSuborglistOpen] = React.useState(false);
+    const [allTenantsOpen, setAllTenantsOpen] = React.useState(false);
     const itemColor = "black";
-
+    const { themeMode, supportEmail, brandColor } = useContext(Context);
+    const theme = getTheme(themeMode, brandColor);
+    const [accountDeleteButtonClicked, setAccountDeleteButtonClicked] = useState(false);
+    const [selectedSuborg, setSelectedSuborg] = useState(null);
     useEffect(() => {
         if(parentOrg !== null && parentOrgFlag === null) {
             let regiontag = "UK";
@@ -79,12 +93,16 @@ const TenantsTab = memo((props) => {
                     } else if (regiontag === "ca") {
 						regiontag = "CA";
 						regionCode = "ca";
+                    }else if (regiontag === "au") {
+                        regiontag = "AUS";
+                        regionCode = "au"
                     }
                 }
                 setParentOrgFlag(regionCode);
+                setParentOrgRegionName(regiontag);
         }
     }
-    }, [parentOrg]);
+    }, [parentOrg, parentOrgFlag]);
     
     var syncList = [
         {
@@ -162,9 +180,13 @@ const TenantsTab = memo((props) => {
                         } else if (regiontag === "ca") {
 							regiontag = "CA";
 							regionCode = "ca";
+                        }else if (regiontag === "au") {
+                            regiontag = "AUS";
+                            regionCode = "au"
                         }
                     }
-                    setParentOrgFlag(regionCode);
+                        setParentOrgFlag(regionCode);
+                        setParentOrgRegionName(regiontag);
                 }
                 }
             })
@@ -479,8 +501,8 @@ const TenantsTab = memo((props) => {
 
     const createSubOrg = (currentOrgId, name) => {
         const data = { name: name, org_id: currentOrgId };
-        console.log(data);
         const url = globalUrl + `/api/v1/orgs/${currentOrgId}/create_sub_org`;
+		setSuborglistOpen(true)
 
         fetch(url, {
             mode: "cors",
@@ -497,7 +519,9 @@ const TenantsTab = memo((props) => {
                 response.json().then((responseJson) => {
                     if (responseJson["success"] === false) {
                         if (responseJson.reason !== undefined) {
-                            toast(responseJson.reason);
+                            toast.error(responseJson.reason, {
+								autoClose: 5000,
+							})
                         } else {
                             toast("Failed creating suborg. Please try again");
                         }
@@ -576,6 +600,221 @@ const TenantsTab = memo((props) => {
             });
     };
 
+    const DeleteAccountPopUp = () => {
+        const [userDeleteAccepted, setUserDeleteAccepted] = useState(false);
+        const [password, setPassword] = useState("");
+        const [showPassword, setShowPassword] = useState(false);
+        const [disabled, setDisabled] = useState(true);
+        const [open, setOpen] = useState(true);
+        const boxStyling = {
+          position: "relative",
+          top: "50%",
+          left: "50%",
+          transform: "translate(-50%, -50%)",
+          zIndex: "9999",
+          backgroundColor: theme.palette.backgroundColor,
+          color: theme.palette.text.primary,
+          padding: 20,
+          borderRadius: 5,
+          boxShadow: "0 0 10px rgba(0, 0, 0, 0.3)",
+          width: 430,
+          height: 430,
+        };
+    
+        const closeIconButtonStyling = {
+          color: theme.palette.text.primary,
+          border: "none",
+          backgroundColor: "transparent",
+          position: 'relative',
+          width: 20,
+          height: 20,
+          cursor: "pointer",
+          left: "calc(100% - 30px)",
+        };
+    
+        const handlePasswordVisibility = () => {
+          setShowPassword(!showPassword);
+        };
+    
+        const buttonStyle = {
+          marginTop: 20,
+          height: 50,
+          border: "none",
+          width: "100%",
+          fontSize: 16,
+          backgroundColor: disabled ? "gray" : "red",
+          color: theme.palette.text.primary,
+          cursor: disabled === false && "pointer",
+        };    
+    
+        const handlePasswordChange = (e) => {
+          setPassword(e.target.value);
+        };
+    
+        const handleCheckBoxEvent = () => {
+          setUserDeleteAccepted((prev) => !prev);
+        };
+    
+        useEffect(() => {
+          if (password.length > 8 && userDeleteAccepted) {
+            setDisabled(false);
+          } else {
+            setDisabled(true);
+          }
+        }, [password, userDeleteAccepted]);
+
+    
+        const handleDeleteAccount = () => {
+          const baseURL = globalUrl;
+    
+          const url = `${baseURL}/api/v1/orgs/${selectedOrganization?.id}`;
+
+          const data = {
+            suborg_id : selectedSuborg?.id,
+            password: password,
+          }
+    
+          fetch(url, {
+            mode: "cors",
+            method: "DELETE",
+            body: JSON.stringify(data),
+            credentials: "include",
+            crossDomain: true,
+            withCredentials: true,
+            headers: {
+              "Content-Type": "application/json",
+            },
+          })
+            .then((response) => response.json())
+            .then((data) => {
+              if (data.success) {
+                toast.success(
+                  "Suborg deleted"
+                );
+                handleGetSubOrgs(userdata.active_org.id);
+                setAccountDeleteButtonClicked(false);
+
+              } else {
+                if (data.reason) {
+                  toast.error(data.reason);
+                }else {
+                    toast.error("Failed to delete suborg. Please try again or contact support@shuffler.io for help.");
+                }
+              }
+            })
+            .catch((error) => {
+              console.error(
+                "There was a problem with your fetch operation:",
+                error
+              );
+            });
+        };
+    
+        return (
+          <Modal open= {open} >
+          <div style={boxStyling}>
+            <IconButton
+                style={closeIconButtonStyling}
+                onClick={() => {
+                    setAccountDeleteButtonClicked(false);
+                    setSelectedSuborg(null);
+                }}
+            >
+              <CloseIcon />
+            </IconButton>
+            <h1 style={{textAlign:"center", margin : "0 0 20px 0"}}>Sub-Organization</h1>
+          {/* <div style={{paddingLeft: 15}} > */}
+            <div
+              style={{
+                display: "flex",
+                flexDirection: "column",
+                textAlign: "left",
+                // paddingLeft: 15
+                // marginLeft: 20
+              }}
+            >
+              <label>If you delete your suborg then:</label>
+              <ul style={{ textAlign: "left" }}>
+                <li>
+                  <label>
+                    Your suborg information will be removed from our Database
+                    permanently.
+                  </label>
+                </li>
+                <li>
+                  <label>This action cannot be reversed.</label>
+                </li>
+              </ul>
+              <div
+                style={{
+                  display: "flex",
+                  flexDirection: "row",
+                  alignItems: "center",
+                  gap: 10,
+                }}
+              >
+                <Checkbox
+                  checked={userDeleteAccepted}
+                  onChange={handleCheckBoxEvent}
+                  size="medium"
+                />
+                <label style={{ fontSize: "16px", color: theme.palette.text.primary }}>
+                  I have read the above information and I agree to it completely
+                </label>
+              </div>
+              <div
+                style={{
+                  marginTop: 20,
+                  display: "flex",
+                  flexDirection: "column",
+                  gap: 8,
+                }}
+              >
+                <label>Enter password to delete suborg {" " + selectedSuborg?.name}</label>
+                <TextField
+                    style={{
+                      backgroundColor: theme.palette.inputColor,
+                      flex: "1",
+                    }}
+                    type={showPassword ? "text" : "password"}
+                    value={password}
+                    onChange={handlePasswordChange}
+                    required
+                    placeholder="Password"
+                    id="standard-required"
+                    autoComplete="off"
+                    InputProps={{
+                        style: {
+                            color: theme.palette.textFieldStyle.color,
+                            backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                            height: "45px",
+                            fontSize: "1em",
+                            borderRadius: theme.palette.textFieldStyle.borderRadius,
+                        },
+                      endAdornment: (
+                        <IconButton
+                          onClick={handlePasswordVisibility}
+                          style={{color:theme.palette.text.primary}}
+                        >
+                          {showPassword ? <VisibilityOff /> : <Visibility />}
+                        </IconButton>
+                      ),
+                    }}
+                  />
+              </div>
+              <button
+                style={buttonStyle}
+                disabled={disabled}
+                onClick={handleDeleteAccount}
+              >
+                Delete Suborg
+              </button>
+            </div>
+          </div>
+          </Modal>
+        );
+      };
+
     const modalView = (
         <Dialog
             open={modalOpen}
@@ -604,7 +843,7 @@ const TenantsTab = memo((props) => {
             }}
         >
             <DialogTitle>
-                <span style={{ color: "white" }}>Add Sub-Organization</span>
+                <Typography variant='h5' color="textPrimary">Add Sub-Organization</Typography>
             </DialogTitle>
             <DialogContent>
                 <div>
@@ -616,7 +855,7 @@ const TenantsTab = memo((props) => {
                         InputProps={{
                             style: {
                                 height: "50px",
-                                color: "white",
+                                color: theme.palette.textFieldStyle.color,
                                 fontSize: "1em",
                             },
                         }}
@@ -635,15 +874,14 @@ const TenantsTab = memo((props) => {
             </DialogContent>
             <DialogActions>
                 <Button
-                    style={{ borderRadius: "2px", fontSize: 16, textTransform: "none", color: "#ff8544"  }}
+                    style={{ borderRadius: "2px", fontSize: 16, textTransform: "none", color: theme.palette.primary.main }}
                     onClick={() => setModalOpen(false)}
-                    color="primary"
                 >
                     Cancel
                 </Button>
                 <Button
                     variant="contained"
-                    style={{ borderRadius: "2px", fontSize: 16, textTransform: "none", backgroundColor: "#ff8544", color: "#1a1a1a"}}
+                    style={{ borderRadius: "2px", fontSize: 16, textTransform: "none",}}
                     onClick={() => {
                         createSubOrg(selectedOrganization.id, orgName);
                     }}
@@ -730,7 +968,7 @@ const TenantsTab = memo((props) => {
                         }
                         style={{ marginLeft: 15, height: 50, borderRadius: "2px", color: "#1a1a1a", backgroundColor: (!selectedOrganization.cloud_sync &&
                             cloudSyncApikey.length === 0) ||
-                        loading ? "rgba(200, 200, 200, 0.5)" : "#ff8544", fontSize: 16, textTransform: "none" }}
+                        loading ? "rgba(200, 200, 200, 0.5)" : theme.palette.primary.main, fontSize: 16, textTransform: "none" }}
                         onClick={() => {
                             setLoading(true);
                             enableCloudSync(
@@ -775,31 +1013,32 @@ const TenantsTab = memo((props) => {
     const textColor = "#9E9E9E !important";
 
     return (
-        <div style={{ width: "100%", minHeight: 1100, boxSizing: 'border-box', padding: "27px 10px 19px 27px", height:"100%", backgroundColor: '#212121',borderTopRightRadius: '8px', borderBottomRightRadius: 8, borderLeft: "1px solid #494949",}}>
+        <div style={{ width: "100%", minHeight: 1100, boxSizing: 'border-box', padding: "27px 10px 19px 27px", height:"100%", backgroundColor: theme.palette.platformColor, borderTopRightRadius: '8px', borderBottomRightRadius: 8, borderLeft: theme.palette.defaultBorder,}}>
             {modalView}
             {cloudSyncModal}
-            <div style={{height: "100%", maxHeight: 1700, overflowY: "auto",overflowX: 'hidden', scrollbarColor: '#494949 transparent', scrollbarWidth: 'thin'}}>
-                <div style={{ height: "100%", width: "calc(100% - 20px)",  scrollbarColor: '#494949 transparent', scrollbarWidth: 'thin' }}>   
+             {accountDeleteButtonClicked && <DeleteAccountPopUp/>}
+            <div style={{height: "100%", maxHeight: 1700, overflowY: "auto",overflowX: 'hidden', scrollbarColor: theme.palette.scrollbarColorTransparent, scrollbarWidth: 'thin'}}>
+                <div style={{ height: "100%", width: "calc(100% - 20px)",  scrollbarColor: theme.palette.scrollbarColorTransparent, scrollbarWidth: 'thin' }}>   
                 <div style={{ marginBottom: 20 }}>
-                    <h2 style={{ marginBottom: 8, marginTop: 0, color: "#ffffff" }}>Organizations</h2>
-                    <span style={{ color: textColor }}>
-                        Control sub organizations (tenants)! {" "}
+                    <Typography variant='h5' color="textPrimary" style={{ marginBottom: 8, marginTop: 0 }}>Tenants</Typography>
+                    <Typography variant='body2' color="textSecondary">
+                        Create, manage and change to sub-organizations (tenants)! {" "}
                         {isCloud
-                            ? "You can only make a sub organization if you are a customer of shuffle or running a POC of the platform. Please contact support@shuffler.io to try it out."
-                            : ''}
+                            ? `You can only make a sub organization if you are a customer of shuffle or running a POC of the platform. Please contact ${supportEmail} to try it out.`
+                            : ''}&nbsp;
                         <a
                             href="/docs/organizations"
                             target="_blank"
                             rel="noopener noreferrer"
-                            style={{ color: "#FF8444" }}
+                            style={{ color: theme.palette.linkColor }}
                         >
                             Learn more
                         </a>
-                    </span>
+                    </Typography>
                 </div>
 
                 <Button
-                    style={{ backgroundColor: '#ff8544', textTransform: 'none', fontSize: 16, color: "#1a1a1a", borderRadius: 4, width: 212, height: 40 }}
+                    style={{ textTransform: 'none', fontSize: 16, borderRadius: 4, width: 212, height: 40 }}
                     variant="contained"
                     color="primary"
                     disabled={userdata.admin !== 'true'}
@@ -826,17 +1065,15 @@ const TenantsTab = memo((props) => {
                         marginTop: 20,
                     }}
                 >
-                    <h3
+                    <Typography 
+                        variant='h6'
+                        color="textPrimary"
                         style={{
                             margin: 0,
-                            fontSize: '1.2rem',
-                            fontWeight: 'bold',
-                            letterSpacing: '1px',
-                            color: "#ffffff"
                         }}
                     >
                         Your Parent Organization
-                    </h3>
+                    </Typography>
                 </div>
                     <div>
                         
@@ -850,7 +1087,7 @@ const TenantsTab = memo((props) => {
                         /> */}
 
 
-                    <div style={{ borderRadius: 4, marginTop: 24, border: "1px solid #494949", width: "100%", overflowX: "auto", paddingBottom: 0 }}>
+                    <div style={{ borderRadius: 4, marginTop: 24, border: theme.palette.defaultBorder, width: "100%", overflowX: "auto", paddingBottom: 0 }}>
                     <List
                         style={{
                         width: "100%",
@@ -881,7 +1118,7 @@ const TenantsTab = memo((props) => {
                                 display: "table-cell",
                                 padding: "0px 8px 8px 8px",
                                 textAlign: "center",
-                                borderBottom: "1px solid #494949",
+                                borderBottom: theme.palette.defaultBorder,
                                 verticalAlign: "middle",
                             }}
                         />
@@ -894,7 +1131,7 @@ const TenantsTab = memo((props) => {
                             padding: "0px 8px 8px 8px",
                             whiteSpace: "nowrap",
                             textOverflow: "ellipsis",
-                            borderBottom: "1px solid #494949",
+                            borderBottom: theme.palette.defaultBorder,
                             verticalAlign: "middle",
                             textAlign: "center",
                             }}
@@ -906,7 +1143,7 @@ const TenantsTab = memo((props) => {
                                 minWidth: 100,
                                 maxWidth: 100,
                                 display: "table-cell",
-                                borderBottom: "1px solid #494949",
+                                borderBottom: theme.palette.defaultBorder,
                                 padding: "0px 8px 8px 8px",
                             }}
                             />
@@ -920,7 +1157,7 @@ const TenantsTab = memo((props) => {
                             padding: "0px 8px 8px 8px",
                             whiteSpace: "nowrap",
                             textOverflow: "ellipsis",
-                            borderBottom: "1px solid #494949",
+                            borderBottom: theme.palette.defaultBorder,
                             verticalAlign: "middle",
                             }}
                         />
@@ -933,7 +1170,7 @@ const TenantsTab = memo((props) => {
                             padding: "0px 8px 8px 8px",
                             whiteSpace: "nowrap",
                             textOverflow: "ellipsis",
-                            borderBottom: "1px solid #494949",
+                            borderBottom: theme.palette.defaultBorder,
                             verticalAlign: "middle",
                             }}
                         />
@@ -945,7 +1182,7 @@ const TenantsTab = memo((props) => {
                                 key={rowIndex}
                                 style={{
                                     display: "flex",
-                                    backgroundColor: "#212121",
+                                    backgroundColor: theme.palette.platformColor,
                                     height: 30,
                                 }}
                                 >
@@ -967,7 +1204,7 @@ const TenantsTab = memo((props) => {
                                         variant="text"
                                         animation="wave"
                                         sx={{
-                                        backgroundColor: "#1a1a1a",
+                                        backgroundColor: theme.palette.loaderColor,
                                         borderRadius: "4px",
                                         }}
                                     />
@@ -978,7 +1215,7 @@ const TenantsTab = memo((props) => {
                         ) : parentOrg?.id?.length > 0 ? (
                     <ListItem
                         style={{
-                            backgroundColor: "#1A1A1A",
+                            backgroundColor: theme.palette.platformColor,
                             display: "table-row",
                             padding: 8,
                             verticalAlign: "middle",
@@ -1024,7 +1261,7 @@ const TenantsTab = memo((props) => {
                                 src={`https://flagcdn.com/w20/${parentOrgFlag}.png`}
                                 style={{ width: "30px", height: "20px", marginRight: "5px" }}
                                 />
-                                <ListItemText primary={parentOrgFlag?.toUpperCase()} />
+                                <ListItemText primary={parentOrgRegionName?.toUpperCase()} />
                             </div>
                             }
                             style={{ display: "table-cell", padding: 8, verticalAlign: "middle" }}
@@ -1086,7 +1323,7 @@ const TenantsTab = memo((props) => {
                                         padding: "10px",
                                         whiteSpace: "nowrap",
                                     }}
-                                    primary={index === 1 ? "Parent Organization not found or May be you are not part of parent org. Please contact support@shuffler.io." : null}
+                                    primary={index === 1 ? `Parent Organization not found or May be you are not part of parent org. Please contact ${supportEmail}` : null}
                                     colSpan={index === 0 ? 5 : undefined}
                                 />
                             ))}
@@ -1114,17 +1351,15 @@ const TenantsTab = memo((props) => {
                                 marginTop: 20,
                             }}
                         >
-                            <h3
+                            <Typography
+                                variant='h6'
+                                color="textPrimary"
                                 style={{
                                     margin: 0,
-                                    fontSize: '1.2rem',
-                                    fontWeight: 'bold',
-                                    letterSpacing: '1px',
-                                    color: "#ffffff"
                                 }}
                             >
                                 Sub Organizations of the Current Organization ({subOrgs.length})
-                            </h3>
+                            </Typography>
                         </div>
 
                         {/* <Divider
@@ -1135,7 +1370,7 @@ const TenantsTab = memo((props) => {
                             }}
                         /> */}
 
-                        <div style={{borderRadius: 4, marginTop: 24, border: "1px solid #494949", width: "100%", overflowX: "auto", paddingBottom: 0 }}>
+                        <div style={{borderRadius: 4, marginTop: 24, border: theme.palette.defaultBorder, width: "100%", overflowX: "auto", paddingBottom: 0 }}>
                         <List 
                             style={{
                                 width: '100%', 
@@ -1145,168 +1380,244 @@ const TenantsTab = memo((props) => {
                                 overflowX: "auto", 
                                 paddingBottom: 0,
                             }}>
-                            <ListItem 
-                                style={{
-                                    width: "100%",
-                                    display: "table-row",
-                                    padding: "0px 8px 8px 8px",
-                                    whiteSpace: "nowrap",
-                                    textOverflow: "ellipsis",
-                                    verticalAlign: "middle",
-                                }}>
-                                <ListItemText 
-                                    primary="Logo" 
-                                    style={{
-                                        width: 100,
-                                        minWidth: 100,
-                                        maxWidth: 100,
-                                        paddingLeft: 20,
-                                        display: "table-cell",
-                                        padding: "0px 8px 8px 8px",
-                                        textAlign: "center",
-                                        borderBottom: "1px solid #494949",
-                                        verticalAlign: "middle",
-                                    }} />
-                                <ListItemText 
-                                        primary="Name" 
-                                        style={{
-                                            minWidth: 100,
-                                            maxWidth: 300,
-                                            display: "table-cell",
-                                            padding: "0px 8px 8px 8px",
-                                            whiteSpace: "nowrap",
-                                            textOverflow: "ellipsis",
-                                            borderBottom: "1px solid #494949",
-                                            verticalAlign: "middle",
-                                            textAlign: "center",
-                                        }} />
-                                    {isCloud && (
-                                        <ListItemText
-                                        primary="Region"
-                                        style={{
-                                            minWidth: 100,
-                                            maxWidth: 100,
-                                            display: "table-cell",
-                                            borderBottom: "1px solid #494949",
-                                            padding: "0px 8px 8px 8px",
-                                        }}
-                                        />
-                                    )}
-                                <ListItemText
-                                    primary="id"
-                                    style={{
-                                    minWidth: 400,
-                                    maxWidth: 400,
-                                    display: "table-cell",
-                                    padding: "0px 8px 8px 8px",
-                                    whiteSpace: "nowrap",
-                                    textOverflow: "ellipsis",
-                                    borderBottom: "1px solid #494949",
-                                    verticalAlign: "middle",
-                                    }}
-                                />
-                                <ListItemText
-                                    primary="Action"
-                                    style={{
-                                    minWidth: 400,
-                                    maxWidth: 400,
-                                    display: "table-cell",
-                                    padding: "0px 8px 8px 8px",
-                                    whiteSpace: "nowrap",
-                                    textOverflow: "ellipsis",
-                                    borderBottom: "1px solid #494949",
-                                    verticalAlign: "middle",
-                                    }}
-                                />
-                            </ListItem>
-                            {subOrgs.map((data, index) => {
-								let regiontag = "UK";
-								let regionCode = "gb";
+							{!suborglistOpen ?
+								<ListItem
+									style={{
+										width: "100%",
+										display: "table-row",
+										padding: "0px 8px 8px 8px",
+										whiteSpace: "nowrap",
+										textOverflow: "ellipsis",
+										verticalAlign: "middle",
+										itemAlign: "center",
 
-								if (data.region_url?.length > 0) {
-									const regionsplit = data.region_url.split(".");
-									if (regionsplit.length > 2 && !regionsplit[0].includes("shuffler")) {
-										const namesplit = regionsplit[0].split("/");
-										regiontag = namesplit[namesplit.length - 1];
-										if (regiontag === "california") {
-											regiontag = "US";
-											regionCode = "us";
-										} else if (regiontag === "frankfurt") {
-											regiontag = "EU-2";
-											regionCode = "eu";
-										} else if (regiontag === "ca") {
-											regiontag = "CA";
-											regionCode = "ca";
+									}}
+								>
+									<ListItemText 
+										primary={
+											<Button 
+												fullWidth 
+												variant="secondary" 
+												style={{
+													textTransform: 'none',
+												}} 
+												onClick={() => setSuborglistOpen(true)}
+											>
+												Show Sub-Organizations <ArrowDropDownIcon />
+											</Button>
+										}
+										style={{
+											width: 100,
+											minWidth: 100,
+											maxWidth: 100,
+											paddingLeft: 20,
+											display: "table-cell",
+											padding: "0px 8px 8px 8px",
+											textAlign: "center",
+											borderBottom: theme.palette.defaultBorder,
+											verticalAlign: "middle",
+										}} 
+									/>
+								</ListItem>
+							: 
+							<span>
+                            	<ListItem 
+                            	    style={{
+                            	        width: "100%",
+                            	        display: "table-row",
+                            	        padding: "0px 8px 8px 8px",
+                            	        whiteSpace: "nowrap",
+                            	        textOverflow: "ellipsis",
+                            	        verticalAlign: "middle",
+                            	    }}>
+                            	    <ListItemText 
+                            	        primary="Logo" 
+                            	        style={{
+                            	            width: 100,
+                            	            minWidth: 100,
+                            	            maxWidth: 100,
+                            	            paddingLeft: 20,
+                            	            display: "table-cell",
+                            	            padding: "0px 8px 8px 8px",
+                            	            textAlign: "center",
+                            	            borderBottom: theme.palette.defaultBorder,
+                            	            verticalAlign: "middle",
+                            	        }} />
+                            	    <ListItemText 
+                            	            primary="Name" 
+                            	            style={{
+                            	                minWidth: 100,
+                            	                maxWidth: 300,
+                            	                display: "table-cell",
+                            	                padding: "0px 8px 8px 8px",
+                            	                whiteSpace: "nowrap",
+                            	                textOverflow: "ellipsis",
+                            	                borderBottom: theme.palette.defaultBorder,
+                            	                verticalAlign: "middle",
+                            	                textAlign: "center",
+                            	            }} />
+                            	        {isCloud && (
+                            	            <ListItemText
+                            	            primary="Region"
+                            	            style={{
+                            	                minWidth: 100,
+                            	                maxWidth: 100,
+                            	                display: "table-cell",
+                            	                borderBottom: theme.palette.defaultBorder,
+                            	                padding: "0px 8px 8px 8px",
+                            	            }}
+                            	            />
+                            	        )}
+                            	    <ListItemText
+                            	        primary="id"
+                            	        style={{
+                            	        minWidth: 400,
+                            	        maxWidth: 400,
+                            	        display: "table-cell",
+                            	        padding: "0px 8px 8px 8px",
+                            	        whiteSpace: "nowrap",
+                            	        textOverflow: "ellipsis",
+                            	        borderBottom: theme.palette.defaultBorder,
+                            	        verticalAlign: "middle",
+                            	        }}
+                            	    />
+                            	    <ListItemText
+                            	        primary="Action"
+                            	        style={{
+                            	        minWidth: 400,
+                            	        maxWidth: 400,
+                            	        display: "table-cell",
+                            	        padding: "0px 8px 8px 8px",
+                            	        whiteSpace: "nowrap",
+                            	        textOverflow: "ellipsis",
+                            	        borderBottom: theme.palette.defaultBorder,
+                            	        verticalAlign: "middle",
+                            	        }}
+                            	    />
+                            	</ListItem>
+                            	{subOrgs.map((data, index) => {
+									let regiontag = "UK";
+									let regionCode = "gb";
+
+									if (data.region_url?.length > 0) {
+										const regionsplit = data.region_url.split(".");
+										if (regionsplit.length > 2 && !regionsplit[0].includes("shuffler")) {
+											const namesplit = regionsplit[0].split("/");
+											regiontag = namesplit[namesplit.length - 1];
+											if (regiontag === "california") {
+												regiontag = "US";
+												regionCode = "us";
+											} else if (regiontag === "frankfurt") {
+												regiontag = "EU-2";
+												regionCode = "eu";
+											} else if (regiontag === "ca") {
+												regiontag = "CA";
+												regionCode = "ca";
+											}
 										}
 									}
-								}
+                                    var bgColor = themeMode === "dark" ? "#212121" : "#FFFFFF";
+                                    if (index % 2 === 0) {
+                                        bgColor = themeMode === "dark" ? "#1A1A1A" :  "#EAEAEA";
+                                    }
 
-								return (
-                                <ListItem key={index} style={{ backgroundColor: index % 2 === 0 ? '#1A1A1A' : '#212121', width: "100%", borderBottomLeftRadius: 8, display:'table-row', borderBottomRightRadius: 8 }}>
-                                    <ListItemText primary={<img alt={data?.name} src={data.image || theme.palette.defaultImage} style={imageStyle} />} style={{ width: 100,
-                                minWidth: 100,
-                                maxWidth: 100,
-                                display: "table-cell",
-                                padding: "8px 8px 8px 20px",
-                                textAlign: "center", }} />
-                                    <ListItemText primary={data.name} style={{ minWidth: 100,
-                                maxWidth: 300,
-                                overflow: "hidden",
-                                whiteSpace: "nowrap",
-                                textOverflow: "ellipsis",
-                                display: "table-cell",
-                                padding: 8,
-                                verticalAlign: "middle",
-                                textAlign: "center", }} />
+									return (
+                            	    <ListItem key={index} style={{ backgroundColor: bgColor, width: "100%", borderBottomLeftRadius: 8, display:'table-row', borderBottomRightRadius: 8 }}>
+                            	        <ListItemText primary={<img alt={data?.name} src={data.image || theme.palette.defaultImage} style={imageStyle} />} style={{ width: 100,
+                            	    minWidth: 100,
+                            	    maxWidth: 100,
+                            	    display: "table-cell",
+                            	    padding: "8px 8px 8px 20px",
+                            	    textAlign: "center", }} />
+                            	        <ListItemText primary={data.name} style={{ minWidth: 100,
+                            	    maxWidth: 300,
+                            	    overflow: "hidden",
+                            	    whiteSpace: "nowrap",
+                            	    textOverflow: "ellipsis",
+                            	    display: "table-cell",
+                            	    padding: 8,
+                            	    verticalAlign: "middle",
+                            	    textAlign: "center", }} />
 
-                                {isCloud && (
-                                    <ListItemText
-                                        primary={
-                                        <div style={{ display: "flex", alignItems: "center" }}>
-                                            <img
-                                            alt={regiontag}
-                                            src={`https://flagcdn.com/w20/${regionCode}.png`}
-                                            style={{ width: "30px", height: "20px", marginRight: "5px" }}
-                                            />
-                                            <ListItemText primary={regiontag?.toUpperCase()} />
-                                        </div>
-                                        }
-                                        style={{ display: "table-cell", padding: 8, verticalAlign: "middle" }}
-                                    />
-                                    )}
-                                    <ListItemText primary={data.id} style={{ minWidth: 300,
-										maxWidth: 300,
-										display: "table-cell",
-										padding: 8,
-										verticalAlign: "middle", }} />
+                            	    {isCloud && (
+                            	        <ListItemText
+                            	            primary={
+                            	            <div style={{ display: "flex", alignItems: "center" }}>
+                            	                <img
+                            	                alt={regiontag}
+                            	                src={`https://flagcdn.com/w20/${regionCode}.png`}
+                            	                style={{ width: "30px", height: "20px", marginRight: "5px" }}
+                            	                />
+                            	                <ListItemText primary={regiontag?.toUpperCase()} />
+                            	            </div>
+                            	            }
+                            	            style={{ display: "table-cell", padding: 8, verticalAlign: "middle" }}
+                            	        />
+                            	        )}
+                            	        <ListItemText primary={data.id} style={{ minWidth: 300,
+											maxWidth: 300,
+											display: "table-cell",
+											padding: 8,
+											verticalAlign: "middle", }} />
 
-                                    <ListItemText
-                            		primary={
-                                		<Tooltip title={data.id === userdata?.active_org?.id ? "You are already in this organization." : ""} disableInteractive>
+                            	        <ListItemText
+                            			primary={
+                            	    		<>
+                                                <Tooltip title={data.id === userdata?.active_org?.id ? "You are already in this organization." : ""} disableInteractive>
+                            	            <Button
+                            	                color="primary"
+                            	                variant='outlined'
+                            	                disabled={data.id === userdata?.active_org?.id}
+                            	                onClick={() => {
+                            	                    handleClickChangeOrg(data.id);
+                            	                }}
+                            	                sx={{ 
+                            	                    boxShadow:"none", textTransform:"capitalize", 
+                            	                    fontSize:16, 
+                            	                    '&.Mui-disabled': {
+                            	                    backgroundColor: 'rgba(200, 200, 200, 0.5)',
+                            	                    color: '#A9A9A9',
+                            	                    },
+                            	                }}
+                            	            >
+                            	                Change Active Org
+                            	            </Button>
+                                            
+                            	        </Tooltip>
+                                        {selectedOrganization?.creator_org?.length > 0 ? null : 
                                         <Button
-                                            color="primary"
-                                            variant='outlined'
-                                            disabled={data.id === userdata?.active_org?.id}
-                                            onClick={() => {
-                                                handleClickChangeOrg(data.id);
-                                            }}
-                                            sx={{ 
-                                                boxShadow:"none", textTransform:"capitalize", 
-                                                fontSize:16, 
-                                                '&.Mui-disabled': {
-                                                backgroundColor: 'rgba(200, 200, 200, 0.5)',
-                                                color: '#A9A9A9',
+                                            variant="outlined"
+                                            sx={{
+                                                whiteSpace: "nowrap",
+                                                textTransform: "none",
+                                                fontSize: "16px",
+                                                color: "red",
+                                                marginLeft: "5px",
+                                                borderColor: "red",
+                                                "&:hover": {
+                                                    color: theme.palette.text.primary,
+                                                    backgroundColor: "red",
                                                 },
+
                                             }}
-                                        >
-                                            Change Active Org
-                                        </Button>
-                                    </Tooltip>
-                            }
-                            style={{ display: "table-cell", verticalAlign: "middle" }}
-                            />
-                                </ListItem>
-                            )})}
+                                            disabled={data?.id === userdata?.active_org?.id}
+                                            onClick={() => {
+                                                setAccountDeleteButtonClicked(true);
+                                                setSelectedSuborg(data);
+                                            }}
+                                            >
+                                            Delete Org
+                                            </Button>}
+
+                                        </>
+                            	}
+                            	style={{ display: "table-cell", verticalAlign: "middle" }}
+                            	/>
+                            	    </ListItem>
+                            	)})}
+
+							</span>}
+
                         </List>
                         </div>
                     </div>
@@ -1321,17 +1632,15 @@ const TenantsTab = memo((props) => {
                 />
 
                 <div style={{ textAlign: 'left', width: '100%', padding: '10px', marginTop: 20 }}>
-                    <h3
+                    <Typography
+                        variant='h6'
+                        color="textPrimary"
                         style={{
                             margin: 0,
-                            fontSize: '1.2rem',
-                            fontWeight: 'bold',
-                            letterSpacing: '1px',
-                            color: "#ffffff"
                         }}
                     >
                         All Tenants
-                    </h3>
+                    </Typography>
                 </div>
 
                 {/* <Divider
@@ -1345,7 +1654,7 @@ const TenantsTab = memo((props) => {
                 style={{
                     borderRadius: 4,
                     marginTop: 24,
-                    border: "1px solid #494949",
+                    border: theme.palette.defaultBorder,
                     width: "100%",
                     overflowX: "auto",
                     paddingBottom: 0,
@@ -1361,247 +1670,294 @@ const TenantsTab = memo((props) => {
                     paddingBottom: 0,
                     }}
                 >
-                    <ListItem
-                    style={{
-                        width: "100%",
-                        display: "table-row",
-                        padding: "0px 8px 8px 8px",
-                        whiteSpace: "nowrap",
-                        textOverflow: "ellipsis",
-                        verticalAlign: "middle",
-                    }}
-                    >
-                    <ListItemText
-                        primary="Logo"
-                        style={{
-                        width: 100,
-                        minWidth: 100,
-                        maxWidth: 100,
-                        paddingLeft: 20,
-                        display: "table-cell",
-                        padding: "0px 8px 8px 8px",
-                        textAlign: "center",
-                        borderBottom: "1px solid #494949",
-                        verticalAlign: "middle",
-                        }}
-                    />
-                    <ListItemText
-                        primary="Name"
-                        style={{
-                        minWidth: 100,
-                        maxWidth: 300,
-                        display: "table-cell",
-                        padding: "0px 8px 8px 8px",
-                        whiteSpace: "nowrap",
-                        textOverflow: "ellipsis",
-                        borderBottom: "1px solid #494949",
-                        verticalAlign: "middle",
-                        textAlign: "center",
-                        }}
-                    />
-                    {isCloud && (
-                        <ListItemText
-                        primary="Region"
-                        style={{
-                            minWidth: 100,
-                            maxWidth: 100,
-                            display: "table-cell",
-                            borderBottom: "1px solid #494949",
-                            padding: "0px 8px 8px 8px",
-                        }}
-                        />
-                    )}
-                    <ListItemText
-                        primary="id"
-                        style={{
-                        minWidth: 400,
-                        maxWidth: 400,
-                        display: "table-cell",
-                        padding: "0px 8px 8px 8px",
-                        whiteSpace: "nowrap",
-                        textOverflow: "ellipsis",
-                        borderBottom: "1px solid #494949",
-                        verticalAlign: "middle",
-                        }}
-                    />
-                    <ListItemText
-                        primary="Action"
-                        style={{
-                        minWidth: 400,
-                        maxWidth: 400,
-                        display: "table-cell",
-                        padding: "0px 8px 8px 8px",
-                        whiteSpace: "nowrap",
-                        textOverflow: "ellipsis",
-                        borderBottom: "1px solid #494949",
-                        verticalAlign: "middle",
-                        }}
-                    />
-                    </ListItem>
+					{!allTenantsOpen ?
+						<ListItem
+							style={{
+								width: "100%",
+								display: "table-row",
+								padding: "0px 8px 8px 8px",
+								whiteSpace: "nowrap",
+								textOverflow: "ellipsis",
+								verticalAlign: "middle",
+								itemAlign: "center",
 
-                    {userdata?.orgs?.length <= 0 ? (
-                    [...Array(6)].map((_, rowIndex) => (
-                        <ListItem
-                        key={rowIndex}
-                        style={{
-                            display: "table-row",
-                            backgroundColor: "#212121",
-                        }}
-                        >
-                        {Array(7)
-                            .fill()
-                            .map((_, colIndex) => (
-                            <ListItemText
-                                key={colIndex}
-                                style={{
-                                display: "table-cell",
-                                padding: "8px",
-                                }}
-                            >
-                                <Skeleton
-                                variant="text"
-                                animation="wave"
-                                sx={{
-                                    backgroundColor: "#1a1a1a",
-                                    height: "20px",
-                                    borderRadius: "4px",
-                                }}
-                                />
-                            </ListItemText>
-                            ))}
-                        </ListItem>
-                    ))
-                    ) : (
-                    userdata?.orgs?.length > 0 &&
-                    userdata.orgs.map((data, index) => {
-                        let regiontag = "UK";
-                        let regionCode = "gb";
-
-                        if (data.region_url?.length > 0) {
-							const regionsplit = data.region_url.split(".");
-							if (regionsplit.length > 2 && !regionsplit[0].includes("shuffler")) {
-								const namesplit = regionsplit[0].split("/");
-								regiontag = namesplit[namesplit.length - 1];
-
-								if (regiontag === "california") {
-								regiontag = "US";
-								regionCode = "us";
-								} else if (regiontag === "frankfurt") {
-								regiontag = "EU-2";
-								regionCode = "eu";
-								} else if (regiontag === "ca") {
-								regiontag = "CA";
-								regionCode = "ca";
+							}}
+						>
+							<ListItemText 
+								primary={
+									<Button 
+										fullWidth 
+										variant="secondary" 
+										style={{
+											textTransform: 'none',
+										}} 
+										onClick={() => setAllTenantsOpen(true)}
+									>
+										Show ALL your tenants <ArrowDropDownIcon />
+									</Button>
 								}
-							}
-                        }
+								style={{
+									width: 100,
+									minWidth: 100,
+									maxWidth: 100,
+									paddingLeft: 20,
+									display: "table-cell",
+									padding: "0px 8px 8px 8px",
+									textAlign: "center",
+									borderBottom: theme.palette.defaultBorder,
+									verticalAlign: "middle",
+								}} 
+							/>
+						</ListItem>
+					: 
+					<span>
+                    	<ListItem
+                    	style={{
+                    	    width: "100%",
+                    	    display: "table-row",
+                    	    padding: "0px 8px 8px 8px",
+                    	    whiteSpace: "nowrap",
+                    	    textOverflow: "ellipsis",
+                    	    verticalAlign: "middle",
+                    	}}
+                    	>
+                    	<ListItemText
+                    	    primary="Logo"
+                    	    style={{
+                    	    width: 100,
+                    	    minWidth: 100,
+                    	    maxWidth: 100,
+                    	    paddingLeft: 20,
+                    	    display: "table-cell",
+                    	    padding: "0px 8px 8px 8px",
+                    	    textAlign: "center",
+                    	    borderBottom: theme.palette.defaultBorder,
+                    	    verticalAlign: "middle",
+                    	    }}
+                    	/>
+                    	<ListItemText
+                    	    primary="Name"
+                    	    style={{
+                    	    minWidth: 100,
+                    	    maxWidth: 300,
+                    	    display: "table-cell",
+                    	    padding: "0px 8px 8px 8px",
+                    	    whiteSpace: "nowrap",
+                    	    textOverflow: "ellipsis",
+                    	    borderBottom: theme.palette.defaultBorder,
+                    	    verticalAlign: "middle",
+                    	    textAlign: "center",
+                    	    }}
+                    	/>
+                    	{isCloud && (
+                    	    <ListItemText
+                    	    primary="Region"
+                    	    style={{
+                    	        minWidth: 100,
+                    	        maxWidth: 100,
+                    	        display: "table-cell",
+                    	        borderBottom: theme.palette.defaultBorder,
+                    	        padding: "0px 8px 8px 8px",
+                    	    }}
+                    	    />
+                    	)}
+                    	<ListItemText
+                    	    primary="id"
+                    	    style={{
+                    	    minWidth: 400,
+                    	    maxWidth: 400,
+                    	    display: "table-cell",
+                    	    padding: "0px 8px 8px 8px",
+                    	    whiteSpace: "nowrap",
+                    	    textOverflow: "ellipsis",
+                    	    borderBottom: theme.palette.defaultBorder,
+                    	    verticalAlign: "middle",
+                    	    }}
+                    	/>
+                    	<ListItemText
+                    	    primary="Action"
+                    	    style={{
+                    	    minWidth: 400,
+                    	    maxWidth: 400,
+                    	    display: "table-cell",
+                    	    padding: "0px 8px 8px 8px",
+                    	    whiteSpace: "nowrap",
+                    	    textOverflow: "ellipsis",
+                    	    borderBottom: theme.palette.defaultBorder,
+                    	    verticalAlign: "middle",
+                    	    }}
+                    	/>
+                    	</ListItem>
 
-                        return (
-                        <ListItem
-                            key={index}
-                            style={{
-                            display: "table-row",
-                            verticalAlign: "middle",
-                            padding: 8,
-                            backgroundColor: index % 2 === 0 ? "#1A1A1A" : "#212121",
-                            borderBottomLeftRadius:
-                                userdata?.orgs?.length - 1 === index ? 8 : 0,
-                            borderBottomRightRadius:
-                                userdata?.orgs?.length - 1 === index ? 8 : 0,
-                            }}
-                        >
-                            <ListItemText
-                            primary={
-                                <img
-                                alt={data.name}
-                                src={data.image || theme.palette.defaultImage}
-                                style={imageStyle}
-                                />
-                            }
-                            style={{
-                                width: 100,
-                                minWidth: 100,
-                                maxWidth: 100,
-                                display: "table-cell",
-                                padding: "8px 8px 8px 20px",
-                                textAlign: "center",
-                            }}
-                            />
-                            <ListItemText
-                            primary={data?.name}
-                            style={{
-                                minWidth: 100,
-                                maxWidth: 300,
-                                overflow: "hidden",
-                                whiteSpace: "nowrap",
-                                textOverflow: "ellipsis",
-                                display: "table-cell",
-                                padding: 8,
-                                verticalAlign: "middle",
-                                textAlign: "center",
-                            }}
-                            ></ListItemText>
-                            {isCloud ? (
-                            <ListItemText
-                                primary={
-                                <div style={{ display: "flex", alignItems: "center" }}>
-                                    <img
-                                    alt={regiontag}
-                                    src={`https://flagcdn.com/w20/${regionCode}.png`}
-                                    style={{
-                                        display: "table-cell",
-                                        padding: 8,
-                                        verticalAlign: "middle",
-                                    }}
-                                    />
+                    	{userdata?.orgs?.length <= 0 ? (
+                    	[...Array(6)].map((_, rowIndex) => (
+                    	    <ListItem
+                    	    key={rowIndex}
+                    	    style={{
+                    	        display: "table-row",
+                    	        backgroundColor: "#212121",
+                    	    }}
+                    	    >
+                    	    {Array(7)
+                    	        .fill()
+                    	        .map((_, colIndex) => (
+                    	        <ListItemText
+                    	            key={colIndex}
+                    	            style={{
+                    	            display: "table-cell",
+                    	            padding: "8px",
+                    	            }}
+                    	        >
+                    	            <Skeleton
+                    	            variant="text"
+                    	            animation="wave"
+                    	            sx={{
+                    	                backgroundColor: "#1a1a1a",
+                    	                height: "20px",
+                    	                borderRadius: "4px",
+                    	            }}
+                    	            />
+                    	        </ListItemText>
+                    	        ))}
+                    	    </ListItem>
+                    	))
+                    	) : (
+                    	userdata?.orgs?.length > 0 &&
+                    	userdata.orgs.map((data, index) => {
+                    	    let regiontag = "UK";
+                    	    let regionCode = "gb";
 
-                                    <ListItemText primary={regiontag} />
-                                </div>
-                                }
-                                style={{
-                                display: "table-cell",
-                                padding: 8,
-                                verticalAlign: "middle",
-                                }}
-                            ></ListItemText>
-                            ) : null}
-                            <ListItemText
-                            primary={data.id}
-                            style={{
-                                minWidth: 300,
-                                maxWidth: 300,
-                                display: "table-cell",
-                                padding: 8,
-                                verticalAlign: "middle",
-                            }}
-                            />
-                            <ListItemText
-                            primary={
-                                <Button
-                                variant="outlined"
-                                style={{
-                                    whiteSpace: "nowrap",
-                                    textTransform: "none",
-                                    fontSize: 16,
-                                }}
-                                disabled={data?.id === userdata?.active_org?.id}
-                                onClick={() => {
-                                    handleClickChangeOrg(data?.id);
-                                }}
-                                >
-                                Change Active Org
-                                </Button>
+                    	    if (data.region_url?.length > 0) {
+								const regionsplit = data.region_url.split(".");
+								if (regionsplit.length > 2 && !regionsplit[0].includes("shuffler")) {
+									const namesplit = regionsplit[0].split("/");
+									regiontag = namesplit[namesplit.length - 1];
+
+									if (regiontag === "california") {
+									regiontag = "US";
+									regionCode = "us";
+									} else if (regiontag === "frankfurt") {
+									regiontag = "EU-2";
+									regionCode = "eu";
+									} else if (regiontag === "ca") {
+									regiontag = "CA";
+									regionCode = "ca";
+									}
+								}
+                    	    }
+
+                            var bgColor = themeMode === "dark" ? "#212121" : "#FFFFFF";
+                            if (index % 2 === 0) {
+                                bgColor = themeMode === "dark" ? "#1A1A1A" :  "#EAEAEA";
                             }
-                            style={{
-                                display: "table-cell",
-                                padding: 8,
-                                verticalAlign: "middle",
-                            }}
-                            ></ListItemText>
-                        </ListItem>
-                        );
-                    })
-                    )}
+
+                    	    return (
+                    	    <ListItem
+                    	        key={index}
+                    	        style={{
+                    	        display: "table-row",
+                    	        verticalAlign: "middle",
+                    	        padding: 8,
+                    	        backgroundColor: bgColor,
+                    	        borderBottomLeftRadius:
+                    	            userdata?.orgs?.length - 1 === index ? 8 : 0,
+                    	        borderBottomRightRadius:
+                    	            userdata?.orgs?.length - 1 === index ? 8 : 0,
+                    	        }}
+                    	    >
+                    	        <ListItemText
+                    	        primary={
+                    	            <img
+                    	            alt={data.name}
+                    	            src={data.image || theme.palette.defaultImage}
+                    	            style={imageStyle}
+                    	            />
+                    	        }
+                    	        style={{
+                    	            width: 100,
+                    	            minWidth: 100,
+                    	            maxWidth: 100,
+                    	            display: "table-cell",
+                    	            padding: "8px 8px 8px 20px",
+                    	            textAlign: "center",
+                    	        }}
+                    	        />
+                    	        <ListItemText
+                    	        primary={data?.name}
+                    	        style={{
+                    	            minWidth: 100,
+                    	            maxWidth: 300,
+                    	            overflow: "hidden",
+                    	            whiteSpace: "nowrap",
+                    	            textOverflow: "ellipsis",
+                    	            display: "table-cell",
+                    	            padding: 8,
+                    	            verticalAlign: "middle",
+                    	            textAlign: "center",
+                    	        }}
+                    	        ></ListItemText>
+                    	        {isCloud ? (
+                    	        <ListItemText
+                    	            primary={
+                    	            <div style={{ display: "flex", alignItems: "center" }}>
+                    	                <img
+                    	                alt={regiontag}
+                    	                src={`https://flagcdn.com/w20/${regionCode}.png`}
+                    	                style={{
+                    	                    display: "table-cell",
+                    	                    padding: 8,
+                    	                    verticalAlign: "middle",
+                    	                }}
+                    	                />
+
+                    	                <ListItemText primary={regiontag} />
+                    	            </div>
+                    	            }
+                    	            style={{
+                    	            display: "table-cell",
+                    	            padding: 8,
+                    	            verticalAlign: "middle",
+                    	            }}
+                    	        ></ListItemText>
+                    	        ) : null}
+                    	        <ListItemText
+                    	        primary={data.id}
+                    	        style={{
+                    	            minWidth: 300,
+                    	            maxWidth: 300,
+                    	            display: "table-cell",
+                    	            padding: 8,
+                    	            verticalAlign: "middle",
+                    	        }}
+                    	        />
+                    	        <ListItemText
+                    	        primary={
+                    	            <Button
+                    	            variant="outlined"
+                    	            style={{
+                    	                whiteSpace: "nowrap",
+                    	                textTransform: "none",
+                    	                fontSize: 16,
+                    	            }}
+                    	            disabled={data?.id === userdata?.active_org?.id}
+                    	            onClick={() => {
+                    	                handleClickChangeOrg(data?.id);
+                    	            }}
+                    	            >
+                    	            Change Active Org
+                    	            </Button>
+                    	        }
+                    	        style={{
+                    	            display: "table-cell",
+                    	            padding: 8,
+                    	            verticalAlign: "middle",
+                    	        }}
+                    	        ></ListItemText>
+                    	    </ListItem>
+                    	    );
+                    	})
+                    	)}
+					</span>}
                 </List>
                 </div>
                 </div>
diff --git a/frontend/src/components/UserManagmentTab.jsx b/frontend/src/components/UserManagmentTab.jsx
index 2bb924b0..81b65b94 100644
--- a/frontend/src/components/UserManagmentTab.jsx
+++ b/frontend/src/components/UserManagmentTab.jsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useContext, memo } from "react";
 import { toast } from 'react-toastify';
-
+import { Context } from "../context/ContextApi.jsx";
 import {
     FormControl,
     InputLabel,
@@ -35,7 +35,7 @@ import {
 import ModeEditOutlineOutlinedIcon from '@mui/icons-material/ModeEditOutlineOutlined';
 import ContentCopyOutlinedIcon from '@mui/icons-material/ContentCopyOutlined';
 
-import theme from "../theme.jsx";
+import {getTheme} from "../theme.jsx";
 const ITEM_HEIGHT = 48;
 const ITEM_PADDING_TOP = 8;
 const MenuProps = {
@@ -75,12 +75,16 @@ const UserManagmentTab = memo((props) => {
     const [logsViewModal, setLogsViewModal] = React.useState(false);
     const [ipSelected, setIpSelected] = React.useState("");
     const [userLogViewing, setUserLogViewing] = React.useState({});
+    const { themeMode, supportEmail, brandColor } = useContext(Context);
+    const theme = getTheme(themeMode, brandColor);
+
 
     useEffect(() => {
         if (selectedOrganization?.mfa_required !== MFARequired) {
           setMFARequired(selectedOrganization?.mfa_required);
         }
       }, [selectedOrganization]);
+
     useEffect(() => { if(users?.length === 0){
         getUsers();
     } }, []);
@@ -248,6 +252,14 @@ const UserManagmentTab = memo((props) => {
             return;
         }
 
+		if (event.target.value.includes("ALL")) {
+			toast.info("Adding to available all sub-organizations. This may take a minute.")
+			event.target.value = selectedOrganization.child_orgs.map((org) => org.id)
+		} else if (event.target.value.includes("None")) { 
+			toast.info("Removing from all sub-organizations. This may take a minute")
+			event.target.value = []
+		}
+
         console.log("event: ", event.target.value);
         setMatchingOrganizations(event.target.value);
         // Workaround for empty orgs
@@ -286,6 +298,14 @@ const UserManagmentTab = memo((props) => {
                     }}
                     MenuProps={MenuProps}
                 >
+					<MenuItem key={-2} value={"None"}>
+						<Checkbox checked={false} />
+						<ListItemText primary={"None"} />
+					</MenuItem>
+					<MenuItem key={-1} value={"ALL"}>
+						<Checkbox checked={false} />
+						<ListItemText primary={"ALL"} />
+					</MenuItem>
                     {selectedOrganization.child_orgs.map((org, index) => (
                         <MenuItem key={index} value={org.id}>
                             <Checkbox checked={matchingOrganizations.indexOf(org.id) > -1} />
@@ -347,7 +367,7 @@ const UserManagmentTab = memo((props) => {
                     toast("Failed to deactivate user: " + responseJson.reason);
                 } else if (responseJson.success === false) {
                     toast(
-                        "Failed to deactivate user. Please contact support@shuffler.io if this persists.",
+                        `Failed to deactivate user. Please contact ${supportEmail} if this persists.`,
                     );
                 } else {
                     toast("Changed activation for user " + data.id);
@@ -586,7 +606,7 @@ const UserManagmentTab = memo((props) => {
                   }}
             >
             <DialogTitle>
-                <Typography style={{ color: "white", textTransform: 'none', fontSize: 24 }}>
+                <Typography variant="h5" style={{ textTransform: 'none', fontSize: 24 }}>
                     Add user
                 </Typography>
             </DialogTitle>
@@ -603,7 +623,7 @@ const UserManagmentTab = memo((props) => {
                         InputProps={{
                             style: {
                                 height: "50px",
-                                color: "white",
+                                color: theme.palette.textFieldStyle.color,
                                 fontSize: "1em",
                             },
                         }}
@@ -636,7 +656,7 @@ const UserManagmentTab = memo((props) => {
                                 InputProps={{
                                     style: {
                                         height: "50px",
-                                        color: "white",
+                                        color: theme.palette.textFieldStyle.color,
                                         fontSize: "1em",
                                     },
                                 }}
@@ -666,17 +686,17 @@ const UserManagmentTab = memo((props) => {
                 </div>
                 {loginInfo}
             </DialogContent>
-                <Box sx={{ display: 'flex', justifyContent: 'flex-end', p: 2, backgroundColor: "#212121" }}>
+                <Box sx={{ display: 'flex', justifyContent: 'flex-end', p: 2, backgroundColor: theme.palette.platformColor }}>
                 <Button
-                    style={{ borderRadius: "2px", textTransform: 'none', fontSize:16, color: "#ff8544", marginRight: 5 }}
+                    style={{ borderRadius: "2px", textTransform: 'none', fontSize:16, marginRight: 5,  color: theme.palette.primary.main }}
                     onClick={() => setModalOpen(false)}
-                    color="primary"
                 >
                     Cancel
                 </Button>
                 <Button
                     variant="contained"
-                    style={{ borderRadius: "2px", textTransform: 'none', fontSize:16, color: "#1a1a1a", backgroundColor: "#ff8544" }}
+                    color="primary"
+                    style={{ borderRadius: "2px", textTransform: 'none', fontSize:16,}}
                     onClick={() => {
                         if (isCloud) {
                             inviteUser(modalUser);
@@ -684,7 +704,6 @@ const UserManagmentTab = memo((props) => {
                             submitUser(modalUser);
                         }
                     }}
-                    color="primary"
                 >
                     Submit
                 </Button>
@@ -735,7 +754,7 @@ const UserManagmentTab = memo((props) => {
               }}
         >
             <DialogTitle style={{ maxWidth: "800px", width: "100%", textAlign: "center", margin: "auto", backgroundColor: theme?.palette?.DialogStyle?.backgroundColor}}>
-                <span style={{ color: "white", backgroundColor: theme?.palette?.DialogStyle?.backgroundColor }}>
+                <span style={{ color: theme.palette.text.primary, backgroundColor: theme?.palette?.DialogStyle?.backgroundColor }}>
                     <EditIcon style={{ marginTop: 5 }} /> Editing {selectedUser.username}
                 </span>
             </DialogTitle>
@@ -752,7 +771,7 @@ const UserManagmentTab = memo((props) => {
                             InputProps={{
                                 style: {
                                     height: 50,
-                                    color: "white",
+                                    color: theme.palette.textFieldStyle.color,
                                 },
                             }}
                             color="primary"
@@ -795,7 +814,7 @@ const UserManagmentTab = memo((props) => {
                             InputProps={{
                                 style: {
                                     height: 50,
-                                    color: "white",
+                                    color: theme.palette.textFieldStyle.color,
                                 },
                             }}
                             color="primary"
@@ -829,9 +848,10 @@ const UserManagmentTab = memo((props) => {
                         backgroundColor: theme.palette.inputColor,
                     }}
                 />
-                <div style={{ margin: "auto", maxWidth: 450 }}>
-                    <Button
-                        style={{textTransform: 'none', fontSize: 16}}
+                <div style={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', margin: "auto", maxWidth: 450 }}>
+                    <div style={{ display: "flex", justifyContent: "space-between", width: "100%" }}>
+                        <Button
+                        style={{textTransform: 'none', fontSize: 16, whiteSpace: 'nowrap', textWrap: 'nowarp'}}
                         variant="outlined"
                         color="primary"
                         disabled={selectedUser.username === userdata.username}
@@ -843,7 +863,7 @@ const UserManagmentTab = memo((props) => {
                         {selectedUser.active ? "Delete from org" : "Delete from org"}
                     </Button>
                     <Button
-                        style={{ textTransform: 'none', fontSize: 16 }}
+                        style={{ textTransform: 'none', fontSize: 16, whiteSpace: 'nowrap', textWrap: 'nowarp',  }}
                         variant="outlined"
                         color="primary"
                         disabled={
@@ -864,7 +884,7 @@ const UserManagmentTab = memo((props) => {
                         }
                         variant="outlined"
                         color="primary"
-                        style={{textTransform: 'none', fontSize: 16}}
+                        style={{textTransform: 'none', fontSize: 16, whiteSpace: 'nowrap', textWrap: 'nowarp', }}
                     >
                         {selectedUser.mfa_info !== undefined &&
                             selectedUser.mfa_info !== null &&
@@ -872,6 +892,7 @@ const UserManagmentTab = memo((props) => {
                             ? "Disable 2FA"
                             : "Enable 2FA"}
                     </Button>
+                    </div>
 
                     {isCloud && userdata.support && selectedUser.id !== userdata.id ? (
                         <Button
@@ -881,6 +902,8 @@ const UserManagmentTab = memo((props) => {
                                 marginTop: 50,
                                 border: "1px solid #d52b2b",
                                 textTransform: "none",
+                                whiteSpace: 'nowrap',
+                                textWrap: 'nowarp',
                                 color:
                                     showDeleteAccountTextbox === true &&
                                         deleteAccountText?.length > 0 &&
@@ -932,7 +955,7 @@ const UserManagmentTab = memo((props) => {
                             InputProps={{
                                 style: {
                                     height: 50,
-                                    color: "white",
+                                    color: theme.palette.textFieldStyle.color,
                                 },
                             }}
                             color="primary"
@@ -1003,7 +1026,7 @@ const UserManagmentTab = memo((props) => {
                                 InputProps={{
                                     style: {
                                         height: 50,
-                                        color: "white",
+                                        color: theme.palette.textFieldStyle.color,
                                         fontSize: "1em",
                                     },
                                     maxLength: 6,
@@ -1111,7 +1134,7 @@ const UserManagmentTab = memo((props) => {
         }}
         >
           <DialogTitle>
-            <span style={{ color: "white" }}>User Logs</span>
+            <span style={{ color: theme.palette.text.primary }}>User Logs</span>
           </DialogTitle>
           <DialogContent>
             {/* ask user for which IP they want to see logs for by iterating of user.login_info */}
@@ -1253,23 +1276,23 @@ const UserManagmentTab = memo((props) => {
       ) : null
 
     return (
-        <div style={{ width: "100%", minHeight: 1100, boxSizing: 'border-box', padding: "27px 10px 19px 27px", height:"100%", backgroundColor: '#212121',borderTopRightRadius: '8px', borderBottomRightRadius: 8, borderLeft: "1px solid #494949", }}>
+        <div style={{ width: "100%", minHeight: 1100, boxSizing: 'border-box', padding: "27px 10px 19px 27px", height:"100%", backgroundColor: theme.palette.platformColor, borderTopRightRadius: '8px', borderBottomRightRadius: 8, borderLeft: "1px solid #494949", }}>
             {modalView}
             {editUserModal}
             {logview}
-            <div style={{ height: "100%", maxHeight: 1700, overflowY: "auto", scrollbarColor: '#494949 transparent', scrollbarWidth: 'thin'}}>
-            <div style={{ height: "100%", width: "calc(100% - 20px)", scrollbarColor: '#494949 transparent', scrollbarWidth: 'thin' }}>
+            <div style={{ height: "100%", maxHeight: 1700, overflowY: "auto", scrollbarColor: theme.palette.scrollbarColorTransparent, scrollbarWidth: 'thin'}}>
+            <div style={{ height: "100%", width: "calc(100% - 20px)", scrollbarColor: theme.palette.scrollbarColorTransparent, scrollbarWidth: 'thin' }}>
                 <div style={{display: 'flex', justifyContent: 'space-between'}}>
             <div>
                 <div style={{ marginBottom: 20 }}>
-                    <h2 style={{ marginBottom: 8, marginTop: 0, color: "#FFFFFF" }}>User Management</h2>
-                    <span style={{ color: "#9E9E9E" }}>
+                    <Typography variant="h5" style={{ marginBottom: 8, marginTop: 0,  }}>User Management</Typography>
+                    <Typography variant="body2" color="textSecondary">
                         Add, edit, distribute or remove users from your organization.{" "}
 						<a
                             target="_blank"
                             rel="noopener noreferrer"
                             href="/admin?admin_tab=sso"
-                            style={{ color: "#FF8444" }}
+                            style={{ color: theme.palette.linkColor }}
                         >
 							Configure SSO
                         </a> 
@@ -1280,15 +1303,15 @@ const UserManagmentTab = memo((props) => {
                             target="_blank"
                             rel="noopener noreferrer"
                             href="/docs/organizations#user_management"
-                            style={{ color: "#FF8444" }}
+                            style={{ color: theme.palette.linkColor }}
                         >
                             learn more about users 
                         </a> 
-                    </span>
+                    </Typography>
                 </div>
                 <div />
                 <Button
-                    style={{ color: "#1a1a1a", backgroundColor: "#ff8544",fontSize: 16, textTransform: 'none', borderRadius: 4, width: 162, height: 40, boxShadow: 'none' }}
+                    style={{ fontSize: 16, textTransform: 'none', borderRadius: 4, width: 162, height: 40, boxShadow: 'none' }}
                     variant="contained"
                     color="primary"
                     onClick={() => setModalOpen(true)}
@@ -1296,9 +1319,9 @@ const UserManagmentTab = memo((props) => {
                     Add user
                 </Button>
                 <Button
-                    style={{ backgroundColor: "#2F2F2F", boxShadow: 'none', borderRadius: 4, width: 81, height: 40, marginLeft: 16, marginRight: 15 }}
+                    style={{ boxShadow: 'none', borderRadius: 4, width: 81, height: 40, marginLeft: 16, marginRight: 15 }}
                     variant="contained"
-                    color="primary"
+                    color="secondary"
                     onClick={() => getUsers()}
                 >
                     <CachedIcon />
@@ -1318,7 +1341,7 @@ const UserManagmentTab = memo((props) => {
                 style={{
                 borderRadius: 4,
                 marginTop: 24,
-                border: "1px solid #494949",
+                border: theme.palette.defaultBorder,
                 width: "100%",
                 overflowX: "auto", 
                 paddingBottom: 0,
@@ -1334,8 +1357,8 @@ const UserManagmentTab = memo((props) => {
                     paddingBottom: 0,
                 }}
             >
-                <ListItem style={{ width: "100%", padding: "10px 10px 10px 0px", verticalAlign: 'middle', borderBottom: "1px solid #494949", display: "table-row" }}>
-                    {["Username", /*"API Key",*/ "Role", /*"Active",*/ "Type", "MFA", ...(selectedOrganization?.child_orgs?.length > 0 ? ["Suborgs"]: []), "Actions", "Last Login"].map((header, index) => (
+                <ListItem style={{ width: "100%", padding: "10px 10px 10px 0px", verticalAlign: 'middle', borderBottom: theme.palette.defaultBorder, display: "table-row" }}>
+                    {[...(isCloud ? ["Region"] : []), "Username", /*"API Key",*/ "Role", /*"Active",*/ "Type", "MFA", ...(selectedOrganization?.child_orgs?.length > 0 ? ["Suborgs"]: []), "Actions", "Last Login"].map((header, index) => (
                         <ListItemText
                             key={index}
                             primary={header}
@@ -1344,7 +1367,7 @@ const UserManagmentTab = memo((props) => {
                                 padding: index === 0 ? "0px 8px 8px 15px": "0px 8px 8px 8px",
                                 whiteSpace: "nowrap",
                                 textOverflow: "ellipsis",
-                                borderBottom: "1px solid #494949",
+                                borderBottom: theme.palette.defaultBorder,
                                 position: "sticky",
                                 verticalAlign: "middle",
                              }}
@@ -1357,10 +1380,10 @@ const UserManagmentTab = memo((props) => {
                             key={rowIndex}
                             style={{
                                 display: "table-row",
-                                backgroundColor: "#212121",
+                                backgroundColor: theme.palette.platformColor,
                             }}
                         >
-                            {Array(9)
+                            {Array(isCloud ? 7 : 6)
                                 .fill()
                                 .map((_, colIndex) => (
                                     <ListItemText
@@ -1374,7 +1397,7 @@ const UserManagmentTab = memo((props) => {
                                             variant="text"
                                             animation="wave"
                                             sx={{
-                                                backgroundColor: "#1a1a1a",
+                                                backgroundColor: theme.palette.loaderColor,
                                                 height: "20px",
                                                 borderRadius: "4px",
                                             }}
@@ -1385,9 +1408,9 @@ const UserManagmentTab = memo((props) => {
                     ))
                 ): users === 0 ? null 
                     : users?.map((data, index) => {
-                        var bgColor = "#212121";
+                        var bgColor = themeMode === "dark" ? "#212121" : "#FFFFFF";
                         if (index % 2 === 0) {
-                            bgColor = "#1A1A1A";
+                            bgColor = themeMode === "dark" ? "#1A1A1A" :  "#EAEAEA";
                         }
 
                         const timeNow = new Date().getTime();
@@ -1418,8 +1441,7 @@ const UserManagmentTab = memo((props) => {
                                 style={{
                                 cursor: "pointer",
                                 textDecoration: "underline",
-                                textDecorationColor: "#F76742",
-                                color: "#F76742",
+                                color: theme.palette.linkColor,
                                 }}
                                 onClick={() => {
                                 setLogsViewModal(true);
@@ -1436,8 +1458,16 @@ const UserManagmentTab = memo((props) => {
                             );
                         }
 
+
+                        const userRegion =  data?.user_geo_info?.country?.iso_code
+
                         return (
                             <ListItem key={index} style={{ backgroundColor: bgColor, display: 'table-row', borderBottomLeftRadius: users?.length - 1 === index ? 8 : 0, borderBottomRightRadius: users?.length - 1 === index ? 8 : 0 }}>
+                                {isCloud ? (
+                                    <ListItemText
+                                    primary={(<img src={`https://flagcdn.com/48x36/${userRegion.toLowerCase()}.png`} alt={data?.user_geo_info?.country?.iso_code} style={{ marginRight: 30, width: 25, height: 23, }} />)}
+                                    style={{ display: 'table-cell', verticalAlign: 'middle', textAlign: 'center' }}
+                                />) : null}
                                 <ListItemText
                                 primary={(
                                     <Tooltip title={data.username || 'No username available'}>
@@ -1449,7 +1479,7 @@ const UserManagmentTab = memo((props) => {
                                     maxWidth: 150,
                                     minWidth: 100,
                                     width: 'auto',
-                                    color: "#FF8444",
+                                    color: theme.palette.primary.main,
                                     textOverflow: "ellipsis",
                                     whiteSpace: "nowrap",
                                     overflow: "hidden",
@@ -1506,8 +1536,8 @@ const UserManagmentTab = memo((props) => {
                                                 setUser(data.id, "role", e.target.value);
                                             }}
                                             sx={{
-                                                backgroundColor: "#1A1A1A",
-                                                color: "white",
+                                                backgroundColor: theme.palette.backgroundColor,
+                                                color: theme.palette.textColor,
                                                 height: "50px",
                                                 borderRadius: "4px",
                                                 marginTop: "8px",
@@ -1526,27 +1556,35 @@ const UserManagmentTab = memo((props) => {
                                         >
                                             <MenuItem
                                                 sx={{
-                                                    backgroundColor: theme.palette.textFieldStyle.backgroundColor,
-                                                    color: "white",
-                                                    
+                                                    backgroundColor: theme.palette.backgroundColor,
+                                                    color: theme.palette.textColor,
+                                                    "&:hover": {
+                                                        backgroundColor: theme.palette.hoverColor,
+                                                    },
                                                 }}
                                                 value={"admin"}
                                             >
                                                 Org Admin
                                             </MenuItem>
                                             <MenuItem
-                                                style={{
-                                                    backgroundColor: theme.palette.textFieldStyle.backgroundColor,
-                                                    color: "white",
+                                                sx={{
+                                                    backgroundColor: theme.palette.backgroundColor,
+                                                    color: theme.palette.textColor,
+                                                    "&:hover": {
+                                                        backgroundColor: theme.palette.hoverColor,
+                                                    },
                                                 }}
                                                 value={"user"}
                                             >
                                                 Org User
                                             </MenuItem>
                                             <MenuItem
-                                                style={{
-                                                    backgroundColor: theme.palette.textFieldStyle.backgroundColor,
-                                                    color: "white",
+                                                sx={{
+                                                    backgroundColor: theme.palette.backgroundColor,
+                                                    color: theme.palette.textColor,
+                                                    "&:hover": {
+                                                        backgroundColor: theme.palette.hoverColor,
+                                                    },
                                                 }}
                                                 value={"org-reader"}
                                             >
@@ -1557,10 +1595,12 @@ const UserManagmentTab = memo((props) => {
                                     style={{ display:'table-cell', verticalAlign: 'middle' }}
                                 />
 
+								{/*
                                 <ListItemText
                                     primary={data.active ? "True" : "False"}
                                     style={{display:'table-cell',verticalAlign: 'middle' , padding: "8px", textAlign: "center", color: data.active ? "#02CB70" : "#F53434" }}
                                 />
+								*/}
 
                                 <ListItemText
                                     primary={
@@ -1573,7 +1613,6 @@ const UserManagmentTab = memo((props) => {
                                     style={{  display:'table-cell',verticalAlign: 'middle', padding: "8px",  }}
                                 />
 
-								{/*
                                 <ListItemText
                                     primary={
                                         data?.mfa_info !== undefined &&
@@ -1584,7 +1623,6 @@ const UserManagmentTab = memo((props) => {
                                     }
                                     style={{ display:'table-cell', verticalAlign: 'middle',padding: "8px", color: data.mfa_info.active ? "#02CB70" : "#F53434" }}
                                 />
-								*/} 
 
                                 {selectedOrganization?.child_orgs !== undefined &&
                                     selectedOrganization?.child_orgs !== null &&
@@ -1648,7 +1686,20 @@ const UserManagmentTab = memo((props) => {
                                             }
                                         }}
                                     >
-                                        <img src="/icons/editIcon.svg" alt="edit icon" style={{width: 24, height: 24}} />
+                                        <svg
+                                        width="24"
+                                        height="24"
+                                        viewBox="0 0 24 24"
+                                        fill="none"
+                                        xmlns="http://www.w3.org/2000/svg"
+                                        >
+                                        <path
+                                            d="M16.1038 4.66848C16.3158 4.45654 16.5674 4.28843 16.8443 4.17373C17.1212 4.05903 17.418 4 17.7177 4C18.0174 4 18.3142 4.05903 18.5911 4.17373C18.868 4.28843 19.1196 4.45654 19.3315 4.66848C19.5435 4.88041 19.7116 5.13201 19.8263 5.40891C19.941 5.68582 20 5.9826 20 6.28232C20 6.58204 19.941 6.87882 19.8263 7.15573C19.7116 7.43263 19.5435 7.68423 19.3315 7.89617L8.43807 18.7896L4 20L5.21038 15.5619L16.1038 4.66848Z"
+                                            stroke={themeMode=== "dark" ? "#F1F1F1" : "#333"}
+                                            strokeLinecap="round"
+                                            strokeLinejoin="round"
+                                        />
+                                        </svg>
                                     </IconButton>
                                     {/* <Button
                                         onClick={() => {
diff --git a/frontend/src/components/WorkflowGrid.jsx b/frontend/src/components/WorkflowGrid.jsx
index 5de17156..218cc060 100644
--- a/frontend/src/components/WorkflowGrid.jsx
+++ b/frontend/src/components/WorkflowGrid.jsx
@@ -24,7 +24,7 @@ import {
 import WorkflowPaper from "../components/WorkflowPaper.jsx"
 import WorkflowPaperNew from "../components/WorkflowPaperNew.jsx"
 
-const searchClient = algoliasearch("JNSS5CFDZZ", "db08e40265e2941b9a7d8f644b6e5240")
+const searchClient = algoliasearch("JNSS5CFDZZ", "c8f882473ff42d41158430be09ec2b4e")
 const AppGrid = props => {
 	const { maxRows, showName, showSuggestion, isMobile, globalUrl, parsedXs, alternativeView, onlyResults, inputsearch } = props
 
diff --git a/frontend/src/components/WorkflowTemplatePopup2.jsx b/frontend/src/components/WorkflowTemplatePopup2.jsx
index 13810251..2c94ec14 100644
--- a/frontend/src/components/WorkflowTemplatePopup2.jsx
+++ b/frontend/src/components/WorkflowTemplatePopup2.jsx
@@ -1,11 +1,12 @@
-import React, { useState, useEffect } from "react";
+import React, { useState, useEffect, useContext } from "react";
 
 import { toast } from "react-toastify" 
-import theme from '../theme.jsx';
+import {getTheme} from '../theme.jsx';
 import { useNavigate, Link, useParams } from "react-router-dom";
 import AppSearchButtons from "../components/AppSearchButtons.jsx";
 import { isMobile } from "react-device-detect";
 import RenderCytoscape from "../components/RenderCytoscape.jsx";
+import { Context } from "../context/ContextApi.jsx";
 import {
 	Button,
 	Typography,
@@ -72,7 +73,8 @@ const WorkflowTemplatePopup = (props) => {
 	const [loadingWorkflow, setLoadingWorkflow] = React.useState(false)
 	const [workflow, setWorkflow] = useState(inputWorkflow !== undefined && inputWorkflow !== null && inputWorkflow.id !== undefined && inputWorkflow.id !== null && inputWorkflow.id !== "" ? inputWorkflow : {})
 	const [_, setUpdate] = useState(0)
-
+	const { themeMode } = useContext(Context);
+	const theme = getTheme(themeMode)
 	const fetchWorkflow = (id) => {
 		if (id === undefined || id === null || id === "") {
 			return
@@ -549,12 +551,10 @@ const WorkflowTemplatePopup = (props) => {
         	    open={modalOpen}
         	    onClose={handleClose}
         	    PaperProps={{
-        	        style: {
-						backgroundColor: "black",
-        	            color: "white",
-        	            minWidth: isHomePage ? null : isMobile ? 300 : 750,
-        	            maxWidth: isHomePage ? null : isMobile ? 300 : 750,
-						paddingTop: isMobile ? null : 75, 
+        	        sx: {
+						backgroundColor: theme.palette.drawer.backgroundColor,
+        	            minWidth: isHomePage ? null : isMobile ? "300px" : "750px",
+        	            maxWidth: isHomePage ? null : isMobile ? "300px" : "750px",
 						itemAlign: "center",
         	        },
         	    }}
@@ -571,7 +571,7 @@ const WorkflowTemplatePopup = (props) => {
 				>
 				  <CloseIcon />
 				</IconButton>
-				<DialogContent style={{marginTop: 0, marginLeft: isHomePage ? null : isMobile ? null :  75, maxWidth: 470, marginTop: 20 }}>
+				<DialogContent style={{paddingTop: isMobile ? null : "75px", backgroundColor: theme.palette.drawer.backgroundColor, marginTop: 0, paddingLeft: isHomePage ? null : isMobile ? null :  75, maxWidth: "100%",}}>
 					<Typography variant="h4" style={{ fontSize: isMobile ? 20 : null}}>
 						<b>Configure Workflow</b>
 					</Typography> 
@@ -790,7 +790,7 @@ const WorkflowTemplatePopup = (props) => {
 					width: isHomePage? isMobile ? null : "100%" : "99%",
 					borderRadius: 8,
 					textTransform: "none",
-					backgroundColor: isHomePage ? null : theme.palette.inputColor,
+					backgroundColor: isHomePage ? null : theme.palette.platformColor,
 					border: borderStyle,
 					cursor: isActive ? errorMessage !== "" ? "not-allowed" : "pointer" : "pointer",
 					position: "relative",
@@ -878,7 +878,7 @@ const WorkflowTemplatePopup = (props) => {
 
 						</div>
 						<div style={{ marginLeft: 20, overflow: "hidden", maxHeight: 30, marginTop: visualOnly ? 12 : showTryitOut && !isActive ? 8 : 23, }}>
-							<Typography variant="body1" style={{ marginTop: parsedDescription.length === 0 ? 10 : 0, fontSize: isMobile ? 13 : 16, fontWeight: isHomePage ? 600 : null, textTransform: 'capitalize', color: isHomePage ? "var(--White-text, #F1F1F1)" : "rgba(241, 241, 241, 1)"}} >
+							<Typography variant="body1" color="textPrimary" style={{ marginTop: parsedDescription.length === 0 ? 10 : 0, fontSize: isMobile ? 13 : 16, fontWeight: isHomePage ? 600 : null, textTransform: 'capitalize', }} >
 								<b>{parsedTitle}</b>
 							</Typography>
 						</div>
diff --git a/frontend/src/components/WorkflowValidationTimeline.jsx b/frontend/src/components/WorkflowValidationTimeline.jsx
index 6df160c8..2d724cfc 100644
--- a/frontend/src/components/WorkflowValidationTimeline.jsx
+++ b/frontend/src/components/WorkflowValidationTimeline.jsx
@@ -398,8 +398,9 @@ const WorkflowValidationTimeline = (props) => {
 									nodecolor = green
 									branchcolor = green
 								} else {
-									nodecolor = grey 
-									branchcolor = grey 
+									// Green by default
+									nodecolor = green 
+									branchcolor = green 
 								}
 							} else {
 								nodecolor = green
@@ -561,8 +562,6 @@ const WorkflowValidationTimeline = (props) => {
 					nodecolor = green
 					branchcolor = green
 				} 
-				
-
 
 				var flex = index !== 0 && index !== relevantactions.length - 1 ? 1 : 3
 				if (nodecolor === green) {
@@ -676,7 +675,6 @@ const WorkflowValidationTimeline = (props) => {
 									{founderror.length > 0 ? founderror : `App: ${appname} - Action: ${action.label}`} 
 								</Typography>
 							} placement="top">
-
 								<Chip label={`${appname}`} style={chipStyle}  icon={
 									<Avatar
 										variant="round"
diff --git a/frontend/src/components/Workflowsearch.jsx b/frontend/src/components/Workflowsearch.jsx
index b8f4c022..1b342645 100644
--- a/frontend/src/components/Workflowsearch.jsx
+++ b/frontend/src/components/Workflowsearch.jsx
@@ -10,7 +10,7 @@ import algoliasearch from 'algoliasearch';
 import { InstantSearch, connectSearchBox, connectHits } from 'react-instantsearch-dom';
 import { Grid, Paper, TextField, ButtonBase, InputAdornment, Typography, Button, Tooltip} from '@mui/material';
 
-const searchClient = algoliasearch("JNSS5CFDZZ", "db08e40265e2941b9a7d8f644b6e5240")
+const searchClient = algoliasearch("JNSS5CFDZZ", "c8f882473ff42d41158430be09ec2b4e")
 const WorkflowSearch = props => {
 	const { maxRows, showName, showSuggestion, isMobile, globalUrl, parsedXs, newSelectedApp, setNewSelectedApp, defaultSearch, showSearch, ConfiguredHits, selectAble, }  = props
 	const rowHandler = maxRows === undefined || maxRows === null ? 50 : maxRows
diff --git a/frontend/src/components/ssoTab.jsx b/frontend/src/components/ssoTab.jsx
index 8f39a296..e220ea6f 100644
--- a/frontend/src/components/ssoTab.jsx
+++ b/frontend/src/components/ssoTab.jsx
@@ -1,4 +1,4 @@
-import { useEffect } from "react";
+import { useEffect, useContext } from "react";
 import React from "react";
 import { 
     Typography, 
@@ -7,16 +7,14 @@ import {
     Tooltip, 
     TextField, 
     Grid, 
-    Skeleton,
-    Dialog,
-    DialogTitle,
-    DialogContent,
-    Box,
+    Checkbox
 } from "@mui/material";
 import { makeStyles } from "@mui/styles";
 import { Link } from "react-router-dom";
 import theme from "../theme.jsx";
 import { toast } from "react-toastify";
+import { Context } from "../context/ContextApi.jsx";
+import { getTheme } from "../theme.jsx";
 
 const useStyles = makeStyles({
 	notchedOutline: {
@@ -30,6 +28,16 @@ const SSOTab = ({selectedOrganization, userdata, isEditOrgTab, globalUrl, handle
     const classes = useStyles();
     const [show2faSetup, setShow2faSetup] = React.useState(false);
 	const [autoPrivision, setAutoProvision] = React.useState(selectedOrganization?.sso_config?.auto_provision)
+	const [roleRequired, setRoleRequired] = React.useState(selectedOrganization?.sso_config?.role_required || false);
+	const [showOpenIdCred, setShowOpenIdCred] = React.useState(false);
+	const [showSamlCred, setShowSamlCred] = React.useState(false);
+	const [skipSSOForAdmin, setSkipSSOForAdmin] = React.useState(
+		selectedOrganization?.sso_config === undefined
+			? false
+			: selectedOrganization?.sso_config?.skip_sso_for_admins === undefined
+				? false
+				: selectedOrganization?.sso_config?.skip_sso_for_admins
+	);
     const [ssoEntrypoint, setSsoEntrypoint] = React.useState(
 		selectedOrganization.sso_config === undefined
 			? ""
@@ -86,6 +94,9 @@ const SSOTab = ({selectedOrganization, userdata, isEditOrgTab, globalUrl, handle
 				: selectedOrganization.sso_config.openid_token
 	)
 
+	const { themeMode, supportEmail, brandColor } = useContext(Context);
+	const theme = getTheme(themeMode, brandColor);
+
     useEffect(()=>{
         
 		if (openidClientSecret !== selectedOrganization?.sso_config?.client_secret) {
@@ -118,12 +129,21 @@ const SSOTab = ({selectedOrganization, userdata, isEditOrgTab, globalUrl, handle
 		if (autoPrivision !== selectedOrganization?.sso_config?.auto_provision) {
 			setAutoProvision(selectedOrganization?.sso_config?.auto_provision)
 		}
+
+		if (roleRequired !== selectedOrganization?.sso_config?.role_required) {
+			setRoleRequired(selectedOrganization?.sso_config?.role_required)
+		}
+
+		if (skipSSOForAdmin !== selectedOrganization?.sso_config?.skip_sso_for_admins) {
+			setSkipSSOForAdmin(selectedOrganization?.sso_config?.skip_sso_for_admins)
+		}
+
     },[selectedOrganization])
 
     const orgSaveButton = (
 		<Tooltip title="Save any unsaved data" placement="bottom">
 			<Button
-				style={{ width: 244, height: 51, flex: 1, textTransform: 'capitalize', padding: "16px, 24px, 16px, 24px", borderRadius: 4, backgroundColor: "#ff8544", color: "#1a1a1a",  fontSize: 16, }}
+				style={{ width: 244, height: 51, flex: 1, textTransform: 'capitalize', padding: "16px, 24px, 16px, 24px", borderRadius: 4,  fontSize: 16, }}
 				variant="contained"
 				color="primary"
 				disabled={
@@ -160,9 +180,15 @@ const SSOTab = ({selectedOrganization, userdata, isEditOrgTab, globalUrl, handle
 							openid_token: openidToken,
 							SSORequired: SSORequired,
 							auto_provision: autoPrivision,
-						}
+							role_required: roleRequired,
+							skip_sso_for_admins: skipSSOForAdmin,
+						},
+						undefined, 
+						{},     
+						"sso_config"
 					)
 				}
+
 			>
 				Save Changes
 				{/* <SaveIcon /> */}
@@ -196,17 +222,35 @@ const SSOTab = ({selectedOrganization, userdata, isEditOrgTab, globalUrl, handle
 			openidAuthorization === "" &&
 			openidToken === ""
 		) {
-			if (!autoPrivision) {
-				toast.error(
-					"Please fill in fields for either OpenID connect or SSO before continuing. "
-				);
-				return;
-			}
+			toast.error(
+				"Please fill in fields for either OpenID connect or SSO before continuing. "
+			);
 		} else {
 			setAutoProvision((prev)=> !prev);
 			toast.info("Toggled Auto Provisioning. Remember to save.");
 		}
 	};
+
+	const handleChangeRoleRequired = (event) => {
+		if (
+			openidAuthorization?.length === 0 &&
+			openidToken?.length === 0
+		) {
+			toast.error(
+				"Please fill in fields for OpenID connect before continuing. "
+			);
+			return;
+		} else {
+			setRoleRequired((prev)=> !prev);
+			toast.info("Toggled Role Required. Remember to save.");
+		}
+	}
+
+	const handlechangeSkipSSOForAdmin = (event) => {
+		
+		setSkipSSOForAdmin((prev) => !prev);
+		toast.info("Toggled Skip SSO for Admins. Remember to save.");
+	};	
 	
 	const HandleTestSSO = () => {
 		const url = `${globalUrl}/api/v1/orgs/${selectedOrganization?.id}/change`;
@@ -229,7 +273,7 @@ const SSOTab = ({selectedOrganization, userdata, isEditOrgTab, globalUrl, handle
 			.then((response) => {
 				if (response.status !== 200) {
 					toast.error(
-						"Failed to test SSO. Please try again later or contact support@shuffler.io if issue persists.",
+						`Failed to test SSO. Please try again later or contact ${supportEmail} if issue persists.`,
 						{ duration: 3000 }
 					);
 					return null;
@@ -266,10 +310,10 @@ const SSOTab = ({selectedOrganization, userdata, isEditOrgTab, globalUrl, handle
 	};
 
     return (
-        <div style={{ width: "100%", height: "100%",boxSizing: 'border-box', padding: "27px 10px 19px 27px", height:"100%", backgroundColor: '#212121', borderRadius: '16px',  }}>
-			<div style={{ height: "100%", width: "100%", overflowX: 'hidden', scrollbarColor: '#494949 transparent', scrollbarWidth: 'thin'}} >
+        <div style={{ width: "100%", height: "100%",boxSizing: 'border-box', padding: "27px 10px 19px 27px",  backgroundColor: theme.palette.platformColor , borderRadius: '16px',  }}>
+			<div style={{ height: "100%", width: "100%", overflowX: 'hidden', scrollbarColor: theme.palette.scrollbarColorTransparent, scrollbarWidth: 'thin'}} >
              <div style={{ width: "100%", overflowX: 'hidden', maxWidth: 883}}>
-			 <Typography style={{ width: "100%",  fontWeight: 'bold', fontSize: 24}}>
+			 <Typography variant="h5" style={{ width: "100%",  fontWeight: 500, fontSize: 24}}>
 					SSO Configuration
 				</Typography>
 				<div
@@ -284,7 +328,7 @@ const SSOTab = ({selectedOrganization, userdata, isEditOrgTab, globalUrl, handle
 					<Typography
 						variant="body2"
 						color="textSecondary"
-						style={{ marginTop: 5, marginBottom: 5, color: "rgba(158, 158, 158, 1)", fontSize: 16, fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)", fontWeight: 400 }}
+						style={{ marginTop: 5, marginBottom: 5, fontSize: 16, fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)", fontWeight: 400 }}
 					>
 						Make SAML SSO or OpenID Authentication Required or Optional for Your Organization.
 					</Typography>
@@ -314,7 +358,7 @@ const SSOTab = ({selectedOrganization, userdata, isEditOrgTab, globalUrl, handle
 					<Typography
 						variant="body2"
 						color="textSecondary"
-						style={{ marginTop: 5, marginBottom: 5, color: "rgba(158, 158, 158, 1)", fontSize: 16, fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)", fontWeight: 400 }}
+						style={{ marginTop: 5, marginBottom: 5, fontSize: 16, fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)", fontWeight: 400 }}
 					>
 						Auto-provisioning of users in SSO. By default, users are auto-provisioned in SSO when they login. If you enable this, no new user will be added in your organization when they login via SSO.
 					</Typography>
@@ -331,6 +375,65 @@ const SSOTab = ({selectedOrganization, userdata, isEditOrgTab, globalUrl, handle
 					
 				</div>
 
+				<div
+					style={{
+						display: "flex",
+						flexDirection: "column",
+						width: "100%",
+                        justifyContent: 'flex-start',
+						marginTop: 30
+					}}
+					>
+					<Typography
+						variant="body2"
+						color="textSecondary"
+						style={{ marginTop: 5, marginBottom: 5, color: "rgba(158, 158, 158, 1)", fontSize: 16, fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)", fontWeight: 400 }}
+					>
+						Restrict user login to SSO if no valid role is assigned by the SSO provider. When enabled, users will not be allowed to log in via SSO if their assigned role doesn't matches one of the following: shuffle-user, shuffle-admin, or shuffle-org-reader. Currently, available for OpenId Connect only. 
+						<a href="https://shuffler.io/docs/extensions#how-to-assign-a-role-to-a-new-user-from-an-sso-provider-(openid-connect)-in-shuffle" target="_blank" style={{ color: theme.palette.linkColor }}> Learn more</a>
+						 </Typography>
+					<div>
+						<Switch
+						checked={roleRequired}
+						onChange={handleChangeRoleRequired}
+                        sx={{marginBottom: 0.6, marginTop: 0.6}}
+						name="onOffSwitch"
+						color="primary"
+						title="Disable auto-provisioning of users in SSO"
+						/>
+					</div>
+					
+				</div>
+				{userdata && userdata?.active_org?.creator_org?.length > 0 ? null : 
+				<div
+					style={{
+						display: "flex",
+						flexDirection: "column",
+						width: "100%",
+                        justifyContent: 'flex-start',
+						marginTop: 30
+					}}
+					>
+					<Typography
+						variant="body2"
+						color="textSecondary"
+						style={{ marginTop: 5, marginBottom: 5, color: "rgba(158, 158, 158, 1)", fontSize: 16, fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)", fontWeight: 400 }}
+					>
+						Skip SSO for Admins. When enabled, parent org admins will be able switch to the sub-organization without SSO. 	
+					</Typography>
+					<div>
+						<Switch
+						checked={skipSSOForAdmin}
+						onChange={handlechangeSkipSSOForAdmin}
+                        sx={{marginBottom: 0.6, marginTop: 0.6}}
+						name="onOffSwitch"
+						color="primary"
+						title="Disable auto-provisioning of users in SSO"
+						/>
+					</div> 
+				</div>
+				}
+
 					<div
 					style={{
 						display: "flex",
@@ -340,7 +443,7 @@ const SSOTab = ({selectedOrganization, userdata, isEditOrgTab, globalUrl, handle
 						paddingBottom: 10,
 					}}
 					>
-					<Typography style={{color: "rgba(158, 158, 158, 1)", margin: "5px 0px 5px 0px", fontSize: 16, fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)" }}>
+					<Typography variant="body2" color="textSecondary" style={{ margin: "5px 0px 5px 0px", fontSize: 16, fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)" }}>
 						You can test your SSO configuration by clicking the button below.
 						Before testing, ensure you have set Open ID Connect or SAML SSO
 						credentials.
@@ -361,7 +464,7 @@ const SSOTab = ({selectedOrganization, userdata, isEditOrgTab, globalUrl, handle
 						<Button
 							variant="outlined"
 							color="primary"
-							style={{ width: 100, textTransform: "none", margin: "10px 10px 10px 0px" }}
+							style={{ width: 100, textTransform: "none", margin: "10px 10px 10px 0px", whiteSpace: "nowrap" }}
 							disabled={
 							!(
 								ssoEntrypoint?.length > 0 ||
@@ -379,93 +482,113 @@ const SSOTab = ({selectedOrganization, userdata, isEditOrgTab, globalUrl, handle
 					</div>
 				<Grid item xs={12} sx={{marginTop: 2}}>
 					<span style={{ display: "flex", flexDirection: "column" }}>
-						<Typography style={{ textAlign: "left", color: "rgba(241, 241, 241, 1)", fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)", fontSize: 24, fontWeight: "bold", }}>OpenID connect</Typography>
-						<span style={{ marginTop: 8, color: "rgba(158, 158, 158, 1)", fontSize: 16,  fontWeight: 400 }}>
+						<Typography variant="h5" color="textPrimary" style={{ textAlign: "left", fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)", fontSize: 24, fontWeight: 500, }}>OpenID connect</Typography>
+						<span style={{ marginTop: 8, color: theme.palette.text.secondary, fontSize: 16,  fontWeight: 400 }}>
 							Configure and Authorize SAML / SSO or OpenID connect. {" "}
 							<a
 								target="_blank"
 								href="/docs/extensions#single-signon"
-								style={{ color: "rgba(255, 132, 68, 1)" }}
+								style={{ color: theme.palette.linkColor }}
 							>
 								Learn more
 							</a>
 						</span>
 					</span>
-					<Typography style={{ textAlign: "left", fontSize: 16, marginTop: 8, color: "rgba(158, 158, 158, 1)", fontWeight: 400 }}>
-						IdP URL for Shuffle OpenID: <Link to={`${globalUrl}/api/v1/login_openid`} target="_blank" style={{ color: "rgba(241, 241, 241, 1)", textDecoration: "none", fontSize: 16,}}>{`${globalUrl}/api/v1/login_openid`}</Link>
-					</Typography>
+					<Typography variant="body2" color="tehttp://localhost:5002/api/v1/login_openidxtSecondary" style={{ textAlign: "left", fontSize: 16, marginTop: 8,  fontWeight: 400 }}>
+						IdP URL for Shuffle OpenID: <Link to={`${globalUrl}/api/v1/login_openid`} target="_blank" style={{ color: theme.palette.text.secondary, textDecoration: "none", fontSize: 16,}}>{`${globalUrl}/api/v1/login_openid`}</Link>
+						</Typography>
+						<div style={{ display: 'flex', marginTop: 10, }}>
+							<Typography
+								color="textSecondary"
+								style={{
+								textAlign: "left",
+								fontSize: 16,
+								marginTop: 8,
+								fontWeight: 400,
+								}}
+							>
+								Show OpenID Credentials
+							</Typography>
+							<Checkbox
+								checked={showOpenIdCred}
+								onChange={(e) => setShowOpenIdCred(e.target.checked)}
+								name="showOpenIdCred"
+								color="primary"
+							/>
+							</div>
 					<Grid container style={{ marginTop: 8, }} spacing={2}>
 						<Grid item xs={6} style={{}}>
 							<span>
-								<Typography style={{ color: "rgba(255, 255, 255, 1)", fontSize: 16, fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)", fontWeight: 400, fontSize: 16 }}>Client ID</Typography>
+								<Typography style={{ fontSize: 16, fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)", fontWeight: 400, }}>Client ID</Typography>
 								<TextField
 									required
 									style={{
 										flex: "1",
 										marginTop: "5px",
 										marginRight: "15px",
-										backgroundColor: isEditOrgTab ? "rgba(33, 33, 33, 1)" : theme.palette.inputColor,
+										backgroundColor: isEditOrgTab ? theme.palette.textFieldStyle.backgroundColor : theme.palette.inputColor,
 									}}
 									fullWidth={true}
-									type="name"
 									multiline={true}
 									rows={2}
 									id="outlined-with-placeholder"
 									margin="normal"
 									variant="outlined"
 									placeholder="The OpenID client ID from the identity provider"
-									value={openidClientId}
-									onChange={(e) => {
-										setOpenidClientId(e.target.value);
-									}}
+									value={showOpenIdCred ? openidClientId : openidClientId?.length > 0 ? "•".repeat(50) : ""}
+										onChange={(e) => setOpenidClientId(e.target.value)}
+										onFocus={(e) => setShowOpenIdCred(true)}
+										onBlur={(e) => setShowOpenIdCred(false)}
 									InputProps={{
 										classes: {
-											notchedOutline: isEditOrgTab ? null : classes.notchedOutline,
+										notchedOutline: isEditOrgTab ? null : classes.notchedOutline,
 										},
 										style: {
-											color: "white",
-											fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)",
-											fontWeight: 400,
-											fontSize: 16,
-											borderRadius: 4,
+										color: theme.palette.textFieldStyle.color,
+										fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)",
+										fontWeight: 400,
+										fontSize: 16,
+										borderRadius: theme.palette.textFieldStyle.borderRadius,
 										},
 									}}
-								/>
+									/>
 							</span>
 						</Grid>
 						<Grid item xs={6} style={{}}>
 							<span>
-								<Typography style={{ color: "rgba(255, 255, 255, 1)", fontSize: 16, fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)", fontWeight: 400, fontSize: 16 }}>Client Secret</Typography>
+								<Typography style={{ fontSize: 16, fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)", fontWeight: 400, }}>Client Secret</Typography>
 								<TextField
 									required
 									style={{
 										flex: "1",
 										marginTop: "5px",
 										marginRight: "15px",
-										backgroundColor: isEditOrgTab ? "rgba(33, 33, 33, 1)" : theme.palette.inputColor,
+										backgroundColor: isEditOrgTab ? theme.palette.textFieldStyle.backgroundColor : theme.palette.inputColor,
 									}}
 									fullWidth={true}
-									type="name"
+									type={showOpenIdCred ? "text" : "password"}
 									multiline={true}
 									rows={2}
 									id="outlined-with-placeholder"
 									margin="normal"
 									variant="outlined"
 									placeholder="The OpenID client secret - DONT use this if dealing with implicit auth / PKCE"
-									value={openidClientSecret}
+									value={showOpenIdCred ? openidClientSecret : openidClientSecret?.length > 0 ? "•".repeat(50) : ""}
 									onChange={(e) => {
 										setOpenidClientSecret(e.target.value);
-									}}
+										}}
+										onFocus={(e) => setShowOpenIdCred(true)}
+										onBlur={(e) => setShowOpenIdCred(false)}
 									InputProps={{
 										classes: {
 											notchedOutline: isEditOrgTab ? null : classes.notchedOutline,
 										},
 										style: {
-											color: "white",
+											color: theme.palette.textFieldStyle.color,
 											fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)",
 											fontWeight: 400,
 											fontSize: 16,
-											borderRadius: 4,
+											borderRadius: theme.palette.textFieldStyle.borderRadius,
 										},
 									}}
 								/>
@@ -475,33 +598,35 @@ const SSOTab = ({selectedOrganization, userdata, isEditOrgTab, globalUrl, handle
 					<Grid container style={{ marginTop: 10, }} spacing={2}>
 						<Grid item xs={6} style={{}}>
 							<span>
-								<Typography style={{ color: "rgba(255, 255, 255, 1)", fontSize: 16, fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)", fontWeight: 400, fontSize: 16 }}>Authorization URL</Typography>
+								<Typography style={{ fontSize: 16, fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)", fontWeight: 400, fontSize: 16 }}>Authorization URL</Typography>
 								<TextField
 									required
 									style={{
 										flex: "1",
 										marginTop: "5px",
 										marginRight: "15px",
-										backgroundColor: isEditOrgTab ? "rgba(33, 33, 33, 1)" : theme.palette.inputColor,
+										backgroundColor: isEditOrgTab ? theme.palette.textFieldStyle.backgroundColor : theme.palette.inputColor,
 									}}
 									fullWidth={true}
-									type="name"
+									type={showOpenIdCred ? "text" : "password"}
 									id="outlined-with-placeholder"
 									margin="normal"
 									variant="outlined"
 									multiline={true}
 									rows={2}
 									placeholder="The OpenID authorization URL (usually ends with /authorize)"
-									value={openidAuthorization}
+									value={showOpenIdCred ? openidAuthorization : openidAuthorization?.length > 0 ? "•".repeat(50) : ""}
 									onChange={(e) => {
 										setOpenidAuthorization(e.target.value)
-									}}
+										}}
+										onFocus={(e) => setShowOpenIdCred(true)}
+										onBlur={(e) => setShowOpenIdCred(false)}
 									InputProps={{
 										classes: {
 											notchedOutline: isEditOrgTab ? null : classes.notchedOutline,
 										},
 										style: {
-											color: "white",
+											color: theme.palette.textFieldStyle.color,
 											fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)",
 											fontWeight: 400,
 											fontSize: 16,
@@ -513,33 +638,35 @@ const SSOTab = ({selectedOrganization, userdata, isEditOrgTab, globalUrl, handle
 						</Grid>
 						<Grid item xs={6} style={{}}>
 							<span>
-								<Typography style={{ color: "rgba(255, 255, 255, 1)", fontSize: 16, fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)", fontWeight: 400, fontSize: 16 }}>Token URL</Typography>
+								<Typography style={{  fontSize: 16, fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)", fontWeight: 400, }}>Token URL</Typography>
 								<TextField
 									required
 									style={{
 										flex: "1",
 										marginTop: "5px",
 										marginRight: "15px",
-										backgroundColor: isEditOrgTab ? "rgba(33, 33, 33, 1)" : theme.palette.inputColor,
+										backgroundColor: isEditOrgTab ? theme.palette.textFieldStyle.backgroundColor : theme.palette.inputColor,
 									}}
 									fullWidth={true}
-									type="name"
+									type={showOpenIdCred ? "text" : "password"}
 									id="outlined-with-placeholder"
 									margin="normal"
 									variant="outlined"
 									multiline={true}
 									rows={2}
 									placeholder="The OpenID token URL (usually ends with /token)"
-									value={openidToken}
+									value={showOpenIdCred ? openidToken : openidToken?.length > 0 ? "•".repeat(50) : ""}
 									onChange={(e) => {
 										setOpenidToken(e.target.value)
-									}}
+										}}
+										onFocus={(e) => setShowOpenIdCred(true)}
+										onBlur={(e) => setShowOpenIdCred(false)}
 									InputProps={{
 										classes: {
 											notchedOutline: isEditOrgTab ? null : classes.notchedOutline,
 										},
 										style: {
-											color: "white",
+											color:theme.palette.textFieldStyle.color,
 											fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)",
 											fontWeight: 400,
 											fontSize: 16,
@@ -554,40 +681,61 @@ const SSOTab = ({selectedOrganization, userdata, isEditOrgTab, globalUrl, handle
 				{/**/}
 				{/*isCloud ? null : */}
 				<Grid item xs={12} sx={{ marginTop: 3.5 }} >
-					<Typography variant="h4" style={{ textAlign: "left", color: "rgba(241, 241, 241, 1)", fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)", fontSize: 24, fontWeight: 600, }}>SAML SSO (v1.1)</Typography>
-					<Typography variant="body2" style={{ textAlign: "left", marginTop: 8, color: "rgba(241, 241, 241, 1)", fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)", fontSize: 16, fontWeight: 400, color: "rgba(158, 158, 158, 1)" }} color="textSecondary">
-						IdP URL for Shuffle SAML/SSO: <Link to={`${globalUrl}/api/v1/login_sso`} target="_blank" style={{ color: "rgba(241, 241, 241, 1)", textDecoration: "none" }}>{`${globalUrl}/api/v1/login_sso`}</Link>
-					</Typography>
+					<Typography variant="h5" color="textPrimary" style={{ textAlign: "left", fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)", fontSize: 24, fontWeight: 500, }}>SAML SSO (v1.1)</Typography>
+					<Typography variant="body2" color="textSecondary"  style={{  textAlign: "left", marginTop: 8, fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)", fontSize: 16, fontWeight: 400, }}>
+						IdP URL for Shuffle SAML/SSO: <Link to={`${globalUrl}/api/v1/login_sso`} target="_blank" style={{ color: theme.palette.text.secondary, textDecoration: "none" }}>{`${globalUrl}/api/v1/login_sso`}</Link>
+						</Typography>
+						<div style={{ display: 'flex', marginTop: 10, }}>
+							<Typography
+								color="textSecondary"
+								style={{
+									textAlign: "left",
+									fontSize: 16,
+									marginTop: 8,
+									fontWeight: 400,
+								}}
+							>
+								Show SAML Credentials
+							</Typography>
+							<Checkbox
+								checked={showSamlCred}
+								onChange={(e) => setShowSamlCred(e.target.checked)}
+								name="showSamlCred"
+								color="primary"
+							/>
+						</div>
 					<Grid container style={{ marginTop: 10, }} spacing={2}>
 						<Grid item xs={6} style={{}}>
 							<span>
-								<Typography style={{ color: "rgba(255, 255, 255, 1)", fontSize: 16, fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)", fontWeight: 400, fontSize: 16 }}>SSO Entrypoint (IdP)</Typography>
+								<Typography style={{ fontSize: 16, fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)", fontWeight: 400, }}>SSO Entrypoint (IdP)</Typography>
 								<TextField
 									required
 									style={{
 										flex: "1",
 										marginTop: "5px",
 										marginRight: "15px",
-										backgroundColor: isEditOrgTab ? "rgba(33, 33, 33, 1)" : theme.palette.inputColor,
+										backgroundColor: isEditOrgTab ? theme.palette.textFieldStyle.backgroundColor : theme.palette.inputColor,
 									}}
 									fullWidth={true}
-									type="name"
+									type={showSamlCred ? "text" : "password"}
 									multiline={true}
 									rows={2}
 									id="outlined-with-placeholder"
 									margin="normal"
 									variant="outlined"
 									placeholder="The entrypoint URL from your provider"
-									value={ssoEntrypoint}
+									value={showSamlCred ? ssoEntrypoint : ssoEntrypoint?.length > 0 ? "•".repeat(50) : ""}
 									onChange={(e) => {
 										setSsoEntrypoint(e.target.value);
-									}}
+										}}
+										onFocus={(e) => setShowSamlCred(true)}
+										onBlur={(e) => setShowSamlCred(false)}
 									InputProps={{
 										classes: {
 											notchedOutline: isEditOrgTab ? null : classes.notchedOutline,
 										},
 										style: {
-											color: "white",
+											color: theme.palette.textFieldStyle.color,
 											fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)",
 											fontWeight: 400,
 											fontSize: 16,
@@ -599,24 +747,26 @@ const SSOTab = ({selectedOrganization, userdata, isEditOrgTab, globalUrl, handle
 						</Grid>
 						<Grid item xs={6} style={{}}>
 							<span>
-								<Typography style={{ color: "rgba(255, 255, 255, 1)", fontSize: 16, fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)", fontWeight: 400, fontSize: 16 }}>SSO Certificate (X509)</Typography>
+								<Typography style={{ fontSize: 16, fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)", fontWeight: 400, fontSize: 16 }}>SSO Certificate (X509)</Typography>
 								<TextField
 									required
 									style={{
 										flex: "1",
 										marginTop: "5px",
 										marginRight: "15px",
-										backgroundColor: isEditOrgTab ? "rgba(33, 33, 33, 1)" : theme.palette.inputColor,
+										backgroundColor: isEditOrgTab ? theme.palette.textFieldStyle.backgroundColor: theme.palette.inputColor,
 									}}
 									fullWidth={true}
-									type="name"
+									type={showSamlCred ? "text" : "password"}
 									id="outlined-with-placeholder"
 									margin="normal"
 									variant="outlined"
 									multiline={true}
 									rows={2}
 									placeholder="The X509 certificate to use"
-									value={ssoCertificate}
+										value={showSamlCred ? ssoCertificate : ssoCertificate?.length > 0 ? "•".repeat(50) : ""}
+										onFocus={(e) => setShowSamlCred(true)}
+										onBlur={(e) => setShowSamlCred(false)}
 									onChange={(e) => {
 										setSsoCertificate(e.target.value);
 									}}
@@ -625,7 +775,7 @@ const SSOTab = ({selectedOrganization, userdata, isEditOrgTab, globalUrl, handle
 											notchedOutline: isEditOrgTab ? null : classes.notchedOutline,
 										},
 										style: {
-											color: "white",
+											color: theme.palette.textFieldStyle.color,
 											fontFamily: "var(--zds-typography-base,Inter,Helvetica,arial,sans-serif)",
 											fontWeight: 400,
 											fontSize: 16,
@@ -646,4 +796,4 @@ const SSOTab = ({selectedOrganization, userdata, isEditOrgTab, globalUrl, handle
     )
 }
 
-export default SSOTab
\ No newline at end of file
+export default SSOTab
diff --git a/frontend/src/context/ContextApi.jsx b/frontend/src/context/ContextApi.jsx
index 3932dfd0..d344e3ed 100644
--- a/frontend/src/context/ContextApi.jsx
+++ b/frontend/src/context/ContextApi.jsx
@@ -1,14 +1,26 @@
-import { createContext, useState, useEffect } from 'react';
+import React, { createContext, useState, useEffect } from 'react';
+import useMediaQuery from '@mui/material/useMediaQuery';
+
 export const Context = createContext();
 
-export const AppContext =(props) => {
+export const AppContext = (props) => {
+	const { serverside } = props
 
-	const currentLocation = window?.location?.pathname;
+	const currentLocation = serverside === true ? "" : window?.location?.pathname;
 
     // Left side bar global states
     const [searchBarModalOpen, setSearchBarModalOpen] = useState(false);
+    const [isDocSearchModalOpen, setIsDocSearchModalOpen] = useState(false);
     const [leftSideBarOpenByClick, setLeftSideBarOpenByClick] = useState(currentLocation?.includes('/workflows/') ? false : true)
-    const [windowWidth, setWindowWidth] = useState(window.innerWidth);
+    const [windowWidth, setWindowWidth] = useState(serverside === true ? 100 : window.innerWidth);
+    const [brandColor, setBrandColor] = useState(() => localStorage.getItem("brandColor") || "#ff8544");
+    const [brandName, setBrandName] = useState(()=> localStorage.getItem("brandName") || "Shuffle");
+
+    const [themeMode, setThemeMode] = useState(
+      () => localStorage.getItem("theme") || "dark"
+    );
+    const [supportEmail, setSupportEmail] = useState("support@shuffler.io");
+    const [logoutUrl, setLogoutUrl] = useState("");
 
     useEffect(() => {
 		if (currentLocation?.includes('/workflows/') && leftSideBarOpenByClick === true) {
@@ -18,6 +30,10 @@ export const AppContext =(props) => {
 
     //Calculate window width
     useEffect(() => {
+		if (serverside === true) {
+			return
+		}
+
         const handleResize = () => {
             setWindowWidth(window?.innerWidth);
         };
@@ -29,14 +45,78 @@ export const AppContext =(props) => {
         };
     }, []);
 
+    const handleThemeChange = (theme) => {
+      if (!theme || theme === "null" || theme === "undefined") {
+        localStorage.setItem("theme", "dark");
+        setThemeMode("dark");
+        return;
+      }
+    
+      const darkMediaQuery = window.matchMedia("(prefers-color-scheme: dark)");
+    
+      const applySystemTheme = () => {
+        const isDark = darkMediaQuery.matches;
+        setThemeMode(isDark ? "dark" : "light");
+        localStorage.setItem("theme", isDark ? "dark" : "light");
+      };
+    
+      if (theme === "system") {
+        applySystemTheme();
+        darkMediaQuery.addEventListener("change", applySystemTheme);
+        return () => {
+          darkMediaQuery.removeEventListener("change", applySystemTheme);
+        };
+      } else {
+        setThemeMode(theme);
+        localStorage.setItem("theme", theme);
+      }
+    };
+    
+    
+    useEffect(() => {
+      if (serverside === true) return;
+    
+      const theme = localStorage.getItem("theme");
+    
+      if (!theme || theme === "null" || theme === "undefined") {
+        localStorage.setItem("theme", "dark");
+        setThemeMode("dark");
+        return;
+      }
+    
+      let cleanup;
+      if (theme === "system") {
+        cleanup = handleThemeChange("system");
+      } else {
+        handleThemeChange(theme);
+      }
+    
+      return () => {
+        if (cleanup) cleanup();
+      };
+    }, []);
+       
 
     return (
         <Context.Provider value={{
+            isDocSearchModalOpen,
+            setIsDocSearchModalOpen,
             searchBarModalOpen,
             setSearchBarModalOpen,
+            supportEmail,
+            setSupportEmail,
+            logoutUrl,
+            setLogoutUrl,
             leftSideBarOpenByClick,
             setLeftSideBarOpenByClick,
-            windowWidth
+            windowWidth,
+            themeMode,
+            setThemeMode,
+            handleThemeChange,
+            brandColor,
+            setBrandColor,
+            brandName,
+            setBrandName,
         }}>
             {props.children}
         </Context.Provider>
diff --git a/frontend/src/defaultCytoscapeStyle.jsx b/frontend/src/defaultCytoscapeStyle.jsx
index d7a6b68e..79d35e35 100644
--- a/frontend/src/defaultCytoscapeStyle.jsx
+++ b/frontend/src/defaultCytoscapeStyle.jsx
@@ -1,586 +1,626 @@
-const data = [
-  {
-    selector: "node",
-    css: {
-      label: function(element) {
-		  var elementname = element.data("label")
-		  if (elementname === null || elementname === undefined) {
-			  return ""
-		  } 
-
-		  elementname = elementname.replaceAll("_", " ", -1)
-		  elementname = elementname.charAt(0).toUpperCase() + elementname.slice(1)
-		  return elementname
-	  },
-      "text-valign": "center",
-	  "text-margin-x": function(element) {
-		  // Attempt at bottom-positioning
-		  // Required text-valign: bottom
-		  // FIXME: Disabled for now.
-		  return "15px"
-
-
-
-		  const name = element.data("label")
-		  console.log("Name: ", name)
-		  if (name === null || name === undefined || name == "" || document=== undefined || document === null) {
-			  return "0px"
-		  }
-
-		  const canvas = document.createElement('canvas');
-    	  const context = canvas.getContext('2d')
-
-		  context.font = '18px Segoe UI, Tahoma, Geneva, Verdana, sans-serif, sans-serif'
-
-		  const textWidth = context.measureText(name).width
-		  return textWidth + "px"
-		  //return -1*(textWidth) + "px"
-	  },
-
-      "font-family": "Segoe UI, Tahoma, Geneva, Verdana, sans-serif, sans-serif",
-      "font-weight": "lighter",
-      "font-size": "18px",
-      "margin-right": "10px",
-      width: "80px",
-      height: "80px",
-      color: "white",
-      padding: "10px",
-      margin: "5px",
-      "border-width": "1px",
-      "z-index": 5001,
+export default function defaultCytoscapeStyle(theme) {
+  return [
+    {
+      selector: "node",
+      css: {
+        label: function(element) {
+        var elementname = element.data("label")
+        if (elementname === null || elementname === undefined) {
+          return ""
+        } 
+  
+        elementname = elementname.replaceAll("_", " ", -1)
+        elementname = elementname.charAt(0).toUpperCase() + elementname.slice(1)
+        return elementname
+      },
+        "text-valign": "center",
+      "text-margin-x": function(element) {
+        // Attempt at bottom-positioning
+        // Required text-valign: bottom
+        // FIXME: Disabled for now.
+        return "15px"
+  
+  
+  
+        const name = element.data("label")
+        console.log("Name: ", name)
+        if (name === null || name === undefined || name == "" || document=== undefined || document === null) {
+          return "0px"
+        }
+  
+        const canvas = document.createElement('canvas');
+          const context = canvas.getContext('2d')
+  
+        context.font = '18px Segoe UI, Tahoma, Geneva, Verdana, sans-serif, sans-serif'
+  
+        const textWidth = context.measureText(name).width
+        return textWidth + "px"
+        //return -1*(textWidth) + "px"
+      },
+  
+        "font-family": "Segoe UI, Tahoma, Geneva, Verdana, sans-serif, sans-serif",
+        "font-weight": "lighter",
+        "font-size": "18px",
+        "margin-right": "10px",
+        width: "80px",
+        height: "80px",
+        color: theme.palette.text.primary || "white",
+        padding: "10px",
+        margin: "5px",
+        "border-width": "1px",
+        "z-index": 5001,
+      },
     },
-  },
-  {
-    selector: "edge",
-    css: {
-      "target-arrow-shape": "triangle",
-      "target-arrow-color": "grey",
-      "curve-style": "unbundled-bezier",
-      label: "data(label)",
-      "text-margin-y": "-15px",
-      width: "2px",
-      color: "white",
-      "line-fill": "linear-gradient",
-      "line-gradient-stop-positions": ["0.0", "100"],
-      "line-gradient-stop-colors": ["grey", "grey"],
-      "z-index": 5001,
+    {
+      selector: "edge",
+      css: {
+        "target-arrow-shape": "triangle",
+        "target-arrow-color": "grey",
+        "curve-style": "unbundled-bezier",
+        label: "data(label)",
+        "text-margin-y": "-15px",
+        width: "2px",
+        color: theme.palette.text.primary || "white",
+        "line-fill": "linear-gradient",
+        "line-gradient-stop-positions": ["0.0", "100"],
+        "line-gradient-stop-colors": ["grey", "grey"],
+        "z-index": 5001,
+      },
     },
-  },
-  {
-    selector: `node[buttonType="ACTIONSUGGESTION"]`,
-    css: {
-      label: "data(label)",
-      shape: "roundrectangle",
-	  "height": "18px",
-	  "width": "145px",
-      "background-color": "#212121",
-      "border-color": "#81c784",
-      "z-index": 10000,
-	  "border-radius": "10px",
-	  "text-margin-x": "0px",
-    },
-  },
-  {
-    selector: `node[type="ACTION"]`,
-    css: {
-      shape: "roundrectangle",
-      "background-color": "#213243",
-      "border-color": "#81c784",
-      "background-width": "100%",
-      "background-height": "100%",
-      "border-radius": "5px",
-      "z-index": 5001,
-    },
-  },
-  {
-    selector: `node[type="COMMENT"]`,
-    css: {
-      label: function(element) {
-		  return element.data("label")
-	  },
-      shape: "roundrectangle",
-      color: "data(color)",
-      width: "data(width)",
-      height: "data(height)",
-      padding: "0px",
-      margin: "0px",
-      "background-color": "data(backgroundcolor)",
-      "background-image": "data(backgroundimage)",
-      "border-color": "#ffffff",
+    {
+      selector: `node[buttonType="ACTIONSUGGESTION"]`,
+      css: {
+        label: "data(label)",
+        shape: "roundrectangle",
+      "height": "18px",
+      "width": "145px",
+        "background-color": "#212121",
+        "border-color": "#81c784",
+        "z-index": 10000,
+      "border-radius": "10px",
       "text-margin-x": "0px",
-      "z-index": 4999,
-      "border-radius": "5px",
+      },
+    },
+    {
+      selector: `node[type="ACTION"]`,
+      css: {
+        shape: "roundrectangle",
+        "background-color": "#213243",
+        "border-color": "#81c784",
+        "background-width": "100%",
+        "background-height": "100%",
+        "border-radius": "5px",
+        "z-index": 5001,
+      },
+    },
+    {
+      selector: `node[type="COMMENT"]`,
+      css: {
+        label: function (element) {
+          return element.data("label")
+        },
+        shape: "roundrectangle",
+        color: "data(color)",
+        width: "data(width)",
+        height: "data(height)",
+        padding: "5px",
+        margin: "0px",
+        "background-color": "data(backgroundcolor)",
+        "background-image": "data(backgroundimage)",
+        "border-color": "#ffffff",
+        "text-margin-x": "data(textMarginX)",
+        "text-margin-y": "data(textMarginY)",
+        "z-index": 4999,
+        "border-radius": "5px",
+        "background-opacity": "0.5",
+        "text-wrap": "wrap",
+        "text-max-width": "data(width)",
+        "text-halign": function(element) {
+        const align = element?.data("textHalign")
+        if (align === null || align === undefined || align === "") {
+          return "center"
+        }
+  
+        return align
+      },
+        "text-valign": function(element) {
+        const align = element?.data("textValign")
+        if (align === null || align === undefined || align === "") {
+          return "center"
+        }
+        
+        return align
+      }
+      },
+    },
+    {
+      selector: `node[type="RESIZE-HANDLE"]`,
+      css: {
+        shape: "ellipse",
+        width: "8px",
+        height: "8px",
+        "border-width": 1,
+        "border-color": theme.palette.text.primary || "white",
+        "z-index": 5002, 
+        "overlay-opacity": 0, 
+        "cursor": "nwse-resize",
+        "opacity": 0, 
+        "pointer-events": "auto", 
+      },
+    },
+    {
+      selector: `node[app_name="Integration Framework"]`,
+      css: {
+        width: "60px",
+        height: "60px",
+        "z-index": 5000,
+  
+      //'border-width': 3,
+        //'border-color': 'transparent',
+      //'border-style': 'solid',
+      //'border-gradient': 'linear-gradient(to right, #FF0000, #FF7F00, #FFFF00, #00FF00, #0000FF, #4B0082, #8A2BE2)' 
+      },
+    },
+    {
+      selector: `node[example="noapp"]`,
+      css: {
+      // Make background image padding on the left side 20px
+        "background-width": "100%",
+        "background-height": "100%",
+  
+        "background-color": "data(iconBackground)",
+        "background-fill": "data(fillstyle)",
+        "background-gradient-direction": "to-bottom-right",
+        "background-gradient-stop-colors": "data(fillGradient)",
+      // Change transparency of background
+      "background-opacity": "0.3",
+      },
+    },
+    {
+      selector: `node[app_name="Shuffle Tools"], node[app_name="email"], node[app_name="http"]`,
+      css: {
+        width: "35px",
+        height: "35px",
+        "z-index": 5000,
+        "font-size": "0px",
+        "background-width": "75%",
+        "background-height": "75%",
+        "background-color": "data(iconBackground)",
+        "background-fill": "data(fillstyle)",
+        "background-gradient-direction": "to-right",
+        "background-gradient-stop-colors": "data(fillGradient)",
+      },
+    },
+    {
+      selector: `node[app_name="Testing"]`,
+      css: {
+        width: "30px",
+        height: "30px",
+        "z-index": 5000,
+        "font-size": "0px",
+      },
+    },
+    {
+      selector: `node[?small_image]`,
+      css: {
+        "background-image": "data(small_image)",
+        "text-halign": "right",
+      },
+    },
+    {
+      selector: `node[?large_image]`,
+      css: {
+        "background-image": "data(large_image)",
+        "text-halign": "right",
+      },
+    },
+    {
+      selector: `node[type="CONDITION"]`,
+      css: {
+        shape: "diamond",
+        "border-color": "##FFEB3B",
+        padding: "30px",
+      },
+    },
+    {
+      selector: `node[type="eventAction"]`,
+      css: {
+        "background-color": "#edbd21",
+      },
+    },
+    {
+      selector: `node[type="TRIGGER"]`,
+      css: {
+        shape: "round-octagon",
+        "border-radius": "5px",
+        "border-color": "orange",
+        "background-color": "#213243",
+        "background-width": "100px",
+        "background-height": "100px",
+      },
+    },
+    {
+      selector: `node[status="running"]`,
+      css: {
+        "border-color": "#81c784",
+      },
+    },
+    {
+      selector: `node[status="stopped"]`,
+      css: {
+        "border-color": "orange",
+      },
+    },
+    {
+      selector: 'node[type="mq"]',
+      css: {
+        "background-color": "#edbd21",
+      },
+    },
+    {
+      selector: "node[?isButton]",
+      css: {
+        shape: "ellipse",
+        width: "15px",
+        height: "15px",
+        "z-index": "5002",
+        "font-size": "0px",
+        border: "1px solid rgba(255,255,255,0.9)",
+        "background-image": "data(icon)",
+        "background-color": "data(iconBackground)",
+      },
+    },
+    {
+      selector: "node[?isSuggestion]",
+      css: {
+        shape: "roundrectangle",
+        width: "30px",
+        height: "30px",
+        "z-index": "5002",
+      filter: "grayscale(100%)",
+        border: "1px solid rgba(255,255,255,0.9)",
+        "background-image": "data(large_image)",
+      "background-fit": "cover",
+        "font-size": "20px",
+        label: "data(label_replaced)",
+      },
+    },
+    {
+      selector: "node[?canConnect]",
+      css: {
+        "border-color": "#f86a3e",
+        "border-width": "10px",
+        "z-index": "5002",
+        "background-color": "#f86a3e",
+      },
+    },
+    {
+      selector: "node[?isDescriptor]",
+      css: {
+        shape: "ellipse",
+        "border-color": "#80deea",
+        width: "5px",
+        height: "5px",
+        "z-index": "5002",
+        "font-size": "10px",
+        "text-valign": "center",
+        "text-halign": "center",
+        border: "1px solid black",
+        "margin-right": "0px",
+        "text-margin-x": "0px",
+        "background-color": "data(imageColor)",
+        "background-image": "data(image)",
+      label: "data(label)",
+      },
+    },
+    {
+      selector: "node[?isStartNode]",
+      css: {
+        shape: function(element) {
+        return "ellipse" 
+      },
+        "border-color": "#80deea",
+        width: "80px",
+        height: "80px",
+        "font-size": "18px",
+        "background-width": "100%",
+        "background-height": "100%",
+      },
+    },
+    {
+      selector: `node[app_id="shuffle_agent"]`,
+      css: {
+      "shape": function(element) {
+            return "roundrectangle"
+      },
+      "height": "74px",
+          "width": "222px",
+        "background-image": "data(large_image)",
+          "label": function(element) {
+        var elementname = element.data("label")
+        if (elementname === null || elementname === undefined) {
+          return ""
+        } 
+  
+        elementname = elementname.replaceAll("_", " ", -1)
+  
+        if (elementname.length > 15) {
+          elementname = elementname.substring(0, 15) + ".."
+        }
+  
+        return elementname
+      },
+      "background-width": "65px",
+      "background-height": "65px",
+      "background-position-x": "20px", 
+      "background-repeat": "no-repeat",
       "background-opacity": "0.5",
-	  "text-wrap": "wrap",
-    },
-  },
-  {
-    selector: `node[app_name="Integration Framework"]`,
-    css: {
-      width: "60px",
-      height: "60px",
-      "z-index": 5000,
-
-	  //'border-width': 3,
-  	  //'border-color': 'transparent',
-	  //'border-style': 'solid',
-	  //'border-gradient': 'linear-gradient(to right, #FF0000, #FF7F00, #FFFF00, #00FF00, #0000FF, #4B0082, #8A2BE2)' 
-    },
-  },
-  {
-    selector: `node[example="noapp"]`,
-    css: {
-	  // Make background image padding on the left side 20px
-      "background-width": "100%",
-      "background-height": "100%",
-
-      "background-color": "data(iconBackground)",
-      "background-fill": "data(fillstyle)",
-      "background-gradient-direction": "to-bottom-right",
-      "background-gradient-stop-colors": "data(fillGradient)",
-	  // Change transparency of background
-	  "background-opacity": "0.3",
-    },
-  },
-  {
-    selector: `node[app_name="Shuffle Tools"], node[app_name="email"], node[app_name="http"]`,
-    css: {
-      width: "35px",
-      height: "35px",
-      "z-index": 5000,
-      "font-size": "0px",
-      "background-width": "75%",
-      "background-height": "75%",
-      "background-color": "data(iconBackground)",
-      "background-fill": "data(fillstyle)",
-      "background-gradient-direction": "to-right",
-      "background-gradient-stop-colors": "data(fillGradient)",
-    },
-  },
-  {
-    selector: `node[app_id="shuffle_agent"]`,
-    css: {
-		"height": "74px",
-      	"width": "222px",
-	  	"background-image": "data(large_image)",
-      	"label": function(element) {
-		  var elementname = element.data("label")
-		  if (elementname === null || elementname === undefined) {
-			  return ""
-		  } 
-
-		  if (elementname.length > 15) {
-			  elementname = elementname.substring(0, 15) + ".."
-		  }
-
-		  return elementname
-		},
-		"background-width": "65px",
-		"background-height": "65px",
-		"background-position-x": "20px", 
-		//"background-position-x": "center",  // Crashes
-		"background-repeat": "no-repeat",
-
-		"font-size": "14px",
-		"text-halign": "center",
-		"text-valign": "center",
-      	"text-margin-x": "-140px",
-      	"text-margin-y": "0px",
-		
-    },
-  },
-  {
-    selector: `node[app_name="Testing"]`,
-    css: {
-      width: "30px",
-      height: "30px",
-      "z-index": 5000,
-      "font-size": "0px",
-    },
-  },
-  {
-    selector: `node[?small_image]`,
-    css: {
-      "background-image": "data(small_image)",
-      "text-halign": "right",
-    },
-  },
-  {
-    selector: `node[?large_image]`,
-    css: {
-      "background-image": "data(large_image)",
-      "text-halign": "right",
-    },
-  },
-  {
-    selector: `node[type="CONDITION"]`,
-    css: {
-      shape: "diamond",
-      "border-color": "##FFEB3B",
-      padding: "30px",
-    },
-  },
-  {
-    selector: `node[type="eventAction"]`,
-    css: {
-      "background-color": "#edbd21",
-    },
-  },
-  {
-    selector: `node[type="TRIGGER"]`,
-    css: {
-      shape: "round-octagon",
-      "border-radius": "5px",
-      "border-color": "orange",
-      "background-color": "#213243",
-      "background-width": "100px",
-      "background-height": "100px",
-    },
-  },
-  {
-    selector: `node[status="running"]`,
-    css: {
-      "border-color": "#81c784",
-    },
-  },
-  {
-    selector: `node[status="stopped"]`,
-    css: {
-      "border-color": "orange",
-    },
-  },
-  {
-    selector: 'node[type="mq"]',
-    css: {
-      "background-color": "#edbd21",
-    },
-  },
-  {
-    selector: "node[?isButton]",
-    css: {
-      shape: "ellipse",
-      width: "15px",
-      height: "15px",
-      "z-index": "5002",
-      "font-size": "0px",
-      border: "1px solid rgba(255,255,255,0.9)",
-      "background-image": "data(icon)",
-      "background-color": "data(iconBackground)",
-    },
-  },
-  {
-    selector: "node[?isSuggestion]",
-    css: {
-      shape: "roundrectangle",
-      width: "30px",
-      height: "30px",
-      "z-index": "5002",
-	  filter: "grayscale(100%)",
-      border: "1px solid rgba(255,255,255,0.9)",
-      "background-image": "data(large_image)",
-	  "background-fit": "cover",
-      "font-size": "20px",
-      label: "data(label_replaced)",
-    },
-  },
-  {
-    selector: "node[?canConnect]",
-    css: {
-      "border-color": "#f86a3e",
-      "border-width": "10px",
-      "z-index": "5002",
-      "background-color": "#f86a3e",
-    },
-  },
-  {
-    selector: "node[?isDescriptor]",
-    css: {
-      shape: "ellipse",
-      "border-color": "#80deea",
-      width: "5px",
-      height: "5px",
-      "z-index": "5002",
-      "font-size": "10px",
-      "text-valign": "center",
+  
+      "font-size": "14px",
       "text-halign": "center",
-      border: "1px solid black",
-      "margin-right": "0px",
-      "text-margin-x": "0px",
-      "background-color": "data(imageColor)",
-      "background-image": "data(image)",
-		label: "data(label)",
+      "text-valign": "center",
+          "text-margin-x": "20px",
+          "text-margin-y": "0px",
+      
+      },
     },
-  },
-  {
-    selector: "node[?isStartNode]",
-    css: {
-      shape: function(element) {
-		  return "ellipse" 
-	  },
-      "border-color": "#80deea",
-      width: "80px",
-      height: "80px",
-      "font-size": "18px",
-      "background-width": "100%",
-      "background-height": "100%",
+    {
+      selector: "node[!is_valid]",
+      css: {
+        "border-color": "#f53434",
+        "border-width": "5px",
+      },
     },
-  },
-  {
-    selector: "node[!is_valid]",
-    css: {
-      "border-color": "#f53434",
-      "border-width": "5px",
+    {
+      selector: ":selected",
+      css: {
+        "background-color": "#77b0d0",
+        "border-color": "#77b0d0",
+        "border-width": "20px",
+      },
     },
-  },
-  {
-    selector: ":selected",
-    css: {
-      "background-color": "#77b0d0",
-      "border-color": "#77b0d0",
-      "border-width": "20px",
+    {
+      selector: ".skipped-highlight",
+      css: {
+        "background-color": "grey",
+        "border-color": "grey",
+        "border-width": "8px",
+        "transition-property": "background-color",
+        "transition-duration": "0.5s",
+      },
     },
-  },
-  {
-    selector: ".skipped-highlight",
-    css: {
-      "background-color": "grey",
-      "border-color": "grey",
-      "border-width": "8px",
-      "transition-property": "background-color",
-      "transition-duration": "0.5s",
+    {
+      selector: ".success-highlight",
+      css: {
+        "background-color": "#41dcab",
+        "border-color": "#41dcab",
+        "border-width": "5px",
+        "transition-property": "background-color",
+        "transition-duration": "0.5s",
+      },
     },
-  },
-  {
-    selector: ".success-highlight",
-    css: {
-      "background-color": "#41dcab",
-      "border-color": "#41dcab",
-      "border-width": "5px",
-      "transition-property": "background-color",
-      "transition-duration": "0.5s",
+    {
+      selector: ".hover-highlight",
+      css: {
+        "background-color": "#5f9265",
+        "border-color": "#5f9265",
+        "border-width": "5px",
+        "transition-property": "background-color",
+        "transition-duration": "0.5s",
+      },
     },
-  },
-  {
-    selector: ".hover-highlight",
-    css: {
-      "background-color": "#5f9265",
-      "border-color": "#5f9265",
-      "border-width": "5px",
-      "transition-property": "background-color",
-      "transition-duration": "0.5s",
+    {
+      selector: ".failure-highlight",
+      css: {
+        "background-color": "#8e3530",
+        "border-color": "#8e3530",
+        "border-width": "5px",
+        "transition-property": "background-color",
+        "transition-duration": "0.5s",
+      },
     },
-  },
-  {
-    selector: ".failure-highlight",
-    css: {
-      "background-color": "#8e3530",
-      "border-color": "#8e3530",
-      "border-width": "5px",
-      "transition-property": "background-color",
-      "transition-duration": "0.5s",
+    {
+      selector: ".not-executing-highlight",
+      css: {
+        "background-color": "grey",
+        "border-color": "grey",
+        "border-width": "5px",
+        "transition-property": "#ffef47",
+        "transition-duration": "0.25s",
+      },
     },
-  },
-  {
-    selector: ".not-executing-highlight",
-    css: {
-      "background-color": "grey",
-      "border-color": "grey",
-      "border-width": "5px",
-      "transition-property": "#ffef47",
-      "transition-duration": "0.25s",
+    {
+      selector: ".executing-highlight",
+      css: {
+        //"background-color": "#ffef47",
+        "border-color": "#ffef47",
+        "border-width": "8px",
+        "transition-property": "border-width",
+        "transition-duration": "0.25s",
+      },
     },
-  },
-  {
-    selector: ".executing-highlight",
-    css: {
-      "background-color": "#ffef47",
-      "border-color": "#ffef47",
-      "border-width": "8px",
-      "transition-property": "border-width",
-      "transition-duration": "0.25s",
+    {
+      selector: ".awaiting-data-highlight",
+      css: {
+        "background-color": "#f4ad42",
+        "border-color": "#f4ad42",
+        "border-width": "5px",
+        "transition-property": "border-color",
+        "transition-duration": "0.5s",
+      },
     },
-  },
-  {
-    selector: ".awaiting-data-highlight",
-    css: {
-      "background-color": "#f4ad42",
-      "border-color": "#f4ad42",
-      "border-width": "5px",
-      "transition-property": "border-color",
-      "transition-duration": "0.5s",
+    {
+      selector: ".shuffle-hover-highlight",
+      css: {
+        "background-color": "#f85a3e",
+        "border-color": "#f85a3e",
+        "border-width": "7px",
+        "transition-property": "border-width",
+        "transition-duration": "0.25s",
+        label: "data(label)",
+        "font-size": "18px",
+        color: theme.palette.text.primary || "white",
+      },
     },
-  },
-  {
-    selector: ".shuffle-hover-highlight",
-    css: {
+    {
+      selector: "$node > node",
+      css: {
+        "padding-top": "10px",
+        "padding-left": "10px",
+        "padding-bottom": "10px",
+        "padding-right": "10px",
+      },
+    },
+    {
+      selector: "edge.executing-highlight",
+      css: {
+        width: "5px",
+        "target-arrow-color": "#ffef47",
+        "line-color": "#ffef47",
+        "transition-property": "line-color, width",
+        "transition-duration": "0.25s",
+      },
+    },
+    {
+      selector: `edge[?decorator]`,
+      css: {
+        width: "1px",
+        "line-style": "dashed",
+        "line-fill": "linear-gradient",
+        "target-arrow-color": "#555555",
+        "line-gradient-stop-positions": ["0.0", "100"],
+        "line-gradient-stop-colors": ["#555555", "#555555"],
+      },
+    },
+    {
+      selector: "edge.success-highlight",
+      css: {
+        width: "3px",
+        "target-arrow-color": "#41dcab",
+        "line-color": "#41dcab",
+        "transition-property": "line-color, width",
+        "transition-duration": "0.5s",
+        "line-fill": "linear-gradient",
+        "line-gradient-stop-positions": ["0.0", "100"],
+        "line-gradient-stop-colors": ["#41dcab", "#41dcab"],
+      },
+    },
+    {
+      selector: ".eh-handle",
+      style: {
+        "background-color": "#337ab7",
+        width: "1px",
+        height: "1px",
+        shape: "circle",
+        "border-width": "1px",
+        "border-color": "black",
+      },
+    },
+    {
+      selector: ".eh-source",
+      style: {
+        "border-width": "3",
+        "border-color": "#337ab7",
+      },
+    },
+    {
+      selector: ".eh-target",
+      style: {
+        "border-width": "3",
+        "border-color": "#337ab7",
+      },
+    },
+    {
+      selector: ".eh-preview, .eh-ghost-edge",
+      style: {
+        "background-color": "#337ab7",
+        "line-color": "#337ab7",
+        "target-arrow-color": "#337ab7",
+        "source-arrow-color": "#337ab7",
+      },
+    },
+    {
+      selector: "edge:selected",
+      css: {
+        "target-arrow-color": "#f85a3e",
+      },
+    },
+    {
+      selector: `edge[?source_workflow]`,
+      css: {
+        "background-opacity": "1",
+        "font-size": "0px",
+      },
+    },
+    {
+      selector: `node[?source_workflow]`,
+      css: {
+        "background-opacity": "0",
+        "font-size": "0px",
+      },
+    },
+    {
+      selector: "node:selected",
+      css: {
+        "border-color": "#f86a3e",
+        "border-width": "7px",
+      },
+    },
+    {
+      selector: `node[buttonType="condition-drag"]`,
+      css: {
+      "width": "5px",
+      "height": "5px",
       "background-color": "#f85a3e",
-      "border-color": "#f85a3e",
-      "border-width": "7px",
-      "transition-property": "border-width",
-      "transition-duration": "0.25s",
-      label: "data(label)",
-      "font-size": "18px",
-      color: "white",
+      },
     },
-  },
-  {
-    selector: "$node > node",
-    css: {
-      "padding-top": "10px",
-      "padding-left": "10px",
-      "padding-bottom": "10px",
-      "padding-right": "10px",
+    {
+      selector: `node[name="switch"]`,
+      css: {
+        label: function(element) {
+        // Load from the actual element
+        var nodeheight = 400 
+        var conditions = [{
+          "name": "Condition 1",
+          "check": "X equals Y",
+        },
+        {
+          "name": "Condition 2",
+          "check": "X2 equals Y2",
+        },
+        {
+          "name": "Condition 3",
+          "check": "X3 equals Y3",
+        }]
+  
+        conditions.push({
+          "name": "Else",
+          "check": "If all else fails",
+        })
+  
+        const newlines = nodeheight / conditions.length
+        console.log("Newlines: ", newlines)
+  
+        const label = conditions.map((condition) => {
+          return `${condition.name}\n\n\n`
+        }).join("\n")
+  
+        return label
+      },
+        color: theme.palette.text.primary || "white",
+        "border-color": "#f85a3e",
+      "background-color": "#1f1f1f",
+        "font-size": "19px",
+        "text-margin-x": "-110px",
+      "text-wrap": "wrap",
+        shape: "roundrectangle",
+        width: "100",
+        height: "300",
+  
+      },
     },
-  },
-  {
-    selector: "edge.executing-highlight",
-    css: {
-      width: "5px",
-      "target-arrow-color": "#ffef47",
-      "line-color": "#ffef47",
-      "transition-property": "line-color, width",
-      "transition-duration": "0.25s",
-    },
-  },
-  {
-    selector: `edge[?decorator]`,
-    css: {
-      width: "1px",
-      "line-style": "dashed",
-      "line-fill": "linear-gradient",
-      "target-arrow-color": "#555555",
-      "line-gradient-stop-positions": ["0.0", "100"],
-      "line-gradient-stop-colors": ["#555555", "#555555"],
-    },
-  },
-  {
-    selector: "edge.success-highlight",
-    css: {
-      width: "3px",
-      "target-arrow-color": "#41dcab",
-      "line-color": "#41dcab",
-      "transition-property": "line-color, width",
-      "transition-duration": "0.5s",
-      "line-fill": "linear-gradient",
-      "line-gradient-stop-positions": ["0.0", "100"],
-      "line-gradient-stop-colors": ["#41dcab", "#41dcab"],
-    },
-  },
-  {
-    selector: ".eh-handle",
-    style: {
-      "background-color": "#337ab7",
-      width: "1px",
-      height: "1px",
-      shape: "circle",
-      "border-width": "1px",
-      "border-color": "black",
-    },
-  },
-  {
-    selector: ".eh-source",
-    style: {
-      "border-width": "3",
-      "border-color": "#337ab7",
-    },
-  },
-  {
-    selector: ".eh-target",
-    style: {
-      "border-width": "3",
-      "border-color": "#337ab7",
-    },
-  },
-  {
-    selector: ".eh-preview, .eh-ghost-edge",
-    style: {
-      "background-color": "#337ab7",
-      "line-color": "#337ab7",
-      "target-arrow-color": "#337ab7",
-      "source-arrow-color": "#337ab7",
-    },
-  },
-  {
-    selector: "edge:selected",
-    css: {
-      "target-arrow-color": "#f85a3e",
-    },
-  },
-  {
-    selector: `edge[?source_workflow]`,
-    css: {
-      "background-opacity": "1",
-      "font-size": "0px",
-    },
-  },
-  {
-    selector: `node[?source_workflow]`,
-    css: {
-      "background-opacity": "0",
-      "font-size": "0px",
-    },
-  },
-  {
-  	selector: "node:selected",
-  	css: {
-  		"border-color": "#f86a3e",
-  		"border-width": "7px",
-  	},
-  },
-  {
-    selector: `node[buttonType="condition-drag"]`,
-    css: {
-		"width": "5px",
-		"height": "5px",
-		"background-color": "#f85a3e",
-    },
-  },
-  {
-    selector: `node[name="switch"]`,
-    css: {
-      label: function(element) {
-		  // Load from the actual element
-		  var nodeheight = 400 
-		  var conditions = [{
-			  "name": "Condition 1",
-			  "check": "X equals Y",
-		  },
-		  {
-			  "name": "Condition 2",
-			  "check": "X2 equals Y2",
-		  },
-		  {
-			  "name": "Condition 3",
-			  "check": "X3 equals Y3",
-		  }]
-
-		  conditions.push({
-			  "name": "Else",
-			  "check": "If all else fails",
-		  })
-
-		  const newlines = nodeheight / conditions.length
-		  console.log("Newlines: ", newlines)
-
-		  const label = conditions.map((condition) => {
-			  return `${condition.name}\n\n\n`
-		  }).join("\n")
-
-		  return label
-	  },
-      color: "white",
-      "border-color": "#f85a3e",
-	  "background-color": "#1f1f1f",
-      "font-size": "19px",
-      "text-margin-x": "-110px",
-	  "text-wrap": "wrap",
-      shape: "roundrectangle",
-      width: "100",
-      height: "300",
-
-    },
-  },
-];
+  ];
+}
 
 //{
 //	selector: 'edge[?hasErrors]',
@@ -593,5 +633,3 @@ const data = [
 //		"line-gradient-stop-colors": ["#991818", "#991818"],
 //	},
 //},
-
-export default data;
diff --git a/frontend/src/index.js b/frontend/src/index.js
index d005b55a..20b3ae48 100755
--- a/frontend/src/index.js
+++ b/frontend/src/index.js
@@ -1,6 +1,7 @@
 import React from "react";
 import { createRoot } from "react-dom/client";
 import App from "./App";
+import { AppContext } from "./context/ContextApi";
 
 //import "./index.css";
 //import reportWebVitals from "./reportWebVitals";
@@ -9,7 +10,9 @@ const rootElement = document.getElementById("root");
 const root = createRoot(rootElement);
 root.render(
   <React.Fragment>
-    <App />
+    <AppContext>
+      <App />
+    </AppContext>
   </React.Fragment>
 );
 
diff --git a/frontend/src/theme.jsx b/frontend/src/theme.jsx
index ae5fcbf9..4835e4f1 100644
--- a/frontend/src/theme.jsx
+++ b/frontend/src/theme.jsx
@@ -1,4 +1,3 @@
-import React from "react";
 import { createTheme, adaptV4Theme } from "@mui/material/styles";
 
 const theme = createTheme(adaptV4Theme({
@@ -27,7 +26,7 @@ const theme = createTheme(adaptV4Theme({
 	distributionColor: "#40E0D0",
 
     green: "#5cc879",
-    borderRadius: 10,
+    borderRadius: 8,
     defaultBorder: "1px solid rgba(255,255,255,0.3)",
 
 	//jsonTheme: "brewer",
@@ -81,7 +80,7 @@ const theme = createTheme(adaptV4Theme({
 	singulBlackWhite: "/images/singul_black_white.png",
   },
   typography: {
-    fontFamily: `"Roboto", "Helvetica", "Arial", "inter", sans-serif`,
+    fontFamily: `"inter", "Roboto", "Helvetica", "Arial", sans-serif`,
     useNextVariants: true,
     fontWeightLight: 300,
     fontWeightRegular: 400,
@@ -112,39 +111,39 @@ const theme = createTheme(adaptV4Theme({
       MuiCssBaseline: {
         styleOverrides: `
           @font-face {
-            font-family: 'Roboto';
+            font-family: 'Inter';
             font-style: normal;
             font-display: swap;
             font-weight: 300;
-            src: local('Roboto Light'), local('Roboto-Light');
+            src: local('Inter Light'), local('Inter-Light');
           }
           @font-face {
-            font-family: 'Roboto';
+            font-family: 'Inter';
             font-style: normal;
             font-display: swap;
             font-weight: 400;
-            src: local('Roboto'), local('Roboto-Regular');
+            src: local('Inter Regular'), local('Inter-Regular');
           }
           @font-face {
-            font-family: 'Roboto';
+            font-family: 'Inter';
             font-style: normal;
             font-display: swap;
             font-weight: 500;
-            src: local('Roboto Medium'), local('Roboto-Medium');
+            src: local('Inter Medium'), local('Inter-Medium');
           }
           @font-face {
-            font-family: 'Roboto';
+            font-family: 'Inter';
             font-style: normal;
             font-display: swap;
             font-weight: 600;
-            src: local('Roboto SemiBold'), local('Roboto-SemiBold');
+            src: local('Inter SemiBold'), local('Inter-SemiBold');
           }
           @font-face {
-            font-family: 'Roboto';
+            font-family: 'Inter';
             font-style: normal;
             font-display: swap;
             font-weight: 700;
-            src: local('Roboto Bold'), local('Roboto-Bold');
+            src: local('Inter Bold'), local('Inter-Bold');
           }
         `,
       },
@@ -153,3 +152,302 @@ const theme = createTheme(adaptV4Theme({
 }));
 
 export default theme;
+
+export const getTheme = (themeMode, brandColor) =>
+  createTheme({
+      palette: {
+        mode: themeMode,
+        main: brandColor || "#FF8544",
+        primary: {
+          main: brandColor || "#FF8544",
+          contrastText:  "#ffffff",
+        },
+        secondary: {
+          main: "rgba(255,255,255,0.7)",
+          contrastText:"#000000",
+        },
+        text: {
+          primary: themeMode === "dark" ? "#ffffff" : "#1A1A1A",
+          secondary: themeMode === "dark" ? "#9E9E9E" : "#616161",
+        },
+        type: themeMode,
+        inputColor: themeMode === "dark" ? "rgba(39,41,45,1)" : "rgba(245, 245, 245, 1)",
+        textColor: themeMode === "dark" ? "#F1F1F1" : "#1A1A1A",
+        textPrimary: themeMode === "dark" ? "rgba(255, 255, 255, 0.8)" : "rgba(26, 26, 26, 0.8)",
+        surfaceColor: themeMode === "dark" ? "#27292d" : "#EFEFEF",
+        platformColor: themeMode === "dark" ? "#212121" : "#ffffff",
+        backgroundColor: themeMode === "dark" ? "#1a1a1a" : "#f1f1f1",
+        distributionColor: themeMode === "dark" ? "#40E0D0" : "#008080",
+        cardBackgroundColor: themeMode === "dark" ? "#1e1e1e" : "#eaeaea",
+        cardHoverColor: themeMode === "dark" ? "#323232" : "#F0F0F0", 
+        hoverColor: themeMode === "dark" ? "#323232" : "#D6D6D6",
+        usecaseCardColor: themeMode === "dark" ? "#2f2f2f" : "rgba(245, 245, 245, 1)",
+        usecaseCardHoverColor: themeMode === "dark" ? "#2F2F2F" : "rgba(245, 245, 245, 1)",
+        usecaseDialogFieldColor: themeMode === "dark" ? "#2B2B2B" : "#F5F5F5",
+        accentColor: themeMode === "dark" ? "#ff8544" : "#ff8544",
+        green: themeMode === "dark" ? "#5cc879" : "#008000",
+        defaultBorder: themeMode === "dark" ? '1px solid #494949' : '1px solid #CCCCCC',
+        linkColor: brandColor === "#ff8544" ? "#f86a3e" : brandColor,
+
+        borderRadius: 10,
+        loaderColor: themeMode === "dark" ? "#1a1a1a" : "#E0E0E0",
+        jsonIconStyle: "round",
+        jsonTheme: themeMode === "dark" ? "summerfruit" : {
+          base00: "#ffffff", // background
+          base01: "#f0f0f0", // very light grey
+          base02: "#f5f5f5", // light grey
+          base03: "#999999", // dim text
+          base04: "#444444", // bold keys
+          base05: "#333333", // normal text
+          base06: "#1a1a1a", // darker text
+          base07: "#000000", // black
+          base08: "#f14c4c", // red
+          base09: "#f58c1f", // orange
+          base0A: "#f2c032", // yellow
+          base0B: "#51975d", // green
+          base0C: "#2aa198", // teal
+          base0D: "#007acc", // blue (keys!)
+          base0E: "#c586c0", // purple
+          base0F: "#d16969", // brown
+        },
+        jsonCollapseStringsAfterLength: 100,
+        drawer: {
+          backgroundColor: themeMode === "dark" ? "#262626" : "#f9f9f9"
+        },
+        reactJsonStyle: {
+          padding: 5,
+          width: "98%",
+          borderRadius: 5,
+          border: themeMode === "dark" ? "1px solid rgba(255,255,255,0.7)" : "1px solid rgba(0,0,0,0.3)",
+          backgroundColor: themeMode === "dark"
+            ? "#1A1A1A"
+            : "#f1f1f1",
+          color: themeMode === "dark"
+            ? "#F1F1F1"
+            : "#1A1A1A",
+          overflowX: "auto",
+        },        
+        textFieldStyle: {
+          backgroundColor: themeMode === "dark" ? "#212121" : "#FFFFFF",
+          color: themeMode === "dark" ? "#ffffff" : "#000000",
+          borderRadius: "5px",
+          height: 40,
+          border: themeMode === "dark" ? "1px solid #4D4D4D" : "1px solid #E0E0E0",
+        },
+        DialogStyle: {
+          backgroundColor: themeMode === "dark" ? "#212121" : "#ffffff",
+          borderRadius: 2,
+          boxShadow: themeMode === "dark" ? "0px 0px 10px 0px rgba(0,0,0,0.75)" : "0px 0px 10px 0px rgba(0,0,0,0.2)",
+          border: themeMode === "dark" ? "1px solid #494949" : "1px solid #cccccc",
+        },
+        innerTextfieldStyle: {
+          height: 40,
+          fontSize: 16,
+          backgroundColor: themeMode === "dark" ? "#212121" : "#f5f5f5",
+        },
+        tooltip: {
+          backgroundColor: themeMode === "dark" ? "#212121" : "#ffffff",
+          color: themeMode === "dark" ? "#ffffff" : "#000000",
+          border: themeMode === "dark" ? "1px solid #494949" : "1px solid #cccccc",
+        },
+        chipStyle: {
+          backgroundColor: themeMode === "dark" ? "#333333" : "#F5F5F5",
+          borderColor: themeMode === "dark" ? "#444444" : "#E0E0E0",
+          color: themeMode === "dark" ? "#FFFFFF" : "#333333",
+        },        
+        defaultImage: "/images/no_image.png",
+        singulOrange: "/images/singul_orange.png",
+        singulGreen: "/images/singul_green.png",
+        singulBlackWhite: "/images/singul_black_white.png",
+        scrollbarColor: themeMode === "dark" ? "#494949 #2f2f2f": "#c1c1c1 #f1f1f1",
+        scrollbarColorTransparent: themeMode === "dark" ? '#494949 transparent': "#c1c1c1 transparent",
+      },
+      typography: {
+        fontFamily: `"inter", "Roboto", "Helvetica", "Arial", sans-serif`,
+        color: themeMode === "dark" ? "#ffffff" : "#000000",
+        useNextVariants: true,
+        fontWeightLight: 300,
+        fontWeightRegular: 400,
+        fontWeightMedium: 500,
+        fontWeightSemiBold: 600,
+        fontWeightBold: 700,
+        allVariants: {
+          color: themeMode === "dark" ? "#ffffff" : "#1A1A1A",
+        },      
+        h1: {
+          fontSize: 40,
+          color: themeMode === "dark" ? "#ffffff" : "#1A1A1A"
+        },
+        h2: {
+          fontSize: 36,
+          color: themeMode === "dark" ? "#ffffff" : "#1A1A1A"
+        },
+        h3: {
+          fontSize: 32,
+          color: themeMode === "dark" ? "#ffffff" : "#1A1A1A"
+        },
+        h4: {
+          fontSize: 30,
+          fontWeight: 500,
+          color: themeMode === "dark" ? "#ffffff" : "#1A1A1A"
+        },
+        h6: {
+          fontSize: 22,
+          color: themeMode === "dark" ? "#ffffff" : "#1A1A1A"
+        },
+        body1: {
+          fontSize: 16,
+          color: themeMode === "dark" ? "#ffffff" : "#1A1A1A"
+        },
+        body2: {
+          fontSize: 14,
+          color: themeMode === "dark" ? "#ffffff" : "#1A1A1A"
+        },
+      },
+      components: {
+        MuiButton: {
+          styleOverrides: {
+            root: {
+              textTransform: 'none',
+              borderRadius: '4px',
+            },
+          },
+          variants: [
+            {
+              props: { variant: 'text', color: 'primary' },
+              style: {
+                color: themeMode === "dark" ? "#ffffff" : "#1A1A1A",
+                whiteSpace: "nowrap",
+		            textWrap: "normal",
+              },
+            },
+            {
+              props: { variant: 'text', color: 'secondary' },
+              style: {
+                color: themeMode === "dark" ? "#9E9E9E" : "#616161",
+                whiteSpace: "nowrap",
+		            textWrap: "normal",
+              },
+            },
+            {
+              props: { variant: 'contained', color: 'primary' },
+              style: {
+                backgroundColor: themeMode === "dark" ? brandColor || '#ff8544' : brandColor || '#FF7C35',
+                color: themeMode === "dark" ? '#1a1a1a': '#FFFFFF',
+                borderRadius: '4px',
+                whiteSpace: "nowrap",
+		            textWrap: "normal",
+                '&:hover': {
+                  fontWeight: 600,
+                  backgroundColor: themeMode === 'dark' ? brandColor || "#ff955c" : brandColor || '#FF8D4F',
+                  color: themeMode === "dark" ? '#1a1a1a': '#FFFFFF',
+                },
+              },
+            },
+            {
+              props: { variant: 'contained', color: 'secondary' },
+              style: {
+                backgroundColor: themeMode === "dark" ? '#494949' : '#C9C9C9',
+                color: themeMode === "dark" ? '#ffffff' : '#4C4C4C',
+                borderRadius: '4px',
+                boxShadow: 'none',
+                whiteSpace: "nowrap",
+		            textWrap: "normal",
+                '&:hover': {
+                  fontWeight: 600,
+                  border: themeMode === "dark" ? '1px solid #f1f1f1' : 'none',
+                  backgroundColor: themeMode === "dark" ? '#494949' : '#C9C9C9',
+                  color: themeMode === "dark" ? '#ffffff' : '#4C4C4C',
+                },
+              },
+            },
+            {
+              props: { variant: 'outlined', color: 'primary' },
+              style: {
+                borderColor: themeMode === "dark" ?  brandColor || "#ff8544" : brandColor || "#cc5f1f",
+                color: themeMode === "dark" ? brandColor || "#ff8544" : brandColor || "#cc5f1f",
+                whiteSpace: "nowrap",
+                fontWeight: 'normal',
+		            textWrap: "normal",
+                '&:hover': {
+                  backgroundColor: themeMode === "dark" ? brandColor || "#ff8544" : "#ffe8dc",
+                  color: themeMode === "dark" ? "#1a1a1a" : "#8a3d00",
+                  fontWeight: 600,
+                },
+              },
+            },            
+            {
+              props: { variant: 'outlined', color: 'secondary' },
+              style: {
+                border: '1px solid #C5C5C5',
+                color: themeMode === "dark" ? '#C5C5C5' : '#2D2D2D',
+                whiteSpace: "nowrap",
+		            textWrap: "normal",
+                '&:hover': {
+                  backgroundColor: themeMode === "dark" ? '#C5C5C5' : '#EFEFEF',
+                  borderColor: themeMode === "dark" ? '#C5C5C5' : '#2D2D2D',
+                  fontWeight: 600,
+                  color: themeMode === "dark" ? '#1a1a1a' : '#1A1A1A',
+                },
+              },
+            },
+          ],
+        },
+        MuiTab: {
+          styleOverrides: {
+            root: {
+              color: themeMode === "dark" ? "#C5C5C5" : "#1A1A1A",
+            },
+          },
+        },
+      },
+
+      overrides: {
+        MuiMenu: {
+          list: {
+            backgroundColor: themeMode === "dark" ? "#27292d" : "#ffffff",
+          },
+        },
+        MuiCssBaseline: {
+          MuiCssBaseline: {
+            styleOverrides: `
+              @font-face {
+                font-family: 'Roboto';
+                font-style: normal;
+                font-display: swap;
+                font-weight: 300;
+                src: local('Roboto Light'), local('Roboto-Light');
+              }
+              @font-face {
+                font-family: 'Roboto';
+                font-style: normal;
+                font-display: swap;
+                font-weight: 400;
+                src: local('Roboto'), local('Roboto-Regular');
+              }
+              @font-face {
+                font-family: 'Roboto';
+                font-style: normal;
+                font-display: swap;
+                font-weight: 500;
+                src: local('Roboto Medium'), local('Roboto-Medium');
+              }
+              @font-face {
+                font-family: 'Roboto';
+                font-style: normal;
+                font-display: swap;
+                font-weight: 600;
+                src: local('Roboto SemiBold'), local('Roboto-SemiBold');
+              }
+              @font-face {
+                font-family: 'Roboto';
+                font-style: normal;
+                font-display: swap;
+                font-weight: 700;
+                src: local('Roboto Bold'), local('Roboto-Bold');
+              }
+            `,
+          },
+        },
+      },
+    });
diff --git a/frontend/src/views/Admin2.jsx b/frontend/src/views/Admin2.jsx
index 45d933b9..f94c3441 100644
--- a/frontend/src/views/Admin2.jsx
+++ b/frontend/src/views/Admin2.jsx
@@ -1,6 +1,7 @@
-import React, { useEffect, useState } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import AdminNavBar from '../components/AdminNavBar.jsx';
 import { toast } from "react-toastify";
+import { Context } from '../context/ContextApi.jsx';
 
 const Admin2 = (props) => {
     // Destructure props if needed
@@ -10,13 +11,15 @@ const Admin2 = (props) => {
     const [selectedOrganization, setSelectedOrganization] = useState({});
     const [organizationFeatures, setOrganizationFeatures] = useState({});
     const [orgRequest, setOrgRequest] = React.useState(true);
+    const [isOrgLoaded, setIsOrgLoaded] = React.useState(false);
+    const {brandName}  = useContext(Context)
     const isCloud = window.location.host === "localhost:3002" || window.location.host === "shuffler.io";
 
 	if (document !== undefined) {
-		if (selectedOrganization?.name !== undefined) {
-			document.title = selectedOrganization?.name + " - Admin - Shuffle"
+        if (selectedOrganization?.name !== undefined) {
+			document.title = brandName?.length > 0 ? selectedOrganization?.name + ` - Admin - ${brandName}` : selectedOrganization?.name + ` - Admin - Shuffle`;
 		} else {
-  			document.title = "Admin - Shuffle"
+  			document.title = brandName?.length > 0 ? `Admin - ${brandName}` : `Admin - Shuffle`;
 		}
 	}
 
@@ -76,6 +79,18 @@ const Admin2 = (props) => {
                             leads.push("tech partner");
                         }
 
+                        if (responseJson.lead_info.integration_partner) {
+                            leads.push("integration partner");
+                        }
+
+						if (responseJson.lead_info.distribution_partner) {
+							leads.push("distribution partner");
+						}
+
+						if (responseJson.lead_info.service_partner) {
+							leads.push("service partner");
+						}
+
                         if (responseJson.lead_info.creator) {
                             leads.push("creator");
                         }
@@ -139,6 +154,8 @@ const Admin2 = (props) => {
             .catch((error) => {
                 console.log("Error getting org: ", error);
                 toast("Error getting current organization");
+            }).finally(() => {
+                setIsOrgLoaded(true)
             });
     };
 
@@ -220,7 +237,8 @@ const Admin2 = (props) => {
         defaults,
         sso_config,
         lead_info,
-        { mfa_required } = {}
+        { mfa_required } = {},
+        editing,
     ) => {
         const data = {
             name: name,
@@ -231,6 +249,7 @@ const Admin2 = (props) => {
             sso_config: sso_config,
             lead_info: lead_info,
             mfa_required: mfa_required !== undefined  ? mfa_required : selectedOrganization?.mfa_required,
+            editing: editing?.length > 0 ? editing : "",
         };
 
         const url = globalUrl + `/api/v1/orgs/${selectedOrganization.id}`;
@@ -268,8 +287,8 @@ const Admin2 = (props) => {
 
 
     const handleStatusChange = (event) => {
-        const { value } = event.target;
-        setSelectedStatus(value);
+        const { value } = event.target
+        setSelectedStatus(value)
 
         handleEditOrg(
             selectedOrganization?.name,
@@ -317,8 +336,9 @@ const Admin2 = (props) => {
     }
 
     return (
-        <div style={{ display: 'flex', justifyContent: 'center', paddingTop: 29, zoom: 0.9}}>
-            <AdminNavBar userdata={userdata} isLoaded={isLoaded} selectedStatus={selectedStatus} setSelectedStatus={setSelectedStatus} selectedTab={selectedTab} orgId={selectedOrganization.id} handleStatusChange={handleStatusChange} handleEditOrg={handleEditOrg} handleGetOrg={handleGetOrg} setSelectedOrganization={setSelectedOrganization} selectedOrganization={selectedOrganization} setNotifications={setNotifications} stripeKey={stripeKey} notifications={notifications} checkLogin={checkLogin} globalUrl={globalUrl} isCloud={isCloud}/>
+        //<div style={{ display: 'flex', justifyContent: 'center', paddingTop: 29, zoom: 0.9}}>
+        <div style={{ display: 'flex', justifyContent: 'center', paddingTop: 29, zoom: 1, }}>
+            <AdminNavBar userdata={userdata} isLoaded={isLoaded} isOrgLoaded={isOrgLoaded} selectedStatus={selectedStatus} setSelectedStatus={setSelectedStatus} selectedTab={selectedTab} orgId={selectedOrganization.id} handleStatusChange={handleStatusChange} handleEditOrg={handleEditOrg} handleGetOrg={handleGetOrg} setSelectedOrganization={setSelectedOrganization} selectedOrganization={selectedOrganization} setNotifications={setNotifications} stripeKey={stripeKey} notifications={notifications} checkLogin={checkLogin} globalUrl={globalUrl} isCloud={isCloud}/>
         </div>
     );
 };
diff --git a/frontend/src/views/AdminSetup.jsx b/frontend/src/views/AdminSetup.jsx
index f8f3d747..65467300 100755
--- a/frontend/src/views/AdminSetup.jsx
+++ b/frontend/src/views/AdminSetup.jsx
@@ -1,6 +1,8 @@
 /* eslint-disable react/no-multi-comp */
 import React, { useState } from "react";
 import { makeStyles } from "@mui/styles";
+import theme from '../theme.jsx';
+import { useNavigate } from "react-router-dom";
 
 import {
   CircularProgress,
@@ -20,11 +22,8 @@ const surfaceColor = "#27292D";
 const inputColor = "#383B40";
 
 const boxStyle = {
-  paddingLeft: "30px",
-  paddingRight: "30px",
-  paddingBottom: "30px",
-  paddingTop: "30px",
-  backgroundColor: surfaceColor,
+  padding: 40, 
+  backgroundColor: theme.palette.backgroundColor,
 };
 
 const useStyles = makeStyles({
@@ -41,8 +40,10 @@ const AdminAccount = (props) => {
   const [firstRequest, setFirstRequest] = useState(true);
   const [loginLoading, setLoginLoading] = useState(false);
 
+
   // Used to swap from login to register. True = login, false = register
   const register = true;
+  let navigate = useNavigate();
 
   const classes = useStyles();
   // Error messages etc
@@ -67,16 +68,25 @@ const AdminAccount = (props) => {
       .then((response) =>
         response.json().then((responseJson) => {
           if (responseJson["success"] === false) {
-            setLoginInfo(responseJson["reason"]);
+            setLoginInfo(responseJson["reason"])
+
+			if (responseJson?.reason?.toLowerCase().includes("connection refused")) { 
+				navigate("/loginsetup")
+			}
+
           } else {
             if (responseJson.reason === "redirect") {
-              window.location.pathname = "/login";
+			  setTimeout(() => {
+              	window.location.pathname = "/login"
+			  }, 2500)
             }
+
           }
         })
       )
       .catch((error) => {
-        setLoginInfo("Error in userdata: ", error);
+        setLoginInfo("Error in userdata (1): ", error);
+		navigate("/loginsetup")
       });
   };
 
@@ -107,14 +117,18 @@ const AdminAccount = (props) => {
           if (responseJson["success"] === false) {
             setLoginInfo(responseJson["reason"]);
           } else {
-            setLoginInfo("Successful register :)");
-            window.location.pathname = "/login";
+            setLoginInfo("Successful register! Redirecting in a moment...");
+
+			setTimeout(() => {
+            	window.location.pathname = "/login";
+			}, 2500)
           }
         })
       )
       .catch((error) => {
-        setLoginLoading(false);
-        setLoginInfo("Error in userdata: ", error);
+        setLoginInfo("Error in userdata (2): ", error);
+        setLoginLoading(false)
+		navigate("/loginsetup")
       });
   };
 
diff --git a/frontend/src/views/AgentUI.jsx b/frontend/src/views/AgentUI.jsx
new file mode 100644
index 00000000..ebc5a558
--- /dev/null
+++ b/frontend/src/views/AgentUI.jsx
@@ -0,0 +1,542 @@
+import React, { useState, useEffect, useContext, memo } from "react";
+import { Context } from "../context/ContextApi.jsx";
+import { getTheme } from "../theme.jsx";
+import { toast } from "react-toastify"
+import ReactJson from "react-json-view-ssr";
+import { validateJson, collapseField, handleReactJsonClipboard, HandleJsonCopy } from "../views/Workflows.jsx";
+
+import {
+	Button,
+	ButtonGroup,
+	Typography,
+	Chip,
+	CircularProgress,
+	Tooltip,
+	IconButton,
+} from '@mui/material'
+
+import {
+	CheckCircle as CheckCircleIcon,
+	HourglassDisabled as HourglassDisabledIcon,
+	RestartAlt as RestartAltIcon,
+	ExpandMore as ExpandMoreIcon,
+	ExpandLess as ExpandLessIcon,
+} from '@mui/icons-material'
+
+import { 
+	green,
+	red,
+} from '../views/AngularWorkflow.jsx'
+
+const AgentUI = (props) => {
+  	const { globalUrl, isLoggedIn, isLoaded, userdata, } = props
+	const [buttonState, setButtonState] = useState("timeline")
+	const [execution, setExecution] = useState(null)
+	const [agentActionResult, setAgentActionResult] = useState(null)
+	const [data, setData] = useState({})
+	const [openIndexes, setOpenIndexes] = useState([])
+	const [disableButtons, setDisableButtons] = useState(false)
+
+	const [originalStartTime, setOriginalStartTime] = useState(0)
+	const [latestEndTime, setLatestEndTime] = useState(0)
+
+    const {themeMode} = useContext(Context)
+  	const theme = getTheme(themeMode)
+
+	const agentWrapperStyle = {
+		width: 1000,
+		height: 1000, 
+		margin: "auto",
+		paddingTop: 100, 
+	}
+
+	if (data.input === undefined || data.input === null) {
+		data.input = ""
+	} else {
+		const verifiedInput = validateJson(data.input)
+		if (verifiedInput.valid === true) {
+			data.input = JSON.stringify(verifiedInput.result, null, 2)
+		}
+	}
+
+	const findNodeData = (execution_data, node_id) => {
+		if (execution_data === undefined || execution_data === null) {
+			return
+		}
+
+		var found = false
+		for (var key in execution_data.results) {
+			const item = execution_data.results[key]
+			if (item?.action?.id !== node_id) {
+				continue
+			}
+
+			setAgentActionResult(item)
+
+			found = true
+			const validate = validateJson(item.result)
+			if (validate.valid) {
+				setData(validate.result)
+			} else {
+				toast.warn("Action output result is not valid JSON!")
+			}
+
+			break
+		}
+
+		if (found === false) {
+			toast.warn("Failed to find the relevant AI Agent result")
+		}
+	}
+
+	const GetExecution = (execution_id, node_id, authorization) => {
+		if (execution_id === undefined || execution_id === null) {
+			toast.error("No execution ID provided. Please provide execution_id in the URL.")
+			return 
+		}
+
+		if (node_id === undefined || node_id === null) {
+			toast.error("No node ID provided. Please provide node_id in the URL.")
+			return
+		}
+
+		if (authorization === undefined || authorization === null) {
+			toast.error("No authorization provided. Please provide authorization in the URL.")
+			return
+		}
+
+		const headers = {}
+		const executionRequest = {
+			"execution_id": execution_id,
+			"authorization": authorization,
+		}
+
+		const url = `${globalUrl}/api/v1/streams/results`
+		fetch(url, {
+		  method: "POST",
+		  headers: headers,
+		  body: JSON.stringify(executionRequest),
+		  credentials: "include",
+		  cors: "no-cors",
+		})
+		.then((response) => {
+			return response.json()
+		})
+		.then((responseJson) => {
+			if (responseJson.success !== false) {
+				if (responseJson.status === "EXECUTING") {
+					// Recursively looking for updates until it's not executing anymore
+            		setTimeout(() => {
+						GetExecution(execution_id, node_id, authorization)
+					}, 3000)
+				} else {
+					setDisableButtons(false)
+					setDisableButtons(false)
+				}
+
+				setExecution(responseJson)
+				findNodeData(responseJson, node_id)
+			} else {
+				setDisableButtons(false)
+				if (responseJson.reason === undefined || responseJson.reason === null) {
+					toast.error("Failed to load the agent data. Please try again and contact support@shuffler.io if this persists")
+				} else {
+					toast.error("Error: " + responseJson.reason)
+				}
+			}
+		})
+		.catch((error) => {
+			setDisableButtons(false)
+			toast.error("Error: " + error)
+		})
+	}
+
+	const RerunDecision = (decision) => {
+		if (execution.execution_id === undefined || execution.execution_id === null) {
+			toast.error("No workflow run loaded. Please try again and contact support@shuffler.io if this persists.")
+			return
+		}
+
+		if (agentActionResult === undefined || agentActionResult === null) {
+			toast.error("Failed to find the relevant agent action. Please try again, and contact support@shuffler.io if it persists.")
+			return
+		}
+
+		console.log("DECISION: ", decision)
+
+		const url = `${globalUrl}/api/v1/apps/agent/run?rerun=true&decision_id=${decision?.run_details?.id}`
+		var body = agentActionResult.action
+		body.source_execution = execution.execution_id
+		body.source_workflow = execution.workflow.id
+
+		fetch(url, {
+		  method: "POST",
+		  body: JSON.stringify(body),
+		  credentials: "include",
+		  cors: "no-cors",
+		})
+		.then((response) => {
+			return response.json()
+		})
+		.then((responseJson) => {
+			console.log("RESP: ", responseJson)
+			if (responseJson.success !== false) {
+			} else {
+				if (responseJson.reason === undefined || responseJson.reason === null) {
+					toast.warn("Failed to restart the agent decision. Please try again and contact support@shuffler.io if this persists")
+				} else {
+					toast.warn(responseJson.reason)
+
+				}
+			}
+
+			GetExecution(execution.execution_id, agentActionResult.action.id, execution.authorization) 
+		})
+		.catch((error) => {
+			toast.error("Error: " + error)
+		})
+	}
+
+	useEffect(() => {
+		const params = new URLSearchParams(window.location.search)
+		const executionId = params.get("execution_id")
+		const nodeId = params.get("node_id")
+		const authorization = params.get("authorization")
+		if (executionId !== undefined && executionId !== null && nodeId !== undefined && nodeId !== null && authorization !== undefined && authorization !== null) {
+			GetExecution(executionId, nodeId, authorization)
+		} else {
+			toast.warn("No execution ID or node ID provided. Please provide execution_id and node_id in the URL.")
+		}
+	}, [])
+
+	const maxTimelineWidth = 150 
+	const TimelineItem = (props) => {
+		const { item, index } = props;
+		const [hovered, setHovered] = useState(false);
+
+		const parsedStatus = item.status === "RUNNING" || item.status === "WAITING" ? 
+			<CircularProgress size={20} style={{marginRight: 10, }} />
+			:
+			item.status === "FINISHED" ?
+			<Tooltip title="Finished" placement="top">
+				<CheckCircleIcon style={{color: green, marginRight: 10, }} />
+			</Tooltip>
+			: 
+			<Tooltip title={`Not started yet: ${item.status}`} placement="top">
+				<HourglassDisabledIcon style={{marginRight: 10, }} />
+			</Tooltip>
+
+		const categoryStyle = {
+			width: 20, 
+			height: 20, 
+			marginRight: 10, 
+		}
+
+		const parsedCategory = item.category === "singul" ?
+			<Tooltip title="Singul" placement="top">
+				<img src="/images/logos/singul.svg" style={categoryStyle} />
+			</Tooltip>
+			: item.category === "ask" ? 
+			<Tooltip title="Ask" placement="top">
+				<img src="/images/workflows/UserInput2.svg" style={categoryStyle} />
+			</Tooltip>
+			:
+			<div style={categoryStyle} />
+				
+		const validate = validateJson(item.details)
+		const itemStartTime = item.start_time
+		var itemEndTime = item.end_time
+		if (itemStartTime !== undefined && (itemStartTime < originalStartTime || originalStartTime === 0)) {
+			setOriginalStartTime(itemStartTime)
+		}
+
+		if (itemEndTime !== undefined && itemEndTime > latestEndTime) {
+			setLatestEndTime(itemEndTime)
+		}
+
+		if (itemEndTime === undefined || itemEndTime === null) {
+			// Set it to now
+			itemEndTime = latestEndTime
+		}
+
+		const totalDuration = latestEndTime - originalStartTime
+		const currentDuration = itemStartTime - itemEndTime
+		var timelineMarginLeft = ((itemStartTime - originalStartTime) / totalDuration) * maxTimelineWidth
+		var timelineWidth = ((itemEndTime - itemStartTime) / totalDuration) * maxTimelineWidth 
+
+		if (totalDuration === currentDuration) {
+			timelineMarginLeft = 0
+			timelineWidth = maxTimelineWidth
+		}
+
+		const defaultTopPadding = 10
+		const open = openIndexes.includes(index)
+
+		return (
+			<div 
+				style={{
+					minHeight: 45, 
+					cursor: hovered ? "pointer" : "default",
+					borderTop: "1px solid " + theme.palette.surfaceColor,
+					borderRadius: theme.palette.borderRadius,
+				}}
+			>
+				<div 
+					style={{
+						display: "flex", 
+						backgroundColor: hovered ? theme.palette.surfaceColor : "inherit",
+					}}
+					onMouseEnter={() => setHovered(true)}
+					onMouseLeave={() => setHovered(false)}
+					onClick={(e) => {
+						if (item.details === undefined || item.details === null || item.details === "") {
+							toast("No details to open")
+							return
+						}
+
+						if (openIndexes.includes(index)) {
+							setOpenIndexes(openIndexes.filter((i) => i !== index))
+						} else {
+							setOpenIndexes([...openIndexes, index])
+						}
+					}}
+				>
+					<div style={{minWidth: 50, maxWidth: 50, paddingTop: defaultTopPadding, }}>
+						{parsedStatus}
+					</div>
+					<div style={{minWidth: 50, maxWidth: 50, paddingTop: defaultTopPadding, }}>
+						{parsedCategory}
+					</div>
+					<div style={{minWidth: 200, maxWidth: 200, paddingTop: defaultTopPadding, }}>
+						{/* To ISO string from unix time */}
+						{new Date(item.start_time * 1000).toLocaleString()}
+					</div>
+					<div style={{minWidth: 100, maxWidth: 100, paddingTop: defaultTopPadding-5,  }}>
+						<Chip
+							label={item.type}
+						/>
+					</div>
+					<div style={{
+						minWidth: 200, 
+						maxWidth: 200, 
+						paddingTop: defaultTopPadding, 
+					}}>
+						{item.label}
+					</div>
+
+					<Tooltip title={`Time taken: ${currentDuration*-1} seconds. Started: ${new Date(item.start_time * 1000).toLocaleString()}\nFinished: ${new Date(item.end_time * 1000).toLocaleString()}`} placement="right">
+						<div style={{
+							minWidth: maxTimelineWidth, 
+							maxWidth: maxTimelineWidth, 
+							paddingTop: defaultTopPadding*1.3, 
+						}}>
+							{currentDuration !== 0 && !isNaN(timelineMarginLeft) && !isNaN(timelineWidth) && timelineWidth > 0 ?
+								<div style={{
+									backgroundColor: item.status === "FINISHED" ? 
+										green : 	 item.status === "RUNNING" || item.status === "" ? 
+										theme.palette.main : theme.palette.surfaceColor,
+
+									marginLeft: timelineMarginLeft, 
+									minWidth: timelineWidth, 
+									maxWidth: timelineWidth,
+									height: 10, 
+									}} />
+							: null}
+						</div>
+					</Tooltip>
+
+					<div style={{
+						minWidth: 100, 
+						maxWidth: 100, 
+						display: "flex", 
+					}}>
+						<Tooltip title="Rerun JUST this decision. This can be used if an agent decision action somehow stopped and didn't get a result." placement="left">
+							<span>
+								<IconButton
+									disabled={item.type !== "decision" || disableButtons}
+									style={{marginLeft: 20, }}
+									onClick={(e) => {
+										e.preventDefault()
+										e.stopPropagation()
+
+										toast.info("Attempting to rerun this decision by itself.")
+										setDisableButtons(true)
+										RerunDecision(item.details)
+									}}
+								>
+									<RestartAltIcon /> 
+								</IconButton>
+							</span>
+						</Tooltip>
+						<Tooltip title="Explore results" placement="right">
+							<span>
+								<IconButton
+									disabled={item.details === undefined || item.details === null || item.details === ""}
+									style={{marginLeft: 10, }}
+								>
+									{open ? 
+										<ExpandLessIcon />
+										: 
+										<ExpandMoreIcon />
+									}
+
+								</IconButton>
+							</span>
+						</Tooltip>
+					</div>
+				</div>
+
+				{open ?
+					<div style={{marginTop: 10, marginBottom: 10, }}>
+						{validate.valid === true ? 
+						  <ReactJson
+							src={validate.result}
+							theme={theme.palette.jsonTheme}
+							style={theme.palette.reactJsonStyle}
+							shouldCollapse={(jsonField) => {
+							  return collapseField(jsonField)
+							}}
+							iconStyle={theme.palette.jsonIconStyle}
+							collapseStringsAfterLength={theme.palette.jsonCollapseStringsAfterLength}
+							displayArrayKey={false}
+							enableClipboard={(copy) => {
+							  handleReactJsonClipboard(copy);
+							}}
+							displayDataTypes={false}
+							onSelect={(select) => {
+							  HandleJsonCopy(validate.result, select, "exec")
+							}}
+							name={false}
+						  />
+						:
+						<code>
+							{item.details}
+						</code>
+					}
+				  </div>
+				: null }
+			</div> 
+		)
+	}
+
+	const TimelineRender = (props) => {
+		const { agent_data } = props;
+		var timelineItems = [
+			{
+				"label": "AI Agent 2",
+				"type": "agent",
+				"category": "agent",
+
+				"status": agent_data.status,
+				"start_time": agent_data.started_at,
+				"end_time": agent_data.completed_at,
+			},
+		]
+
+		var sortedTimelineItems = []
+		for (var key in agent_data?.decisions) {
+			const item = agent_data.decisions[key]
+
+			if (item.run_details.started_at === undefined || item.run_details.started_at === null) {
+				item.run_details.started_at = originalStartTime
+			}
+
+			if (item.run_details.completed_at === undefined || item.run_details.completed_at === null) {
+				item.run_details.completed_at = Math.floor(Date.now() / 1000)
+			}
+
+			var newTimelineItem = {
+				"label": item.action,
+				"type": "decision",
+				"category": item.category,
+
+				"status": item.run_details.status,
+				"start_time": item.run_details.started_at,
+				"end_time": item.run_details.completed_at,
+			}
+
+			newTimelineItem.details = item
+			timelineItems.push(newTimelineItem)
+		}
+
+		timelineItems.sort((a, b) => {
+			if (a.start_time < b.start_time) {
+				return 1;
+			}
+
+			return 0;
+		})
+
+		return (
+			<div style={{marginTop: 20, }}>
+				{/*
+				<div style={{display: "flex", }}>
+					{agent_data?.status === "RUNNING" || agent_data?.status === "WAITING" ?
+						<CircularProgress size={20} style={{marginRight: 10, }} />
+						:
+						agent_data?.status === "FINISHED" ?
+							<CheckCircleIcon style={{color: green, marginRight: 10, }} />
+						:
+						<HourglassDisabledIcon style={{marginRight: 10, }} />
+					}
+						
+					<Typography variant="h6" style={{marginLeft: 20, }}>
+						{agent_data?.status}
+					</Typography>
+				</div>
+				*/}
+
+				<div style={{marginTop: 10, }} />
+				{timelineItems?.map((item, index) => {
+					return (
+						<TimelineItem 
+							item={item} 
+							index={index}
+							key={index} 
+						/>
+					)
+				})}
+
+			</div>
+		)
+	}
+
+	return (
+		<div style={agentWrapperStyle}>
+			{/*
+			<Typography variant="h4">
+				Agent Input: {data.input}
+			</Typography>
+			*/}
+
+			<ButtonGroup style={{marginTop: 50, }}>
+				<Button 
+					variant={buttonState === "default" ? "contained" : "outlined"}
+					color="secondary" 
+					onClick={() => {
+						setButtonState("default");
+					}}
+				>
+					Default
+				</Button>
+				<Button 
+					variant={buttonState === "timeline" ? "contained" : "outlined"}
+					color="secondary" 
+					onClick={() => {
+						setButtonState("timeline");
+					}}
+				>
+					Timeline	
+				</Button>
+			</ButtonGroup>
+
+			{buttonState === "timeline" ?
+				<TimelineRender agent_data={data} />
+			: 
+				null
+			}
+		</div>
+	)
+}
+
+export default AgentUI
diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx
index 3904b15f..0466fb85 100755
--- a/frontend/src/views/AngularWorkflow.jsx
+++ b/frontend/src/views/AngularWorkflow.jsx
@@ -2,10 +2,11 @@
 import React, { useState, useEffect, useLayoutEffect, memo, useMemo, useRef, useContext } from "react";
 import ReactDOM from "react-dom"
 
-import theme from "../theme.jsx";
+import { getTheme } from "../theme.jsx";
 import { useInterval } from "react-powerhooks";
 import { makeStyles, } from "@mui/styles";
 
+import YAML from "yaml";
 import WorkflowTemplatePopup from "../components/WorkflowTemplatePopup.jsx"
 import { v4 as uuidv4, v5 as uuidv5, validate as isUUID, } from "uuid";
 import { useNavigate, Link, useParams } from "react-router-dom";
@@ -74,6 +75,7 @@ import {
 
 
 import {
+  Storage as StorageIcon, 
   Code as CodeIcon, 
   Folder as FolderIcon,
   VerifiedUser as VerifiedUserIcon,
@@ -131,6 +133,7 @@ import {
   ArrowForward as ArrowForwardIcon,
   OpenInFull as OpenInFullIcon,
   Difference as DifferenceIcon,
+  DataObject as DataObjectIcon, 
 } from "@mui/icons-material";
 import SwapHorizIcon from '@mui/icons-material/SwapHoriz';
 //import * as cytoscape from "cytoscape";
@@ -142,11 +145,11 @@ import edgehandles from "cytoscape-edgehandles";
 import CytoscapeComponent from "react-cytoscapejs";
 
 import Draggable from "react-draggable";
-import cytoscapestyle from "../defaultCytoscapeStyle.jsx";
+import defaultCytoscapeStyle from "../defaultCytoscapeStyle.jsx";
 import ShuffleCodeEditor from "../components/ShuffleCodeEditor1.jsx";
 
 import WorkflowValidationTimeline from "../components/WorkflowValidationTimeline.jsx"
-import { validateJson, collapseField, GetIconInfo } from "../views/Workflows.jsx";
+import { validateJson, collapseField, GetIconInfo, handleReactJsonClipboard, HandleJsonCopy, } from "../views/Workflows.jsx";
 import { GetParsedPaths, internalIds, } from "../views/Apps.jsx";
 import ConfigureWorkflow from "../components/ConfigureWorkflow.jsx";
 import AuthenticationOauth2 from "../components/Oauth2Auth.jsx";
@@ -163,6 +166,33 @@ export const triggers = [
   {
     name: "Webhook",
     type: "TRIGGER",
+    parameters : [
+      {
+          "name": "url",
+          "example": "",
+          "value": ""
+      },
+      {
+          "name": "tmp",
+          "example": "",
+          "value": "",
+      },
+      {
+        "name": "auth_headers",
+        "example": "",
+        "value": "",
+      },
+      {
+        "name": "custom_response_body",
+        "example": "",
+        "value": "",
+      },
+      {
+        "name": "await_response",
+        "example": "",
+        "value": "v1",
+      },
+    ],
     status: "uninitialized",
     trigger_type: "WEBHOOK",
     errors: null,
@@ -178,6 +208,18 @@ export const triggers = [
   {
     name: "Schedule",
     type: "TRIGGER",
+    parameters : [
+      {
+          "name": "cron",
+          "example": "",
+          "value": "*/25 * * * *"
+      },
+      {
+          "name": "execution_argument",
+          "example": "",
+          "value": "",
+      },
+    ],
     status: "uninitialized",
     trigger_type: "SCHEDULE",
     errors: null,
@@ -222,6 +264,38 @@ export const triggers = [
   {
     name: "User Input",
     type: "TRIGGER",
+    parameters: [
+      {
+          "name": "alertinfo",
+          "example": "",
+          "value": "Do you want to continue the workflow? Start parameters: $exec",
+      },
+      {
+          "name": "options",
+          "example": "",
+          "value": "boolean",
+      },
+      {
+          "name": "type",
+          "example": "",
+          "value": "subflow",
+      },
+      {
+          "name": "email",
+          "example": "",
+          "value": "test@test.com",
+      },
+      {
+          "name": "sms",
+          "example": "",
+          "value": "0000000",
+      },
+      {
+          "name": "subflow",
+          "example": "",
+          "value": "",
+      }
+    ],
     status: "running",
     large_image: "/images/workflows/UserInput2.svg",
     description: "Wait for user input trigger",
@@ -323,6 +397,7 @@ export function SetJsonDotnotation(jsonInput, inputKey) {
   return jsonInput;
 }
 
+
 //export const green = "#86c142";
 export const green = "#02CB70"
 export const yellow = "#FECC00";
@@ -358,39 +433,18 @@ export function removeParam(key, sourceURL) {
   return rtn;
 }
 
-const useStyles = makeStyles({
-  notchedOutline: {
-    borderColor: "#FF8544 !important",
-  },
-  root: {
-    "& .MuiAutocomplete-listbox": {
-      border: "2px solid #FF8544",
-      color: "white",
-      fontSize: 18,
-      "& li:nth-child(even)": {
-        backgroundColor: "#CCC",
-      },
-      "& li:nth-child(odd)": {
-        backgroundColor: "#FFF",
-      },
-    },
-  },
-  inputRoot: {
-    color: "white",
-    "&:hover .MuiOutlinedInput-notchedOutline": {
-      borderColor: "#f86a3e",
-    },
-  },
-});
-
 const splitter = "|~|";
 const svgSize = 24;
+const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
+
 //const referenceUrl = "https://shuffler.io/functions/webhooks/"
 //const referenceUrl = window.location.origin+"/api/v1/hooks/"
 
-const searchClient = algoliasearch("JNSS5CFDZZ", "db08e40265e2941b9a7d8f644b6e5240")
+const searchClient = algoliasearch("JNSS5CFDZZ", "c8f882473ff42d41158430be09ec2b4e")
 const AngularWorkflow = (defaultprops) => {
   const { globalUrl, setCookie, isLoggedIn, isLoaded, userdata, data_id, ReactGA, } = defaultprops;
+  const {themeMode, supportEmail, brandColor} = useContext(Context)
+  const theme = getTheme(themeMode, brandColor)
   const referenceUrl = globalUrl + "/api/v1/hooks/";
   //const alert = useAlert()
   let navigate = useNavigate();
@@ -404,10 +458,36 @@ const AngularWorkflow = (defaultprops) => {
 
   var to_be_copied = "";
   const [firstrequest, setFirstrequest] = React.useState(true);
-  const [cystyle] = useState(cytoscapestyle);
+  const cystyle = useMemo(() => defaultCytoscapeStyle(theme), [themeMode]);
+  // const cystyle = useMemo(() => defaultCytoscapeStyle, [themeMode]);
 
   const [cy, setCy] = React.useState();
 
+  const useStyles = makeStyles({
+    notchedOutline: {
+      borderColor: "#FF8544 !important",
+    },
+    root: {
+      "& .MuiAutocomplete-listbox": {
+        border: "2px solid #FF8544",
+        color: theme.palette.text.primary,
+        fontSize: 18,
+        "& li:nth-child(even)": {
+          backgroundColor: "#CCC",
+        },
+        "& li:nth-child(odd)": {
+          backgroundColor: "#FFF",
+        },
+      },
+    },
+    inputRoot: {
+      color: theme.palette.text.primary,
+      "&:hover .MuiOutlinedInput-notchedOutline": {
+        borderColor: "#f86a3e",
+      },
+    },
+  });
+
   const [toolsApp, setToolsApp] = React.useState({});
   const [currentView, setCurrentView] = React.useState(0);
   const [triggerAuthentication, setTriggerAuthentication] = React.useState({});
@@ -431,6 +511,7 @@ const AngularWorkflow = (defaultprops) => {
       "default",
     ]
   });
+
   const [appGroup, setAppGroup] = React.useState([]);
   const [triggerGroup, setTriggerGroup] = React.useState([]);
   const [executionText, setExecutionText] = React.useState("");
@@ -472,6 +553,7 @@ const AngularWorkflow = (defaultprops) => {
   const [authGroups, setAuthGroups] = React.useState([])
 
   const curpath = typeof window === "undefined" || window.location === undefined ? "" : window.location.pathname;
+  const cursearch = typeof window === "undefined" || window.location === undefined ? "" : window.location.search;
 
 
   // 0 = normal, 1 = just done, 2 = normal
@@ -503,7 +585,7 @@ const AngularWorkflow = (defaultprops) => {
   const [allRevisions, setAllRevisions] = useState([])
   const [menuPosition, setMenuPosition] = useState(null);
   const [showDropdown, setShowDropdown] = React.useState(false);
-  const [subflowActionList, setSubflowActionList] = React.useState([]);
+  const [triggerActionList, setTriggerActionList] = React.useState([]);
 
   const [apps, setApps] = React.useState([]);
   const [filteredApps, setFilteredApps] = React.useState([]);
@@ -574,11 +656,18 @@ const AngularWorkflow = (defaultprops) => {
   }, [editWorkflowModalOpen])
 
   useEffect(() => {
-    if (selectedTrigger !== undefined && selectedTrigger?.parameters !== undefined && selectedTrigger?.parameters !== null && selectedTrigger?.parameters?.length > 1) {
-      // Right now just setting for the subflow
-      setSelectedTriggerValue(selectedTrigger?.parameters[1]?.value)
-    }
-  }, [selectedTrigger])
+	  // Check if selectedTriggerIndex is a number >= 0
+	  if (isNaN(selectedTriggerIndex) || selectedTriggerIndex < 0) {
+		  return
+	  }
+
+      if (selectedTrigger?.trigger_type === "SUBFLOW" && selectedTriggerIndex !== undefined && selectedTriggerIndex !== null && workflow?.triggers[selectedTriggerIndex].parameters.length > 1) {
+        setSelectedTriggerValue(workflow.triggers[selectedTriggerIndex].parameters[1].value || "")
+      } else if (selectedTrigger?.trigger_type === "USERINPUT" && selectedTriggerIndex !== undefined && selectedTriggerIndex !== null && workflow?.triggers[selectedTriggerIndex].parameters.length > 0) {
+        setSelectedTriggerValue(workflow.triggers[selectedTriggerIndex].parameters[0].value || "Do you want to continue the workflow? Start parameters: $exec")
+      }
+
+  }, [selectedTriggerIndex, selectedTrigger, workflow])
 
   useEffect(() => {
     if(selectedEdge && Object.keys(selectedEdge).length > 0){
@@ -638,10 +727,36 @@ const AngularWorkflow = (defaultprops) => {
 						"Nothing",
 						"Create ticket",
 						"List tickets",
+						"Send Email",
 						"Get specific ticket",
 					],
 					"multiselect": true,
 				},
+				{
+					"name": "memory",
+					"value": "",
+					"required": true,
+					"description": "Whether to store the conversation in memory",
+					"options": [
+						"Nothing",
+						"Shuffle Datastore",
+					],
+					"multiselect": false,
+					"disabled": true,
+				},
+				{
+					"name": "knowledge",
+					"value": "",
+					"required": true,
+					"description": "The knowledge we should inject into the context window",
+					"options": [
+						"Nothing",
+						"Shuffle Files",
+					],
+					"multiselect": false,
+					"disabled": true,
+				},
+
 			]
 		}],
 		large_image: theme.palette.singulBlackWhite,
@@ -665,28 +780,22 @@ const AngularWorkflow = (defaultprops) => {
         "name": "action",
         "value": "list_tickets",
         "options": [
+          "create_ticket",
           "list_tickets",
           "get_ticket",
-          "create_ticket",
+          "close_ticket",
+          "add_comment",
+          "update_ticket",
+          "search_tickets"
         ],
         "required": true,
       },
       {
         "name": "fields",
-        "value": "",
+        "value": '{\n  "ticket_id": "123456",\n  "comment": "This is a comment"\n}',
         "required": false,
         "multiline": true,
       },
-        /*{
-          "name": "options",
-          "value": "deduplicate,enrich",
-          "required": false,
-          "multiselect": true,
-          "options": [
-            "deduplicate",
-            "enrich",
-          ]
-        }*/
       ]
     }, {
       "name": "Communication",
@@ -696,8 +805,14 @@ const AngularWorkflow = (defaultprops) => {
         "name": "action",
         "value": "list_messages",
         "options": [
-          "list_messages",
           "send_message",
+          "list_messages",
+          "get_message", 
+          "search_messages",
+          "list_attachments",
+          "get_attachment",
+          "create_contact",
+          "get_contact"
         ],
         "required": true,
       },
@@ -714,9 +829,134 @@ const AngularWorkflow = (defaultprops) => {
       "label": "IAM",
       "parameters": [{
         "name": "action",
-        "value": "get_kms_key",
+        "value": "get_asset",
+      	"options": [
+			"reset_password",
+			"enable_user",
+			"disable_user",
+			"get_identity",
+			"get_asset",
+			"search_identity"
+		  ],
+          "required": true,
+      },
+      {
+        "name": "fields",
+        "value": "",
+        "required": false,
+        "multiline": true,
+      }]
+    },
+    {
+      "name": "Assets",
+      "description": "Available actions for Assets",
+      "label": "Assets",
+      "parameters": [{
+        "name": "action",
+        "value": "list_assets",
         "options": [
-          "get_kms_key",
+          "list_assets",
+          "get_asset",
+          "search_assets",
+          "search_users",
+          "search_endpoints",
+          "search_vulnerabilities"
+        ],
+        "required": true,
+      },
+      {
+        "name": "fields",
+        "value": "",
+        "required": false,
+        "multiline": true,
+      }]
+    },
+    {
+      "name": "Eradication",
+      "description": "Available actions for Eradication",
+      "label": "Eradication",
+      "parameters": [{
+        "name": "action",
+        "value": "list_alerts",
+        "options": [
+          "list_alerts",
+          "close_alert",
+          "get_alert",
+          "create_detection",
+          "block_hash",
+          "search_hosts",
+          "isolate_host",
+          "unisolate_host",
+          "trigger_host_scan"
+        ],
+        "required": true,
+      },
+      {
+        "name": "fields",
+        "value": "",
+        "required": false,
+        "multiline": true,
+      }]
+    },
+    {
+      "name": "Intel",
+      "description": "Available actions for Intel",
+      "label": "Intel",
+      "parameters": [{
+        "name": "action",
+        "value": "get_ioc",
+        "options": [
+          "get_ioc",
+          "create_ioc",
+          "search_ioc",
+          "update_ioc",
+          "delete_ioc"
+        ],
+        "required": true,
+      },
+      {
+        "name": "fields",
+        "value": "",
+        "required": false,
+        "multiline": true,
+      }]
+    },
+    {
+      "name": "Network",
+      "description": "Available actions for Network",
+      "label": "Network",
+      "parameters": [{
+        "name": "action",
+        "value": "get_rules",
+        "options": [
+          "get_rules",
+          "allow_ip",
+          "block_ip"
+        ],
+        "required": true,
+      },
+      {
+        "name": "fields",
+        "value": "",
+        "required": false,
+        "multiline": true,
+      }]
+    },
+    {
+      "name": "SIEM",
+      "description": "Available actions for SIEM",
+      "label": "SIEM",
+      "parameters": [{
+        "name": "action",
+        "value": "search",
+        "options": [
+          "search",
+          "list_alerts",
+          "close_alert",
+          "get_alert",
+          "create_detection",
+          "add_to_lookup_list",
+          "isolate_endpoint"
         ],
         "required": true,
       },
@@ -730,23 +970,6 @@ const AngularWorkflow = (defaultprops) => {
     ]
   }]
 
-  /*
-    {
-      "name": "Email",
-      "label": "Email",
-      "parameters": [{	
-        "name": "action",
-        "value": "list_email",
-        "options": [
-          "list_email", 
-          "send_mail", 
-        ],
-        "required": true,
-      }],
-    }]
-  }] 
-  */
-
   // For code editor
   const [codeEditorModalOpen, setCodeEditorModalOpen] = React.useState(false);
   const [codedata, setcodedata] = React.useState("");
@@ -762,7 +985,7 @@ const AngularWorkflow = (defaultprops) => {
 
   const [loadedApps, setLoadedApps] = React.useState([])
 
-  const loadAppConfig = (appId, select) => {
+  const loadAppConfig = (appId, select, skipAppLoad) => {
     if (appId === undefined || appId === null || appId.length === 0) {
       console.log("No appId to load")
       return
@@ -782,6 +1005,14 @@ const AngularWorkflow = (defaultprops) => {
       return
     }
 
+	// Ensures reloads don't randomly happen
+	const appsearchValue = document.getElementById("appsearch")
+	if (appsearchValue !== undefined && appsearchValue !== null) {
+	  if (appsearchValue.value !== undefined && appsearchValue.value !== null && appsearchValue.value.length > 0) {
+		  return
+	  }
+	}
+
     if (loadedApps.includes(appId)) {
       //console.log("App already loaded: ", appId)
 
@@ -858,7 +1089,7 @@ const AngularWorkflow = (defaultprops) => {
               setSelectedApp(foundapp)
             }
 
-            if (apps === undefined || apps === null || apps.length === 0) {
+            if ((apps === undefined || apps === null || apps.length === 0) && skipAppLoad !== true) {
 				console.log("No apps to update :(")
   			  	getApps() 
 				return 
@@ -878,7 +1109,7 @@ const AngularWorkflow = (defaultprops) => {
               break
             }
           } else {
-			  console.log("Found app, but no actions: ", foundapp)
+			  //console.log("Found app, but no actions: ", foundapp)
 		  }
 
           if (cy !== undefined && cy !== null) {
@@ -946,11 +1177,16 @@ const AngularWorkflow = (defaultprops) => {
   }
 
   useEffect(() => {
-    if (workflow.actions?.length == 1) {
-      if (workflow.actions[0].app_id == "3e320a20966d33c9b7e6790b2705f0bf") {
+    if (workflow?.actions?.length == 1) {
+      if (workflow?.actions[0].app_id == "3e320a20966d33c9b7e6790b2705f0bf") {
         setWorkflowAsCode(true);
       }
     }
+
+    if (workflow?.suborg_distribution !== undefined && workflow?.suborg_distribution !== null && workflow?.suborg_distribution.length > 0) {
+    	getChildWorkflows(workflow.id)
+    }
+
   }, [workflow]);
 
   // Event for making sure app is correct
@@ -1116,7 +1352,8 @@ const AngularWorkflow = (defaultprops) => {
                 !el.data("isButton") &&
                 !el.data("isDescriptor") &&
                 !el.data("isSuggestion") &&
-                el.data("type") !== "COMMENT") {
+                el.data("type") !== "COMMENT" &&
+                el.data("type") !== "RESIZE-HANDLE") {
                 return true
               }
 
@@ -1136,23 +1373,66 @@ const AngularWorkflow = (defaultprops) => {
   useEffect(() => {
     // if (subflowActionList.length === 0) {
     const newActionList = [];
-    // FIXME: Have previous execution values in here
-    newActionList.push({
-      type: "Runtime Argument",
-      name: "Runtime Argument",
-      value: "$exec",
-      highlight: "exec",
-      autocomplete: "exec",
-      example: "hello",
-    })
-    newActionList.push({
-      type: "Shuffle Database",
-      name: "Shuffle Database",
+
+
+    if (workflowExecutions.length > 0) {
+      for (let execution of workflowExecutions) {
+        const execArg = execution.execution_argument;
+        if (execArg && execArg.length > 0) {
+          const valid = validateJson(execArg);
+          if (valid.valid) {
+            newActionList.push({
+              type: "Runtime Argument",
+              name: "Runtime Argument",
+              value: "$exec",
+              highlight: "exec",
+              autocomplete: "exec",
+              example: valid.result,
+            })
+
+            break
+          }
+        }
+      }
+    }
+
+    // Add default Runtime Argument if none were added
+    if (newActionList.length === 0) {
+      newActionList.push({
+        type: "Runtime Argument",
+        name: "Runtime Argument",
+        value: "$exec",
+        highlight: "exec",
+        autocomplete: "exec",
+        example: "",
+      })
+    }
+    // Add Shuffle DB with cache keys if available
+    let cacheKey = {
+      type: "Shuffle DB",
+      name: "Shuffle DB", 
       value: "$shuffle_cache",
-      highlight: "shuffle_db",
+      highlight: "shuffle_cache",
       autocomplete: "shuffle_cache",
-      example: "hello",
-    })
+      example: "Hello",
+    }
+
+    if (listCache?.keys?.length > 0) {
+      cacheKey.example = {};
+      for (let item of listCache.keys) {
+        if (item.key) {
+          let itemValue = item.value ?? "";
+          if (itemValue.length > 10000) {
+            itemValue = "";
+          }
+          cacheKey.example[item.key.split(" ").join("_")] = { value: itemValue };
+        }
+      }
+    }
+
+    newActionList.push(cacheKey);
+    // FIXME: Have previous execution values in here
+ 
     if (
       workflow.workflow_variables !== null &&
       workflow.workflow_variables !== undefined &&
@@ -1216,7 +1496,7 @@ const AngularWorkflow = (defaultprops) => {
 
             const validated = validateJson(foundResult.result)
             if (validated.valid) {
-              exampledata = validateJson.result
+              exampledata = validated.result
               break
             }
           }
@@ -1234,7 +1514,7 @@ const AngularWorkflow = (defaultprops) => {
       }
     }
 
-    setSubflowActionList(newActionList);
+    setTriggerActionList(newActionList);
   }, [workflow.workflow_variables, workflow.execution_variables, workflow, selectedTrigger]);
 
 
@@ -1243,56 +1523,6 @@ const AngularWorkflow = (defaultprops) => {
 		return
 	}
 	
-	//console.log("Failed in trigger selection: ", selectedTriggerIndex, "Trigger: ", selectedTrigger)
-
-	var found = null
-	try {
-		for (var key in workflows) {
-			const curworkflow = workflows[key]
-			const curtrigger = curworkflow?.triggers[selectedTriggerIndex]
-			if (curtrigger === undefined || curtrigger === null) {
-				console.log("Failed in trigger selection (1): ", curworkflow)
-				continue
-			}
-
-			if (curtrigger?.parameters === undefined || curtrigger?.parameters === null || curtrigger?.parameters.length === 0) {
-				console.log("Failed in trigger selection (2): ", curworkflow)
-				continue
-			}
-
-			if (curtrigger?.parameters[0] === undefined || curtrigger?.parameters[0] === null || curtrigger?.parameters[0].value === undefined || curtrigger?.parameters[0].value === null) {
-				console.log("Failed in trigger selection (3): ", curworkflow)
-				continue
-			}
-
-			if (curtrigger?.parameters[0].value === selectedTrigger?.parameters[0]?.value) {
-				found = curworkflow
-				setSubworkflow(curworkflow)
-			}
-		}
-
-		if (found !== null) {
-    		setSubworkflow(found)
-		}
-	} catch (e) {
-		console.log("Failed in trigger selection (4): ", e)
-		//return
-	}
-
-    if (found) {
-      const startNode = found.actions?.find((action) => action.id === workflow?.triggers[selectedTriggerIndex]?.parameters[3]?.value)
-      setSubworkflowStartnode(startNode)
-    }
-
-	/*
-	// Multi-tenant sometimes gives us shit :(
-	if (selectedTrigger === undefined || selectedTrigger === null || selectedTrigger.id === undefined || selectedTrigger.id === null && selectedTriggerIndex >= 0) {
-		if (workflow.triggers !== undefined && workflow.triggers !== null && workflow.triggers.length > selectedTriggerIndex) {
-			setSelectedTrigger(workflow.triggers[selectedTriggerIndex])
-		}
-	}
-	*/
-
 	// Check if the running state is correct or not according to allTriggers
 	if (allTriggers !== undefined && allTriggers !== null) { 
 		// Find the active trigger
@@ -1315,33 +1545,45 @@ const AngularWorkflow = (defaultprops) => {
 			const allTriggersInOne = useTriggers.pipelines.concat(useTriggers.schedules).concat(useTriggers.webhooks) 
 			for (let triggerkey in allTriggersInOne) {
 				const curtrigger = allTriggersInOne[triggerkey]
-				if (curtrigger.id === selectedTrigger.id) {
-					if (curtrigger.status === undefined || curtrigger.status === null) {
-						continue
-					}
-
-					if (curtrigger.running === undefined || curtrigger.running === null) {
-						continue
-					}
-
-					var changed = false
-					if (curtrigger.status !== selectedTrigger.status) {
-						changed = true
-						selectedTrigger.status = curtrigger.status
-					}
-
-					if (curtrigger.running !== selectedTrigger.running) {
-						changed = true
-						selectedTrigger.running = curtrigger.running
-					}
-
-					if (changed) {
-						//console.log("TRIGGER FIX: ", selectedTrigger)
-						setSelectedTrigger(selectedTrigger)
-					}
-
-					break
+				if (curtrigger.id !== selectedTrigger.id) {
+					continue
 				}
+
+				if (curtrigger.status === undefined || curtrigger.status === null) {
+					continue
+				}
+
+				var changed = false
+				if (selectedTrigger?.parameters === undefined || selectedTrigger?.parameters === null) {
+					changed = true
+
+					if (selectedTrigger?.trigger_type === "SCHEDULE" && curtrigger?.frequency !== undefined && curtrigger?.frequency !== null) {
+						selectedTrigger.parameters = [{
+							name: "cron",
+							value: curtrigger.frequency,
+						},
+						{
+							name: "execution_argument",
+							value: curtrigger.argument,
+						}]
+					}
+				}
+
+				if (curtrigger.status !== selectedTrigger.status) {
+					changed = true
+					selectedTrigger.status = curtrigger.status
+				}
+
+				if (curtrigger.running !== selectedTrigger.running) {
+					changed = true
+					selectedTrigger.running = curtrigger.running
+				}
+
+				if (changed) {
+					setSelectedTrigger(selectedTrigger)
+				}
+
+				break
 			}
 		}
 	}
@@ -1500,6 +1742,8 @@ const AngularWorkflow = (defaultprops) => {
     if (workflow.org_id !== undefined && workflow.org_id !== null && workflow.org_id.length > 0) {
       headers["Org-Id"] = workflow.org_id
     }
+          
+	setWorkflows([])
 
     fetch(globalUrl + "/api/v1/workflows?subflow=true", {
       method: "GET",
@@ -1517,7 +1761,7 @@ const AngularWorkflow = (defaultprops) => {
         if (responseJson !== undefined) {
 
           // Sets up subflow trigger with the right info
-          if (trigger_index > -1) {
+          if (isNaN(trigger_index) === false && trigger_index > -1) {
 
             var baseSubflow = {}
             const trigger = workflow.triggers[trigger_index];
@@ -1547,10 +1791,10 @@ const AngularWorkflow = (defaultprops) => {
                   if (Object.getOwnPropertyNames(baseSubflow).length > 0) {
                     const foundAction = baseSubflow.actions.find(action => action?.id === param.value)
                     if (foundAction !== null && foundAction !== undefined) {
-                      setSubworkflowStartnode(foundAction);
+                      setSubworkflowStartnode(foundAction)
                     }
                   } else {
-                    setSubworkflowStartnode(param.value);
+                    setSubworkflowStartnode(param.value)
                   }
                 }
               }
@@ -1748,7 +1992,6 @@ const AngularWorkflow = (defaultprops) => {
           const newkeys = sortByKey(responseJson.executions, "-started_at");
           setWorkflowExecutions(newkeys);
 
-          const cursearch = typeof window === "undefined" || window.location === undefined ? "" : window.location.search;
           var tmpView = new URLSearchParams(cursearch).get("execution_id");
           if (execution_id !== undefined && execution_id !== null && execution_id.length > 0 && (tmpView === undefined || tmpView === null || tmpView.length === 0)) {
             tmpView = execution_id;
@@ -1804,7 +2047,6 @@ const AngularWorkflow = (defaultprops) => {
             }
           }
         } else {
-          const cursearch = typeof window === "undefined" || window.location === undefined ? "" : window.location.search;
           var tmpView = new URLSearchParams(cursearch).get("execution_id");
           if (tmpView === undefined || tmpView === null || tmpView.length === 0) {
             const execution_id = tmpView;
@@ -1847,7 +2089,6 @@ const AngularWorkflow = (defaultprops) => {
           //toast("Failed loading the workflow run")
           console.log("Status not 200 for stream results :O!");
 
-          //const cursearch = typeof window === "undefined" || window.location === undefined ? "" : window.location.search;
           //const newitem = removeParam("execution_id", cursearch);
           //navigate(curpath + newitem)
         }
@@ -2091,7 +2332,6 @@ const AngularWorkflow = (defaultprops) => {
   }
 
   // Controls the colors and direction of execution results.
-  // Style is in defaultCytoscapeStyle.js
   const handleUpdateResults = (responseJson, executionRequest) => {
     if (responseJson === undefined || responseJson === null || responseJson.success === false) {
       stop()
@@ -2240,9 +2480,11 @@ const AngularWorkflow = (defaultprops) => {
       console.log("Should redirect to register with redirect.")
 
       setTimeout(() => {
-        toast("You may not have access to this workflow.")
-        //window.location.href = `/register?view=/workflows/${props.match.params.key}&message=You need sign up to use workflows with Shuffle`
-        window.location.href = `/workflows`
+        // toast("You may not have access to this workflow.")
+        localStorage.setItem("redirectId", props.match.params.key)
+        navigate("/register?view=workflows&message=You need sign up to use workflows with Shuffle");
+        // window.location.href = `/register?view=/workflows/${props.match.params.key}&message=You need sign up to use workflows with Shuffle`
+        // window.location.href = `/workflows`
       }, 2500)
 
       return
@@ -2280,6 +2522,7 @@ const AngularWorkflow = (defaultprops) => {
     var newBranches = [];
     var newVBranches = [];
     var newComments = [];
+    var newResizes = [];
     for (let cyelementsKey in cyelements) {
       if (cyelements[cyelementsKey].data === undefined) {
         continue;
@@ -2464,7 +2707,40 @@ const AngularWorkflow = (defaultprops) => {
           //console.log(curworkflowComment)
 
           newComments.push(curworkflowComment);
-        } else {
+        } else if (type === "RESIZE-HANDLE") {
+          if (useworkflow.resizes === undefined || useworkflow.resizes === null) {
+            useworkflow.resizes = [];
+          }
+
+          var curworkflowResize = useworkflow.resizes.find(
+            (a) => a.id === cyelements[cyelementsKey].data()["id"]
+          );
+
+          if (curworkflowResize === undefined) {
+            curworkflowResize = cyelements[cyelementsKey].data();
+          }
+
+          // Ensure width and height are properly parsed
+          const parsedHeight = parseInt(curworkflowResize["height"]);
+          if (!isNaN(parsedHeight)) {
+            curworkflowResize.height = parsedHeight;
+          } else {
+            curworkflowResize.height = 150; // Default value if parsing fails
+          }
+
+          const parsedWidth = parseInt(curworkflowResize["width"]);
+          if (!isNaN(parsedWidth)) {
+            curworkflowResize.width = parsedWidth;
+          } else {
+            curworkflowResize.width = 200; // Default value if parsing fails
+          }
+
+          // Update position from Cytoscape
+          curworkflowResize.position = cyelements[cyelementsKey].position();
+
+          newResizes.push(curworkflowResize);
+        }
+        else {
           toast("No handler for type: " + type);
         }
       }
@@ -2495,18 +2771,25 @@ const AngularWorkflow = (defaultprops) => {
     }
     */
 
+	// FIXME: What is this?
     if (cy !== undefined && cy !== null) {
       // scale: 0.3,
       // bg: "#27292d",
-      const cyImageData = cy.png({
-        output: "base64uri",
-        maxWidth: 480,
-        maxHeight: 270,
-      })
+	  if (cy?.png !== undefined && cy?.png !== null) {
+		  try {
+			  const cyImageData = cy.png({
+				output: "base64uri",
+				maxWidth: 480,
+				maxHeight: 270,
+			  })
 
-      if (cyImageData !== undefined && cyImageData !== null && cyImageData.length > 0) {
-        useworkflow.image = cyImageData
-      }
+			  if (cyImageData !== undefined && cyImageData !== null && cyImageData.length > 0) {
+				useworkflow.image = cyImageData
+			  }
+		  } catch (e) {
+			  console.log("Failed to get image data: ", e)
+		  }
+	  }
     }
 
     if (useworkflow.id === undefined || useworkflow.id === null || useworkflow.id.length === 0) {
@@ -2571,9 +2854,9 @@ const AngularWorkflow = (defaultprops) => {
           setSavingState(0);
           console.log("Workflow failed loading: ", responseJson);
           if (responseJson.reason !== undefined && responseJson.reason !== null) {
-            toast("Failed to save: " + responseJson.reason);
+            toast.error("Failed to save: " + responseJson.reason);
           } else {
-            toast("Failed to save. Please contact your support@shuffler.io or your local admin if this is unexpected.")
+            toast.error(`Failed to save. Please contact your ${supportEmail} or your local admin if this is unexpected.`)
           }
         } else {
           setSavingState(1);
@@ -2715,10 +2998,12 @@ const AngularWorkflow = (defaultprops) => {
       return newExample
     }
 
+	/*
     for (var i = 0; i < found.length; i++) {
       //newExample = newExample.replace(found[i], "REQUIRED")
       newExample = newExample.replace(found[i], "REPLACE_ME")
     }
+	*/
 
     return newExample
   }
@@ -2755,6 +3040,92 @@ const AngularWorkflow = (defaultprops) => {
     return true;
   };
 
+  const runFromHere = (curAction) => {
+	if (curAction.app_id === undefined || curAction.app_id === null || curAction.app_id.length === 0) {
+		toast.error(`No app id found for action. Please contact ${supportEmail} if this persists`)
+		return
+	}
+
+	if (workflow.id !== undefined && workflow.id !== null && workflow.id.length > 0) {
+		curAction.source_workflow = workflow.id
+	}
+
+	// Based on the previous execution id 
+	// Look for the "execution_id" parameter
+    const execFound = new URLSearchParams(cursearch).get("execution_id");
+	if (execFound !== undefined && execFound !== null && execFound.length > 0) {
+		toast.info("Rerunning based on previously watched execution id")
+		curAction.source_execution = execFound
+	} else if (workflowExecutions !== undefined && workflowExecutions !== null && workflowExecutions.length > 0) {
+		curAction.source_execution = workflowExecutions[0].execution_id
+	} else {
+		toast.error("No previous execution found. Please run the workflow first.")
+		return
+	}
+
+	setExecutionRunning(true)
+	setExecutionRequestStarted(true)
+	var headers = {
+		'Content-Type': 'application/json',
+		'Accept': 'application/json',
+	}
+
+    if (workflow.org_id !== undefined && workflow.org_id !== null && workflow.org_id.length > 0) {
+      headers["Org-Id"] = workflow.org_id
+    }
+
+	// Rerun makes it return execution_id + authorization
+	const appRunUrl = `${globalUrl}/api/v1/apps/${curAction.app_id}/run?rerun=true`
+	fetch(appRunUrl, {
+		method: 'POST',
+		headers: headers, 
+		body: JSON.stringify(curAction),
+		credentials: "include",
+	})
+	.then((response) => {
+		setExecutionRunning(false)
+		setExecutionRequestStarted(false)
+
+		if (response.status !== 200) {
+			console.log("Status not 200 for stream results :O!")
+		}
+
+		return response.json()
+	})
+	.then((responseJson) => {
+		setExecutionRequestStarted(false)
+
+		if (responseJson?.success === false) {
+			setExecutionRunning(false)
+
+			if (responseJson?.reason !== undefined && responseJson?.reason !== null && responseJson?.reason.length > 0) {
+				toast.error(responseJson.reason)
+			} else {
+				toast.error(`Failed to run the action. Please try again or contact ${supportEmail}`)
+			}
+
+			return
+		} else if (responseJson?.success === true && responseJson?.execution_id !== undefined && responseJson?.execution_id !== null && responseJson?.execution_id.length > 0) {
+			navigate(`?execution_id=${responseJson.execution_id}&node=${curAction.id}&rerun=true`)
+			setExecutionRequest({
+				execution_id: responseJson.execution_id,
+				authorization: responseJson.authorization,
+			})
+
+			setExecutionData({})
+			setExecutionModalOpen(true)
+			setExecutionModalView(1)
+			start()
+		}
+	})
+	.catch((error) => {
+		toast.error("Failed to run the action. "+error.toString())
+
+		setExecutionRunning(false)
+		setExecutionRequestStarted(false)
+	})
+  }
+
   const executeWorkflow = (executionArgument, startNode, hasSaved, skip_popup) => {
 
     if (hasSaved === false) {
@@ -2783,11 +3154,11 @@ const AngularWorkflow = (defaultprops) => {
 
       // FIXME: Check if any node contains $exec in a param
       // If they do, show a popup asking if they want to execute it without an execution argument, or to use a previous one
-      if (skip_popup !== true && executionArgument === undefined || executionArgument === null || executionArgument.length === 0)
+      if (skip_popup !== true && executionArgument === undefined || executionArgument === null || executionArgument?.length === 0)
 
-        if (workflow.actions !== undefined && workflow.actions !== null && workflow.actions.length > 0) {
+        if (workflow?.actions !== undefined && workflow?.actions !== null && workflow?.actions?.length > 0) {
           var foundmissing = false
-          for (let actionkey in workflow.actions) {
+          for (let actionkey in workflow?.actions) {
             if (workflow.actions[actionkey].parameters === undefined || workflow.actions[actionkey].parameters === null || workflow.actions[actionkey].parameters.length === 0) {
               continue
             }
@@ -3173,6 +3544,19 @@ const AngularWorkflow = (defaultprops) => {
           return
         }
 
+		for (var key in responseJson) {
+			const curapp = responseJson[key]
+			if (curapp?.actions === undefined || curapp?.actions === null || curapp?.actions?.length === 0 || curapp?.actions?.length === 1) {
+        		loadAppConfig(curapp?.id, false, true)
+			}
+
+			if (key > 10) {
+				console.log("Breaking on 10 sideloads of total", responseJson.length)
+				break
+
+			}
+		}
+
 		// Find app with ID "794e51c3c1a8b24b89ccc573a3defc47" (gmail) to force-break it,
 		// Find app with ID "3e2bdf9d5069fe3f4746c29d68785a6a" (shuffle tools) to force-break it,
 		// as to ensure the autocorrect works. 
@@ -3414,6 +3798,7 @@ const AngularWorkflow = (defaultprops) => {
       "border-opacity": ".7",
       "font-size": "25px",
       "border-color": color,
+      "color": theme.palette.text.primary
     }
 
     const animationDuration = 150
@@ -3901,7 +4286,7 @@ const AngularWorkflow = (defaultprops) => {
           apps.push(responseJson.actions[index]);
         }
 
-        console.log("Setting used subflow apps: ", apps)
+        //console.log("Setting used subflow apps: ", apps)
         setUsedSubflowApps(apps);
 
         return apps
@@ -3914,6 +4299,10 @@ const AngularWorkflow = (defaultprops) => {
   }
 
   const findWorkflowDiff = (parentWorkflow, childWorkflow) => {
+	  // Ensures new memory is used
+	  parentWorkflow = JSON.parse(JSON.stringify(parentWorkflow))
+	  childWorkflow = JSON.parse(JSON.stringify(childWorkflow))
+
 	  var diff = {
 		  "different": false,
 		  "environment": false,
@@ -3931,9 +4320,13 @@ const AngularWorkflow = (defaultprops) => {
 		  return diff
 	  }
 
-
 	  var parentEnvironment = ""
 	  var childEnvironment = ""
+
+	  if (parentWorkflow.triggers !== undefined && parentWorkflow.triggers !== null && parentWorkflow.triggers.length > 0) {
+		  parentWorkflow.actions = parentWorkflow.actions.concat(parentWorkflow.triggers)
+	  }
+
 	  for (var parentKey in parentWorkflow.actions) {
 		  const parentAction = parentWorkflow.actions[parentKey]
 		  if (parentAction.environment !== undefined && parentAction.environment !== null && parentAction.environment !== "") {
@@ -3945,6 +4338,19 @@ const AngularWorkflow = (defaultprops) => {
 		  }
 
 		  var found = false
+		  if (childWorkflow.triggers !== undefined && childWorkflow.triggers !== null && childWorkflow.triggers.length > 0) {
+			  for (var triggerKey in childWorkflow.triggers) {
+				  if (childWorkflow.triggers[triggerKey].replacement_for_trigger !== parentAction.id) {
+					  continue
+				  }
+
+				  // Rewrapping the ID just in case
+				  childWorkflow.triggers[triggerKey].id = childWorkflow.triggers[triggerKey].replacement_for_trigger
+				  childWorkflow.actions.push(childWorkflow.triggers[triggerKey])
+				  break
+			  }
+		  }
+
 		  for (var childKey in childWorkflow.actions) {
 			  const childAction = childWorkflow.actions[childKey]
 			  if (childAction.environment !== undefined && childAction.environment !== null && childAction.environment !== "") {
@@ -3991,6 +4397,10 @@ const AngularWorkflow = (defaultprops) => {
 				  continue
 			  }
 
+			  var parentworkflow = ""
+			  var parentstartnode = ""
+			  var childworkflow = ""
+			  var childstartnode = ""
 			  for (var parentParamIndex in parentAction.parameters) {
 				  const parentParam = parentAction.parameters[parentParamIndex]
 				  for (var childParamIndex in childAction.parameters) {
@@ -3999,20 +4409,38 @@ const AngularWorkflow = (defaultprops) => {
 						  continue
 					  }
 
+					  if (childParam.name === "workflow" || childParam.name === "subflow") {
+						  parentworkflow = parentParam.value
+						  childworkflow = childParam.value
+						  continue
+					  }
+
+					  if (childParam.name == "startnode") {
+						  parentstartnode = parentParam.value
+						  childstartnode = childParam.value
+						  continue
+					  }
+
 					  if (childParam.value !== parentParam.value) {
 						  actionDiff.parameters.push(childParam.name) 
 					  }
 				  }
 			  }
+
+			  if (parentworkflow !== childworkflow && parentstartnode !== childstartnode) {
+				  actionDiff.parameters.push("subflow")
+			  }
 		  }
 
 		  if (actionDiff.parameters.length > 0) {
 			  actionDiff.params = true
 		  }
 
+		  /*
 		  if (!found) {
 			  actionDiff.new = true
 		  }
+		  */
 
 		  if (actionDiff !== undefined && actionDiff !== null && Object.keys(actionDiff).length > 1) {
 			  actionDiff.label = parentAction.label.replaceAll("_", " ")
@@ -4123,16 +4551,24 @@ const AngularWorkflow = (defaultprops) => {
 
             // Check for execution_id in URL
             // don't redirect if it exists
-            const cursearch = typeof window === "undefined" || window.location === undefined ? "" : window.location.search;
             var execFound = new URLSearchParams(cursearch).get("execution_id");
             var sessionToken = new URLSearchParams(cursearch).get("session_token");
             if (execFound === null && sessionToken === null) {
 
-              toast.error(`You don't have access to this workflow or loading failed. Redirecting to workflows in a few seconds. If you recently deleted this workflow, speak with support@shuffler.io to recover it from a revision.`, {
-				  autoClose: 10000,
-			  })
+			  if (isCloud) {
+				  toast.error(`You don't have access to this workflow or loading failed. Redirecting to workflows in a few seconds. If you recently deleted this workflow, speak with ${supportEmail} to recover it from a revision.`, {
+					  autoClose: 10000,
+				  })
+			  } else { 
+				  toast.error(`You don't have access to this workflow or loading failed. Redirecting to workflows in a few seconds. Contact ${supportEmail} if this is unexpected.`, {
+					  autoClose: 10000,
+				  })
+			  }
 
               setTimeout(() => {
+                if(!isLoggedIn){
+                localStorage.setItem("redirectId", props.match.params.key);
+                }
                 window.location.pathname = "/workflows";
               }, 2500);
 
@@ -4423,6 +4859,17 @@ const AngularWorkflow = (defaultprops) => {
             setOriginalWorkflow(responseJson)
           }
 
+		  const tmpUi = new URLSearchParams(cursearch).get("ui");
+		  if (
+		    tmpUi !== undefined &&
+		    tmpUi !== null &&
+		    tmpUi === "yaml"
+		  ) {
+			  setTimeout(() => {
+		  		setupWorkflowYaml(responseJson) 
+			  }, 2500)
+		  }
+
           setWorkflow(responseJson);
           setWorkflowDone(true);
 
@@ -4441,6 +4888,9 @@ const AngularWorkflow = (defaultprops) => {
 
             setConfigureWorkflowModalOpen(true)
           }
+
+
+
         }
       })
       .catch((error) => {
@@ -4785,7 +5235,7 @@ const AngularWorkflow = (defaultprops) => {
         }
       }
 
-      if (nodedata.app_name === "Webhook" || nodedata.app_name === "Schedule" || nodedata.app_name === "Gmail" || nodedata.app_name === "Office365") {
+      if (nodedata.app_name === "Webhook" || nodedata.app_name === "Schedule") {
         if (!found) {
           //console.log("Find amount of executions for the specific nodetype: ", nodedata.app_name, "Executions: ", workflowExecutions)
           // Find how many executions it has 
@@ -4814,6 +5264,7 @@ const AngularWorkflow = (defaultprops) => {
         }
       } else {
         // Readding the icon after moving the node
+		/*
         if (!found) {
           const iconInfo = GetIconInfo(nodedata);
           const svg_pin = `<svg width="${svgSize}" height="${svgSize}" viewBox="0 0 ${svgSize} ${svgSize}" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="${iconInfo.icon}" fill="${iconInfo.iconColor}"></path></svg>`;
@@ -4841,6 +5292,7 @@ const AngularWorkflow = (defaultprops) => {
         } else {
           //console.log("Node already exists - don't add descriptor node");
         }
+		*/
       }
     }
 
@@ -6305,11 +6757,15 @@ const AngularWorkflow = (defaultprops) => {
 			if (workflow.org_id !== undefined && workflow.org_id !== null && workflow.org_id.length > 0 && originalWorkflow.org_id !== undefined && originalWorkflow.org_id !== null && originalWorkflow.org_id.length > 0 && workflow.org_id === originalWorkflow.org_id) {
 				// Allows a parent workflow to control the schedule
 			} else if (data.replacement_for_trigger !== undefined && data.replacement_for_trigger !== null && data.replacement_for_trigger.length > 0) {
-				toast.warning("This schedule is controlled by the parent workflow. If you want additional schedule control, please add a custom schedule to this workflow.", {
-					autoClose: 30000,
-				})
-        		event.target.unselect()
-				return
+
+				// No custom control on cloud 
+				if (isCloud) {
+					toast.warning("This schedule is controlled by the parent workflow. If you want additional schedule control, please add a custom schedule to this workflow.", {
+						autoClose: 30000,
+					})
+					event.target.unselect()
+					return
+				}
 			}
 
         } else if (data.app_name === "Webhook" && trigger_index >= 0) {
@@ -6475,6 +6931,21 @@ const AngularWorkflow = (defaultprops) => {
 		}
 
         setSelectedComment(data);
+      } else if (data.type === "RESIZE-HANDLE") {
+
+        const parentNode = cy.getElementById(data.attachedTo);
+        if (parentNode) {
+          console.log("Resizing parent node:", parentNode);
+
+          // Get the parent node's data
+          const parentData = parentNode.data();
+          if (parentData?.type === "COMMENT") {
+
+            // Set the parent node's data as the selected comment
+            setSelectedComment(parentData);
+          }
+        }
+        return; // Exit after handling the resize handle
       } else {
         toast("Can't handle node type " + data.type);
         return;
@@ -6528,7 +6999,11 @@ const AngularWorkflow = (defaultprops) => {
       })
       .then((responseJson) => {
         if (responseJson.success === false) {
-          toast("Failed to auto-activate the app. Go to /apps and activate it.")
+			if (responseJson.reason !== undefined && responseJson.reason !== null && responseJson.reason.length > 0) {
+          		toast.error("Failed to auto-activate the app: " + responseJson.reason)
+			} else {
+          		toast.error("Failed to auto-activate the app. Go to /apps and activate it.")
+			}
         } else {
           if (refresh === true) {
             setHighlightedApp(appid)
@@ -6885,7 +7360,7 @@ const AngularWorkflow = (defaultprops) => {
     )
     if (targetnode !== -1) {
       if (workflow.triggers[targetnode].app_name === "User Input" || workflow.triggers[targetnode].app_name === "Shuffle Workflow" || workflow.triggers[targetnode].app_name === "Shuffle Subflow") {
-        console.log("User Input or Shuffle Workflow")
+        //console.log("User Input or Shuffle Workflow")
       } else {
         toast("Can't have triggers as target of branch")
         event.target.remove()
@@ -7116,7 +7591,6 @@ const AngularWorkflow = (defaultprops) => {
           data: newcybranch,
         };
 
-        console.log("SHOULD STITCH WITH STARTNODE");
         cy.add(edgeToBeAdded);
       }
 
@@ -7440,25 +7914,9 @@ const AngularWorkflow = (defaultprops) => {
         }
         break;
       case 86:
-        if (event.ctrlKey) {
-          //console.log("CTRL+V")
-          // The below parts are handled in the function handlePaste()
-          /*
-          const clipboard = navigator.clipboard
-          if (clipboard === undefined || window === undefined || window === null) {
-            toast("Can only use cliboard over HTTPS (port 3443)")
-            return
-          } 
-
-          console.log("CLIPBOARD: ", window.clipboardData)
-          const pastedData = window.clipboardData.getData('Text');
-          console.log("PASTED: ", pastedData)
-
-        	
-          //var tmpAuth = JSON.parse(JSON.stringify(appAuthentication))
-          var jsonvalid = true
-          var parsedjson = []
-          */
+        console.log("CTRL+V? ctrl: ", event.ctrlKey)
+        if (event.ctrlKey) { 
+          // Paste is handled in the handlePaste() function.
         }
         break;
       case 88:
@@ -7482,30 +7940,25 @@ const AngularWorkflow = (defaultprops) => {
   };
 
   const handlePaste = (event) => {
-    if (
-      event.path !== undefined &&
-      event.path !== null &&
-      event.path.length > 0
-    ) {
+    if (event.path !== undefined && event.path !== null && event.path.length > 0) {
       if (event.path[0].localName !== "body") {
-        return;
+		  console.log("Skipping paste because body is not targeted")
+          return;
       }
     }
 
-    if (
-      event.target !== undefined &&
-      event.target !== null
-    ) {
-      if (event.target.localName !== "body") {
-        return;
-      }
+    if (event.target !== undefined && event.target !== null) {
+	  // If it's an input area, skip paste
+	  if (event.target.localName === "input" || event.target.localName === "textarea") {
+		  console.log("Skipping paste because body is not targeted (1). Target: ", event?.target?.localName)
+		  return;
+	  }
     }
 
-
-    event.preventDefault();
-    const clipboard = (event.originalEvent || event).clipboardData.getData(
-      "text/plain"
-    );
+	// Does this stop things?
+    //event.preventDefault()
+    const clipboard = (event.originalEvent || event).clipboardData.getData("text/plain")
+	console.log("CLIPBOARD TO PASTE: ", clipboard)
 
     try {
 	  const allnodes = cy.nodes().jsons()
@@ -8414,9 +8867,9 @@ const AngularWorkflow = (defaultprops) => {
           }
 
           // Set the edge to be dashed
-          edge.style("target-arrow-color", "white")
+          edge.style("target-arrow-color", theme.palette.text.primary)
           edge.style("line-style", "solid")
-          edge.style("line-gradient-stop-colors", ["white", "white"])
+          edge.style("line-gradient-stop-colors", [theme.palette.text.primary, theme.palette.text.primary])
         }
       }
 
@@ -8560,7 +9013,7 @@ const AngularWorkflow = (defaultprops) => {
     }
 
     if (nodedata.type !== "COMMENT") {
-      parsedStyle.color = "white";
+      parsedStyle.color = theme.palette.text.primary;
     }
 
     if (event.target !== undefined && event.target !== null) {
@@ -8619,9 +9072,9 @@ const AngularWorkflow = (defaultprops) => {
     const edgeData = event.target.data();
     if (edgeData.decorator === true) {
       // Set color of it to white and not stripled
-      event.target.style("target-arrow-color", "white")
+      event.target.style("target-arrow-color", theme.palette.text.primary)
       event.target.style("line-style", "solid")
-      event.target.style("line-gradient-stop-colors", ["white", "white"])
+      event.target.style("line-gradient-stop-colors", [theme.palette.text.primary, theme.palette.text.primary])
 
       return;
     }
@@ -9218,11 +9671,15 @@ const AngularWorkflow = (defaultprops) => {
     }
 
     insertedNodes = insertedNodes.concat(newedges);
-    setWorkflow(inputworkflow);
+    setWorkflow(inputworkflow)
 
     // Reset view for cytoscape
     if (cy !== undefined && cy !== null) {
-      cy.add(insertedNodes)
+	  try {
+      	cy.add(insertedNodes)
+	  } catch (error) {
+		  console.log("Error adding nodes to cytoscape (6): ", error)
+	  }
 
 	  try {
       	cy.fit(null, 250)
@@ -9301,12 +9758,6 @@ const AngularWorkflow = (defaultprops) => {
       }
     }
 
-    //if (selectedNode.data("id") === selectedAction.id) {
-    //	setSelectedApp({});
-    //	setSelectedAction({});
-    //setSelectedTrigger({});
-    //setSelectedTriggerIndex({});
-    //}
     const parsedSelection = cy.$(":selected");
     if (selectedNode.data().decorator === true && selectedNode.data("type") !== "COMMENT") {
       toast("This node can't be deleted.");
@@ -9501,12 +9952,196 @@ const AngularWorkflow = (defaultprops) => {
       });
   }
 
+  const setupWorkflowYaml = (inputworkflow) => {
+	  toast.warn("YAML exploring is an experimental feature - only visible to support users. The goal of this is to make it EASY to edit the workflow as YAML instead of just using the UI")
+	  if (userdata?.support !== true) {
+		  console.log("Not support: ", userdata)
+		  return
+	  }
+
+	  // This should be getting the workflow based on actual nodes in the workflow
+	  // as the goal is to have it be live
+	  var copiedWorkflow = JSON.parse(JSON.stringify(inputworkflow))
+
+	  const removeObjects = [
+		  "execution_org",
+		  "categories",
+		  "example_argument",
+		  "public",
+		  "contact_info",
+		  "published_id",
+		  "revision_id",
+		  "usecase_ids",
+		  "input_questions",
+		  "form_control",
+		  "blogpost",
+		  "video",
+		  "status",
+		  "generated",
+		  "hidden",
+		  "updated_by",
+		  "validated",
+		  "validation",
+		  "childorg_workflow_ids",
+		  "backup_config",
+		  "auth_groups",
+		  "isValid",
+		  "workflow_as_code",
+		  "image",
+		  "sharing",
+		  "owner",
+		  "configuration",
+		  "created",
+		  "edited",
+		  "last_runtime",
+		  "due_date",
+		  "is_valid",
+		  "execution_environment",
+		  "default_return_value",
+		  "visual_branches",
+		  "previously_saved",
+		  "workflow_type",
+		  "parentorg_workflow",
+		  "suborg_distribution",
+		  "id",
+		  "comments",
+		  "org_id",
+
+		  // Failing test
+		  "spalabi",
+	  ]
+
+	  for (var i = 0; i < removeObjects.length; i++) {
+		  delete copiedWorkflow[removeObjects[i]]
+	  }
+
+	  const removeActionValues = [
+		  "_id",
+		  "id",
+
+		  "large_image",
+		  "description",
+		  "is_valid",
+		  "isStartNode",
+		  "sharing",
+		  "public",
+		  "generated",
+		  "execution_variable",
+		  "position",
+		  "category",
+		  "reference_url",
+		  "sub_action",
+		  "run_magic_output",
+		  "run_magic_input",
+		  "category_label",
+		  "suggestions",
+		  "parent_controlled",
+		  "source_workflow",
+		  "source_executions",
+		  "app_association",
+		  "suggestion",
+		  "small_image",
+		  "long_description",
+		  "tags",
+		  "errors",
+		  "source_executions",
+		  "source_execution",
+		  "required",
+		  "example",
+		  "type",
+
+		  "test2",
+	  ]
+
+	  const removeActionParamValues = [
+		  "id",
+		  "multiline",
+		  "multiselect",
+		  "options",
+		  "action_field",
+		  "variant",
+		  "configuration",
+		  "tags",
+		  "schema",
+		  "skip_multicheck",
+		  "value_replace",
+		  "unique_toggled",
+		  "hidden",
+		  "error",
+		  "example",
+
+		  "test3",
+	  ]
+
+	  if (copiedWorkflow?.actions !== undefined && copiedWorkflow?.actions !== null && copiedWorkflow?.actions.length > 0) {
+		  for (var key in copiedWorkflow.actions) {
+			  for (var i = 0; i < removeActionValues.length; i++) {
+				  delete copiedWorkflow.actions[key][removeActionValues[i]]
+			  }
+
+
+			  if (copiedWorkflow.actions[key].parameters === undefined || copiedWorkflow.actions[key].parameters === null) {
+				  continue
+			  }
+
+			  for (var j = 0; j < copiedWorkflow.actions[key].parameters.length; j++) {
+				  for (var k = 0; k < removeActionParamValues.length; k++) {
+					  delete copiedWorkflow.actions[key].parameters[j][removeActionParamValues[k]]
+				  }
+			  }
+		  }
+	  }
+
+	  if (copiedWorkflow?.triggers !== undefined && copiedWorkflow?.triggers !== null && copiedWorkflow?.triggers.length > 0) {
+		  for (var key in copiedWorkflow.triggers) {
+			  for (var i = 0; i < removeActionValues.length; i++) {
+				  delete copiedWorkflow.triggers[key][removeActionValues[i]]
+			  }
+
+			  delete copiedWorkflow.triggers[key]["app_name"]
+			  delete copiedWorkflow.triggers[key]["app_version"]
+			  delete copiedWorkflow.triggers[key]["name"]
+			  delete copiedWorkflow.triggers[key]["priority"]
+			  delete copiedWorkflow.triggers[key]["replacement_for_trigger"]
+
+			  if (copiedWorkflow.triggers[key].parameters === undefined || copiedWorkflow.triggers[key].parameters === null) {
+				  continue
+			  }
+
+			  for (var j = 0; j < copiedWorkflow.triggers[key].parameters.length; j++) {
+				  for (var k = 0; k < removeActionParamValues.length; k++) {
+					  delete copiedWorkflow.triggers[key].parameters[j][removeActionParamValues[k]]
+				  }
+			  }
+		  }
+	  }
+
+	  if (copiedWorkflow?.workflow_variables === undefined || copiedWorkflow?.workflow_variables === null || copiedWorkflow?.workflow_variables.length === 0) {
+		  delete copiedWorkflow.workflow_variables
+	  }
+
+	  if (copiedWorkflow?.branches === undefined || copiedWorkflow?.branches === null || copiedWorkflow?.branches.length === 0) {
+		  delete copiedWorkflow.branches
+	  }
+
+
+	  // YAML
+	  const sampledata = YAML.stringify(copiedWorkflow)
+
+	  navigate("?ui=yaml", { replace: true })
+
+      setCodeEditorModalOpen(true) 
+	  setEditorData({
+		"name": "workflow yaml",
+		"value": sampledata,
+	  })
+  }
+
   // eslint-disable-next-line react-hooks/exhaustive-deps
   //useEffect(() => {
   if (firstrequest) {
     setFirstrequest(false)
     getWorkflow(props.match.params.key, {})
-    getChildWorkflows(props.match.params.key)
     getRevisionHistory(props.match.params.key)
     loadTriggers()
     getApps()
@@ -9517,8 +10152,6 @@ const AngularWorkflow = (defaultprops) => {
     setLeftSideBarOpenByClick(false)
     localStorage.setItem("expandLeftNav", false)
 
-    const cursearch = typeof window === "undefined" || window.location === undefined ? "" : window.location.search;
-
     // FIXME: Don't check specific one here
     const tmpExec = new URLSearchParams(cursearch).get("execution_highlight");
     if (
@@ -9545,6 +10178,7 @@ const AngularWorkflow = (defaultprops) => {
       //navigate(`?execution_highlight=${parsed_url}`)
       //props.history.push(curpath + newitem);
     }
+
     return;
   }
 
@@ -9604,7 +10238,8 @@ const AngularWorkflow = (defaultprops) => {
             !el.data("isButton") &&
             !el.data("isDescriptor") &&
             !el.data("isSuggestion") &&
-            el.data("type") !== "COMMENT") {
+            el.data("type") !== "COMMENT" &&
+            el.data("type") !== "RESIZE-HANDLE") {
             return true
           }
 
@@ -9686,6 +10321,27 @@ const AngularWorkflow = (defaultprops) => {
     cy.on("mouseover", "node", (e) => onNodeHover(e));
     cy.on("mouseout", "node", (e) => onNodeHoverOut(e));
 
+    cy.on("mouseover", "node[type='RESIZE-HANDLE']", (e) => {
+      const nodeId = e.target.id();
+      
+      // Check the node ID to determine the cursor style based on position
+      if (nodeId.includes("bottom-right")) {
+        cy.container().style.cursor = "nwse-resize"; // Bottom-right resize cursor
+      } else if (nodeId.includes("top-right")) {
+        cy.container().style.cursor = "nesw-resize"; // Top-right resize cursor
+      } else if (nodeId.includes("top-left")) {
+        cy.container().style.cursor = "nwse-resize"; // Top-left resize cursor
+      } else if (nodeId.includes("bottom-left")) {
+        cy.container().style.cursor = "nesw-resize"; // Bottom-left resize cursor
+      } else {
+        cy.container().style.cursor = "default"; // Default cursor for other cases
+      }
+    });
+
+    cy.on("mouseout", "node[type='RESIZE-HANDLE']", (e) => {
+      cy.container().style.cursor = "";
+    });
+
     // Handles dragging
     cy.on("drag", "node", (e) => onNodeDrag(e, selectedAction));
     cy.on("free", "node", (e) => onNodeDragStop(e, selectedAction));
@@ -9739,9 +10395,14 @@ const AngularWorkflow = (defaultprops) => {
           toast("Successfully stopped schedule");
         }
 
-        workflow.triggers[triggerindex].status = "stopped";
-        trigger.status = "stopped";
-        setSelectedTrigger(trigger);
+		if (triggerindex !== undefined && triggerindex !== null && triggerindex >= 0) {
+        	workflow.triggers[triggerindex].status = "stopped";
+		}
+
+        //trigger.status = "stopped";
+		//console.log("TRIGGER: ", trigger)
+        //setSelectedTrigger(trigger);
+
         setWorkflow(workflow);
         saveWorkflow(workflow)
 
@@ -9840,7 +10501,7 @@ const AngularWorkflow = (defaultprops) => {
       }
     }
 
-    toast("Creating schedule")
+    toast.info("Creating schedule")
     var data = {
       name: trigger.name,
       frequency: workflow.triggers[triggerindex].parameters[0].value,
@@ -9889,9 +10550,9 @@ const AngularWorkflow = (defaultprops) => {
       })
       .then((responseJson) => {
         if (!responseJson.success) {
-          toast("Failed to set schedule: " + responseJson.reason);
+          toast.error("Failed to set schedule: " + responseJson.reason);
         } else {
-          toast("Successfully created schedule");
+          toast.success("Successfully created schedule");
           workflow.triggers[triggerindex].status = "running";
           trigger.status = "running";
           setSelectedTrigger(trigger);
@@ -9950,7 +10611,7 @@ const AngularWorkflow = (defaultprops) => {
     minWidth: isMobile ? 50 : "100%",
     maxWidth: isMobile ? 50 : "100%",
     marginTop: "5px",
-    color: "white",
+    color: theme.palette.text.primary,
     backgroundColor: theme.palette.surfaceColor,
     cursor: "pointer",
     display: "flex",
@@ -9963,7 +10624,7 @@ const AngularWorkflow = (defaultprops) => {
     minWidth: "100%",
     maxWidth: "100%",
     marginTop: "5px",
-    color: "white",
+    color: theme.palette.text.primary,
     backgroundColor: theme.palette.surfaceColor,
     cursor: "pointer",
     display: "flex",
@@ -10055,7 +10716,7 @@ const AngularWorkflow = (defaultprops) => {
                 aria-controls="long-menu"
                 aria-haspopup="true"
                 onClick={menuClick}
-                style={{ color: "white" }}
+                style={{ color: theme.palette.text.primary }}
               >
                 <MoreVertIcon />
               </IconButton>
@@ -10077,7 +10738,7 @@ const AngularWorkflow = (defaultprops) => {
                 <MenuItem
                   style={{
                     backgroundColor: theme.palette.inputColor,
-                    color: "white",
+                    color: theme.palette.text.primary,
                   }}
                   onClick={() => {
                     setOpen(false);
@@ -10103,7 +10764,7 @@ const AngularWorkflow = (defaultprops) => {
                 <MenuItem
                   style={{
                     backgroundColor: theme.palette.inputColor,
-                    color: "white",
+                    color: theme.palette.text.primary,
                   }}
                   onClick={() => {
                     deleteVariable(type, index);
@@ -10139,7 +10800,7 @@ const AngularWorkflow = (defaultprops) => {
             rel="noopener noreferrer"
             href="https://shuffler.io/docs/workflows#workflow_variables"
             target="_blank"
-            style={{ textDecoration: "none", color: "#FF8544" }}
+            style={{ textDecoration: "none", color: theme.palette.linkColor }}
           >
             Workflow variables?
           </a>
@@ -10189,7 +10850,7 @@ const AngularWorkflow = (defaultprops) => {
             rel="noopener noreferrer"
             href="https://shuffler.io/docs/workflows#execution_variables"
             target="_blank"
-            style={{ textDecoration: "none", color: "#FF8544" }}
+            style={{ textDecoration: "none", color: theme.palette.linkColor }}
           >
             Runtime variables?
           </a>
@@ -10504,6 +11165,7 @@ const AngularWorkflow = (defaultprops) => {
           large_image: data.large_image,
           status: "uninitialized",
           name: data.name,
+          parameters: data?.parameters,
           isStartNode: false,
           position: newposition,
         }
@@ -10705,6 +11367,10 @@ const AngularWorkflow = (defaultprops) => {
   }
 
   const handleAppDrag = (e, app) => {
+	if (cy === undefined || cy === null) {
+		return
+	}
+
     const cycontainer = cy.container()
 
     // Handling drag of public apps
@@ -11232,11 +11898,11 @@ const AngularWorkflow = (defaultprops) => {
                     <Grid item style={{ flex: 1 }}>
                       <Typography
                         variant="body1"
-                        color="textSecondary"
                         style={{
                           marginBottom: 0,
                           marginLeft: 5,
                           marginTop: newAppname.length > 17 ? -3 : 8,
+                          color: theme.palette.textPrimary
                         }}
                       >
                         {newAppname}
@@ -11355,7 +12021,7 @@ const AngularWorkflow = (defaultprops) => {
 
       const positionInfo = document.activeElement.getBoundingClientRect()
       const outerlistitemStyle = {
-        width: "100%",
+        width: "80%",
         overflowX: "hidden",
         overflowY: "hidden",
         borderBottom: "1px solid rgba(255,255,255,0.4)",
@@ -11375,7 +12041,7 @@ const AngularWorkflow = (defaultprops) => {
         if (queryID !== undefined && queryID !== null) {
           aa('init', {
             appId: "JNSS5CFDZZ",
-            apiKey: "db08e40265e2941b9a7d8f644b6e5240",
+            apiKey: "c8f882473ff42d41158430be09ec2b4e",
           })
 
           const timestamp = new Date().getTime()
@@ -11399,8 +12065,9 @@ const AngularWorkflow = (defaultprops) => {
 
       var type = "app"
       const baseImage = <LibraryBooksIcon />
+	  const width = 230
       return (
-        <div style={{ position: "relative", marginTop: 15, marginLeft: 0, marginRight: 10, position: "absolute", color: "white", zIndex: 1001, backgroundColor: theme.palette.inputColor, minWidth: leftBarSize - 10, maxWidth: leftBarSize - 10, boxShadows: "none", overflowX: "hidden", }}>
+        <div style={{ position: "relative", marginTop: 15, marginLeft: 0, marginRight: 10, position: "absolute", color: theme.palette.textColor, zIndex: 1001, backgroundColor: theme.palette.textFieldStyle.backgroundColor, /*minWidth: leftBarSize+30,*/ minWidth: width, maxWidth: width, boxShadows: "none", overflowX: "hidden", }}>
           <List style={{ backgroundColor: theme.palette.inputColor, }}>
             {hits.length === 0 ?
               <ListItem style={outerlistitemStyle}>
@@ -11421,7 +12088,7 @@ const AngularWorkflow = (defaultprops) => {
                   overflowX: "hidden",
                   overflowY: "hidden",
                   borderBottom: "1px solid rgba(255,255,255,0.4)",
-                  backgroundColor: mouseHoverIndex === index ? "#1f2023" : "inherit",
+                  backgroundColor: mouseHoverIndex === index ? theme.palette.hoverColor : "inherit",
                   cursor: "pointer",
                   marginLeft: 0,
                   marginRight: 0,
@@ -11494,7 +12161,7 @@ const AngularWorkflow = (defaultprops) => {
                     }}
                     defaultPosition={{ x: 0, y: 0 }}
                   >
-                    <div style={{ textDecoration: "none", color: "white", }} onClick={(event) => {
+                    <div style={{ overflow: "hidden", textDecoration: "none", color: theme.palette.text.primary, }} onClick={(event) => {
                       clickedApp(hit)
 
                     }}>
@@ -11541,8 +12208,7 @@ const AngularWorkflow = (defaultprops) => {
       <div style={{ marginBottom: 25 }}>
         <Typography
           variant="body1"
-          color="textSecondary"
-          style={{ marginTop: 20, marginLeft: 5 }}
+          style={{ marginTop: 20, marginLeft: 5, color: theme.palette.textPrimary }}
         >
           {title}
         </Typography>
@@ -11631,9 +12297,12 @@ const AngularWorkflow = (defaultprops) => {
             />
           )}
 
-          <Typography variant="body1" color="textSecondary" style={{ marginTop: 20, marginLeft: 5, }}>
-            Your Apps
-          </Typography>
+          {visibleApps.length > extraApps.length ? 
+			  <Typography variant="body1" style={{ marginTop: 20, marginLeft: 5, color: theme.palette.textPrimary}}>
+				Your Apps
+			  </Typography>
+		  : null}
+
           {visibleApps.length > extraApps.length ? (
             <div style={appScrollStyle}>
               {visibleApps.map((app, index) => {
@@ -11646,7 +12315,10 @@ const AngularWorkflow = (defaultprops) => {
                 }
 
                 if ((app.id === "integration" || app.id === "shuffle_agent") && userdata.support !== true) {
-                  return null
+					if (isCloud === false && app.id === "integration") {
+					} else {
+                  		return null
+					}
                 }
 
                 if (viewedApps.includes(app.id)) {
@@ -11690,7 +12362,7 @@ const AngularWorkflow = (defaultprops) => {
                   }}
                 >
                   <Typography variant="body1" color="textSecondary">
-                    Click one of the relevant public apps below to Activate it for your organization.
+                    Click one of the public apps below to Activate it for your organization.
                   </Typography>
                   <InstantSearch searchClient={searchClient} indexName="appsearch" onClick={() => {
                     console.log("CLICKED")
@@ -11711,7 +12383,7 @@ const AngularWorkflow = (defaultprops) => {
             </div>
           ) : apps.length > 0 ? (
             <div
-              style={{ textAlign: "center", width: leftBarSize, marginTop: 10, marginLeft: 5, marginRight: 5, }}
+              style={{ textAlign: "center", width: leftBarSize, marginTop: 25, marginLeft: 10 , marginRight: 10, }}
               onLoad={() => {
                 console.log("Should load in extra apps?")
               }}
@@ -11719,6 +12391,7 @@ const AngularWorkflow = (defaultprops) => {
               <Typography variant="body1" color="textSecondary">
                 Couldn't find the apps you were looking for? Searching unactivated apps. Click one of these apps to Activate it for your organisation.
               </Typography>
+
               <InstantSearch searchClient={searchClient} indexName="appsearch" onClick={() => {
                 console.log("CLICKED")
               }}>
@@ -11796,7 +12469,7 @@ const AngularWorkflow = (defaultprops) => {
 
     const newaction = selectedApp.actions.find((a) => a.name === e.target.value)
     if (newaction === undefined || newaction === null) {
-      toast("Failed to find the action you selected. Please try again or contact support@shuffler.io if it persists.");
+      toast(`Failed to find the action you selected. Please try again or contact ${supportEmail} if it persists.`);
       return;
     }
 
@@ -12053,6 +12726,8 @@ const AngularWorkflow = (defaultprops) => {
   const selectedTriggerChange = (event) => {
     selectedTrigger.label = event.target.value;
     setSelectedTrigger(selectedTrigger);
+    workflow.triggers[selectedTriggerIndex].label = event.target.value;
+    setWorkflow(workflow);
   };
 
   // Starts on current node and climbs UP the tree to the root object.
@@ -12074,7 +12749,7 @@ const AngularWorkflow = (defaultprops) => {
     // maxiter = max amount of parent nodes to loop
     // also handles breaks if there are issues
     var iterations = 0;
-    var maxiter = 10;
+    var maxiter = 100;
     while (true) {
       for (let parentkey in allkeys) {
         var currentnode = cy.getElementById(allkeys[parentkey]);
@@ -12142,8 +12817,8 @@ const AngularWorkflow = (defaultprops) => {
   const appApiViewStyle = {
     display: "flex",
     flexDirection: "column",
-    backgroundColor: "#1F2023",
-    color: "white",
+    backgroundColor: theme.palette.DialogStyle.backgroundColor,
+    color: theme.palette.text.primary,
     paddingRight: 15,
     paddingLeft: 15,
     minHeight: "100%",
@@ -12172,7 +12847,9 @@ const AngularWorkflow = (defaultprops) => {
     overflowAnchor: "none",
     minWidth: minSize,
     width: isMobile ? "100%" : minSize,
-    zoom: 0.9,
+    zoom: isSafari ? undefined : 0.9,
+    transform: isSafari ? "scale(0.9)" : undefined,
+    transformOrigin: isSafari ? "top right" : undefined,
   };
 
   const setTriggerFolderWrapperMulti = (event) => {
@@ -12220,16 +12897,19 @@ const AngularWorkflow = (defaultprops) => {
   };
 
   const setTriggerCronWrapper = (value) => {
-    console.log("Cron Value: ", value)
     if (selectedTrigger.parameters === null) {
       selectedTrigger.parameters = [];
     }
-
+    selectedTrigger.parameters[0] = {
+      value: value,
+      name: "cron",
+    };
     workflow.triggers[selectedTriggerIndex].parameters[0] = {
       value: value,
       name: "cron",
     };
     setWorkflow(workflow);
+    setSelectedTrigger(selectedTrigger);
   };
 
   const setTriggerOptionsWrapper = (value) => {
@@ -12275,11 +12955,14 @@ const AngularWorkflow = (defaultprops) => {
     if (selectedTrigger.parameters === null) {
       selectedTrigger.parameters = [];
     }
-
+    selectedTrigger.parameters[0] = {
+      value : value
+    }
     workflow.triggers[selectedTriggerIndex].parameters[0] = {
       value: value,
       name: "alertinfo",
     };
+    setSelectedTrigger(selectedTrigger)
     setWorkflow(workflow);
   };
 
@@ -12416,13 +13099,7 @@ const AngularWorkflow = (defaultprops) => {
 
       // Get parent nodes and their data
       if (selectedEdge) {
-
-        let nodeId;
-        if (type === "source") {
-          nodeId = selectedEdge.source;
-        } else if (type === "destination") {
-          nodeId = selectedEdge.target; 
-        }
+        const nodeId = selectedEdge.target; 
 
         const node = cy.getElementById(nodeId);
         if (node?.length > 0) {
@@ -12538,7 +13215,7 @@ const AngularWorkflow = (defaultprops) => {
                       event.preventDefault()
                       setExpansionModalOpen(true)
                       setActiveDialog("codeeditor")
-                      navigate(`?condition_id=${data.id}&field=${data.name}`)
+                      navigate(`?condition_id=${data.id}&condition_field=${data.name}`)
                       setEditorData({
                         "name": data.name,
                         "value": data.value || "",
@@ -12549,7 +13226,7 @@ const AngularWorkflow = (defaultprops) => {
                   >
                     <Tooltip title="Expand editor" placement="top">
                       <OpenInFullIcon style={{ 
-                        color: "rgba(255,255,255,0.7)",
+                        color: theme.palette.textColor,
                         fontSize: 20,
                       }}/>
                     </Tooltip>
@@ -12566,7 +13243,7 @@ const AngularWorkflow = (defaultprops) => {
               data.value !== undefined &&
               data.value !== null &&
               data.value.includes(".#") ? (
-                <span style={{ color: "white", marginBottom: 5 }}>
+                <span style={{ color: theme.palette.text.primary, marginBottom: 5 }}>
                   Use "Shuffle Tools" app with "Filter List" action to handle loops
                 </span>
               ) : null
@@ -12623,9 +13300,9 @@ const AngularWorkflow = (defaultprops) => {
         
           // Update the field value based on type
           if (type === "source") {
-            handleConditionFieldChange("source", "value", toComplete);
+            handleConditionFieldChange("source", toComplete);
           } else if (type === "destination") {
-            handleConditionFieldChange("destination", "value", toComplete);
+            handleConditionFieldChange("destination", toComplete);
           }
         
           handleMenuClose();
@@ -12717,7 +13394,7 @@ const AngularWorkflow = (defaultprops) => {
             startIcon={<AddCircleOutlineIcon/>}
             sx={{ 
               marginLeft: 10,
-              color: "white",
+              color: theme.palette.text.primary,
               fontSize: "15px",
               fontFamily: theme?.typography?.fontFamily,
               textTransform: "none",
@@ -12729,6 +13406,7 @@ const AngularWorkflow = (defaultprops) => {
               justifyContent: "flex-start",
               "&:hover": {
                 backgroundColor: "transparent",
+                color: theme.palette.text.primary,
                 border: "none"
               },
               // Disable ripple effect
@@ -12738,7 +13416,7 @@ const AngularWorkflow = (defaultprops) => {
             }}
             >
               <Tooltip title="Show available variables" placement="top">
-                <span>Auto Complete</span>
+                Auto Complete
               </Tooltip>
             </Button>
             <KeyboardArrowDownIcon
@@ -12756,8 +13434,8 @@ const AngularWorkflow = (defaultprops) => {
               onClose={handleMenuClose}
               PaperProps={{
                 style: {
-                  backgroundColor: "#82ccc3",
-                  color: "white",
+                  backgroundColor: theme.palette.backgroundColor,
+                  color: theme.palette.text.primary,
                   marginTop: 2,
                   maxHeight: 400,
                 },
@@ -12872,7 +13550,7 @@ const AngularWorkflow = (defaultprops) => {
                       }
                       parentMenuOpen={!!menuPosition}
                       style={{
-                        color: "white",
+                        color: theme.palette.text.primary,
                         minWidth: 250,
                         maxWidth: 250,
                         maxHeight: 50,
@@ -12891,7 +13569,7 @@ const AngularWorkflow = (defaultprops) => {
                           style={{
                             // backgroundColor: theme.palette.inputColor,
                             marginLeft: 15,
-                            color: "white",
+                            color: theme.palette.text.primary,
                             minWidth: 250,
                             maxWidth: 250,
                             padding: 0,
@@ -12934,7 +13612,7 @@ const AngularWorkflow = (defaultprops) => {
                               key={pathdata.name}
                               style={{
                                 // backgroundColor: theme.palette.inputColor,
-                                color: "white",
+                                color: theme.palette.text.primary,
                                 minWidth: 250,
                                 maxWidth: 250,
                                 padding: boxPadding,
@@ -12975,7 +13653,7 @@ const AngularWorkflow = (defaultprops) => {
                     key={innerdata.name}
                     style={{
                       // backgroundColor: theme.palette.inputColor,
-                      color: "white",
+                      color: theme.palette.text.primary,
                       padding: "10px 12px", // Add padding here
                     }}
                     value={innerdata}
@@ -13008,7 +13686,7 @@ const AngularWorkflow = (defaultprops) => {
   };
 
   const menuItemStyle = {
-    color: "white",
+    color: theme.palette.text.primary,
     backgroundColor: theme.palette.inputColor,
   };
 
@@ -13072,7 +13750,7 @@ const AngularWorkflow = (defaultprops) => {
         style: {
           padding: 30,
           pointerEvents: "auto",
-          color: "white",
+          color: theme.palette.text.primary,
           minWidth: isMobile ? "90%" : 800,
           border: theme.palette.defaultBorder,
 
@@ -13095,11 +13773,11 @@ const AngularWorkflow = (defaultprops) => {
             setAuthgroupModalOpen(false)
           }}
         >
-          <CloseIcon style={{ color: "white" }} />
+          <CloseIcon style={{ color: theme.palette.text.primary }} />
         </IconButton>
       </Tooltip>
       <DialogTitle id="draggable-dialog-title" style={{ cursor: "move", }}>
-        <span style={{ color: "white" }}>Authgroup Selection</span>
+        <span style={{ color: theme.palette.text.primary }}>Authgroup Selection</span>
       </DialogTitle>
       <DialogContent>
         <Typography variant="body1" color="textSecondary">
@@ -13196,7 +13874,7 @@ const AngularWorkflow = (defaultprops) => {
         style: {
           padding: 30,
           pointerEvents: "auto",
-          color: "white",
+          color: theme.palette.text.primary,
           minWidth: isMobile ? "90%" : 650,
           border: theme.palette.defaultBorder,
 
@@ -13219,11 +13897,11 @@ const AngularWorkflow = (defaultprops) => {
             setExecutionArgumentModalOpen(false)
           }}
         >
-          <CloseIcon style={{ color: "white" }} />
+          <CloseIcon style={{ color: theme.palette.text.primary }} />
         </IconButton>
       </Tooltip>
       <DialogTitle id="draggable-dialog-title" style={{ cursor: "move", }}>
-        <span style={{ color: "white" }}>Provide an execution argument</span>
+        <span style={{ color: theme.palette.text.primary }}>Provide an execution argument</span>
       </DialogTitle>
       <DialogContent>
 
@@ -13242,7 +13920,7 @@ const AngularWorkflow = (defaultprops) => {
                     InputProps={{
                       style: {
                         height: "50px",
-                        color: "white",
+                        color: theme.palette.text.primary,
                         fontSize: "1em",
                       },
                     }}
@@ -13407,7 +14085,7 @@ const AngularWorkflow = (defaultprops) => {
       open={aiQueryModalOpen}
       PaperProps={{
         style: {
-          color: "white",
+          color: theme.palette.text.primary,
           minWidth: isMobile ? "90%" : 450,
           border: theme.palette.defaultBorder,
           padding: 50,
@@ -13437,7 +14115,7 @@ const AngularWorkflow = (defaultprops) => {
           onClick={(e) => {
           }}
         >
-          <DragIndicatorIcon style={{ color: "white" }} />
+          <DragIndicatorIcon style={{ color: theme.palette.text.primary }} />
         </IconButton>
       </Tooltip>
       <IconButton
@@ -13445,7 +14123,7 @@ const AngularWorkflow = (defaultprops) => {
           position: "absolute",
           top: 6,
           right: 6,
-          color: "white",
+          color: theme.palette.text.primary,
         }}
         onClick={() => {
           setAiQueryModalOpen(false)
@@ -13457,7 +14135,7 @@ const AngularWorkflow = (defaultprops) => {
         Shuffle AI
       </Typography>
       <Typography variant="body2" color="textSecondary">
-        What you write here will be fed to the Shuffle AI to generate a change for the selected action or field. Best used for when you are stuck with formatting. Uses your AI credits (resets monthly). <b>Beta feature.</b> Please give feedback to support@shuffler.io {"<"}3
+        What you write here will be fed to the Shuffle AI to generate a change for the selected action or field. Best used for when you are stuck with formatting. Uses your AI credits (resets monthly). <b>Beta feature.</b> Please give feedback to {supportEmail} {"<"}3
 
       </Typography>
       <TextField
@@ -13501,19 +14179,23 @@ const AngularWorkflow = (defaultprops) => {
       />
     </Dialog>
 
-  const handleConditionFieldChange = (fieldType, fieldName, value) => {
+  const handleConditionFieldChange = (fieldType, value) => {
     if (fieldType === "source") {
       setSourceValue({
         ...sourceValue,
         value: value
-      });
+      })
+
+	  setUpdate(Math.random())
     } else if (fieldType === "destination") {
       setDestinationValue({
         ...destinationValue,
         value: value
-      });
-      }
-    };
+      })
+
+	  setUpdate(Math.random())
+    }
+  }
 
 
   const conditionsModal = (
@@ -13527,14 +14209,23 @@ const AngularWorkflow = (defaultprops) => {
       aria-labelledby="draggable-dialog-title"
       open={conditionsModalOpen}
       PaperProps={{
-        style: {
+        sx: {
           pointerEvents: "auto",
-          color: "white",
-          minWidth: isMobile ? "90%" : 800,
+          color: theme.palette.DialogStyle.color,
+          minWidth: isMobile ? "90%" : "800px",
           border: theme.palette.defaultBorder,
 
-          borderRadius: theme.palette.borderRadius,
-          backgroundColor: "black",
+          borderRadius: theme.palette.DialogStyle.borderRadius,
+          backgroundColor: theme.palette.DialogStyle.backgroundColor,
+          '& .MuiDialogContent-root': {
+            backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+          },
+          '& .MuiDialogTitle-root': {
+            backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+          },
+          '& .MuiDialogActions-root': {
+            backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+          },
         },
       }}
       onClose={() => {
@@ -13545,7 +14236,8 @@ const AngularWorkflow = (defaultprops) => {
           position: "absolute",
           bottom: 10,
           left: 10,
-          color: "rgba(255,255,255,0.6)",
+          color: theme.palette.textColor,
+          backgroundColor: 'inherit',
           zIndex: 10000,
         }}
       >
@@ -13556,7 +14248,7 @@ const AngularWorkflow = (defaultprops) => {
           href="/docs/workflows#conditions"
           style={{
             textDecoration: "none",
-            color: "#FF8544",
+            color: theme.palette.linkColor,
           }}
         >
           Learn more
@@ -13564,7 +14256,7 @@ const AngularWorkflow = (defaultprops) => {
       </span>
       <FormControl>
         <DialogTitle id="draggable-dialog-title" style={{ cursor: "move", }}>
-          <span style={{ color: "white" }}>Condition</span>
+          <span style={{ color: theme.palette.text.primary }}>Condition</span>
         </DialogTitle>
         <DialogContent style={{}}>
           <div style={{ display: "flex" }}>
@@ -13774,7 +14466,7 @@ const AngularWorkflow = (defaultprops) => {
             </div>
           </div>
         </DialogContent>
-        <DialogActions>
+        <DialogActions sx={{pr: 3, pb: 1}}>
           <Button
             style={{ borderRadius: "0px" }}
             variant="text"
@@ -13784,16 +14476,18 @@ const AngularWorkflow = (defaultprops) => {
               setSourceValue({});
               setConditionValue({});
               setDestinationValue({});
+              navigate("")
             }}
             color="secondary"
           >
             Cancel
           </Button>
           <Button
-            style={{ borderRadius: "0px" }}
+            sx={{ borderRadius: "4px", px: 3 }}
             variant="contained"
             onClick={() => {
               setSelectedEdge({});
+              navigate("")
 
               var data = {
                 condition: conditionValue,
@@ -13880,7 +14574,7 @@ const AngularWorkflow = (defaultprops) => {
         minWidth: "100%",
         maxWidth: "100%",
         marginTop: "5px",
-        color: "white",
+        color: theme.palette.text.primary,
         backgroundColor: theme.palette.surfaceColor,
         cursor: "pointer",
         display: "flex",
@@ -13981,7 +14675,7 @@ const AngularWorkflow = (defaultprops) => {
                 aria-controls="long-menu"
                 aria-haspopup="true"
                 onClick={menuClick}
-                style={{ color: "white" }}
+                style={{ color: theme.palette.text.primary }}
               >
                 <MoreVertIcon />
               </IconButton>
@@ -14001,7 +14695,7 @@ const AngularWorkflow = (defaultprops) => {
                 }}
               >
                 <MenuItem
-                  style={{ backgroundColor: theme.palette.inputColor, color: "white" }}
+                  style={{ backgroundColor: theme.palette.inputColor, color: theme.palette.text.primary }}
                   onClick={() => {
                     duplicateCondition(index);
                   }}
@@ -14010,7 +14704,7 @@ const AngularWorkflow = (defaultprops) => {
                   {"Duplicate"}
                 </MenuItem>
                 <MenuItem
-                  style={{ backgroundColor: theme.palette.inputColor, color: "white" }}
+                  style={{ backgroundColor: theme.palette.inputColor, color: theme.palette.text.primary }}
                   onClick={() => {
                     setOpen(false);
                     deleteCondition(index);
@@ -14074,7 +14768,7 @@ const AngularWorkflow = (defaultprops) => {
               {
                 selectedEdge && Object.keys(selectedEdge).length > 0 ?
                 <ArrowForwardIcon style={{ 
-                  color: "rgba(255,255,255,0.7)",
+                  color: theme.palette.textColor,
                   fontSize: 20,
                 }} />
                 : null
@@ -14099,7 +14793,7 @@ const AngularWorkflow = (defaultprops) => {
             rel="noopener noreferrer"
             target="_blank"
             href="https://shuffler.io/docs/workflows#conditions"
-            style={{ textDecoration: "none", color: "#FF8544" }}
+            style={{ textDecoration: "none", color: theme.palette.linkColor }}
           >
             What are conditions?
           </a>
@@ -14595,20 +15289,19 @@ const AngularWorkflow = (defaultprops) => {
         cy.add(cybranch);
       }
 
-      console.log("Value to be set: ", e.target.value);
       try {
-        workflow.triggers[
-          selectedTriggerIndex
-        ].parameters[3].value = e.target.value.id;
-      } catch {
-        workflow.triggers[selectedTriggerIndex].parameters[3] =
-        {
-          name: "startnode",
-          value: e.target.value.id,
-        };
+        workflow.triggers[selectedTriggerIndex].parameters[3].value = e.target.value.id
+      } catch(e) {
+		  console.log("Error: ", e)
+          workflow.triggers[selectedTriggerIndex].parameters[3] =
+          {
+            name: "startnode",
+            value: e.target.value.id,
+          };
       }
 
-      setWorkflow(workflow);
+      setWorkflow(workflow)
+	  setUpdate(Math.random())
     }
   }
 
@@ -14618,43 +15311,62 @@ const AngularWorkflow = (defaultprops) => {
   };
 
   const handleItemClick = (values) => {
-    console.log("VALUES: ", values)
-    if (values === undefined || values === null || values.length === 0) {
-      return;
+  console.log("VALUES: ", values)
+  if (values === undefined || values === null || values.length === 0) {
+    return;
+  }
+
+  // Get the base autocomplete value and normalize it
+  let toComplete = values[0].autocomplete.toLowerCase().replaceAll(" ", "_");
+  
+  // Add $ prefix if not already present
+  if (!toComplete.startsWith("$")) {
+    toComplete = "$" + toComplete;
+  }
+
+  // Add any additional path components
+  for (let key in values) {
+    if (key === "0" || !values[key].autocomplete) {
+      continue; 
     }
 
+    toComplete += values[key].autocomplete;
+  }
 
-    /*
-    workflow.triggers[selectedTriggerIndex].parameters[1].value
-      .trim()
-      .endsWith("$")
-      ? values[0].autocomplete
-      : "$" + values[0].autocomplete;
+  var foundField;
+  // Update the field value
+  if(selectedTrigger?.trigger_type === "SUBFLOW"){
+    foundField = document.getElementById("subflow_exec_field");
+  }else if(selectedTrigger?.trigger_type === "USERINPUT"){
+    foundField = document.getElementById("userinput_info_field");
+  }
 
-    for (var key in values) {
-      if (key === 0 || values[key].autocomplete.length === 0) {
-        continue;
-      }
+  if (foundField) {
+    // Get current cursor position
+    const cursorPos = foundField.selectionStart;
+    const currentValue = foundField.value;
 
-      toComplete += values[key].autocomplete
-    }
-    */
-
-    if (selectedTrigger.name === "Shuffle Workflow") {
-      const toComplete = workflow?.triggers?.[selectedTriggerIndex]?.parameters?.[1]?.value + "$" + values[0]?.autocomplete
-      // selectedTrigger.parameters[1].value = toComplete
-      workflow.triggers[selectedTriggerIndex].parameters[1].value = toComplete
-      const foundfield = document.getElementById("subflow_exec_field")
-      if (foundfield !== undefined && foundfield !== null) {
-        foundfield.value = toComplete
-      }
-      setWorkflow(workflow)
+    // Insert the new value at cursor position
+    const newValue = currentValue.slice(0, cursorPos) + toComplete + currentValue.slice(cursorPos);
+    foundField.value = newValue;
+    
+    // Update state
+    setSelectedTriggerValue(newValue);
+    if(selectedTrigger?.trigger_type === "SUBFLOW"){
+    workflow.triggers[selectedTriggerIndex].parameters[1].value = newValue
+    }else if(selectedTrigger?.trigger_type === "USERINPUT"){
+      workflow.triggers[selectedTriggerIndex].parameters[0].value = newValue
     }
 
-    setUpdate(Math.random());
-    setShowDropdown(false);
-    setMenuPosition(null);
-  };
+    // Set cursor position after inserted text
+    foundField.setSelectionRange(cursorPos + toComplete.length, cursorPos + toComplete.length);
+  }
+
+  setWorkflow(workflow);
+  setUpdate(Math.random());
+  setShowDropdown(false);
+  setMenuPosition(null);
+};
 
   const subflowtypes = [
     {
@@ -14668,7 +15380,8 @@ const AngularWorkflow = (defaultprops) => {
     }
   ]
 
-  const handleSubflowParamChange = (triggerId, triggerField, newData) => {
+  const handleTriggerParamChange = (triggerId, triggerField, newData) => {
+	var updateFail = "" 
 
     if (workflow !== undefined && workflow !== null) {  
         // Find the trigger with matching id 
@@ -14681,12 +15394,23 @@ const AngularWorkflow = (defaultprops) => {
           workflow.triggers[triggerIndex].parameters[paramIndex].value = newData;
           
           // Update workflow state to trigger re-render
-          setWorkflow({...workflow});
+          setWorkflow(workflow);
           setSelectedTriggerValue(newData)
           setLastSaved(false);
-        }
-      }
-    }
+		  setUpdate(Math.random())
+        } else {
+			updateFail = "Parameter is undefined or null"
+		}
+	  } else {
+		  updateFail = "Trigger is undefined or null"
+	  }
+	} else {
+		updateFail = "Workflow is undefined or null"
+	}
+
+	if (updateFail !== "") {
+		toast.error(updateFail + " - Failed to update subflow parameter value. Please try again.")
+	}
   }
 
   const SubflowSidebar = Object.getOwnPropertyNames(selectedTrigger).length === 0 || workflow.triggers[selectedTriggerIndex] === undefined || selectedTrigger.trigger_type !== "SUBFLOW" ? null :
@@ -14723,7 +15447,7 @@ const AngularWorkflow = (defaultprops) => {
               marginTop: 10,
               flex: 1,
               backgroundColor: theme.palette.inputColor,
-              color: "white",
+              color: theme.palette.text.primary,
               height: 35,
               marginleft: 10,
               borderRadius: theme.palette?.borderRadius,
@@ -14740,7 +15464,7 @@ const AngularWorkflow = (defaultprops) => {
                   key={index}
                   style={{
                     backgroundColor: theme.palette.inputColor,
-                    color: "white",
+                    color: theme.palette.text.primary,
                   }}
                   value={data.name}
                 >
@@ -14755,7 +15479,7 @@ const AngularWorkflow = (defaultprops) => {
         rel="noopener noreferrer"
         target="_blank"
         href="https://shuffler.io/docs/triggers#subflow"
-        style={{ textDecoration: "none", color: "#FF8544" }}
+        style={{ textDecoration: "none", color: theme.palette.linkColor }}
       >
         What are subflows?
       </a>
@@ -14773,13 +15497,14 @@ const AngularWorkflow = (defaultprops) => {
           <Typography>Name</Typography>
           <TextField
             style={{
-              backgroundColor: "#212121",
+              backgroundColor: theme.palette.inputColor,
+              color: theme.palette.text.primary,
               borderRadius: theme.palette?.borderRadius,
               marginTop: 3,
             }}
             InputProps={{
               style: {
-                color: "white"
+                color: theme.palette.text.primary
               }
             }}
             size="small"
@@ -14802,13 +15527,14 @@ const AngularWorkflow = (defaultprops) => {
                 <Typography>Delay</Typography>
                 <TextField
                   style={{
-                    backgroundColor: "#212121",
+                    backgroundColor: theme.palette.inputColor,
+                    color: theme.palette.text.primary,
                     marginTop: 3,
                     maxWidth: 50,
                   }}
                   InputProps={{
                     style: {
-                      color: "white"
+                      color: theme.palette.text.primary
                     }
                   }}
                   size="small"
@@ -14859,7 +15585,7 @@ const AngularWorkflow = (defaultprops) => {
           />
         }
         style={{ marginTop: 10 }}
-        label={<div style={{ color: "white" }}>Wait for results</div>}
+        label={<div style={{ color: theme.palette.text.primary }}>Wait for results</div>}
       />
       <div style={{ flex: "6", marginTop: 10, }}>
         <div>
@@ -14873,34 +15599,16 @@ const AngularWorkflow = (defaultprops) => {
               }}
             >
               <div style={{ flex: "10" }}>
-                <b>Select a workflow to execute </b>
+                <b>Select a workflow to run</b>
               </div>
             </div>
-            {workflow.triggers[selectedTriggerIndex].parameters[0].value
-              .length === 0 ? null : workflow.triggers[selectedTriggerIndex]
-                .parameters[0].value === props.match.params.key ? null : (
-              <div style={{ marginLeft: 5, flex: 1 }}>
-                <a
-                  rel="noopener noreferrer"
-                  href={`/workflows/${workflow.triggers[selectedTriggerIndex].parameters[0].value}`}
-                  target="_blank"
-                  style={{
-                    textDecoration: "none",
-                    color: "#FF8544",
-                    marginLeft: 5,
-                    marginTop: 10,
-                  }}
-                >
-                  <OpenInNewIcon />
-                </a>
-              </div>
-            )}
           </div>
 
           {workflows === undefined ||
             workflows === null ||
-            workflows.length === 0 ? null : (
-
+            workflows.length === 0 ? 
+			  <CircularProgress color="secondary" style={{ margin: "auto", marginTop: 10, width: 25, height: 25, }} />
+			: (
             <Autocomplete
               id="subflow_search"
               autoHighlight
@@ -14909,7 +15617,7 @@ const AngularWorkflow = (defaultprops) => {
               ListboxProps={{
                 style: {
                   backgroundColor: theme.palette.inputColor,
-                  color: "white",
+                  color: theme.palette.text.primary,
                 },
               }}
               sx={{
@@ -14974,7 +15682,7 @@ const AngularWorkflow = (defaultprops) => {
                   <Tooltip arrow placement="left" title={
                     <span style={{}}>
                       {data.image !== undefined && data.image !== null && data.image.length > 0 ?
-                        <img src={data.image} alt={data.name} style={{ backgroundColor: theme.palette.surfaceColor, maxHeight: 200, minHeigth: 200, borderRadius: theme.palette?.borderRadius, }} />
+                        <img src={data.image} alt={data.name} style={{ backgroundColor: theme.palette.surfaceColor, maxHeight: 200, minHeigth: 200, maxWidth: 285, borderRadius: theme.palette?.borderRadius, }} />
                         : null}
                       <Typography>
                         Choose Subflow '{data.name}'
@@ -14984,7 +15692,7 @@ const AngularWorkflow = (defaultprops) => {
                     <MenuItem
                       style={{
                         backgroundColor: theme.palette.inputColor,
-                        color: data.id === workflow.id ? "red" : "white",
+                        color: data.id === workflow.id ? "red" : theme.palette.text.primary,
                       }}
                       value={data}
                       onClick={() => {
@@ -15005,13 +15713,36 @@ const AngularWorkflow = (defaultprops) => {
               }}
               renderInput={(params) => {
                 return (
-                  <TextField
-                    style={theme.palette.textFieldStyle}
-                    {...params}
-                    label="Find your workflow"
-                    variant="outlined"
-                  />
-                );
+				  <div style={{ display: "flex", }}>
+                    <TextField
+                      style={theme.palette.textFieldStyle}
+                      {...params}
+                      label="Find your workflow"
+                      variant="outlined"
+                    />
+					{workflow.triggers[selectedTriggerIndex].parameters[0].value
+					  .length === 0 ? null : workflow.triggers[selectedTriggerIndex]
+						.parameters[0].value === props.match.params.key ? 
+						null
+						: (
+					  <div style={{ marginLeft: 5, }}>
+						<a
+						  rel="noopener noreferrer"
+						  href={`/workflows/${workflow.triggers[selectedTriggerIndex].parameters[0].value}`}
+						  target="_blank"
+						  style={{
+							textDecoration: "none",
+							color: "#FF8544",
+							marginLeft: 5,
+							marginTop: 10,
+						  }}
+						>
+						  <OpenInNewIcon />
+						</a>
+					  </div>
+					)}
+				  </div>
+                )
               }}
             />
           )}
@@ -15034,6 +15765,7 @@ const AngularWorkflow = (defaultprops) => {
                   <b>Select the Startnode</b>
                 </div>
               </div>
+
               <Autocomplete
                 id="subflow_node_search"
                 autoHighlight
@@ -15042,7 +15774,7 @@ const AngularWorkflow = (defaultprops) => {
                 ListboxProps={{
                   style: {
                     backgroundColor: theme.palette.inputColor,
-                    color: "white",
+                    color: theme.palette.text.primary,
                   },
                 }}
                 sx={{
@@ -15106,7 +15838,7 @@ const AngularWorkflow = (defaultprops) => {
                       }}
                       style={{
                         backgroundColor: theme.palette.inputColor,
-                        color: isParent ? "red" : "white",
+                        color: isParent ? "red" : theme.palette.text.primary,
                       }}
                       value={action}
                     >
@@ -15171,14 +15903,14 @@ const AngularWorkflow = (defaultprops) => {
                       "name": workflow.triggers[selectedTriggerIndex].parameters[1].name,
                       "value": parsedvalue,
                       "field_number": 1,
-                      "actionlist": subflowActionList,
+                      "actionlist": triggerActionList,
                       "field_id": "subflow_exec_field",
                     })
                   }}
                 >
                   <OpenInFullIcon
                     style={{
-                      color: "rgba(255,255,255,0.7)",
+                      color: theme.palette.textColor,
                       height: 20,
                       width: 20
                     }}
@@ -15189,9 +15921,14 @@ const AngularWorkflow = (defaultprops) => {
           </div>
           <TextField
             id="subflow_exec_field"
-            style={theme.palette.textFieldStyle}
+            style={{
+              backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+              color: theme.palette.textFieldStyle.color,
+            }}
             InputProps={{
               style: {
+                backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                color: theme.palette.textFieldStyle.color,
               },
               endAdornment: (
                 <InputAdornment position="end">
@@ -15216,15 +15953,13 @@ const AngularWorkflow = (defaultprops) => {
             fullWidth
             color="primary"
             placeholder="Some execution data"
-            value={
-              selectedTriggerValue
-            }
+            value={selectedTriggerValue || ""}
             onChange={(e) => {  
               setLastSaved(false)
               setSelectedTriggerValue(e.target.value)
             }}
-            onBlur={() => {
-              workflow.triggers[selectedTriggerIndex].parameters[1].value = selectedTriggerValue
+            onBlur={(e) => {
+              workflow.triggers[selectedTriggerIndex].parameters[1].value = e.target.value
               setWorkflow(workflow)
             }}
           />
@@ -15238,20 +15973,21 @@ const AngularWorkflow = (defaultprops) => {
               open={!!menuPosition}
               style={{
                 border: `2px solid #FF8544`,
-                color: "white",
+                color: theme.palette.text.primary,
                 marginTop: 2,
               }}
             >
-              {subflowActionList.map((innerdata) => {
+              {triggerActionList.map((innerdata) => {
                 const icon =
                   innerdata.type === "action" ? (
                     <AppsIcon style={{ marginRight: 10 }} />
                   ) : innerdata.type === "workflow_variable" ||
                     innerdata.type === "execution_variable" ? (
                     <FavoriteBorderIcon style={{ marginRight: 10 }} />
-                  ) : (
-                    <ScheduleIcon style={{ marginRight: 10 }} />
-                  );
+                  ) : innerdata.type === "Shuffle DB" ? 
+                  <StorageIcon style={{ marginRight: 10,  }} />
+                :
+                  <ScheduleIcon style={{ marginRight: 10 }} />
 
                 const handleExecArgumentHover = (inside) => {
                   var exec_text_field = document.getElementById(
@@ -15353,7 +16089,7 @@ const AngularWorkflow = (defaultprops) => {
                       parentMenuOpen={!!menuPosition}
                       style={{
                         backgroundColor: theme.palette.inputColor,
-                        color: "white",
+                        color: theme.palette.text.primary,
                         minWidth: 250,
                       }}
                       onClick={() => {
@@ -15376,7 +16112,7 @@ const AngularWorkflow = (defaultprops) => {
                             key={pathdata.name}
                             style={{
                               backgroundColor: theme.palette.inputColor,
-                              color: "white",
+                              color: theme.palette.text.primary,
                               minWidth: 250,
                             }}
                             value={pathdata}
@@ -15409,7 +16145,7 @@ const AngularWorkflow = (defaultprops) => {
                       }
                       parentMenuOpen={!!menuPosition}
                       style={{
-                        color: "white",
+                        color: theme.palette.text.primary,
                         minWidth: 250,
                         maxWidth: 250,
                         maxHeight: 50,
@@ -15427,7 +16163,7 @@ const AngularWorkflow = (defaultprops) => {
                           style={{
                             // backgroundColor: theme.palette.inputColor,
                             marginLeft: 15,
-                            color: "white",
+                            color: theme.palette.text.primary,
                             minWidth: 250,
                             maxWidth: 250,
                             padding: 0,
@@ -15470,7 +16206,7 @@ const AngularWorkflow = (defaultprops) => {
                               key={pathdata.name}
                               style={{
                                 // backgroundColor: theme.palette.inputColor,
-                                color: "white",
+                                color: theme.palette.text.primary,
                                 minWidth: 250,
                                 maxWidth: 250,
                                 padding: boxPadding,
@@ -15511,7 +16247,7 @@ const AngularWorkflow = (defaultprops) => {
                     key={innerdata.name}
                     style={{
                       // backgroundColor: theme.palette.inputColor,
-                      color: "white",
+                      color: theme.palette.text.primary,
                     }}
                     value={innerdata}
                     onMouseOver={() => handleMouseover()}
@@ -15605,7 +16341,7 @@ const AngularWorkflow = (defaultprops) => {
             rel="noopener noreferrer"
             target="_blank"
             href="https://shuffler.io/docs/workflows#comments"
-            style={{ textDecoration: "none", color: "#FF8544" }}
+            style={{ textDecoration: "none", color: theme.palette.linkColor }}
           >
             What are comments?
           </a>
@@ -15621,11 +16357,14 @@ const AngularWorkflow = (defaultprops) => {
           <div>Name</div>
           <TextField
             style={{
-              backgroundColor: theme.palette.inputColor,
-              borderRadius: theme.palette?.borderRadius,
+              backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+              color: theme.palette.textFieldStyle.color,
+              borderRadius: theme.palette?.textFieldStyle.borderRadius,
             }}
             InputProps={{
               style: {
+                backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                color: theme.palette.textFieldStyle.color,
               },
             }}
             multiline
@@ -15639,6 +16378,79 @@ const AngularWorkflow = (defaultprops) => {
               setSelectedComment(selectedComment);
             }}
           />
+          <div style={{ display: "flex", marginTop: 10 }}>
+            <div style={{
+              width: "50%"
+            }}>
+              <div>Justify</div>
+              <Select
+                style={{ backgroundColor: theme.palette.inputColor }}
+                fullWidth
+                defaultValue="center"
+                value={selectedComment.textHalign !== "center" && selectedComment.textHalign !== undefined ? selectedComment.textHalign === "left" ? "right" : "left" : "center"}
+                onChange={(event) => {
+                  const alignment = event.target.value;
+                  const width = selectedComment.width || 250; // Default width if undefined
+
+                  // Compute new values
+                  let textHalign = alignment !== "center" ? alignment === "left" ? "right" : "left" : "center";
+                  let textMarginX = "0px"; // Default for center alignment
+
+                  if (alignment === "left") {
+                    textMarginX = `-${width}px`;
+                  } else if (alignment === "right") {
+                    textMarginX = `${width}px`;
+                  }
+                  selectedComment.textHalign = textHalign;
+                  selectedComment.textMarginX = textMarginX;
+                  // Update state properly
+                  setSelectedComment((prev) => ({
+                    ...prev,
+                    textHalign,
+                    textMarginX,
+                  }));
+
+                  // Use useEffect or separate logging to confirm state changes
+                }}
+              >
+                <MenuItem value="left">Left</MenuItem>
+                <MenuItem value="center">Center</MenuItem>
+                <MenuItem value="right">Right</MenuItem>
+              </Select>
+            </div>
+            <div style={{ marginLeft: 5, width: "50%" }}>
+              <div>Align</div>
+              <Select
+                fullWidth
+                style={{ backgroundColor: theme.palette.inputColor }}
+                defaultValue="center"
+                value={selectedComment.textValign !== "center" && selectedComment.textHalign !== undefined ? selectedComment.textValign === "top" ? "bottom" : "top" : "center" || "center"}
+                onChange={(event) => {
+                  const height = selectedComment.height || 150; // Default width if undefined
+
+                  let textValign = event.target.value === "center" ? "center" : event.target.value === "top" ? "bottom" : "top";
+                  let textMarginY = "0px"; // Default for center alignment
+
+                  if (textValign === "top") {
+                    textMarginY = `${height}px`;
+                  } else if (textValign === "bottom") {
+                    textMarginY = `-${height}px`;
+                  }
+                  selectedComment.textValign = textValign;
+                  selectedComment.textMarginY = textMarginY;
+                  setSelectedComment((prev) => ({
+                    ...prev,
+                    textValign,
+                    textMarginY
+                  }));
+                }}
+              >
+                <MenuItem value="top">Top</MenuItem>
+                <MenuItem value="center">Center</MenuItem>
+                <MenuItem value="bottom">Bottom</MenuItem>
+              </Select>
+            </div>
+          </div>
           <div style={{ display: "flex", marginTop: 10 }}>
             <div>
               <div>Height</div>
@@ -15743,7 +16555,6 @@ const AngularWorkflow = (defaultprops) => {
             defaultValue={selectedComment["backgroundimage"]}
             onChange={(event) => {
               selectedComment.backgroundimage = event.target.value;
-              console.log("Comment: ", selectedComment)
               setSelectedComment(selectedComment);
             }}
           />
@@ -15757,20 +16568,7 @@ const AngularWorkflow = (defaultprops) => {
   // Special SCHEDULE handler
   var trigger_header_auth = ""
   if (Object.getOwnPropertyNames(selectedTrigger)?.length > 0 && workflow?.triggers !== null && workflow?.triggers !== undefined && workflow?.triggers?.length >= selectedTriggerIndex && workflow?.triggers[selectedTriggerIndex] !== undefined) {
-    if (selectedTrigger.trigger_type === "SCHEDULE" && workflow.triggers[selectedTriggerIndex].parameters === undefined || workflow.triggers[selectedTriggerIndex].parameters === null) {
-      console.log("Autofixing schedule")
-
-      workflow.triggers[selectedTriggerIndex].parameters = [];
-      workflow.triggers[selectedTriggerIndex].parameters[0] = {
-        name: "cron",
-        value: isCloud ? "*/25 * * * *" : "60",
-      };
-      workflow.triggers[selectedTriggerIndex].parameters[1] = {
-        name: "execution_argument",
-        value: '{"name": "value"}',
-      };
-      setWorkflow(workflow);
-    } else if (selectedTrigger.trigger_type === "WEBHOOK") {
+    if (selectedTrigger.trigger_type === "WEBHOOK") {
       if (workflow.triggers[selectedTriggerIndex] === undefined) {
         return null;
       }
@@ -15819,52 +16617,11 @@ const AngularWorkflow = (defaultprops) => {
         workflow.triggers[selectedTriggerIndex].parameters.length > 2
           ? workflow.triggers[selectedTriggerIndex].parameters[2].value
           : "";
-    } else if (
-      selectedTrigger.trigger_type === "USERINPUT"
-    ) {
-      if (
-        workflow.triggers[selectedTriggerIndex].parameters === undefined ||
-        workflow.triggers[selectedTriggerIndex].parameters === null ||
-        workflow?.triggers[selectedTriggerIndex]?.parameters?.length === 0
-      ) {
-        workflow.triggers[selectedTriggerIndex].parameters = [];
-        workflow.triggers[selectedTriggerIndex].parameters[0] = {
-          name: "alertinfo",
-          value: "Do you want to continue the workflow? Start parameters: $exec",
-        };
-
-        // boolean,
-        workflow.triggers[selectedTriggerIndex].parameters[1] = {
-          name: "options",
-          value: "boolean",
-        };
-
-        // email,sms,app ...
-        workflow.triggers[selectedTriggerIndex].parameters[2] = {
-          name: "type",
-          value: "subflow",
-        };
-
-        workflow.triggers[selectedTriggerIndex].parameters[3] = {
-          name: "email",
-          value: "test@test.com",
-        };
-        workflow.triggers[selectedTriggerIndex].parameters[4] = {
-          name: "sms",
-          value: "0000000",
-        };
-        workflow.triggers[selectedTriggerIndex].parameters[5] = {
-          name: "subflow",
-          value: "",
-        };
-
-        setWorkflow(workflow);
-      }
     }
   }
 
   const WebhookSidebar = !selectedTrigger || Object.getOwnPropertyNames(selectedTrigger)?.length === 0 || !workflow?.triggers || workflow?.triggers[selectedTriggerIndex] === undefined || selectedTrigger?.trigger_type !== "WEBHOOK" ? null :
-    <div style={appApiViewStyle}>
+    <div style={{...appApiViewStyle, overflow: 'hidden'}}>
       <h3 style={{ marginBottom: "5px" }}>
         {selectedTrigger.app_name}: {selectedTrigger.status}
       </h3>
@@ -15872,7 +16629,7 @@ const AngularWorkflow = (defaultprops) => {
         rel="noopener noreferrer"
         target="_blank"
         href="https://shuffler.io/docs/triggers#webhook"
-        style={{ textDecoration: "none", color: "#FF8544" }}
+        style={{ textDecoration: "none", color: theme.palette.linkColor }}
       >
         What are webhooks?
       </a>
@@ -15894,6 +16651,7 @@ const AngularWorkflow = (defaultprops) => {
         fullWidth
         color="primary"
         placeholder={selectedTrigger.label}
+        defaultValue={selectedTrigger?.label}
         onChange={selectedTriggerChange}
 		disabled={selectedTrigger?.parent_controlled === true && workflow?.parentorg_workflow?.length > 0}
       />
@@ -15907,7 +16665,7 @@ const AngularWorkflow = (defaultprops) => {
             ListboxProps={{
               style: {
                 backgroundColor: theme.palette.inputColor,
-                color: "white",
+                color: theme.palette.text.primary,
               },
             }}
             sx={{
@@ -16069,7 +16827,7 @@ const AngularWorkflow = (defaultprops) => {
             }}
             style={{
               backgroundColor: theme.palette.inputColor,
-              color: "white",
+              color: theme.palette.text.primary,
               height: 50,
             }}
           >
@@ -16081,7 +16839,7 @@ const AngularWorkflow = (defaultprops) => {
               return (
                 <MenuItem
                   key={data}
-                  style={{ backgroundColor: theme.palette.inputColor, color: "white" }}
+                  style={{ backgroundColor: theme.palette.inputColor, color: theme.palette.text.primary }}
                   value={data}
                 >
                   {data}
@@ -16141,7 +16899,7 @@ const AngularWorkflow = (defaultprops) => {
                   ].parameters[0].value.includes("127.0.0.1")) ? (
 
                 <span
-                  style={{ color: "white", marginBottom: 5, marginleft: 5 }}
+                  style={{ color: theme.palette.text.primary, marginBottom: 5, marginleft: 5 }}
                 >
                   PS: This does NOT work with localhost. Use your local IP
                   instead.
@@ -16256,13 +17014,15 @@ const AngularWorkflow = (defaultprops) => {
           <div>
             <TextField
               style={{
-                backgroundColor: theme.palette.inputColor,
-                borderRadius: theme.palette?.borderRadius,
+                backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                borderRadius: theme.palette?.textFieldStyle.borderRadius,
               }}
               id="webhook_uri_header"
               onClick={() => { }}
               InputProps={{
                 style: {
+                  backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                  color: theme.palette.textFieldStyle.color,
                 },
               }}
               fullWidth
@@ -16309,13 +17069,15 @@ const AngularWorkflow = (defaultprops) => {
           <div style={{ marginBottom: 20, }}>
             <TextField
               style={{
-                backgroundColor: theme.palette.inputColor,
-                borderRadius: theme.palette?.borderRadius,
+                backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                borderRadius: theme.palette?.textFieldStyle.borderRadius,
               }}
               id="webhook_uri_header"
               onClick={() => { }}
               InputProps={{
                 style: {
+                  backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                  color: theme.palette.textFieldStyle.color,
                 },
               }}
               fullWidth
@@ -16371,7 +17133,7 @@ const AngularWorkflow = (defaultprops) => {
                     value="await_response"
                   />
                 }
-                label={<div style={{ color: "white" }}>Wait For Response</div>}
+                label={<div style={{ color: theme.palette.text.primary }}>Wait For Response</div>}
               />
             </FormGroup>
             : null}
@@ -16632,7 +17394,7 @@ const AngularWorkflow = (defaultprops) => {
         rel="noopener noreferrer"
         target="_blank"
         href="https://shuffler.io/docs/triggers#user_input"
-        style={{ textDecoration: "none", color: "#FF8544" }}
+        style={{ textDecoration: "none", color: theme.palette.linkColor }}
       >
         What is the user input trigger?
       </a>
@@ -16648,16 +17410,19 @@ const AngularWorkflow = (defaultprops) => {
       <div>Name</div>
       <TextField
         style={{
-          backgroundColor: theme.palette.inputColor,
-          borderRadius: theme.palette?.borderRadius,
+          backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+          borderRadius: theme.palette?.textFieldStyle.borderRadius,
         }}
         InputProps={{
           style: {
+            backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+            color: theme.palette.textFieldStyle.color,
           },
         }}
         fullWidth
         color="primary"
         placeholder={selectedTrigger.label}
+        defaultValue={selectedTrigger?.label}
         onChange={selectedTriggerChange}
 		disabled={selectedTrigger?.parent_controlled === true && workflow?.parentorg_workflow?.length > 0}
       />
@@ -16671,7 +17436,7 @@ const AngularWorkflow = (defaultprops) => {
               }}
               InputProps={{
                 style: {
-                  color: "white",
+                  color: theme.palette.text.primary,
                   marginLeft: "5px",
                   maxWidth: "95%",
                   height: 50,
@@ -16687,41 +17452,394 @@ const AngularWorkflow = (defaultprops) => {
           </div>
 					*/}
       <div style={{ flex: "6", marginTop: 10, }}>
-        <div
-          style={{
-            marginTop: "20px",
-            marginBottom: "7px",
-            display: "flex",
-          }}
-        >
-          <div style={{ flex: "10" }}>
-            <b>Information</b>
-            <Typography variant="body2" color="textSecondary">
-              The information you want to show the user. Supports variables. Supports Markdown & HTML.
-            </Typography>
-          </div>
+      <div style={{ marginTop: "20px", marginBottom: "5px", display: "flex", width: "100%", flexDirection: "column" }}>
+        <div style={{ display: "flex", justifyContent: "space-between", alignItems: "center", width: "100%" }}>
+          <b>Information</b>
+          <Tooltip title="Expand editor window" placement="top">
+            <IconButton
+              onClick={(event) => {
+                event.preventDefault()
+                setCodeEditorModalOpen(true)
+                setActiveDialog("codeeditor")
+                var parsedvalue = workflow?.triggers[selectedTriggerIndex]?.parameters[0]?.value
+
+                navigate(`?trigger_id=${selectedTrigger.id}&trigger_field=${"alertinfo"}&trigger_name=${selectedTrigger.label}`)
+                setEditorData({
+                  "name": workflow.triggers[selectedTriggerIndex].parameters[0].name,
+                  "value": parsedvalue,
+                  "field_number": 0,
+                  "actionlist": triggerActionList,
+                  "field_id": "information_field",
+                })
+              }}
+            >
+              <OpenInFullIcon
+                style={{
+                  color: theme.palette.textColor,
+                  height: 20,
+                  width: 20
+                }}
+              />
+            </IconButton>
+          </Tooltip>
+        </div>
+        <Typography color="textSecondary" sx={{fontSize: "13px"}}>
+            The information you want to show the user. Supports variables. Supports Markdown & HTML.
+          </Typography>
         </div>
         <TextField
+          id="userinput_info_field"
           style={{
-            backgroundColor: theme.palette.inputColor,
-            borderRadius: theme.palette?.borderRadius,
+            backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+            borderRadius: theme.palette?.textFieldStyle.borderRadius,
           }}
           InputProps={{
             style: {
+              backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+              color: theme.palette.textFieldStyle.color,
             },
+            endAdornment: (
+              <InputAdornment position="end">
+                <Tooltip title="Autocomplete text" placement="top">
+                  <AddCircleOutlineIcon
+                    style={{ cursor: "pointer" }}
+                    onClick={(event) => {
+                      setMenuPosition({
+                        top: event.pageY + 10,
+                        left: event.pageX + 10,
+                      });
+                      //setShowDropdownNumber(3)
+                      setShowDropdown(true);
+                    }}
+                  />
+                </Tooltip>
+              </InputAdornment>
+            ),
           }}
           fullWidth
           rows="4"
           multiline
-          defaultValue={
-            workflow.triggers !== undefined && workflow.triggers !== null && workflow.triggers[selectedTriggerIndex].parameters !== undefined && workflow.triggers[selectedTriggerIndex].parameters.length > 0 && workflow.triggers[selectedTriggerIndex].parameters[0] !== undefined && workflow.triggers[selectedTriggerIndex].parameters[0].value !== undefined ? workflow.triggers[selectedTriggerIndex].parameters[0].value : ""
-          }
+          value={selectedTriggerValue || ""}
           color="primary"
           placeholder=""
+          onChange={(e) => {  
+            setLastSaved(false)
+            setSelectedTriggerValue(e.target.value)
+          }}
           onBlur={(e) => {
+            setLastSaved(false)
             setTriggerTextInformationWrapper(e.target.value);
           }}
         />
+        {!showDropdown ? null :
+          <Menu
+              anchorReference="anchorPosition"
+              anchorPosition={menuPosition}
+              onClose={() => {
+                handleMenuClose();
+              }}
+              open={!!menuPosition}
+              style={{
+                border: `2px solid #FF8544`,
+                color: theme.palette.text.primary,
+                marginTop: 2,
+              }}
+            >
+              {triggerActionList.map((innerdata) => {
+                const icon =
+                  innerdata.type === "action" ? (
+                    <AppsIcon style={{ marginRight: 10 }} />
+                  ) : innerdata.type === "workflow_variable" ||
+                    innerdata.type === "execution_variable" ? (
+                    <FavoriteBorderIcon style={{ marginRight: 10 }} />
+                  ) : innerdata.type === "Shuffle DB" ? 
+                  <StorageIcon style={{ marginRight: 10,  }} />
+                :
+                  <ScheduleIcon style={{ marginRight: 10 }} />
+
+                const handleExecArgumentHover = (inside) => {
+                  var exec_text_field = document.getElementById(
+                    "execution_argument_input_field"
+                  );
+                  if (exec_text_field !== null) {
+                    if (inside) {
+                      exec_text_field.style.border = "2px solid #FF8544";
+                    } else {
+                      exec_text_field.style.border = "";
+                    }
+                  }
+
+                  // Also doing arguments
+                  if (
+                    workflow.triggers !== undefined &&
+                    workflow.triggers !== null &&
+                    workflow.triggers.length > 0
+                  ) {
+                    for (let triggerkey in workflow.triggers) {
+                      const item = workflow.triggers[triggerkey];
+
+                      if (cy !== undefined && cy !== null) {
+                        var node = cy.getElementById(item.id);
+                        if (node.length > 0) {
+                          if (inside) {
+                            node.addClass("shuffle-hover-highlight");
+                          } else {
+                            node.removeClass("shuffle-hover-highlight");
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+
+                const handleActionHover = (inside, actionId) => {
+                  if (cy !== undefined && cy !== null) {
+                    var node = cy.getElementById(actionId);
+                    if (node.length > 0) {
+                      if (inside) {
+                        node.addClass("shuffle-hover-highlight");
+                      } else {
+                        node.removeClass("shuffle-hover-highlight");
+                      }
+                    }
+                  }
+                };
+
+                const handleMouseover = () => {
+                  if (innerdata.type === "Runtime Argument") {
+                    handleExecArgumentHover(true);
+                  } else if (innerdata.type === "action") {
+                    handleActionHover(true, innerdata.id);
+                  }
+                };
+
+                const handleMouseOut = () => {
+                  if (innerdata.type === "Runtime Argument") {
+                    handleExecArgumentHover(false);
+                  } else if (innerdata.type === "action") {
+                    handleActionHover(false, innerdata.id);
+                  }
+                };
+
+                var parsedPaths = [];
+
+                if (innerdata.type === "workflow_variable") {
+                  // Try to parse the value if it's a string that could be JSON
+                  if (typeof innerdata.value === "string") {
+                    try {
+                      const parsedValue = JSON.parse(innerdata.value)
+                      if (typeof parsedValue === "object") {
+                        parsedPaths = GetParsedPaths(parsedValue, "");
+                      }
+                    } catch (e) {
+                      // Not valid JSON, use the value directly
+                      parsedPaths = GetParsedPaths(innerdata.value, "");
+                    }
+                  } else if (typeof innerdata.value === "object") {
+                    parsedPaths = GetParsedPaths(innerdata.value, "");
+                  }
+                } else if (typeof innerdata.example === "object") {
+                  parsedPaths = GetParsedPaths(innerdata.example, "");
+                }
+
+                const coverColor = "#82ccc3"
+
+                return parsedPaths.length > 0 ? (
+                  <span>
+                    {/*
+                    <NestedMenuItem
+                      key={innerdata.name}
+                      label={
+                        <div style={{ display: "flex" }}>
+                          {icon} {innerdata.name}
+                        </div>
+                      }
+                      parentMenuOpen={!!menuPosition}
+                      style={{
+                        backgroundColor: theme.palette.inputColor,
+                        color: theme.palette.text.primary,
+                        minWidth: 250,
+                      }}
+                      onClick={() => {
+                        handleItemClick([innerdata]);
+                      }}
+                    >
+                      {parsedPaths.map((pathdata, index) => {
+                        // FIXME: Should be recursive in here
+                        const icon =
+                          pathdata.type === "value" ? (
+                            <VpnKeyIcon style={iconStyle} />
+                          ) : pathdata.type === "list" ? (
+                            <FormatListNumberedIcon style={iconStyle} />
+                          ) : (
+                            <ExpandMoreIcon style={iconStyle} />
+                          )
+      
+                        return (
+                          <MenuItem
+                            key={pathdata.name}
+                            style={{
+                              backgroundColor: theme.palette.inputColor,
+                              color: theme.palette.text.primary,
+                              minWidth: 250,
+                            }}
+                            value={pathdata}
+                            onMouseOver={() => { }}
+                            onClick={() => {
+                              handleItemClick([innerdata, pathdata]);
+                            }}
+                          >
+                            <Tooltip
+                              color="primary"
+                              title={`Ex. value: ${pathdata.value}`}
+                              placement="left"
+                            >
+                              <div style={{ display: "flex" }}>
+                                {icon} {pathdata.name}
+                              </div>
+                            </Tooltip>
+                          </MenuItem>
+                        );
+                      })}
+                    </NestedMenuItem>
+                    */}
+
+                    <NestedMenuItem
+                      key={innerdata.name}
+                      label={
+                        <div style={{ display: "flex", marginLeft: 0, }}>
+                          {icon} {innerdata.name}
+                        </div>
+                      }
+                      parentMenuOpen={!!menuPosition}
+                      style={{
+                        color: theme.palette.text.primary,
+                        minWidth: 250,
+                        maxWidth: 250,
+                        maxHeight: 50,
+                        overflow: "hidden",
+                      }}
+                      onClick={() => {
+                        console.log(innerdata.example)
+                        handleItemClick([innerdata]);
+                      }}
+                    >
+                      <Paper style={{ minHeight: 500, maxHeight: 500, minWidth: 275, maxWidth: 275, position: "fixed", top: menuPosition?.top - 200, left: menuPosition?.left - 455, padding: "10px 0px 10px 10px", overflow: "hidden", overflowY: "auto", border: "1px solid rgba(255,255,255,0.3)", }}>
+
+                        <MenuItem
+                          key={innerdata.name}
+                          style={{
+                            // backgroundColor: theme.palette.inputColor,
+                            marginLeft: 15,
+                            color: theme.palette.text.primary,
+                            minWidth: 250,
+                            maxWidth: 250,
+                            padding: 0,
+                            position: "relative",
+                          }}
+                          value={innerdata}
+                          onMouseOver={() => {
+                            //console.log("HOVER: ", pathdata);
+                          }}
+                          onClick={() => {
+                            handleItemClick([innerdata]);
+                          }}
+                        >
+                          <Typography variant="h6" style={{ paddingBottom: 5 }}>
+                            {innerdata.name}
+                          </Typography>
+                        </MenuItem>
+
+                        {parsedPaths.map((pathdata, index) => {
+                          // FIXME: Should be recursive in here
+                          //<VpnKeyIcon style={iconStyle} />
+                          const icon =
+                            pathdata.type === "value" ? (
+                              <span style={{ marginLeft: 9, }} />
+                            ) : pathdata.type === "list" ? (
+                              <FormatListNumberedIcon style={{ marginLeft: 9, marginRight: 10, }} />
+                            ) : (
+                              <CircleIcon style={{ marginLeft: 9, marginRight: 10, color: coverColor }} />
+                            );
+                          //<ExpandMoreIcon style={iconStyle} />
+
+                          const indentation_count = (pathdata.name.match(/\./g) || []).length + 1
+                          const baseIndent = <div style={{ marginLeft: 20, height: 30, width: 1, backgroundColor: coverColor, }} />
+                          //const boxPadding = pathdata.type === "object" ? "10px 0px 0px 0px" : 0
+                          const boxPadding = 0
+                          const namesplit = pathdata.name.split(".")
+                          const newname = namesplit[namesplit.length - 1]
+                          return (
+                            <MenuItem
+                              key={pathdata.name}
+                              style={{
+                                // backgroundColor: theme.palette.inputColor,
+                                color: theme.palette.text.primary,
+                                minWidth: 250,
+                                maxWidth: 250,
+                                padding: boxPadding,
+                              }}
+                              value={pathdata}
+                              onMouseOver={() => {
+                                //console.log("HOVER: ", pathdata);
+                              }}
+                              onClick={() => {
+                                handleItemClick([innerdata, pathdata]);
+                              }}
+                            >
+                              <Tooltip
+                                color="primary"
+                                title={`Ex. value: ${pathdata.value}`}
+                                placement="left"
+                              >
+                                <div style={{ display: "flex", height: 30, }}>
+                                  {Array(indentation_count).fill().map((subdata, subindex) => {
+                                    return (
+                                      baseIndent
+                                    )
+                                  })}
+                                  {icon} {newname}
+                                  {pathdata.type === "list" ? <SquareFootIcon style={{ marginleft: 10, }} onClick={(e) => {
+
+                                  }} /> : null}
+                                </div>
+                              </Tooltip>
+                            </MenuItem>
+                          );
+                        })}
+                      </Paper>
+                    </NestedMenuItem>
+                  </span>
+                ) : (
+                  <MenuItem
+                    key={innerdata.name}
+                    style={{
+                      // backgroundColor: theme.palette.inputColor,
+                      color: theme.palette.text.primary,
+                    }}
+                    value={innerdata}
+                    onMouseOver={() => handleMouseover()}
+                    onMouseOut={() => {
+                      handleMouseOut();
+                    }}
+                    onClick={() => {
+                      handleItemClick([innerdata]);
+                    }}
+                  >
+                    <Tooltip
+                      color="primary"
+                      title={`Value: ${innerdata.value}`}
+                      placement="left"
+                    >
+                      <div style={{ display: "flex" }}>
+                        {icon} {innerdata.name}
+                      </div>
+                    </Tooltip>
+                  </MenuItem>
+                );
+              })}
+          </Menu>
+        }
         <div
           style={{
             marginTop: "20px",
@@ -16751,7 +17869,7 @@ const AngularWorkflow = (defaultprops) => {
                 value="subflow"
               />
             }
-            label={<div style={{ color: "white" }}>Subflow</div>}
+            label={<div style={{ color: theme.palette.text.primary }}>Subflow</div>}
           />
           <FormControlLabel
             control={
@@ -16767,7 +17885,7 @@ const AngularWorkflow = (defaultprops) => {
                 value="email"
               />
             }
-            label={<div style={{ color: "white" }}>Email</div>}
+            label={<div style={{ color: theme.palette.text.primary }}>Email</div>}
           />
           <FormControlLabel
             control={
@@ -16782,7 +17900,7 @@ const AngularWorkflow = (defaultprops) => {
                 disabled={true}
               />
             }
-            label={<div style={{ color: "white" }}>SMS</div>}
+            label={<div style={{ color: theme.palette.text.primary }}>SMS</div>}
           />
         </FormGroup>
         {workflow?.triggers &&
@@ -16804,7 +17922,7 @@ const AngularWorkflow = (defaultprops) => {
                   ListboxProps={{
                     style: {
                       backgroundColor: theme.palette.inputColor,
-                      color: "white",
+                      color: theme.palette.text.primary,
                     },
                   }}
 				  sx={{
@@ -16860,7 +17978,7 @@ const AngularWorkflow = (defaultprops) => {
                       }>
                         <MenuItem
                           style={{
-                            color: data.id === workflow.id ? "red" : "white",
+                            color: data.id === workflow.id ? "red" : theme.palette.text.primary,
                           }}
                           value={data}
                           onClick={() => {
@@ -16881,12 +17999,32 @@ const AngularWorkflow = (defaultprops) => {
                   }}
                   renderInput={(params) => {
                     return (
-                      <TextField
-                    	style={theme.palette.textFieldStyle}
-                        {...params}
-                        label="Find the workflow you want to trigger"
-                        variant="outlined"
-                      />
+					  <div style={{display: "flex", }}>
+						  <TextField
+							style={theme.palette.textFieldStyle}
+							{...params}
+							label="Find the workflow you want to trigger"
+							variant="outlined"
+                      	  />
+
+							{subworkflow === null || subworkflow === undefined || subworkflow?.id === undefined || subworkflow?.id === null || subworkflow?.id.length === 0 ? null :
+								<Tooltip title="Show subflow in new window" placement="top">
+									<a
+									  rel="noopener noreferrer"
+									  href={`/workflows/${subworkflow.id}`}
+									  target="_blank"
+									  style={{
+										textDecoration: "none",
+										color: "#FF8544",
+										marginLeft: 5,
+										marginTop: 10,
+									  }}
+									>
+									  <OpenInNewIcon />
+									</a>
+								</Tooltip>
+							}
+						</div>
                     );
                   }}
                 />
@@ -16925,13 +18063,14 @@ const AngularWorkflow = (defaultprops) => {
           ? (
             <TextField
               style={{
-                backgroundColor: theme.palette.inputColor,
-                borderRadius: theme.palette?.borderRadius,
+                backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                borderRadius: theme.palette?.textFieldStyle.borderRadius,
                 marginTop: 10,
               }}
               InputProps={{
                 style: {
-                  color: "white",
+                  color: theme.palette.textFieldStyle.color,
+                  backgroundColor: theme.palette.textFieldStyle.backgroundColor,
                   fontSize: "1em",
                 },
               }}
@@ -16958,7 +18097,6 @@ const AngularWorkflow = (defaultprops) => {
           workflow?.triggers[selectedTriggerIndex].parameters[2] &&
           workflow?.triggers[selectedTriggerIndex].parameters[2].value &&
           (
-            workflow?.triggers[selectedTriggerIndex].parameters[2].value.includes("email") ||
             workflow?.triggers[selectedTriggerIndex].parameters[2].value.includes("sms")
           ) ? (
           <TextField
@@ -17049,8 +18187,8 @@ const AngularWorkflow = (defaultprops) => {
       </div>
 
     </div>
-  const defaultEnvironment = environments.find(
-    (env) => env.default && env.Name.toLowerCase() !== "cloud"
+  const defaultEnvironment = environments && environments?.find(
+    (env) => env?.default && env?.Name?.toLowerCase() !== "cloud"
   );
 
   if (selectedTrigger.trigger_type === "PIPELINE" && selectedTrigger.environment === "onprem" && defaultEnvironment !== undefined) {
@@ -17067,7 +18205,7 @@ const AngularWorkflow = (defaultprops) => {
         rel="noopener noreferrer"
         target="_blank"
         href="https://shuffler.io/docs/triggers#pipelines"
-        style={{ textDecoration: "none", color: "#FF8544" }}
+        style={{ textDecoration: "none", color: theme.palette.linkColor}}
       >
         What are pipelines?
       </a>
@@ -17114,7 +18252,7 @@ const AngularWorkflow = (defaultprops) => {
           }}
           style={{
             backgroundColor: theme.palette.inputColor,
-            color: "white",
+            color: theme.palette.text.primary,
             height: 50,
           }}
         >
@@ -17132,7 +18270,7 @@ const AngularWorkflow = (defaultprops) => {
                 key={data.id}
                 style={{
                   backgroundColor: theme.palette.inputColor,
-                  color: "white",
+                  color: theme.palette.text.primary,
                 }}
                 value={data.Name}
               >
@@ -17329,7 +18467,7 @@ const AngularWorkflow = (defaultprops) => {
         rel="noopener noreferrer"
         target="_blank"
         href="https://shuffler.io/docs/triggers#schedule"
-        style={{ textDecoration: "none", color: "#FF8544" }}
+        style={{ textDecoration: "none", color: theme.palette.linkColor }}
       >
         What are schedules?
       </a>
@@ -17345,16 +18483,19 @@ const AngularWorkflow = (defaultprops) => {
       <div>Name</div>
       <TextField
         style={{
-          backgroundColor: theme.palette.inputColor,
-          borderRadius: theme.palette?.borderRadius,
+          backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+          borderRadius: theme.palette?.textFieldStyle.borderRadius,
         }}
         InputProps={{
           style: {
+            backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+            color: theme.palette.textFieldStyle.color,
           },
         }}
         fullWidth
         color="primary"
         placeholder={selectedTrigger.label}
+        defaultValue={selectedTrigger?.label}
         onChange={selectedTriggerChange}
 		disabled={selectedTrigger?.parent_controlled === true && workflow?.parentorg_workflow?.length > 0}
       />
@@ -17373,9 +18514,9 @@ const AngularWorkflow = (defaultprops) => {
           fullWidth
           onChange={(e) => {
             selectedTrigger.environment = e.target.value;
-            setSelectedTrigger(selectedTrigger);
             if (e.target.value === "cloud") {
               console.log("Set cloud config");
+              selectedTrigger.parameters[0].value = "*/25 * * * *";
               workflow.triggers[selectedTriggerIndex].parameters[0].value =
                 "*/25 * * * *";
             } else {
@@ -17384,13 +18525,13 @@ const AngularWorkflow = (defaultprops) => {
               workflow.triggers[selectedTriggerIndex].parameters[0].value =
                 "60";
             }
-
+            setSelectedTrigger(selectedTrigger);
             setWorkflow(workflow);
             setUpdate(Math.random());
           }}
           style={{
-            backgroundColor: theme.palette.inputColor,
-            color: "white",
+            backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+            color: theme.palette.textFieldStyle.color,
             height: 50,
           }}
         >
@@ -17402,7 +18543,7 @@ const AngularWorkflow = (defaultprops) => {
             return (
               <MenuItem
                 key={data}
-                style={{ backgroundColor: theme.palette.inputColor, color: "white" }}
+                style={{ backgroundColor: theme.palette.textFieldStyle.backgroundColor, color: theme.palette.textFieldStyle.color}}
                 value={data}
               >
                 {data}
@@ -17439,16 +18580,18 @@ const AngularWorkflow = (defaultprops) => {
               }}
             />
             <div style={{ flex: "10" }}>
-              <b>When to start: {isCloud || selectedTrigger?.environment === "cloud" ? <a href="https://crontab.guru" target="_blank" style={{ color: "#FF8544", }}>Cron formatting</a> : "every X second"}</b>
+              <b>When to start: {isCloud || selectedTrigger?.environment === "cloud" ? <a href="https://crontab.guru" target="_blank" style={{ color: theme.palette.linkColor, }}>Cron formatting</a> : "every X second"}</b>
             </div>
           </div>
           <TextField
             style={{
-              backgroundColor: theme.palette.inputColor,
-              borderRadius: theme.palette?.borderRadius,
+              backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+              borderRadius: theme.palette?.textFieldStyle.borderRadius,
             }}
             InputProps={{
               style: {
+                backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                color: theme.palette.textFieldStyle.color,
               },
             }}
             fullWidth
@@ -17496,11 +18639,13 @@ const AngularWorkflow = (defaultprops) => {
           </div>
           <TextField
             style={{
-              backgroundColor: theme.palette.inputColor,
-              borderRadius: theme.palette?.borderRadius,
+              backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+              borderRadius: theme.palette?.textFieldStyle.borderRadius,
             }}
             InputProps={{
               style: {
+                backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                color: theme.palette.textFieldStyle.color,
               },
             }}
             disabled={
@@ -17579,12 +18724,74 @@ const AngularWorkflow = (defaultprops) => {
   const topBarStyle = {
     position: "absolute",
 
-    top: isMobile ? 30 : 25,
+    top: isMobile ? 30 : isSafari ? 15 : 25,
     transform: isMobile ? "translateX(20px)" : `translateX(${leftBarSize}px)`,
     transition: "all 0.3s ease",
-    zoom: 0.9,
+    zoom: isSafari ? undefined : 0.9,
   }
 
+
+	const changeOrg = () => {
+		localStorage.setItem("globalUrl", "");
+		localStorage.setItem("getting_started_sidebar", "open");
+		fetch(`${globalUrl}/api/v1/orgs/${workflow.org_id}/change`, {
+		  mode: "cors",
+		  credentials: "include",
+		  crossDomain: true,
+		  method: "POST",
+		  body: JSON.stringify({ "org_id": workflow.org_id }),
+		  withCredentials: true,
+		  headers: {
+			"Content-Type": "application/json; charset=utf-8",
+		  },
+		})
+		  .then(function (response) {
+			if (response.status !== 200) {
+			  console.log("Error in response");
+			} else {
+			  localStorage.removeItem("apps")
+			  localStorage.removeItem("workflows")
+			  localStorage.removeItem("userinfo")
+			}
+
+			return response.json();
+		  })
+		  .then(function (responseJson) {
+			console.log("In here?")
+			if (responseJson.success === true) {
+			  if (responseJson.region_url !== undefined && responseJson.region_url !== null && responseJson.region_url.length > 0) {
+				console.log("Region Change: ", responseJson.region_url);
+				localStorage.setItem("globalUrl", responseJson.region_url);
+				//globalUrl = responseJson.region_url
+			  }
+
+			  if (responseJson["reason"] === "SSO_REDIRECT") {
+				setTimeout(() => {
+				  toast.info("Redirecting to SSO login page as SSO is required for this organization.")
+				  window.location.href = responseJson["url"]
+				  return
+				}, 2000)
+			  } else {
+				setTimeout(() => {
+				  window.location.reload();
+				}, 2000);
+			  }
+
+			  toast.info("Successfully changed active organisation - refreshing!");
+			} else {
+			  if (responseJson.reason !== undefined && responseJson.reason !== null && responseJson.reason.length > 0) {
+				toast(responseJson.reason);
+			  } else {
+				toast(`Failed changing org. Try again or contact ${supportEmail} if this persists.`);
+			  }
+			}
+		  })
+		  .catch((error) => {
+			console.log("error changing: ", error);
+			//removeCookie("session_token", {path: "/"})
+		  })
+		}
+
   const TopCytoscapeBar = (props) => {
     const [hovered, setHovered] = useState(false)
 
@@ -17652,72 +18859,15 @@ const AngularWorkflow = (defaultprops) => {
             </Tooltip>
           )}
 
-          {!distributedFromParent ?
-            isCorrectOrg ? null :
+          {!distributedFromParent || userdata?.support === true ?
+            isCorrectOrg ? null : 
               <Typography variant="body2" style={{ marginLeft: 10, }}>
                 <b>Warning</b>: <span
                   style={{ color: "#FF8544", cursor: "pointer", pointerEvents: "auto", }}
                   onClick={() => {
                     toast("Changing to correct organisation. Please wait a few seconds.")
 
-                    localStorage.setItem("globalUrl", "");
-                    localStorage.setItem("getting_started_sidebar", "open");
-                    fetch(`${globalUrl}/api/v1/orgs/${workflow.org_id}/change`, {
-                      mode: "cors",
-                      credentials: "include",
-                      crossDomain: true,
-                      method: "POST",
-                      body: JSON.stringify({ "org_id": workflow.org_id }),
-                      withCredentials: true,
-                      headers: {
-                        "Content-Type": "application/json; charset=utf-8",
-                      },
-                    })
-                      .then(function (response) {
-                        if (response.status !== 200) {
-                          console.log("Error in response");
-                        } else {
-                          localStorage.removeItem("apps")
-                          localStorage.removeItem("workflows")
-                          localStorage.removeItem("userinfo")
-                        }
-
-                        return response.json();
-                      })
-                      .then(function (responseJson) {
-                        console.log("In here?")
-                        if (responseJson.success === true) {
-                          if (responseJson.region_url !== undefined && responseJson.region_url !== null && responseJson.region_url.length > 0) {
-                            console.log("Region Change: ", responseJson.region_url);
-                            localStorage.setItem("globalUrl", responseJson.region_url);
-                            //globalUrl = responseJson.region_url
-                          }
-
-                          if (responseJson["reason"] === "SSO_REDIRECT") {
-                            setTimeout(() => {
-                              toast.info("Redirecting to SSO login page as SSO is required for this organization.")
-                              window.location.href = responseJson["url"]
-                              return
-                            }, 2000)
-                          } else {
-                            setTimeout(() => {
-                              window.location.reload();
-                            }, 2000);
-                          }
-
-                          toast("Successfully changed active organisation - refreshing!");
-                        } else {
-                          if (responseJson.reason !== undefined && responseJson.reason !== null && responseJson.reason.length > 0) {
-                            toast(responseJson.reason);
-                          } else {
-                            toast("Failed changing org. Try again or contact support@shuffler.io if this persists.");
-                          }
-                        }
-                      })
-                      .catch((error) => {
-                        console.log("error changing: ", error);
-                        //removeCookie("session_token", {path: "/"})
-                      })
+					changeOrg()
 
 
 
@@ -17736,7 +18886,14 @@ const AngularWorkflow = (defaultprops) => {
 
           {originalWorkflow?.suborg_distribution === undefined || originalWorkflow?.suborg_distribution === null || originalWorkflow?.suborg_distribution?.length === 0 || originalWorkflow?.suborg_distribution.includes("none") ? 
 
-			originalWorkflow?.parentorg_workflow !== undefined && originalWorkflow?.parentorg_workflow !== null && originalWorkflow?.parentorg_workflow.length > 0 || workflow?.parentorg_workflow !== undefined && workflow?.parentorg_workflow !== null && workflow?.parentorg_workflow.length > 0 ?
+			<div>
+			  {originalWorkflow?.parentorg_workflow !== undefined && originalWorkflow?.parentorg_workflow !== null && originalWorkflow?.parentorg_workflow.length > 0 || workflow?.parentorg_workflow !== undefined && workflow?.parentorg_workflow !== null && workflow?.parentorg_workflow.length > 0 ?
+
+				null
+
+				  /*
+				   * Disabled because redirects occurred anyway
+
 				<Button
 				  color="secondary"
 				  variant="outlined"
@@ -17746,15 +18903,21 @@ const AngularWorkflow = (defaultprops) => {
 					  textTransform: "none",
 					  marginLeft: 10, 
 				  }}
-			  	  onClick={() => {
-					navigate(`/workflows/${workflow.parentorg_workflow}`)
+				  onClick={() => {
+					//changeOrg() 
+
 					// Reload the page
+					navigate(`/workflows/${workflow.parentorg_workflow}`)
 					window.location.reload()
 				  }}
 				>
 				  Go to parent org workflow
 				</Button>
-				: userdata !== undefined && userdata !== null && userdata.orgs !== undefined && userdata.orgs !== null && userdata.orgs.length > 1 && workflow?.id !== undefined && workflow?.id && workflow?.id?.length > 0 ?
+				*/
+
+				: null}
+
+			  {userdata !== undefined && userdata !== null && userdata.orgs !== undefined && userdata.orgs !== null && userdata.orgs.length > 1 && workflow?.id !== undefined && workflow?.id && workflow?.id?.length > 0 && userdata?.active_org?.creator_org?.length === 0 && userdata?.active_org?.id == workflow?.org_id ?
 					<Button
 					  color="secondary"
 					  variant="outlined"
@@ -17770,12 +18933,12 @@ const AngularWorkflow = (defaultprops) => {
 					>
 						Enable Suborg Distribution
 					</Button>
-			    : null
-
+				: null}
+			</div>
 			:
 
 			<Tooltip title={lastSaved === false && originalWorkflow.id === workflow.id ? 
-				<Typography variant="body1" style={{margin: 10, color: "white", }}>
+				<Typography variant="body1" style={{margin: 10, color: theme.palette.text.primary, }}>
 					Save the workflow first 
 				</Typography>
 				: null} arrow placement="right">
@@ -17784,7 +18947,7 @@ const AngularWorkflow = (defaultprops) => {
 
             	  <InputLabel
             	    id="suborg-changer"
-            	    style={{ color: "rgba(255,255,255,0.7)", }}
+            	    style={{ color: theme.palette.textColor, }}
             	  >
             	    Select an Org ({originalWorkflow?.suborg_distribution?.length})
             	  </InputLabel>
@@ -17792,7 +18955,7 @@ const AngularWorkflow = (defaultprops) => {
             	    style={{
             	      pointerEvents: "auto",
             	      backgroundColor: theme.palette.inputColor,
-            	      color: "white",
+            	      color: theme.palette.text.primary,
             	      maxWidth: 300,
             	      minWidth: 300,
             	      borderRadius: theme.palette?.borderRadius,
@@ -17807,6 +18970,10 @@ const AngularWorkflow = (defaultprops) => {
             	    value={workflow.org_id}
             	    disabled={savingState !== 0 || suborgWorkflows?.length === 0 || allTriggers === undefined}
             	    onChange={(e) => {
+					  if (cy !== undefined && cy !== null) {
+						  cy.nodes().unselect()
+					  }
+
 					  if (lastSaved === false && originalWorkflow.id === workflow.id) {
   					  	  setSuborgWorkflows([])
 
@@ -18145,7 +19312,7 @@ const AngularWorkflow = (defaultprops) => {
 
           	  <InputLabel
           	    id="execution_location"
-          	    style={{ color: "rgba(255,255,255,0.7)", marginLeft: 40, }}
+          	    style={{ color: theme.palette.text.primary, marginLeft: 40, }}
           	  >
           	    Runtime Location
           	  </InputLabel>
@@ -18153,6 +19320,12 @@ const AngularWorkflow = (defaultprops) => {
           	    labelId="execution_location"
 				disabled={savingState !== 0}
           	    MenuProps={{
+                PaperProps: {
+                  sx: {
+                    '& .MuiList-root': {
+                      backgroundColor: "transparent",
+                    },
+                  }}
           	    }}
           	    value={
           	      selectedActionEnvironment === undefined || selectedActionEnvironment === null || selectedActionEnvironment.Name === undefined || selectedActionEnvironment.Name === null ? isCloud ? "Cloud" : "Shuffle" : selectedActionEnvironment.Name
@@ -18185,13 +19358,13 @@ const AngularWorkflow = (defaultprops) => {
           	    }}
           	    style={{
           	      pointerEvents: "auto",
-          	      color: "white",
+          	      color: theme.palette.text.primary,
           	      maxWidth: 250,
           	      minWidth: 250,
           	      borderRadius: theme.palette?.borderRadius,
           	      marginLeft: 35,
 
-          	      backgroundColor: theme.palette.inputColor,
+          	      backgroundColor: "transparent",
           	      height: 40,
           	    }}
           	  >
@@ -18205,9 +19378,9 @@ const AngularWorkflow = (defaultprops) => {
           	      return (
           	        <MenuItem
           	          key={data.Name}
-          	          style={{
-          	            backgroundColor: theme.palette.inputColor,
-          	            color: "white",
+          	          sx={{
+          	            backgroundColor:"transparent",
+          	            color: theme.palette.text.primary,
           	          }}
           	          value={data.Name}
           	        >
@@ -18252,7 +19425,7 @@ const AngularWorkflow = (defaultprops) => {
 
           	          {data.default === true ?
           	            <Chip
-          	              style={{ marginLeft: 0, padding: 0, marginRight: 10, cursor: "pointer", }}
+          	              style={{ marginLeft: 0, padding: 0, marginRight: 10, cursor: "pointer", color: theme.palette.text.primary, border: theme.palette.textFieldStyle.border}}
           	              label={"Default"}
           	              variant="outlined"
           	              color="secondary"
@@ -18324,20 +19497,20 @@ const AngularWorkflow = (defaultprops) => {
           }}
         >
           <div
-            style={{ margin: 15, color: "white", maxWidth: 250, minWidth: 250 }}
+            style={{ margin: 15, color: theme.palette.text.primary, maxWidth: 250, minWidth: 250 }}
           >
             <h4>This menu is used to control the workflow itself.</h4>
             <Divider
               style={{
-                backgroundColor: "white",
+                backgroundColor: theme.palette.text.primary,
                 marginTop: 10,
                 marginBottom: 10,
               }}
             />
 
             <FormControlLabel
-              style={{ marginBottom: 15, color: "white" }}
-              label={<div style={{ color: "white" }}>Skip Notifications</div>}
+              style={{ marginBottom: 15, color: theme.palette.text.primary }}
+              label={<div style={{ color: theme.palette.text.primary }}>Skip Notifications</div>}
               control={
                 <Switch
                   checked={workflow.configuration.skip_notifications}
@@ -18356,8 +19529,8 @@ const AngularWorkflow = (defaultprops) => {
               }
             />
             <FormControlLabel
-              style={{ marginBottom: 15, color: "white" }}
-              label={<div style={{ color: "white" }}>Exit on Error</div>}
+              style={{ marginBottom: 15, color: theme.palette.text.primary }}
+              label={<div style={{ color: theme.palette.text.primary }}>Exit on Error</div>}
               control={
                 <Switch
                   checked={workflow.configuration.exit_on_error}
@@ -18375,8 +19548,8 @@ const AngularWorkflow = (defaultprops) => {
               }
             />
             <FormControlLabel
-              style={{ marginBottom: 15, color: "white" }}
-              label={<div style={{ color: "white" }}>Start from top</div>}
+              style={{ marginBottom: 15, color: theme.palette.text.primary }}
+              label={<div style={{ color: theme.palette.text.primary }}>Start from top</div>}
               control={
                 <Switch
                   checked={workflow.configuration.start_from_top}
@@ -18579,12 +19752,12 @@ const AngularWorkflow = (defaultprops) => {
   const shownErrors = !isMobile && workflow.errors !== undefined && workflow.errors !== null && workflow.errors.length > 0 && showErrors && (!workflow.public || userdata.support === true) ?
     <div
       style={{
-        border: "1px solid rgba(255,255,255,0.1)",
+        border: theme.palette.DialogStyle.border,
         position: "absolute",
         bottom: 100,
         left: leftSideBarOpenByClick ? leftBarSize + 270 : leftBarSize + 115,
 
-        color: "white",
+        color: theme.palette.DialogStyle.color,
         padding: 10,
         borderRadius: theme.palette?.borderRadius,
         transition: "left 0.3s ease, top 0.3s ease",
@@ -18592,11 +19765,16 @@ const AngularWorkflow = (defaultprops) => {
     >
 
       <Tooltip
-        title="Hide error messages. They will show up the next refresh."
+        title="Hides error messages this session."
         placement="top"
       >
         <IconButton
           style={{ position: "absolute", top: 0, right: 0 }}
+          sx={{
+            "&:hover": {
+              backgroundColor: theme.palette.hoverColor,
+            },
+          }}
           onClick={(e) => {
             e.preventDefault();
 
@@ -18604,17 +19782,17 @@ const AngularWorkflow = (defaultprops) => {
             setShowErrors(false)
           }}
         >
-          <CloseIcon style={{ color: "white" }} />
+          <CloseIcon style={{ color: theme.palette.text.primary }} />
         </IconButton>
       </Tooltip>
 
-      <Typography variant="body2" color="textSecondary">
+      <Typography variant="body2" color={theme.palette.textColor}>
         {/*<WarningIcon style={{marginRight: 5, height: 15, width: 15, }} />*/}
         <b>{workflow.errors.length} Workflow Issue{workflow.errors.length > 1 ? "s" : ""}</b>
       </Typography>
       <Typography
         variant="body2"
-        color="textSecondary"
+        color={theme.palette.textColor}
       >
         {workflow.errors.slice(0, 3).map((error, index) => {
           // Loop through each word, and if it matches "Action <name> " then replace it with a link to the action
@@ -18718,7 +19896,6 @@ const AngularWorkflow = (defaultprops) => {
               if (!workflow.public && executionModalOpen) {
                 setExecutionRunning(false);
                 stop()
-                const cursearch = typeof window === "undefined" || window.location === undefined ? "" : window.location.search;
                 const newitem = removeParam("execution_id", cursearch);
                 navigate(curpath + newitem)
                 setExecutionModalView(0);
@@ -18771,7 +19948,6 @@ const AngularWorkflow = (defaultprops) => {
               if (!workflow.public && executionModalOpen) {
                 setExecutionRunning(false);
                 stop()
-                const cursearch = typeof window === "undefined" || window.location === undefined ? "" : window.location.search;
                 const newitem = removeParam("execution_id", cursearch);
                 navigate(curpath + newitem)
                 setExecutionModalView(0);
@@ -18938,7 +20114,7 @@ const AngularWorkflow = (defaultprops) => {
       .catch((error) => {
         console.log("Dupe workflow for suborg error: ", error.toString())
       })
-  }
+  } 
 
   const BottomCytoscapeBar = () => {
     if (workflow.id === undefined || workflow.id === null || (!workflow.public && apps.length === 0)) {
@@ -18969,7 +20145,12 @@ const AngularWorkflow = (defaultprops) => {
             workflow.public
             || executionRequestStarted
           }
-          style={{ height: boxSize, width: boxSize + 5, backgroundColor: green, }}
+          style={{ 
+			  height: boxSize, 
+			  width: boxSize + 5, 
+			  backgroundColor: green, 
+        color: theme.palette.text.primary,
+		  }}
           color="primary"
           variant="contained"
           onClick={() => {
@@ -19000,7 +20181,7 @@ const AngularWorkflow = (defaultprops) => {
             style={{
               borderTop: "1px solid rgba(74, 74, 74, 1)",
               borderBottom: "1px solid rgba(74, 74, 74, 1)",
-              height: buttonHeights,
+              height: buttonHeights+2,
             }}
           >
             {executionButton}
@@ -19039,6 +20220,10 @@ const AngularWorkflow = (defaultprops) => {
                     height: buttonHeights + 2,
                     marginTop: -1,
                     border: "none",
+
+					// Remove left side borderRadius
+					borderTopLeftRadius: 0,
+					borderBottomLeftRadius: 0,
                   }
                 }}
                 disabled={workflow.public}
@@ -19060,7 +20245,7 @@ const AngularWorkflow = (defaultprops) => {
             style={{
               marginLeft: 25,
               marginTop: 2,
-              border: "1px solid rgba(255,255,255,0.3)",
+              border: theme.palette.DialogStyle.border,
               borderRadius: theme.palette?.borderRadius / 2,
 
               maxHeight: buttonHeights,
@@ -19075,6 +20260,10 @@ const AngularWorkflow = (defaultprops) => {
                   style={{
                     height: buttonHeights,
                     width: 64,
+                    display: "flex",
+                    alignItems: "center",
+                    justifyContent: "center",
+                    padding: 0, 
                   }}
                   variant={
                     lastSaved && !workflow.public ? "text" : "contained"
@@ -19092,7 +20281,7 @@ const AngularWorkflow = (defaultprops) => {
                       if (queryID !== undefined && queryID !== null) {
                         aa('init', {
                           appId: "JNSS5CFDZZ",
-                          apiKey: "db08e40265e2941b9a7d8f644b6e5240",
+                          apiKey: "c8f882473ff42d41158430be09ec2b4e",
                         })
 
                         const timestamp = new Date().getTime()
@@ -19114,7 +20303,7 @@ const AngularWorkflow = (defaultprops) => {
                   }}
                 >
                   {savingState === 2 ? (
-                    <CircularProgress style={{ height: 35, width: 35 }} />
+                    <CircularProgress size={24} thickness={4} variant="indeterminate" />
                   ) : savingState === 1 ? (
                     <DoneIcon style={{ color: green }} />
                   ) : (
@@ -19278,6 +20467,29 @@ const AngularWorkflow = (defaultprops) => {
                 </Button>
               </span>
             </Tooltip>
+
+			
+			{userdata?.support === true ? 
+				<Tooltip
+				  color="secondary"
+				  title="Show simplified YAML (support only)"
+				  placement="top"
+				>
+				  <span>
+					<Button
+					  disabled={workflow.public}
+					  color="secondary"
+					  variant="text"
+					  style={{ width: 65, height: buttonHeights, }}
+					  onClick={() => {
+						setupWorkflowYaml(workflow)
+					  }}
+					>
+					  <DataObjectIcon />
+					</Button>
+				  </span>
+				</Tooltip>
+			: null}
           </ButtonGroup>
 
 
@@ -19286,12 +20498,115 @@ const AngularWorkflow = (defaultprops) => {
     );
   };
 
+  const setupResizeHandlers = (cy, nodeId) => {
+    let height;
+    let width;
+    let resizeTimeout;
+
+    cy.on("drag", ".resize-handle", (event) => {
+      if (resizeTimeout) return;
+
+      resizeTimeout = setTimeout(() => {
+        resizeTimeout = null;
+        const handle = event.target;
+        const parent = cy.$(`#${nodeId}`); // Fetch the main node directly
+
+        // Check if the parent node exists
+        if (!parent || parent.empty()) {
+          console.warn(`Parent node (${nodeId}) not found.`);
+          return;
+        }
+
+        if (!handle?.position()) {
+          console.warn(`Handle position is undefined for ${handle.id()}`);
+          return;
+        }
+
+        const handlePos = handle.position();
+        const parentPos = parent.position();
+
+        if (!parentPos) {
+          console.warn(`Parent position is undefined for ${nodeId}`);
+          return;
+        }
+
+        // Calculate new width & height based on handle movement
+        const newWidth = Math.abs(handlePos.x - parentPos.x) * 2;
+        const newHeight = Math.abs(handlePos.y - parentPos.y) * 2;
+
+        // Apply min/max constraints
+        const constrainedWidth = Math.max(100, Math.min(newWidth, 500));
+        const constrainedHeight = Math.max(50, Math.min(newHeight, 300));
+
+        // Update node size
+        parent.style({
+          width: constrainedWidth,
+          height: constrainedHeight,
+        });
+
+        // Store dimensions for state update on drag end
+        height = Math.floor(constrainedHeight);
+        width = Math.floor(constrainedWidth);
+
+        // Update handle positions
+        cy.$(".resize-handle").forEach((corner) => {
+          if (!corner?.id() || !corner.position()) return;
+
+          const { x, y } = parent.position();
+          const offsetX = corner.id().includes("left") ? -constrainedWidth / 2 : constrainedWidth / 2;
+          const offsetY = corner.id().includes("top") ? -constrainedHeight / 2 : constrainedHeight / 2;
+
+          corner.position({ x: x + offsetX, y: y + offsetY });
+        });
+      }, 16); // Throttle to ~60 FPS
+    });
+
+    // Update state when resizing ends
+    cy.on("free", ".resize-handle", (event) => {
+      const data = event.target.data();
+      const parentNode = cy.getElementById(data.attachedTo);
+
+      if (parentNode) {
+
+        parentNode.data({
+          ...parentNode.data(),
+          width: Math.floor(width),
+          height: Math.floor(height),
+        });
+        setSelectedComment((prev) => ({
+          ...prev,
+          width: Math.floor(width),
+          height: Math.floor(height),
+        }));
+      }
+    });
+
+  };
+
+
+  const setupNodeDragHandler = (cy, nodeId) => {
+    cy.on("drag", `#${nodeId}`, (event) => {
+      const node = event.target;
+      const { x, y } = node.position();
+      const width = parseFloat(node.style("width"));
+      const height = parseFloat(node.style("height"));
+
+      // Move resize handles with the node
+      cy.$(".resize-handle").forEach((corner) => {
+        const offsetX = corner.id().includes("left") ? -width / 2 : width / 2;
+        const offsetY = corner.id().includes("top") ? -height / 2 : height / 2;
+
+        corner.position({ x: x + offsetX, y: y + offsetY });
+      });
+    });
+  };
+
   const addCommentNode = () => {
     const newId = uuidv4();
-    const position = {
-      x: 300,
-      y: 300,
-    };
+    const position = { x: 300, y: 300 };
+    const width = 250;
+    const height = 150;
+    const handleOffset = 10; // Move handles outside the node
 
     cy.add({
       group: "nodes",
@@ -19301,20 +20616,52 @@ const AngularWorkflow = (defaultprops) => {
         type: "COMMENT",
         is_valid: true,
         decorator: true,
-        width: 250,
-        height: 150,
-        position: position,
+        width,
+        height,
+        position,
         backgroundcolor: "#1f2023",
         color: "#ffffff",
+
+        textHalign: "right",
+        textValign: "bottom",
+        textMarginX: "-250px",
+        textMarginY: "-150px",
       },
-      position: position,
+      position,
     });
+
+    // Define corner positions relative to the main node
+    const corners = [
+      { id: `${newId}-top-left`, dx: -width / 2 - handleOffset, dy: -height / 2 - handleOffset },
+      { id: `${newId}-top-right`, dx: width / 2 + handleOffset, dy: -height / 2 - handleOffset },
+      { id: `${newId}-bottom-left`, dx: -width / 2 - handleOffset, dy: height / 2 + handleOffset },
+      { id: `${newId}-bottom-right`, dx: width / 2 + handleOffset, dy: height / 2 + handleOffset },
+    ];
+
+    // Add resize handles **without** the parent property
+    corners.forEach((corner) => {
+      cy.add({
+        group: "nodes",
+        data: {
+          id: corner.id,
+          type: "RESIZE-HANDLE",
+          is_valid: true,
+          attachedTo: newId,
+          decorator: true,
+        }, // No parent to avoid edges
+        position: { x: position.x + corner.dx, y: position.y + corner.dy },
+        classes: "resize-handle",
+      });
+    });
+
+    setupResizeHandlers(cy, newId);
+    setupNodeDragHandler(cy, newId);
   };
 
   const RightSideBar = (props) => {
 
     var defaultReturn = null
-    if (Object.getOwnPropertyNames(selectedComment).length > 0) {
+    if (Object.getOwnPropertyNames(selectedComment).length > 0 && selectedComment.hasOwnProperty('id')) {
       defaultReturn = <CommentSidebar />
     } else if (Object.getOwnPropertyNames(selectedTrigger).length > 0) {
       if (selectedTrigger.trigger_type === undefined) {
@@ -19484,7 +20831,7 @@ const AngularWorkflow = (defaultprops) => {
               return (
                 <Chip
                   key={index}
-                  style={{ backgroundColor: "#3d3f43", height: 30, marginRight: 5, paddingLeft: 5, paddingRight: 5, height: 28, cursor: "pointer", borderColor: "#3d3f43", color: "white", }}
+                  style={{ backgroundColor: "#3d3f43", height: 30, marginRight: 5, paddingLeft: 5, paddingRight: 5, height: 28, cursor: "pointer", borderColor: "#3d3f43", color: theme.palette.text.primary, }}
                   label={tag}
                   variant="outlined"
                   color="primary"
@@ -19504,7 +20851,7 @@ const AngularWorkflow = (defaultprops) => {
           <Typography variant="body1">
             <a
               href={workflow.blogpost}
-              style={{ textDecoration: "none", color: "#f86a3e" }}
+              style={{ textDecoration: "none", color: theme.palette.linkColor}}
               rel="noopener noreferrer"
               target="_blank"
             >
@@ -19772,10 +21119,10 @@ const AngularWorkflow = (defaultprops) => {
     minWidth: "95%",
     maxWidth: "95%",
     marginTop: 5,
-    color: "white",
+    color: theme.palette.text.primary,
     marginBottom: 10,
     padding: 5,
-    backgroundColor: theme.palette.backgroundColor,
+    backgroundColor: theme.palette.platformColor,
     borderRadius: theme.palette.borderRadius,
     cursor: "pointer",
     display: "flex",
@@ -19807,6 +21154,7 @@ const AngularWorkflow = (defaultprops) => {
               height: 30,
               paddingLeft: 0,
               width: 30,
+              color: theme.palette.text.primary,
             }}
             onClick={() => {
               if (validate.valid) {
@@ -19836,18 +21184,17 @@ const AngularWorkflow = (defaultprops) => {
           >
             <Tooltip
               color="primary"
-              title="Expand result window"
+              title="Expand debug window"
               placement="top"
               style={{ zIndex: 10011 }}
             >
-              <ArrowLeftIcon style={{ color: "white" }} />
+              <ArrowLeftIcon sx={{color: theme.palette.text.primary}} />
             </Tooltip>
           </IconButton>
           <ReactJson
             src={validate.result}
             theme={theme.palette.jsonTheme}
             style={theme.palette.reactJsonStyle}
-            collapsed={false}
             shouldCollapse={(jsonField) => {
               return collapseField(jsonField)
             }}
@@ -20033,127 +21380,6 @@ const AngularWorkflow = (defaultprops) => {
     );
   };
 
-  const handleReactJsonClipboard = (copy) => {
-
-    const elementName = "copy_element_shuffle";
-    var copyText = document.getElementById(elementName);
-    if (copyText !== null && copyText !== undefined) {
-      if (
-        copy.namespace !== undefined &&
-        copy.name !== undefined &&
-        copy.src !== undefined
-      ) {
-        copy = copy.src;
-      }
-
-      const clipboard = navigator.clipboard;
-      if (clipboard === undefined) {
-        toast("Can only copy over HTTPS (port 3443)");
-        return;
-      }
-
-      var stringified = JSON.stringify(copy);
-      if (stringified.startsWith('"') && stringified.endsWith('"')) {
-        stringified = stringified.substring(1, stringified.length - 1);
-      }
-
-      navigator.clipboard.writeText(stringified);
-      copyText.select();
-      copyText.setSelectionRange(0, 99999); /* For mobile devices */
-
-      /* Copy the text inside the text field */
-      document.execCommand("copy");
-
-      console.log("COPYING!");
-      toast("Copied value to clipboard, NOT json path.")
-    } else {
-      console.log("Failed to copy from " + elementName + ": ", copyText);
-    }
-  };
-
-  const HandleJsonCopy = (base, copy, base_node_name) => {
-    if (typeof copy.name === "string") {
-      copy.name = copy.name.replaceAll(" ", "_");
-    }
-
-    //lol
-    if (typeof base === 'object' || typeof base === 'dict') {
-      base = JSON.stringify(base)
-    }
-
-    if (base_node_name === "execution_argument" || base_node_name === "Runtime Argument") {
-      base_node_name = "exec"
-    }
-
-    //console.log("COPY: ", base_node_name, copy);
-
-    //var newitem = JSON.parse(base);
-    var newitem = validateJson(base).result
-
-    // Check if base_node_name has changed
-    if (cy !== undefined && cy !== null) {
-      //console.log("Change name?")
-      //const allNodes = cy.nodes().jsons();
-      //for (var key in allNodes) {
-      //const currentNode = allNodes[key];
-
-      //if (currentNode.
-      //}
-
-      //const nodedata = cy.getElementById(data.action.id).data();
-      //base_node_name = 
-    }
-
-    to_be_copied = "$" + base_node_name.toLowerCase().replaceAll(" ", "_");
-    for (let copykey in copy.namespace) {
-      if (copy.namespace[copykey].includes("Results for")) {
-        continue;
-      }
-
-      if (newitem !== undefined && newitem !== null) {
-        newitem = newitem[copy.namespace[copykey]];
-        if (!isNaN(copy.namespace[copykey])) {
-          to_be_copied += ".#";
-        } else {
-          to_be_copied += "." + copy.namespace[copykey];
-        }
-      }
-    }
-
-    if (newitem !== undefined && newitem !== null) {
-      newitem = newitem[copy.name];
-      if (!isNaN(copy.name)) {
-        to_be_copied += ".#";
-      } else {
-        to_be_copied += "." + copy.name;
-      }
-    }
-
-    to_be_copied = to_be_copied.replaceAll(" ", "_");
-	console.log("COPY: ", to_be_copied);
-    const elementName = "copy_element_shuffle";
-    var copyText = document.getElementById(elementName);
-    if (copyText !== null && copyText !== undefined) {
-      //console.log("NAVIGATOR: ", navigator);
-      const clipboard = navigator.clipboard;
-      if (clipboard === undefined) {
-        toast("Can only copy over HTTPS (port 3443)");
-        return;
-      }
-
-      navigator.clipboard.writeText(to_be_copied);
-      copyText.select();
-      copyText.setSelectionRange(0, 99999); /* For mobile devices */
-
-      /* Copy the text inside the text field */
-      document.execCommand("copy");
-      //console.log("COPYING!");
-      toast("Copied JSON path to clipboard.")
-    } else {
-      console.log("Couldn't find element ", elementName);
-    }
-  }
-
   // Not used because of issue with state updates.
   const ShowReactJsonField = (props) => {
     const { validate, jsonValue, collapsed, label, autocomplete } = props
@@ -20191,7 +21417,6 @@ const AngularWorkflow = (defaultprops) => {
           src={validate.result}
           theme={theme.palette.jsonTheme}
           style={theme.palette.reactJsonStyle}
-          collapsed={parsedCollapse}
           shouldCollapse={(jsonField) => {
             return collapseField(jsonField)
           }}
@@ -20344,6 +21569,7 @@ const AngularWorkflow = (defaultprops) => {
   const envStatus = !(executionData.workflow !== undefined && executionData.workflow !== null && executionData.workflow.actions !== undefined && executionData.workflow.actions !== null && executionData.workflow.actions.length > 0) ? "loading" : "success"
 
   var executionDelay = -75
+
   const executionModal = (
     <Drawer
       anchor={"right"}
@@ -20351,9 +21577,8 @@ const AngularWorkflow = (defaultprops) => {
       onClose={() => {
         setExecutionModalOpen(false)
 
-        const cursearch = typeof window === "undefined" || window.location === undefined ? "" : window.location.search;
-        const newitem = removeParam("execution_id", cursearch);
-        navigate(curpath + newitem)
+        //const newitem = removeParam("execution_id", cursearch);
+        //navigate(curpath + newitem)
       }}
       style={{
         resize: "both",
@@ -20372,12 +21597,12 @@ const AngularWorkflow = (defaultprops) => {
           overflow: "auto",
           minWidth: isMobile ? "100%" : 490,
           maxWidth: isMobile ? "100%" : 490,
-          color: "white",
+          color: theme.palette.text.primary,
           fontSize: 18,
           borderLeft: theme.palette.defaultBorder,
 
           borderRadius: theme.palette.borderRadius,
-          backgroundColor: "black",
+          backgroundColor: themeMode === "dark" ? "black" : theme.palette.drawer.backgroundColor,
         },
       }}
     >
@@ -20394,19 +21619,19 @@ const AngularWorkflow = (defaultprops) => {
               setExecutionModalOpen(false)
             }}
           >
-            <CloseIcon style={{ color: "white" }} />
+            <CloseIcon style={{ color: theme.palette.text.primary }} />
           </IconButton>
         </Tooltip>
         : null}
       {executionModalView === 0 ? (
-        <div style={{ padding: isMobile ? "0px 0px 0px 10px" : 25, zIndex: 12502, }}>
+        <div style={{ padding: isMobile ? "0px 0px 0px 10px" : 25, zIndex: 12502,  backgroundColor: theme.palette.drawer.backgroundColor,  height: "100%", }}>
           <div style={{ display: "flex", }}>
             <Breadcrumbs
               aria-label="breadcrumb"
               separator="›"
-              style={{ color: "white", fontSize: 16 }}
+              style={{ color: theme.palette.text.primary, fontSize: 16, textWrap: "nowrap" }}
             >
-              <h2 style={{ color: "rgba(255,255,255,0.5)" }}>
+              <h2 style={{ color: theme.palette.text.primary}}>
                 <DirectionsRunIcon style={{ marginRight: 0, }} />
                 All Workflow Runs
               </h2>
@@ -20421,29 +21646,27 @@ const AngularWorkflow = (defaultprops) => {
                   color="secondary"
                   style={{ marginLeft: 125, maxHeight: 30, marginTop: 20, }}
                 >
-                  <QueryStatsIcon style={{ color: "white", }} />
+                  <QueryStatsIcon style={{ color: theme.palette.text.primary, }} />
                 </Button>
               </a>
             </Tooltip>
           </div>
-          <Tooltip title="Refresh runs (Ctrl + ;)" arrow>
-            <Button
-              style={{ borderRadius: theme.palette?.borderRadius, }}
-              variant="outlined"
-              fullWidth
-              onClick={() => {
-          	    getWorkflowExecution(workflow.id, "", executionFilter, workflow.org_id)
-              }}
-              color="secondary"
-            >
-              <CachedIcon style={{ marginRight: 10 }} />
-              Refresh Runs
-            </Button>
-          </Tooltip>
+		  <Button
+		    style={{ borderRadius: 8, }}
+		    variant="outlined"
+		    fullWidth
+		    onClick={() => {
+		  	getWorkflowExecution(workflow.id, "", executionFilter, workflow.org_id)
+		    }}
+		    color="secondary"
+		  >
+		    <CachedIcon style={{ marginRight: 10 }} />
+		    Refresh Runs
+		  </Button>
           <ButtonGroup
             fullWidth
             style={{ marginTop: 5, maxHeight: 50, overflow: "hidden", }}>
-		>
+		
             <Button
               color="secondary"
               variant={executionFilter === "ALL" ? "contained" : "outlined"}
@@ -20646,7 +21869,7 @@ const AngularWorkflow = (defaultprops) => {
                                 style={{
                                   height: "100%",
                                   width: 40,
-                                  borderColor: "white",
+                                  borderColor: theme.palette.text.primary,
                                   marginRight: 15,
                                 }}
                               >
@@ -20659,7 +21882,7 @@ const AngularWorkflow = (defaultprops) => {
                                 marginBottom: "auto",
                                 marginRight: 15,
                                 fontSize: 13,
-                                color: "rgba(255,255,255,0.8)",
+                                color: theme.palette.text.primary,
                               }}
                             >
                               {timestamp}
@@ -20676,10 +21899,10 @@ const AngularWorkflow = (defaultprops) => {
                                     marginLeft: 10,
                                     marginTop: "auto",
                                     marginBottom: "auto",
-									color: "rgba(255,255,255,0.5)",
+									                  color: theme.palette.text.primary,
                                   }}
                                 >
-                                  {successActions} <span style={{ color: "rgba(255,255,255,0.4)" }}>+</span> {skippedActions > 0 ? skippedActions : <span style={{ color: "rgba(255,255,255,0.4)" }}>{skippedActions}</span>} <span style={{ color: "rgba(255,255,255,0.4)" }}>=</span> {calculatedResult}
+                                  {successActions} <span style={{ color: theme.palette.text.primary }}>+</span> {skippedActions > 0 ? skippedActions : <span style={{ color: theme.palette.text.primary}}>{skippedActions}</span>} <span style={{ color: theme.palette.text.primary }}>=</span> {calculatedResult}
                                 </div>
                               </Tooltip>
                             ) : null}
@@ -20688,11 +21911,11 @@ const AngularWorkflow = (defaultprops) => {
                           {foundnotifications > 0 ?
                             <Tooltip title={"This workflow created " + foundnotifications + " notification(s)"} placement="top">
                               <ErrorOutlineIcon
-                                style={{ color: "rgba(255,255,255,0.4)", marginTop: 10, marginRight: 10, }}
+                                style={{ color: theme.palette.text.primary, marginTop: 10, marginRight: 10, }}
                                 onClick={(e) => {
                                   e.preventDefault()
                                   e.stopPropagation()
-                                  window.open(`/admin?admin_tab=notifications&workflow=${data.workflow.id}&execution_id=${data.execution_id}`, "_blank")
+                                  window.open(`/admin?org_id=${workflow.org_id}&admin_tab=notifications&workflow=${data.workflow.id}&execution_id=${data.execution_id}`, "_blank")
                                 }}
                               />
                             </Tooltip>
@@ -20722,19 +21945,24 @@ const AngularWorkflow = (defaultprops) => {
             </div>
           ) : (
             <Fade in={true} timeout={1000} style={{ transitionDelay: `${150}ms` }}>
-              <div style={{ marginTop: 100, }}>
-                <Typography variant="body1" color="textSecondary">
+              <div style={{ marginTop: 100, marginBottom: 0 }}>
+                <Typography variant="body1" color="textSecondary" style={{textAlign: "center", }}>
                   No executions found for the '{executionFilter}' filter.
                 </Typography>
 
                 <Button
                   fullWidth
                   variant="outlined"
-                  style={{
-                    marginTop: 20,
+                  sx={{
+                    marginTop: 1,
                     textTransform: "none",
                     border: `1px solid ${green}`,
                     color: green,
+                    "&:hover": {
+                      backgroundColor: `${green}20`,
+                      color: green,
+                      border: `1px solid ${green}`,
+                    },
                   }}
                   onClick={() => {
                     executeWorkflow(executionText, workflow.start, lastSaved);
@@ -20747,13 +21975,13 @@ const AngularWorkflow = (defaultprops) => {
           )}
         </div>
       ) : (
-        <div style={{ padding: isMobile ? "0px 10px 50px 10px" : "25px 15px 150px 15px", maxWidth: isMobile ? "100%" : "100%", overflowX: "hidden", }}>
+        <div style={{ backgroundColor: theme.palette.drawer.backgroundColor, padding: isMobile ? "0px 10px 50px 10px" : "25px 15px 150px 15px", maxWidth: isMobile ? "100%" : "100%", overflowX: "hidden", height: "100%"}}>
 
 
           <Breadcrumbs
             aria-label="breadcrumb"
             separator="›"
-            style={{ color: "white", fontSize: 16 }}
+            style={{ color: theme.palette.text.primary, fontSize: 16 }}
           >
             <span
               style={{ color: "rgba(255,255,255,0.5)", display: "flex" }}
@@ -20777,43 +22005,44 @@ const AngularWorkflow = (defaultprops) => {
                   stop()
                 }}
               >
-                <ArrowBackIcon style={{ color: "rgba(255,255,255,0.5)" }} />
+                <ArrowBackIcon style={{ color: theme.palette.text.primary }} />
               </IconButton>
-              <Tooltip title="See more runs (Ctrl + Shift)" arrow>
                 <h2
-                  style={{ color: "rgba(255,255,255,0.5)", cursor: "pointer" }}
+                  style={{ color: theme.palette.text.primary, cursor: "pointer" }}
                   onClick={() => {
-                    const cursearch = typeof window === "undefined" || window.location === undefined ? "" : window.location.search;
                     const newitem = removeParam("execution_id", cursearch);
                     navigate(curpath + newitem)
                     setExecutionRunning(false);
                     stop()
                   }}
                 >
-                  See more runs
+                  Back to all runs
                 </h2>
-              </Tooltip>
             </span>
           </Breadcrumbs>
           <Divider
             style={{
-              backgroundColor: "rgba(255,255,255,0.6)",
+              backgroundColor: theme.palette.defaultBorder,
               marginTop: 10,
               marginBottom: 10,
             }}
           />
-          <div style={{ display: "flex", paddingLeft: 10, paddingRight: 10, position: "sticky", top: 0, zIndex: 12500, backgroundColor: theme.palette.platformColor, borderRadius: theme.palette.borderRadius, border: "2px solid rgba(255,255,255,0.3)", marginBottom: 10, }}>
+          <div style={{ display: "flex", paddingLeft: 10, paddingRight: 10, position: "sticky", top: 0, zIndex: 12500, backgroundColor: theme.palette.drawer.backgroundColor, borderRadius: theme.palette.borderRadius, border: "2px solid rgba(255,255,255,0.3)", marginBottom: 10, }}>
             <h2>Details</h2>
             <Tooltip
               color="primary"
-              title="Rerun workflow (uses same startnode as the original)"
-              placement="top"
+              title={
+				  <Typography variant="body1">
+					Rerun workflow. Uses same startnode as the original. Runs from scratch.
+				  </Typography>
+			  }
+              placement="left"
               style={{ zIndex: 50000 }}
             >
               <span style={{}}>
                 <Button
                   color="primary"
-                  style={{ float: "right", marginTop: 20, marginLeft: 10 }}
+                  style={{ float: "right", marginTop: 20, marginLeft: 10, }}
                   onClick={() => {
                     const skip_popup = true
                     executeWorkflow(
@@ -20843,8 +22072,8 @@ const AngularWorkflow = (defaultprops) => {
             >
               <span style={{}}>
                 <Button
-                  color="primary"
-                  style={{ float: "right", marginTop: 20, marginLeft: 10 }}
+                color="primary"
+                  style={{ float: "right", marginTop: 20, }}
                   onClick={() => {
                     // Find current one in execution list
                     var nextindex = -1
@@ -20866,7 +22095,7 @@ const AngularWorkflow = (defaultprops) => {
                     changeExecution(data)
                   }}
                 >
-                  <ArrowBackIcon color="secondary" />
+                  <ArrowBackIcon />
                 </Button>
               </span>
             </Tooltip>
@@ -20880,7 +22109,7 @@ const AngularWorkflow = (defaultprops) => {
               <span style={{}}>
                 <Button
                   color="primary"
-                  style={{ float: "right", marginTop: 20, }}
+                  style={{ float: "right", marginTop: 20}}
                   onClick={() => {
                     // Find current one in execution list
                     var nextindex = -1
@@ -20902,7 +22131,7 @@ const AngularWorkflow = (defaultprops) => {
                     changeExecution(data)
                   }}
                 >
-                  <ArrowForwardIcon color="secondary" />
+                  <ArrowForwardIcon />
                 </Button>
               </span>
             </Tooltip>
@@ -20917,7 +22146,7 @@ const AngularWorkflow = (defaultprops) => {
                 <span style={{}}>
                   <Button
                     color="primary"
-                    style={{ float: "right", marginTop: 20, marginLeft: 10 }}
+                    style={{ float: "right", marginTop: 20, }}
                     onClick={() => {
                       abortExecution();
                     }}
@@ -20936,7 +22165,7 @@ const AngularWorkflow = (defaultprops) => {
                 <span style={{}}>
                   <Button
                     color={executionData.notifications_created === undefined || executionData.notifications_created === null || executionData.notifications_created === 0 ? "secondary" : "primary"}
-                    style={{ float: "right", marginTop: 20, marginLeft: 10 }}
+                    style={{ float: "right", marginTop: 20, }}
                     disabled={executionData.notifications_created === undefined || executionData.notifications_created === null || executionData.notifications_created === 0}
                   >
                     <ErrorOutlineIcon
@@ -20962,7 +22191,7 @@ const AngularWorkflow = (defaultprops) => {
                 <span style={{}}>
                   <Button
                     color="secondary"
-                    style={{ float: "right", marginTop: 20, marginLeft: 10 }}
+                    style={{ float: "right", marginTop: 20, }}
 
                     // Max 5 days in the past
                     disabled={userdata.region_url !== "https://shuffler.io" || executionData.started_at < (Math.floor(Date.now() / 1000) - 432000)}
@@ -21010,7 +22239,7 @@ const AngularWorkflow = (defaultprops) => {
                     rel="noopener noreferrer"
                     href={`/admin?tab=app_auth`}
                     target="_blank"
-                    style={{ textDecoration: "none", color: "#FF8544" }}
+                    style={{ textDecoration: "none", color: theme.palette.linkColor }}
                   >
                     Auth Group '{executionData.authgroup !== undefined && executionData.authgroup !== null && executionData.authgroup.length > 0 ? `${executionData.authgroup}` : null}'
                   </a>
@@ -21035,7 +22264,7 @@ const AngularWorkflow = (defaultprops) => {
                         rel="noopener noreferrer"
                         href={`/workflows/${executionData.execution_source}?view=executions&execution_id=${executionData.execution_parent}`}
                         target="_blank"
-                        style={{ textDecoration: "none", color: "#FF8544" }}
+                        style={{ textDecoration: "none", color: theme.palette.linkColor }}
                       >
                         Parent Workflow
                       </a>
@@ -21046,7 +22275,7 @@ const AngularWorkflow = (defaultprops) => {
                         rel="noopener noreferrer"
                         href={`/forms/${executionData.workflow.id}`}
                         target="_blank"
-                        style={{ textDecoration: "none", color: "#FF8544" }}
+                        style={{ textDecoration: "none", color: theme.palette.linkColor }}
                       >
                         Form
                       </a>
@@ -21083,6 +22312,7 @@ const AngularWorkflow = (defaultprops) => {
           ) : null}
 
           {executionData.workflow !== undefined && executionData.workflow !== null && executionData.workflow.actions !== undefined && executionData.workflow.actions !== null && executionData.workflow.actions.length > 0 ?
+
             <div style={{ display: "flex", marginLeft: 10, }}>
               <Typography variant="body1">
 
@@ -21108,7 +22338,7 @@ const AngularWorkflow = (defaultprops) => {
             </div>
             : null}
 
-          {userdata.support === true && executionData.workflow !== undefined && executionData.workflow !== null && executionData.status !== "EXECUTING" ?
+          {userdata.support === true && executionData.workflow !== undefined && executionData.workflow !== null && executionData.status !== "EXECUTING" && executionData.status !== "ABORTED" ?
             <div style={{ marginTop: 5, marginBottom: 5, }}>
               <WorkflowValidationTimeline
                 originalWorkflow={workflow}
@@ -21132,7 +22362,7 @@ const AngularWorkflow = (defaultprops) => {
 
           <Divider
             style={{
-              backgroundColor: "rgba(255,255,255,0.6)",
+              backgroundColor: theme.palette.defaultBorder,
               marginTop: 15,
               marginBottom: 20,
             }}
@@ -21146,9 +22376,9 @@ const AngularWorkflow = (defaultprops) => {
                 result.status === "SKIPPED"
             ) ? (
             <FormControlLabel
-              style={{ color: "white", marginBottom: 10 }}
+              style={{ color: theme.palette.text.primary, marginBottom: 10 }}
               label={
-                <div style={{ color: "white" }}>
+                <div style={{ color: theme.palette.text.primary }}>
                   Show skipped actions
                 </div>
               }
@@ -21162,6 +22392,7 @@ const AngularWorkflow = (defaultprops) => {
               }
             />
           ) : null}
+
           <div style={{ display: "flex", marginTop: 10, marginBottom: 30 }}>
             <div>
               {executionData.status !== undefined &&
@@ -21177,13 +22408,15 @@ const AngularWorkflow = (defaultprops) => {
 
                   {environments.length > 0 && defaultEnvironmentIndex < environments.length && nonskippedResults.length === 0 && environments[defaultEnvironmentIndex].Name !== "Cloud" ?
                     <Typography variant="body2" color="textSecondary" style={{}}>
-                      No results yet. Is Orborus running for the "{environments[defaultEnvironmentIndex].Name}" environment? <a href="/admin?tab=locations" rel="noopener noreferrer" target="_blank" style={{ textDecoration: "none", color: "#f86a3e" }}>Find out here</a>. If the Workflow doesn't start within 30 seconds with Orborus running, contact support: <a href="mailto:support@shuffler.io" rel="noopener noreferrer" target="_blank" style={{ textDecoration: "none", color: "#f86a3e" }}>support@shuffler.io</a>
+                      No results yet. Is Orborus running for the "{environments[defaultEnvironmentIndex].Name}" environment? <a href="/admin?tab=locations" rel="noopener noreferrer" target="_blank" style={{ textDecoration: "none", color: "#f86a3e" }}>Find out here</a>. If the Workflow doesn't start within 30 seconds with Orborus running, contact support: <a href={`mailto:${supportEmail}`} rel="noopener noreferrer" target="_blank" style={{ textDecoration: "none", color: "#f86a3e" }}>{supportEmail}</a>
+                      No results yet. Is Orborus running for the "{environments[defaultEnvironmentIndex].Name}" environment? <a href="/admin?tab=locations" rel="noopener noreferrer" target="_blank" style={{ textDecoration: "none", color: theme.palette.linkColor }}>Find out here</a>. If the Workflow doesn't start within 30 seconds with Orborus running, contact support: <a href="mailto:support@shuffler.io" rel="noopener noreferrer" target="_blank" style={{ textDecoration: "none", color: theme.palette.linkColor}}>support@shuffler.io</a>
                     </Typography>
                     : null}
                 </div>
               ) : null}
             </div>
           </div>
+
           {
             executionData.results === undefined ||
               executionData.results === null ||
@@ -21193,7 +22426,7 @@ const AngularWorkflow = (defaultprops) => {
                 <CircularProgress style={{ marginLeft: 145, marginBottom: 10, }} />
                 {environments.length > 0 && defaultEnvironmentIndex < environments.length && nonskippedResults.length === 0 && environments[defaultEnvironmentIndex].Name !== "Cloud" ?
                   <Typography variant="body2" color="textSecondary" style={{}}>
-                    No results yet. Is Orborus running for the "{environments[defaultEnvironmentIndex].Name}" environment? <a href="/admin?tab=locations" rel="noopener noreferrer" target="_blank" style={{ textDecoration: "none", color: "#f86a3e" }}>Learn more</a>. If the Workflow doesn't start within 30 seconds with Orborus running, contact support: <a href="mailto:support@shuffler.io" rel="noopener noreferrer" target="_blank" style={{ textDecoration: "none", color: "#f86a3e" }}>support@shuffler.io</a>
+                    No results yet. Is Orborus running for the "{environments[defaultEnvironmentIndex].Name}" environment? <a href="/admin?tab=locations" rel="noopener noreferrer" target="_blank" style={{ textDecoration: "none", color: theme.palette.linkColor }}>Learn more</a>. If the Workflow doesn't start within 30 seconds with Orborus running, contact support: <a href={`mailto:${supportEmail}`} rel="noopener noreferrer" target="_blank" style={{ textDecoration: "none", color: theme.palette.linkColor }}>{supportEmail}</a>
                   </Typography>
                   :
                   null}
@@ -21204,6 +22437,14 @@ const AngularWorkflow = (defaultprops) => {
                   return null;
                 }
 
+          		const showRerun = new URLSearchParams(cursearch).get("rerun")
+				if (showRerun === "true") {
+          			const showNode = new URLSearchParams(cursearch).get("node")
+					if (data.action.id !== showNode) {
+						return null
+					}
+				}
+
                 // FIXME: The latter replace doens't really work if ' is used in a string
                 var showResult = data.result.trim();
                 const validate = validateJson(showResult);
@@ -21283,10 +22524,10 @@ const AngularWorkflow = (defaultprops) => {
                     );
                   }
 
-                  if (data.action.app_name === "User Input") {
+                  if (data?.action?.app_name === "User Input" || data?.action?.name === "run_userinput") {
                     actionimg = (
                       <img
-                        alt={"Shuffle Subflow"}
+                        alt={"User Input Trigger"}
                         src={triggers[4].large_image}
                         style={{
                           marginRight: 20,
@@ -21397,22 +22638,31 @@ const AngularWorkflow = (defaultprops) => {
                   }
                 }
 
-                const cursearch = typeof window === "undefined" || window.location === undefined ? "" : window.location.search;
                 const chosenNodeId = new URLSearchParams(cursearch).get("node");
                 const highlightNode = chosenNodeId !== null && chosenNodeId !== undefined && chosenNodeId !== "" && chosenNodeId === data.action.id
+				var relevant_errors = []
+				if (data?.action?.parameters !== undefined && data?.action?.parameters !== null && data?.action?.parameters.length > 0) {
+					for (var i = 0; i < data.action.parameters.length; i++) {
+						// Specific error patterns in params
+						const param = data.action.parameters[i]
+						if (param?.name?.endsWith("_error") && (param?.name?.startsWith("shuffle_") || param?.name?.startsWith("liquid_"))) {
+							relevant_errors.push(param)
+						}
+					}
+				}
 
                 return (
                   <div
                     key={index}
                     style={{
                       marginBottom: 20,
-                      border: highlightNode ? "2px solid red"
+                      border: highlightNode ? `2px solid ${red}`
                         :
                         data.action.sub_action === true
                           ? "1px solid rgba(255,255,255,0.3)"
                           : "1px solid rgba(255,255,255, 0.3)",
                       borderRadius: theme.palette?.borderRadius,
-                      backgroundColor: theme.palette.inputColor,
+                      backgroundColor: theme.palette.cardBackgroundColor,
                       padding: "15px 10px 10px 10px",
                       overflow: "hidden",
                     }}
@@ -21470,7 +22720,7 @@ const AngularWorkflow = (defaultprops) => {
                               setActiveDialog("result")
                               setCodeModalOpen(true);
                             } else {
-                              toast("Please wait until the workflow is loaded and try again")
+                              //toast("Please wait until the workflow is loaded and try again")
                               setCodeModalOpen(true)
                               setSelectedResult(data)
 
@@ -21479,11 +22729,17 @@ const AngularWorkflow = (defaultprops) => {
                         >
                           <Tooltip
                             color="primary"
-                            title="Expand result window"
+                            title={
+								<Typography variant="body1">
+									Expand debug window. Errors: {relevant_errors.length}
+								</Typography>
+							}
                             placement="top"
                             style={{ zIndex: 50000 }}
                           >
-                            <ArrowLeftIcon style={{ color: "white" }} />
+                            <ArrowLeftIcon style={{ 
+								color: relevant_errors.length > 0 ? yellow : theme.palette.textColor,
+							}} />
                           </Tooltip>
                         </IconButton>
                         {actionimg}
@@ -21505,6 +22761,28 @@ const AngularWorkflow = (defaultprops) => {
                           </div>
                         </div>
                       </div>
+
+					  {data.action.app_name === "AI Agent" || data.action.app_name === "Shuffle Agent" ? 
+                        <span
+                          style={{ flex: 10, float: "right", textAlign: "right" }}
+                        >
+						  <Tooltip title={"Explore Agent Timeline"}>
+							  <a
+								rel="noopener noreferrer"
+								href={`/agents?execution_id=${executionData.execution_id}&authorization=${executionData.authorization}&node_id=${data.action.id}`}
+								target="_blank"
+								style={{
+								  textDecoration: "none",
+								  color: theme.palette.linkColor,
+								}}
+								onClick={(event) => { }}
+							  >
+								<OpenInNewIcon />
+							  </a>
+						  </Tooltip>
+						</span>
+					  : null}
+
                       {data.action.app_name === "shuffle-subflow" &&
                         validate.result.success !== undefined &&
                         validate.result.success === true ? (
@@ -21535,7 +22813,7 @@ const AngularWorkflow = (defaultprops) => {
                                 target="_blank"
                                 style={{
                                   textDecoration: "none",
-                                  color: "#FF8544",
+                                  color: theme.palette.linkColor,
                                 }}
                                 onClick={(event) => { }}
                               >
@@ -21567,7 +22845,6 @@ const AngularWorkflow = (defaultprops) => {
                           src={validate.result}
                           theme={theme.palette.jsonTheme}
                           style={theme.palette.reactJsonStyle}
-                          collapsed={false}
                           shouldCollapse={(jsonField) => {
                             return collapseField(jsonField)
                           }}
@@ -21654,6 +22931,11 @@ const AngularWorkflow = (defaultprops) => {
     const checked = validateJson(data.value.trim())
 
     if (data.name === "shuffle_action_logs" && data.value !== undefined && data.value !== null && data.value.length > 0 && data.value.includes("add env SHUFFLE_LOGS_DISABLED")) {
+
+		if (isCloud) {
+			return null
+		}
+
 		  return (
 			<div style={{ maxWidth: 600, marginTop: 75, overflowX: "hidden", }}>
 			  <Typography
@@ -21663,7 +22945,7 @@ const AngularWorkflow = (defaultprops) => {
 				<b>Action Logs</b>
 			  </Typography>
 			  <Typography variant="body2" style={{ whiteSpace: 'pre-line', }}>
-				More log details for this action are not available without <a style={{ color: "#FF8544", }} href="/admin?tab=locations" target="_blank" rel="noopener noreferrer">an onprem environment</a> with the <a style={{ color: "#FF8544", }} href="/docs/configuration#scaling-shuffle" target="_blank" rel="noopener noreferrer">SHUFFLE_LOGS_DISABLED</a> environment variable set to false: SHUFFLE_LOGS_DISABLED=false. Logs are enabled by default, except in scale mode.
+				More log details for this action are not available without <a style={{ color: theme.palette.linkColor, }} href="/admin?tab=locations" target="_blank" rel="noopener noreferrer">an onprem environment</a> with the <a style={{ color: theme.palette.linkColor, }} href="/docs/configuration#scaling-shuffle" target="_blank" rel="noopener noreferrer">SHUFFLE_LOGS_DISABLED</a> environment variable set to false: SHUFFLE_LOGS_DISABLED=false. Logs are enabled by default, except in scale mode.
 			  </Typography>
 			</div>
 		  )
@@ -21729,7 +23011,6 @@ const AngularWorkflow = (defaultprops) => {
               src={checked.result}
               theme={theme.palette.jsonTheme}
               style={theme.palette.reactJsonStyle}
-              collapsed={data.value.length < 10000 ? false : true}
               shouldCollapse={(jsonField) => {
                 return collapseField(jsonField)
               }}
@@ -21744,7 +23025,7 @@ const AngularWorkflow = (defaultprops) => {
               variant="body2"
               style={{
                 whiteSpace: 'pre-line',
-                color: showlink ? "#FF8544" : "white",
+                color: showlink ? "#FF8544" : theme.palette.text.primary,
                 cursor: showlink ? "pointer" : "default",
               }}
               onClick={(e) => {
@@ -21799,7 +23080,7 @@ const AngularWorkflow = (defaultprops) => {
     }
 
     if (result.status === 405) {
-      return "Method not allowed. Check the URL to ensure it has all the required parameters. If you keep getting a 405, please forward a screenshot of this to support@shuffler.io"
+      return `Method not allowed. Check the URL to ensure it has all the required parameters. If you keep getting a 405, please forward a screenshot of this to ${supportEmail}`
     }
 
     if (result.status === 415) {
@@ -21866,7 +23147,7 @@ const AngularWorkflow = (defaultprops) => {
     }
 
     if (stringjson.includes("kms/")) {
-      return "KMS authentication most likely failed. Check your notifications for more details on this page: /admin?admin_tab=notifications. If you need help with KMS, please contact support@shuffler.io"
+      return `KMS authentication most likely failed. Check your notifications for more details on this page: /admin?admin_tab=notifications. If you need help with KMS, please contact ${supportEmail}`
     }
 
     if (stringjson.includes("invalidurl")) {
@@ -21894,7 +23175,7 @@ const AngularWorkflow = (defaultprops) => {
 
     if (stringjson.includes("connectionerror")) {
       if (stringjson.includes("kms")) {
-        return "KMS authentication most likely failed (2). Check your notifications for more details on this page: /admin?admin_tab=notifications&kms=true. If you need help with KMS, please contact support@shuffler.io"
+        return `KMS authentication most likely failed (2). Check your notifications for more details on this page: /admin?admin_tab=notifications&kms=true. If you need help with KMS, please contact ${supportEmail}`
       }
 
       return "The URL is incorrect, or Shuffle can't reach it. Set up a Shuffle Environment in the same VLAN, or whitelist Shuffle's IPs."
@@ -21915,23 +23196,25 @@ const AngularWorkflow = (defaultprops) => {
       open={codeModalOpen}
       PaperProps={{
         onClick: () => setActiveDialog("result"),
-        style: {
+        sx: {
           pointerEvents: "auto",
-          color: "white",
-          minWidth: isMobile ? "90%" : 750,
-          padding: 30,
-          maxHeight: 550,
+          color: theme.palette.text.primary,
+          minWidth: isMobile ? "90%" : "750px",
+          maxHeight: "550px",
           overflowY: "auto",
           overflowX: "hidden",
           border: theme.palette.defaultBorder,
 
-          borderRadius: theme.palette.borderRadius,
-          backgroundColor: "black",
+          borderRadius: theme.palette.DialogStyle.borderRadius,
+          backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+          '& .MuiDialogContent-root': {
+            backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+            padding: "30px 30px 30px 30px",
+          },
         },
       }}
     >
-      {/* Have a sticky top bar */}
-      <span id="top_bar" style={{ position: "sticky", top: -30, zIndex: 12000, }}>
+      <span id="top_bar" style={{ position: "sticky", top: -20, zIndex: 12000,}}>
         <Tooltip
           title="Suggest solution"
           placement="top"
@@ -21993,7 +23276,7 @@ const AngularWorkflow = (defaultprops) => {
               }
             }}
           >
-            <DoneIcon style={{ color: "white" }} />
+            <DoneIcon style={{ color: theme.palette.text.primary }} />
           </IconButton>
         </Tooltip>
         <Tooltip
@@ -22036,7 +23319,7 @@ const AngularWorkflow = (defaultprops) => {
               }
             }}
           >
-            <ErrorIcon style={{ color: "white" }} />
+            <ErrorIcon style={{ color: theme.palette.text.primary }} />
           </IconButton>
         </Tooltip>
         <Tooltip
@@ -22066,7 +23349,7 @@ const AngularWorkflow = (defaultprops) => {
               }
             }}
           >
-            <VisibilityIcon style={{ color: "white" }} />
+            <VisibilityIcon style={{ color: theme.palette.text.primary }} />
           </IconButton>
         </Tooltip>
         <Tooltip
@@ -22086,7 +23369,7 @@ const AngularWorkflow = (defaultprops) => {
             onClick={(e) => {
             }}
           >
-            <DragIndicatorIcon style={{ color: "white" }} />
+            <DragIndicatorIcon style={{ color: theme.palette.text.primary }} />
           </IconButton>
         </Tooltip>
         <Tooltip
@@ -22101,17 +23384,18 @@ const AngularWorkflow = (defaultprops) => {
               setCodeModalOpen(false);
             }}
           >
-            <CloseIcon style={{ color: "white" }} />
+            <CloseIcon style={{ color: theme.palette.text.primary }} />
           </IconButton>
         </Tooltip>
       </span>
 
+      <DialogContent>
       <div style={{ marginBottom: 40, }}>
         <div style={{ display: "flex", marginBottom: 15, position: "sticky", top: -31, zIndex: 10000, }}>
           {curapp === null ? null : (
             <img
               alt={selectedResult.action.app_name}
-              src={selectedResult === undefined ? theme.palette.defaultImage : selectedResult.action.app_name === "shuffle-subflow" ? triggers[3].large_image : selectedResult.action.app_name === "User Input" ? triggers[4].large_image : selectedResult.action !== undefined && selectedResult.action.large_image !== undefined && selectedResult.action.large_image !== null && selectedResult.action.large_image !== "" ? selectedResult.action.large_image : curapp !== undefined ? curapp.large_image : theme.palette.defaultImage}
+              src={selectedResult === undefined ? theme.palette.defaultImage : selectedResult?.action?.name === "run_userinput" ? triggers[4].large_image : selectedResult.action.app_name === "shuffle-subflow" ? triggers[3].large_image : selectedResult.action !== undefined && selectedResult.action.large_image !== undefined && selectedResult.action.large_image !== null && selectedResult.action.large_image !== "" ? selectedResult.action.large_image : curapp !== undefined ? curapp.large_image : theme.palette.defaultImage}
               style={{
                 marginRight: 20,
                 width: imgsize,
@@ -22130,12 +23414,11 @@ const AngularWorkflow = (defaultprops) => {
                 fontSize: 24,
                 marginTop: "auto",
                 marginBottom: "auto",
-                cursor: "move",
               }}
             >
               <b>{selectedResult.action.label.replaceAll("_", " ")}</b>
             </div>
-            <div style={{ fontSize: 14, color: "rgba(255,255,255,0.6)", }}>{selectedResult.action.name}</div>
+            <div style={{ fontSize: 14, color: theme.palette.textColor, }}>{selectedResult.action.name}</div>
           </div>
         </div>
 
@@ -22155,7 +23438,6 @@ const AngularWorkflow = (defaultprops) => {
             src={validate.result}
             theme={theme.palette.jsonTheme}
             style={theme.palette.reactJsonStyle}
-            collapsed={selectedResult.result.length < 10000 ? false : true}
             shouldCollapse={(jsonField) => {
               return collapseField(jsonField)
             }}
@@ -22216,6 +23498,7 @@ const AngularWorkflow = (defaultprops) => {
             </span>
           </div>
         )}
+
         <div>
           {selectedResult.action.parameters !== null &&
             selectedResult.action.parameters !== undefined ? (
@@ -22254,11 +23537,12 @@ const AngularWorkflow = (defaultprops) => {
           ) : null}
         </div>
       </div>
+      </DialogContent>
     </Dialog>
   );
 
   const newView = (
-    <div style={{ color: "white", marginLeft: leftSideBarOpenByClick ? workflow?.public ? 210 : 250 : workflow?.public ? isLoggedIn ? 60 : 0 : isLoggedIn ? 100 : 0, transition: "margin-left 0.3s ease", overflow: 'hidden' }}>
+    <div style={{ color: theme.palette.text.primary, marginLeft: leftSideBarOpenByClick ? workflow?.public ? 210 : 250 : workflow?.public ? isLoggedIn ? 60 : 0 : isLoggedIn ? 100 : 0, transition: "margin-left 0.3s ease", overflow: 'hidden' }}>
       <div
         style={{ display: "flex", borderTop: "0px solid rgba(91, 96, 100, 1)" }}
       >
@@ -22388,6 +23672,7 @@ const AngularWorkflow = (defaultprops) => {
 
 		  		suborgWorkflows={suborgWorkflows}
 		  		originalWorkflow={originalWorkflow}
+  				runFromHere={runFromHere} 
               />
             </div>
           </Fade>
@@ -22498,7 +23783,7 @@ const AngularWorkflow = (defaultprops) => {
         PaperProps={{
           style: {
             pointerEvents: "auto",
-            color: "white",
+            color: theme.palette.text.primary,
             border: theme.palette.defaultBorder,
             maxWidth: isMobile ? bodyWidth - 100 : 800,
             minWidth: isMobile ? bodyWidth - 100 : 800,
@@ -22510,7 +23795,7 @@ const AngularWorkflow = (defaultprops) => {
       >
         <FormControl>
           <DialogTitle id="draggable-dialog-title" style={{ cursor: "move", }}>
-            <span style={{ color: "white" }}>Runtime Variable</span>
+            <span style={{ color: theme.palette.text.primary }}>Runtime Variable</span>
           </DialogTitle>
           <DialogContent>
             Runtime Variables are TEMPORARY variables that you can only be set
@@ -22519,7 +23804,7 @@ const AngularWorkflow = (defaultprops) => {
               rel="noopener noreferrer"
               href="https://shuffler.io/docs/workflows#execution_variables"
               target="_blank"
-              style={{ textDecoration: "none", color: "#FF8544" }}
+              style={{ textDecoration: "none", color: theme.palette.linkColor }}
             >
               here
             </a>
@@ -22530,7 +23815,7 @@ const AngularWorkflow = (defaultprops) => {
               style={{ marginTop: 25 }}
               InputProps={{
                 style: {
-                  color: "white",
+                  color: theme.palette.text.primary,
                 },
               }}
               margin="dense"
@@ -22545,7 +23830,7 @@ const AngularWorkflow = (defaultprops) => {
               style={{ marginTop: 25 }}
               InputProps={{
                 style: {
-                  color: "white",
+                  color: theme.palette.text.primary,
                 },
               }}
               margin="dense"
@@ -22613,7 +23898,7 @@ const AngularWorkflow = (defaultprops) => {
             <DialogContent>
               <Divider
                 style={{
-                  backgroundColor: "white",
+                  backgroundColor: theme.palette.text.primary,
                   marginTop: 15,
                   marginBottom: 15,
                 }}
@@ -22677,7 +23962,7 @@ const AngularWorkflow = (defaultprops) => {
         PaperProps={{
           style: {
             pointerEvents: "auto",
-            color: "white",
+            color: theme.palette.text.primary,
             border: theme.palette.defaultBorder,
             maxWidth: isMobile ? bodyWidth - 100 : "100%",
 
@@ -22688,7 +23973,7 @@ const AngularWorkflow = (defaultprops) => {
       >
         <FormControl>
           <DialogTitle id="draggable-dialog-title" style={{ cursor: "move", }}>
-            <span style={{ color: "white" }}>Workflow Variable</span>
+            <span style={{ color: theme.palette.text.primary }}>Workflow Variable</span>
           </DialogTitle>
           <DialogContent>
             <TextField
@@ -22697,7 +23982,7 @@ const AngularWorkflow = (defaultprops) => {
               placeholder="Name"
               InputProps={{
                 style: {
-                  color: "white",
+                  color: theme.palette.text.primary,
                 },
               }}
               margin="dense"
@@ -22712,7 +23997,7 @@ const AngularWorkflow = (defaultprops) => {
               fullWidth
               InputProps={{
                 style: {
-                  color: "white",
+                  color: theme.palette.text.primary,
                 },
               }}
               defaultValue={newVariableDescription}
@@ -22726,7 +24011,7 @@ const AngularWorkflow = (defaultprops) => {
               margin="dense"
               InputProps={{
                 style: {
-                  color: "white",
+                  color: theme.palette.text.primary,
                 },
               }}
               fullWidth
@@ -22875,11 +24160,8 @@ const AngularWorkflow = (defaultprops) => {
       // Automatically mapping fields that already exist (predefined).
       // Warning if fields are NOT filled
       for (let paramkey in selectedApp.authentication.parameters) {
-        if (
-          authenticationOption.fields[
-            selectedApp.authentication.parameters[paramkey].name
-          ].length === 0
-        ) {
+        if (authenticationOption.fields[selectedApp.authentication.parameters[paramkey].name].length === 0) {
+
           if (
             selectedApp.authentication.parameters[paramkey].value !== undefined &&
             selectedApp.authentication.parameters[paramkey].value !== null &&
@@ -22928,8 +24210,30 @@ const AngularWorkflow = (defaultprops) => {
 
       var newAuthOption = JSON.parse(JSON.stringify(authenticationOption));
       var newFields = [];
+
+	  var warningsent = false
       for (let authkey in newAuthOption.fields) {
-        const value = newAuthOption.fields[authkey];
+        var value = newAuthOption.fields[authkey];
+
+		if (value?.toLowerCase().includes("secret. replace")) {
+			value = ""
+
+			if (authkey === "url") {
+				// Use default value of the url
+				const urlparam = selectedApp.authentication.parameters.find((data) => data.name === "url")
+				if (urlparam !== undefined && urlparam !== null) {
+					if (urlparam.example !== undefined && urlparam.example !== null && urlparam.example.length > 0) {
+						value = urlparam.example
+					}
+				}
+			} else {
+				if (!warningsent) {
+					warningsent = true
+					toast("Warning: As you didn't fill in all fields, be aware that the authentication may fail.")
+				}
+			}
+		}
+
         newFields.push({
           "key": authkey,
           "value": value,
@@ -22953,7 +24257,7 @@ const AngularWorkflow = (defaultprops) => {
     return (
       <div>
         <DialogTitle id="draggable-dialog-title" style={{ cursor: "move", }}>
-          <div style={{ color: "white" }}>
+          <div style={{ color: theme.palette.text.primary }}>
             Authentication for {selectedApp.name.replaceAll("_", " ", -1)}
           </div>
         </DialogTitle>
@@ -22962,7 +24266,7 @@ const AngularWorkflow = (defaultprops) => {
             target="_blank"
             rel="noopener noreferrer"
             href="https://shuffler.io/docs/apps#authentication"
-            style={{ textDecoration: "none", color: "#FF8544" }}
+            style={{ textDecoration: "none", color: theme.palette.linkColor }}
           >
             What is app authentication?
           </a>
@@ -23045,7 +24349,7 @@ const AngularWorkflow = (defaultprops) => {
                     }}
                     style={{
                       backgroundColor: theme.palette.surfaceColor,
-                      color: "white",
+                      color: theme.palette.text.primary,
                       height: 50,
                     }}
                   >
@@ -23053,7 +24357,7 @@ const AngularWorkflow = (defaultprops) => {
                       key={"false"}
                       style={{
                         backgroundColor: theme.palette.inputColor,
-                        color: "white",
+                        color: theme.palette.text.primary,
                       }}
                       value={"false"}
                     >
@@ -23063,7 +24367,7 @@ const AngularWorkflow = (defaultprops) => {
                       key={"true"}
                       style={{
                         backgroundColor: theme.palette.inputColor,
-                        color: "white",
+                        color: theme.palette.text.primary,
                       }}
                       value={"true"}
                     >
@@ -23082,18 +24386,18 @@ const AngularWorkflow = (defaultprops) => {
                     }}
                     fullWidth
                     type={
-                      data.example !== undefined && data.example.includes("***")
+                      data.example !== undefined && data.example.includes("**")
                         ? "password"
                         : "text"
                     }
                     color="primary"
                     defaultValue={
-                      data.value !== undefined && data.value !== null && !data.value.includes("Secret. Replace") ? data.value : ""
+                      data.value !== undefined && data.value !== null && !data.value.includes("Secret. Replace") ? data.value : 
+					  data?.example !== undefined && data?.example !== null && data?.example !== "" && !data?.example.includes("*") ? data.example : ""
                     }
                     placeholder={data.example}
                     onChange={(event) => {
-                      authenticationOption.fields[data.name] =
-                        event.target.value;
+                      authenticationOption.fields[data.name] = event.target.value;
                     }}
                     id={`${data.name}_auth`}
                   />
@@ -23127,7 +24431,7 @@ const AngularWorkflow = (defaultprops) => {
         open={configureWorkflowModalOpen}
         PaperProps={{
           style: {
-            color: "white",
+            color: theme.palette.text.primary,
             minWidth: 650,
             border: theme.palette.defaultBorder,
 
@@ -23142,7 +24446,7 @@ const AngularWorkflow = (defaultprops) => {
             position: "absolute",
             top: 14,
             right: 14,
-            color: "white",
+            color: theme.palette.text.primary,
           }}
           onClick={() => {
             setConfigureWorkflowModalOpen(false);
@@ -23184,25 +24488,35 @@ const AngularWorkflow = (defaultprops) => {
       hideBackdrop={true}
       disableEnforceFocus={true}
       disableBackdropClick={true}
-      style={{ pointerEvents: "none" }}
+      style={{ 
+        pointerEvents: "none",
+     }}
       open={authenticationModalOpen}
       onClose={() => {
         setSelectedMeta(undefined)
       }}
       PaperProps={{
-        style: {
+        sx: {
           pointerEvents: "auto",
-          color: "white",
-          minWidth: 1100,
-          minHeight: 700,
-          maxHeight: 700,
-          padding: 15,
+          color: theme.palette.DialogStyle.color,
+          minWidth: "1100px",
+          minHeight: "700px",
+          maxHeight: "700px",
           overflow: "hidden",
           zIndex: 10012,
-          border: theme.palette.defaultBorder,
+          border: theme.palette.DialogStyle.border,
 
-          borderRadius: theme.palette.borderRadius,
-          backgroundColor: "black",
+          borderRadius: theme.palette.DialogStyle.borderRadius,
+          backgroundColor: theme.palette.DialogStyle.backgroundColor,
+          '& .MuiDialogContent-root': {
+            backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+          },
+          '& .MuiDialogTitle-root': {
+            backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+          },
+          '& .MuiDialogActions-root': {
+            backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+          },
         },
       }}
     >
@@ -23214,6 +24528,7 @@ const AngularWorkflow = (defaultprops) => {
           right: 75,
           height: 50,
           width: 50,
+          backgroundColor: theme.palette.DialogStyle.backgroundColor,
         }}
       >
         {selectedApp.reference_info === undefined ||
@@ -23226,7 +24541,7 @@ const AngularWorkflow = (defaultprops) => {
             rel="noopener noreferrer"
             target="_blank"
             href={"https://github.com/shuffle/python-apps"}
-            style={{ textDecoration: "none", color: "#f86a3e" }}
+            style={{ textDecoration: "none", color: theme.palette.linkColor }}
           >
             <img
               alt={`Documentation image for ${selectedApp.name}`}
@@ -23248,7 +24563,7 @@ const AngularWorkflow = (defaultprops) => {
             rel="noopener noreferrer"
             target="_blank"
             href={selectedApp.reference_info.github_url}
-            style={{ textDecoration: "none", color: "#f86a3e" }}
+            style={{ textDecoration: "none", color: theme.palette.linkColor }}
           >
             <img
               alt={`Documentation image for ${selectedApp.name}`}
@@ -23304,7 +24619,7 @@ const AngularWorkflow = (defaultprops) => {
       >
         <CloseIcon />
       </IconButton>
-      <div style={{ display: "flex", flexDirection: "row" }}>
+      <div style={{ display: "flex", flexDirection: "row", backgroundColor: theme.palette.DialogStyle.backgroundColor }}>
         <div
           style={{
             flex: 
@@ -23312,11 +24627,14 @@ const AngularWorkflow = (defaultprops) => {
 			  selectedApp.authentication.parameters === null ||
 			  selectedApp.authentication.parameters === undefined ||
 			  selectedApp.authentication.parameters.length === 0 ? 0 : 2,
-            padding: 0,
+            paddingLeft: 15,
+            paddingTop: 15,
+            paddingBottom: 15,
             minHeight: isMobile ? "90%" : 700,
             maxHeight: isMobile ? "90%" : 700,
             overflowY: "auto",
             overflowX: isMobile ? "auto" : "hidden",
+            backgroundColor: theme.palette.DialogStyle.backgroundColor,
           }}
         >
           {authenticationType.type === "oauth2" || authenticationType.type === "oauth2-app" ?
@@ -23346,6 +24664,7 @@ const AngularWorkflow = (defaultprops) => {
             minHeight: 630,
             overflowY: "auto",
             overflowX: "hidden",
+            backgroundColor: theme.palette.DialogStyle.backgroundColor,
           }}
           onLoad={() => {
             /*
@@ -23433,7 +24752,7 @@ const AngularWorkflow = (defaultprops) => {
                   rel="noopener noreferrer"
                   target="_blank"
                   href="https://discord.gg/B2CBzUm"
-                  style={{ textDecoration: "none", color: "#f86a3e" }}
+                  style={{ textDecoration: "none", color: theme.palette.linkColor }}
                 >
                   Join the community on Discord!
                 </a>
@@ -23453,7 +24772,7 @@ const AngularWorkflow = (defaultprops) => {
                       rel="noopener noreferrer"
                       target="_blank"
                       href={"https://github.com/shuffle/python-apps"}
-                      style={{ textDecoration: "none", color: "#f86a3e" }}
+                      style={{ textDecoration: "none", color: theme.palette.linkColor }}
                     >
                       Check it out on Github!
                     </a>
@@ -23495,7 +24814,7 @@ const AngularWorkflow = (defaultprops) => {
                           href={selectedMeta.link}
                           style={{ textDecoration: "none", color: "#FF8544" }}
                         >
-                          <Button style={{ color: "white", }} variant="outlined" color="secondary">
+                          <Button style={{ color: theme.palette.text.primary, }} variant="outlined" color="secondary">
                             <EditIcon /> &nbsp;&nbsp;Edit
                           </Button>
                         </a>
@@ -23506,13 +24825,13 @@ const AngularWorkflow = (defaultprops) => {
                         style={{
                           height: "100%",
                           width: 1,
-                          backgroundColor: "white",
+                          backgroundColor: theme.palette.text.primary,
                           marginLeft: 50,
                           marginRight: 50,
                         }}
                       />
                     )}
-                    <Typography style={{ display: "inline", marginTop: 11 }}>
+                    <Typography style={{ display: "inline", marginTop: 11, textWrap: "nowrap" }}>
                       {selectedMeta.read_time} minute
                       {selectedMeta.read_time === 1 ? "" : "s"} to read
                     </Typography>
@@ -23592,7 +24911,7 @@ const AngularWorkflow = (defaultprops) => {
       PaperProps={{
         style: {
           pointerEvents: "auto",
-          color: "white",
+          color: theme.palette.text.primary,
           minWidth: 600,
           minHeight: 250,
           maxHeight: 250,
@@ -23607,7 +24926,7 @@ const AngularWorkflow = (defaultprops) => {
       }}
     >
       <DialogTitle id="tenzir-config-modal" style={{ cursor: "move" }}>
-        <div style={{ color: "white" }}>Run a Tenzir Pipeline</div>
+        <div style={{ color: theme.palette.text.primary }}>Run a Tenzir Pipeline</div>
         <Typography variant="body2" color="textSecondary" style={{ marginTop: 10, }}>
           Runs a Tenzir pipeline. You can use the output of the pipeline in your workflow.
         </Typography>
@@ -23659,7 +24978,7 @@ const AngularWorkflow = (defaultprops) => {
     return (
       <div style={{ width: 350, padding: 15, position: "fixed", top: suggestionBox.position.top, left: suggestionBox.position.left, borderRadius: theme.palette?.borderRadius, backgroundColor: theme.palette.surfaceColor, border: "1px solid rgba(255,255,255,0.3)", }}>
         {/*
-				<AutoFixHighIcon style={{height: 12, width: 12, color: "white", position: "absolute", top: 10, right: 24, }} />
+				<AutoFixHighIcon style={{height: 12, width: 12, color: theme.palette.text.primary, position: "absolute", top: 10, right: 24, }} />
 				*/}
         <Tooltip
           title="Close"
@@ -23681,7 +25000,7 @@ const AngularWorkflow = (defaultprops) => {
               });
             }}
           >
-            <CloseIcon style={{ color: "white", height: 12, width: 12, }} />
+            <CloseIcon style={{ color: theme.palette.text.primary, height: 12, width: 12, }} />
           </IconButton>
         </Tooltip>
         <form onSubmit={(e, value) => {
@@ -24030,7 +25349,7 @@ const AngularWorkflow = (defaultprops) => {
             minWidth: isMobile ? "100%" : 360,
             maxWidth: isMobile ? "100%" : 360,
             backgroundColor: theme.palette.platformColor,
-            color: "white",
+            color: theme.palette.text.primary,
             fontSize: 18,
             zIndex: 15001,
             borderRight: theme.palette.defaultBorder,
@@ -24060,7 +25379,7 @@ const AngularWorkflow = (defaultprops) => {
 						</Button>
 					: null*/}
         </div>
-        <div style={{ textAlign: "center", color: "white", flex: 2, paddingTop: 20, }}>
+        <div style={{ textAlign: "center", color: theme.palette.text.primary, flex: 2, paddingTop: 20, }}>
           <Typography variant="h6">
             {selectedVersion?.name}
           </Typography>
@@ -24262,6 +25581,8 @@ const AngularWorkflow = (defaultprops) => {
   }
 
   const handleActionParamChange = (actionId, fieldName, newData) => {
+	var updateFail = ""
+
     if (workflow !== undefined) {
       // Find the action with matching id
       const actionIndex = workflow?.actions.findIndex(action => action.id === actionId);
@@ -24276,9 +25597,20 @@ const AngularWorkflow = (defaultprops) => {
           // Update workflow state to trigger re-render
           setWorkflow({...workflow});
           setLastSaved(false);
-        }
-      }
-    }
+		  setUpdate(Math.random())
+        } else {
+			updateFail = "Parameter is undefined or null"
+		}
+	  } else {
+		  updateFail = "Trigger is undefined or null"
+	  }
+	} else {
+		updateFail = "Workflow is undefined or null"
+	}
+
+	if (updateFail !== "") {
+		toast.error(updateFail + " - Failed to update subflow parameter value. Please try again.")
+	}
   }
   /*
   var foundusecase = {}
@@ -24369,7 +25701,7 @@ const AngularWorkflow = (defaultprops) => {
             // selectedTrigger={selectedTrigger}
             aiSubmit={aiSubmit}
             toolsAppId={toolsApp.id}
-            handleSubflowParamChange={handleSubflowParamChange}
+            handleTriggerParamChange={handleTriggerParamChange}
             codedata={editorData.value}
             setcodedata={setcodedata}
             selectedEdge={selectedEdge}
@@ -24391,6 +25723,7 @@ const AngularWorkflow = (defaultprops) => {
 
 
             setAiQueryModalOpen={setAiQueryModalOpen}
+			isWorkflowEditor={editorData?.name === "workflow yaml"}
           />
           : null}
 
@@ -24417,7 +25750,7 @@ const AngularWorkflow = (defaultprops) => {
                 position: "absolute",
                 top: 6,
                 right: 6,
-                color: "white",
+                color: theme.palette.text.primary,
               }}
               onClick={() => {
                 setSelectionOpen(false)
@@ -24451,7 +25784,7 @@ const AngularWorkflow = (defaultprops) => {
                 position: "absolute",
                 top: 6,
                 right: 6,
-                color: "white",
+                color: theme.palette.text.primary,
               }}
               onClick={() => {
                 setShowVideo("")
diff --git a/frontend/src/views/ApiExplorerWrapper.jsx b/frontend/src/views/ApiExplorerWrapper.jsx
index 96298437..d104d43d 100644
--- a/frontend/src/views/ApiExplorerWrapper.jsx
+++ b/frontend/src/views/ApiExplorerWrapper.jsx
@@ -50,7 +50,7 @@ import { green } from "../views/AngularWorkflow.jsx"
 
 const searchClient = algoliasearch(
   "JNSS5CFDZZ",
-  "db08e40265e2941b9a7d8f644b6e5240"
+  "c8f882473ff42d41158430be09ec2b4e"
 )
 
 // Lazy loading of ApiExplorer component to reduce initial load time
@@ -59,6 +59,7 @@ const ApiExplorer = React.lazy(() => import("../components/ApiExplorer.jsx"));
 
 const ApiExplorerWrapper = (props) => {
   const { globalUrl, serverside, userdata, isLoggedIn, isLoaded} = props;
+  const { supportEmail } = useContext(Context);
   const isCloud = window.location.host === "localhost:3002" || window.location.host === "shuffler.io"
   const location = useLocation();
   const navigate = useNavigate();
@@ -165,7 +166,7 @@ const ApiExplorerWrapper = (props) => {
 			}
 
 			if (!found) {
-				toast.error(`Failed to get API data for '${appname}' (1). Contact support@shuffler.io if this persists.`, {
+				toast.error(`Failed to get API data for '${appname}' (1). Contact ${supportEmail} if this persists.`, {
 					"autoClose": 10000,
 				})
 
@@ -174,7 +175,7 @@ const ApiExplorerWrapper = (props) => {
 				},3000)
 			}
 		} else {
-			toast.error(`Failed to get API data for '${appname}' (2). Contact support@shuffler.io if this persists.`, {
+			toast.error(`Failed to get API data for '${appname}' (2). Contact ${supportEmail} if this persists.`, {
 				"autoClose": 10000,
 			})
 			setTimeout(()=>{
@@ -539,7 +540,7 @@ const ApiExplorerWrapper = (props) => {
     }else if (openapi?.id?.length > 0) {
       appid = openapi?.id;
     }else{
-      toast.error("App id is missing and we can't run the API. Please contact support@shuffler.io if this persists.");
+      toast.error(`App id is missing and we can't run the API. Please contact ${supportEmail} if this persists.`);
       return;
     }
 
@@ -673,7 +674,7 @@ const ApiExplorerWrapper = (props) => {
 
 				if (data.result.includes("custom_action doesn't exist")) {
 					// No timeout error
-					toast.info("This API is being rebuilt due to missing functionality. Please wait a minute or two, then try again. If this persists, please report to support@shuffler.io", {
+					toast.info(`This API is being rebuilt due to missing functionality. Please wait a minute or two, then try again. If this persists, please report to ${supportEmail}`, {
 						"autoClose": 90000,
 					})
 				} else if (data.result.includes("authentication") && data.result.includes("Oauth2")) {
diff --git a/frontend/src/views/AppCreator.jsx b/frontend/src/views/AppCreator.jsx
index 2d1bbb32..1eaf5fcb 100755
--- a/frontend/src/views/AppCreator.jsx
+++ b/frontend/src/views/AppCreator.jsx
@@ -1,7 +1,7 @@
-import React, { useState, useEffect } from "react";
+import React, { useState, useEffect, useContext } from "react";
 import { makeStyles } from "@mui/styles";
 import { BrowserView, MobileView } from "react-device-detect";
-import theme from '../theme.jsx';
+import { getTheme } from '../theme.jsx';
 
 import {
   Paper,
@@ -57,6 +57,7 @@ import { ToastContainer, toast } from "react-toastify"
 import words from "shellwords";
 
 import AvatarEditor from "react-avatar-editor";
+import { Context } from "../context/ContextApi.jsx";
 
 const surfaceColor = "#27292D";
 const inputColor = "#383B40";
@@ -67,33 +68,7 @@ const bodyDivStyle = {
   zoom: 0.8,
 };
 
-const actionListStyle = {
-  paddingLeft: "10px",
-  paddingRight: "10px",
-  paddingBottom: "10px",
-  paddingTop: "10px",
-  marginTop: "5px",
-  display: "flex",
-  color: "white",
-  position: "relative",
 
-  backgroundColor: theme.palette.platformColor,
-};
-
-const boxStyle = {
-  color: "white",
-  flex: "1",
-  marginLeft: "10px",
-  marginRight: "10px",
-  paddingLeft: "30px",
-  paddingRight: "30px",
-  paddingBottom: "30px",
-  paddingTop: "30px",
-  display: "flex",
-  flexDirection: "column",
-
-  backgroundColor: theme.palette.backgroundColor,
-};
 
 const dividerStyle = {
   marginBottom: "10px",
@@ -427,9 +402,40 @@ const AppCreator = (defaultprops) => {
   const [actionAmount, setActionAmount] = useState(increaseAmount);
   const [newAppGroup, setNewAppGroup] = useState("")
 
+  const { themeMode, supportEmail, brandColor } = useContext(Context);
+  const theme = getTheme(themeMode, brandColor);
+
   const [oauth2Scopes, setOauth2Scopes] = useState([]);
   const [oauth2Type, setOauth2Type] = useState("delegated");
 
+  const actionListStyle = {
+    paddingLeft: "10px",
+    paddingRight: "10px",
+    paddingBottom: "10px",
+    paddingTop: "10px",
+    marginTop: "5px",
+    display: "flex",
+    color: theme.palette.text.primary,
+    position: "relative",
+  
+    backgroundColor: theme.palette.platformColor,
+  };
+  
+  const boxStyle = {
+    color: theme.palette.text.primary,
+    flex: "1",
+    marginLeft: "10px",
+    marginRight: "10px",
+    paddingLeft: "30px",
+    paddingRight: "30px",
+    paddingBottom: "30px",
+    paddingTop: "30px",
+    display: "flex",
+    flexDirection: "column",
+  
+    backgroundColor: theme.palette.platformColor,
+  };
+
   //client_credentials
   const [oauth2GrantType, setOauth2GrantType] = useState("");
   const defaultAuth = {
@@ -739,7 +745,7 @@ const AppCreator = (defaultprops) => {
     }
 
     setBasedata(data);
-		console.log("Info: ", data)
+		console.log("Loaded Info: ", data)
 
 		try { 
 			if (data.info !== null && data.info !== undefined) {
@@ -753,7 +759,12 @@ const AppCreator = (defaultprops) => {
 					if (data.info.title.length > 29) {
 						setName(data.info.title.slice(0, 29));
 					} else {
-						setName(data.info.title);
+						// Check if fork=true in URL
+						if (window.location.search.includes("fork=true")) {
+							setName(data.info.title + " Fork");
+						} else {
+							setName(data.info.title)
+						}
 					}
 				}
 
@@ -943,8 +954,8 @@ const AppCreator = (defaultprops) => {
 			if (newaction.url !== undefined && newaction.url !== null && newaction.url.includes("_shuffle_replace_")) {
 				//const regex = /_shuffle_replace_\d/i;
 				const regex = /_shuffle_replace_\d+/i
-				
-				newaction.url = newaction.url.replaceAll(new RegExp(regex, 'g'), "")
+				const newurl = newaction.url.replaceAll(new RegExp(regex, 'g'), "")
+				newaction.url = newurl
 			}
 
           // Finding category
@@ -956,7 +967,6 @@ const AppCreator = (defaultprops) => {
 				if (pathsplit[splitkey].includes("_shuffle_replace_")) {
 					//const regex = /_shuffle_replace_\d/i;
 					const regex = /_shuffle_replace_\d+/i
-					//console.log("NEW: ", 
 					pathsplit[splitkey] = pathsplit[splitkey].replaceAll(new RegExp(regex, 'g'), "")
 				}
 
@@ -1968,7 +1978,7 @@ const AppCreator = (defaultprops) => {
   // Saving the app that's been configured.
 	// Save SAVE app
   const submitApp = () => {
-    toast("Uploading and building app " + name);
+    toast.info("Uploading and building app " + name + ". This may take a minute or two.");
     setAppBuilding(true);
     setErrorCode("");
 
@@ -1978,6 +1988,8 @@ const AppCreator = (defaultprops) => {
     const schemes = [splitBase[0]];
     const basePath = "/" + splitBase.slice(3).join("/");
 
+	const newBaseUrl = baseUrl.replaceAll("http//", "http://").replaceAll("https//", "https://")
+
     const data = {
       openapi: "3.0.0",
       info: {
@@ -1986,7 +1998,7 @@ const AppCreator = (defaultprops) => {
         version: "1.0",
         "x-logo": fileBase64,
       },
-      servers: [{ url: baseUrl }],
+      servers: [{ url: newBaseUrl }],
       host: host,
       basePath: basePath,
       schemes: schemes,
@@ -2037,7 +2049,7 @@ const AppCreator = (defaultprops) => {
     for (let actionkey in actions) {
       var item = JSON.parse(JSON.stringify(actions[actionkey]))
       if (item.errors.length > 0) {
-        toast("Saving with error in action " + item.name);
+        //toast("Saving with error in action " + item.name);
       }
 
       if (item.name === undefined && item.description !== undefined) {
@@ -2595,15 +2607,23 @@ const AppCreator = (defaultprops) => {
     }
 
     if (setExtraAuth.length > 0) {
+	  const invalidfieldnames = ["apikey", "username", "password", "username_basic", "password_basic", "url", "access_token"]
       for (let authkey in extraAuth) {
         const curauth = extraAuth[authkey];
-
         if (curauth.name.length === 0 || curauth.name.toLowerCase() == "url") {
           toast("Can't add extra auth with empty name or Name URL");
           setAppBuilding(false);
           return;
         }
 
+		// Additional comparisonchecks
+    	if (authenticationOption !== "No authentication" && authenticationOption !== "") {
+			if (invalidfieldnames.includes(curauth.name.toLowerCase())) {
+				toast.warn("Skipping extra auth field: " + curauth.name + ". This is not valid.")
+				continue
+			}
+		}
+
         data.components.securitySchemes[curauth.name] = {
           type: "apiKey",
           in: curauth.type,
@@ -2624,12 +2644,17 @@ const AppCreator = (defaultprops) => {
       credentials: "include",
     })
       .then((response) => {
+		setAppBuilding(false)
         if (response.status === 403) {
+
+
     		var urlParams = new URLSearchParams(window.location.search)
 			if (urlParams.has("id")) {
-				toast.error("Please log in to build this app. If this error persists, please contact support@shuffler.io")
+				toast.error(`Please log in to build this app. If this error persists, please contact ${supportEmail}`)
 			} else {
-				toast.error("Failed to save the app as you are not the owner. Redirecting you to the forking page. When there, save again.")
+				toast.error("Failed to save the app as you are not the owner. Redirecting you to the forking page. If this does not load, please download and re-import the app.", {
+					autoClose: 10000
+				})
 				if (props.match.params.appid !== undefined && props.match.params.appid !== null && props.match.params.appid.length > 0) {
 					setTimeout(() => {
 						window.open(`/apps/new?id=${props.match.params.appid}`, "_blank")
@@ -2645,24 +2670,28 @@ const AppCreator = (defaultprops) => {
         	//throw new Error("NOT 200 :O")
         }
 
-        setAppBuilding(false);
         return response.json();
       })
       .then((responseJson) => {
-        if (!responseJson.success) {
-		  if (responseJson.extra !== undefined && responseJson.extra !== null) {
+        if (responseJson?.success !== true) {
+		  if (responseJson?.extra !== undefined && responseJson?.extra !== null) {
 			toast("Failed building: " + responseJson.extra);
-		  }
-
-          if (responseJson.reason !== undefined) {
+		  } else if (responseJson?.reason !== undefined) {
             setErrorCode(responseJson.reason);
 
-			if (responseJson.extra === undefined && responseJson.extra === null) {
-            	toast("Failed to verify: " + responseJson.reason);
+			if (responseJson?.details !== undefined && responseJson?.details !== null) {
+				toast.error("Failed to build - contact support@shuffler.io: " + responseJson.details, {
+					autoClose: 60000 
+				})
+			} else {
+				toast.error("Failed to build: " + responseJson.reason, {
+					autoClose: 10000
+				})
 			}
-          }
+          } else {
+		  }
         } else {
-          toast("Successfully uploaded openapi");
+          toast.success("Successfully built openapi app! Added job to rebuild it in your hybrid runtime locations (Orborus).");
           if (window.location.pathname.includes("/new")) {
             if (responseJson.id !== undefined && responseJson.id !== null) {
               window.location = `/apps/edit/${responseJson.id}`;
@@ -2673,18 +2702,18 @@ const AppCreator = (defaultprops) => {
       .catch((error) => {
         setAppBuilding(false);
         setErrorCode(error.toString());
-        toast(error.toString());
+        toast.error(error.toString());
       });
   };
 
   const bearerAuth =
     authenticationOption === "Bearer auth" ? (
-      <div style={{ color: "white" }}>
+      <div style={{ color: theme.palette.text.primary }}>
         <h4>
           <a
             target="_blank"
             href="https://swagger.io/docs/specification/authentication/bearer-authentication/"
-            style={{ textDecoriation: "none", color: "#f85a3e" }}
+            style={{ textDecoriation: "none", color: theme.palette.linkColor }}
           >
             Bearer auth
           </a>
@@ -2697,12 +2726,12 @@ const AppCreator = (defaultprops) => {
   // Basicauth
   const basicAuth =
     authenticationOption === "Basic auth" ? (
-      <div style={{ color: "white" }}>
+      <div style={{ color: theme.palette.text.primary }}>
         <h4>
           <a
             target="_blank"
             href="https://swagger.io/docs/specification/authentication/basic-authentication/"
-            style={{ textDecoriation: "none", color: "#f85a3e" }}
+            style={{ textDecoriation: "none", color: theme.palette.linkColor }}
           >
             Basic authentication
           </a>
@@ -2796,7 +2825,7 @@ const AppCreator = (defaultprops) => {
                 flex: 2,
                 marginTop: 0,
                 marginBottom: 0,
-                backgroundColor: inputColor,
+                backgroundColor: theme.palette.textFieldStyle.backgroundColor,
                 marginRight: 5,
               }}
               fullWidth={true}
@@ -2805,16 +2834,28 @@ const AppCreator = (defaultprops) => {
               margin="normal"
               variant="outlined"
               defaultValue={extraAuth[index].name}
+			  helperText={
+				  <Typography variant="caption" style={{ color: theme.palette.error.main, marginTop: 10, marginBottom: 10, }}>
+				  	{extraAuth[index]?.name?.toLowerCase() === "url" 
+					  || extraAuth[index]?.name?.toLowerCase() === "apikey"
+					  ? `ERROR: Invalid key: ${extraAuth[index].name}. ` : ""}
+					</Typography>
+			  }
               onChange={(e) => {
                 extraAuth[index].name = e.target.value;
                 setExtraAuth(extraAuth);
               }}
+			  onBlur={(e) => {
+				  // Forcerender
+				  setUpdate(Math.random());
+			  }}
               InputProps={{
                 classes: {
                   notchedOutline: classes.notchedOutline,
                 },
                 style: {
-                  color: "white",
+                  color: theme.palette.textFieldStyle.color,
+                  backgroundColor: theme.palette.textFieldStyle.backgroundColor,
                   minHeight: 50,
                   marginLeft: 5,
                   maxWidth: "95%",
@@ -2829,7 +2870,7 @@ const AppCreator = (defaultprops) => {
                 marginTop: 0,
                 marginBottom: 0,
                 flex: 2,
-                backgroundColor: inputColor,
+                backgroundColor: theme.palette.textFieldStyle.backgroundColor,
                 marginRight: 5,
               }}
               fullWidth={true}
@@ -2844,7 +2885,8 @@ const AppCreator = (defaultprops) => {
               }}
               InputProps={{
                 style: {
-                  color: "white",
+                  color: theme.palette.textFieldStyle.color,
+                  backgroundColor: theme.palette.textFieldStyle.backgroundColor,
                   minHeight: 50,
                   marginLeft: 5,
                   maxWidth: "95%",
@@ -2862,9 +2904,9 @@ const AppCreator = (defaultprops) => {
               value={extraAuth[index].type}
               style={{
                 flex: 1,
-                backgroundColor: inputColor,
+                backgroundColor: theme.palette.backgroundColor,
                 paddingLeft: "10px",
-                color: "white",
+                color: theme.palette.text.primary,
                 height: 50,
                 borderRadius: theme.shape.borderRadius,
               }}
@@ -2875,14 +2917,14 @@ const AppCreator = (defaultprops) => {
             >
               <MenuItem
                 key={index}
-                style={{ backgroundColor: inputColor, color: "white" }}
+                style={{ backgroundColor: theme.palette.backgroundColor, color: theme.palette.text.primary }}
                 value={"header"}
               >
                 Header
               </MenuItem>
               <MenuItem
                 key={index}
-                style={{ backgroundColor: inputColor, color: "white" }}
+                style={{ backgroundColor: theme.palette.backgroundColor, color: theme.palette.text.primary }}
                 value={"query"}
               >
                 Query
@@ -2930,7 +2972,7 @@ const AppCreator = (defaultprops) => {
 
   const jwtAuth =
     authenticationOption === "JWT" ? (
-      <div style={{ color: "white", marginTop: 20 }}>
+      <div style={{ color: theme.palette.text.primary, marginTop: 20 }}>
         <Typography variant="body1">JWT authentication</Typography>
         <Typography
           variant="body2"
@@ -2949,7 +2991,7 @@ const AppCreator = (defaultprops) => {
           variant="outlined"
           defaultValue={parameterName}
           helperText={
-            <span style={{ color: "white", marginBottom: "2px" }}>
+            <span style={{ color: theme.palette.text.primary, marginBottom: "2px" }}>
               Must start with / and be a valid path
             </span>
           }
@@ -2959,7 +3001,7 @@ const AppCreator = (defaultprops) => {
               notchedOutline: classes.notchedOutline,
             },
             style: {
-              color: "white",
+              color: theme.palette.text.primary,
             },
           }}
         />
@@ -2980,7 +3022,7 @@ const AppCreator = (defaultprops) => {
           variant="outlined"
           defaultValue={parameterName}
           helperText={
-            <span style={{ color: "white", marginBottom: "2px" }}>
+            <span style={{ color: theme.palette.text.primary, marginBottom: "2px" }}>
 			  Must use 'key=value&key=value' format
             </span>
           }
@@ -2992,7 +3034,7 @@ const AppCreator = (defaultprops) => {
               notchedOutline: classes.notchedOutline,
             },
             style: {
-              color: "white",
+              color: theme.palette.text.primary,
             },
           }}
         />
@@ -3002,7 +3044,7 @@ const AppCreator = (defaultprops) => {
 
   const oauth2Auth =
     authenticationOption === "Oauth2" ? (
-      <div style={{ color: "white", marginTop: 20 }}>
+      <div style={{ color: theme.palette.text.primary, marginTop: 20 }}>
         <Typography variant="body1">Oauth2 authentication</Typography>
         <Typography
           variant="body2"
@@ -3061,7 +3103,7 @@ const AppCreator = (defaultprops) => {
         		      notchedOutline: classes.notchedOutline,
         		    },
         		    style: {
-        		      color: "white",
+        		      color: theme.palette.text.primary,
         		    },
         		  }}
         		/>
@@ -3112,7 +3154,7 @@ const AppCreator = (defaultprops) => {
               notchedOutline: classes.notchedOutline,
             },
             style: {
-              color: "white",
+              color: theme.palette.text.primary,
             },
           }}
         />
@@ -3161,7 +3203,7 @@ const AppCreator = (defaultprops) => {
 							}}
         		  InputProps={{
         		    style: {
-        		      color: "white",
+        		      color: theme.palette.text.primary,
         		    },
         		  }}
         		/>
@@ -3178,7 +3220,7 @@ const AppCreator = (defaultprops) => {
 		  required
 		  InputProps={{
 			style: {
-			  color: "white",
+			  color: theme.palette.text.primary,
 			  maxHeight: 160,
 			},
 		  }}
@@ -3203,7 +3245,7 @@ const AppCreator = (defaultprops) => {
 
   const apiKey =
     authenticationOption === "API key" ? (
-      <div style={{ color: "white", marginTop: 20 }}>
+      <div style={{ color: theme.palette.text.primary, marginTop: 20 }}>
         <Typography variant="body1">API key authentication</Typography>
         <Typography variant="body2" color="textSecondary">
           <b>Do NOT put your actual API-key.</b> Add the name of the field used for authentication, e.g. "X-APIKEY". 
@@ -3222,7 +3264,7 @@ const AppCreator = (defaultprops) => {
 							variant="outlined"
 							value={parameterName}
 							helperText={
-								<span style={{ color: "white", marginBottom: "2px" }}>
+								<span style={{ color: theme.palette.text.primary, marginBottom: "2px" }}>
 									Can't be empty or contain any of the following: !#$%&'^"+-._~|]+$:=
 								</span>
 							}
@@ -3239,7 +3281,7 @@ const AppCreator = (defaultprops) => {
 									notchedOutline: classes.notchedOutline,
 								},
 								style: {
-									color: "white",
+									color: theme.palette.text.primary,
 								},
 							}}
 						/>
@@ -3256,7 +3298,7 @@ const AppCreator = (defaultprops) => {
         		    borderRadius: theme.shape.borderRadius,
         		    backgroundColor: inputColor,
         		    paddingLeft: 10,
-        		    color: "white",
+        		    color: theme.palette.text.primary,
         		    height: 57,
         		  }}
         		  inputProps={{
@@ -3272,7 +3314,7 @@ const AppCreator = (defaultprops) => {
         		    return (
         		      <MenuItem
         		        key={index}
-        		        style={{ backgroundColor: inputColor, color: "white" }}
+        		        style={{ backgroundColor: inputColor, color: theme.palette.text.primary }}
         		        value={data}
         		      >
         		        {data}
@@ -3464,15 +3506,14 @@ const AppCreator = (defaultprops) => {
     		  <Tooltip title={chipRequired ? "Make not required" : "Make required"}>
     		    <Chip
     		      style={{
-    		        backgroundColor: chipRequired ? "#f86a3e" : "#3d3f43",
+    		        backgroundColor: chipRequired ? "#f86a3e" : theme.palette.chipStyle.backgroundColor,
     		        height: 30,
     		        margin: 3,
     		        paddingLeft: 5,
     		        paddingRight: 5,
-    		        height: 28,
     		        cursor: "pointer",
-    		        borderColor: "#3d3f43",
-    		        color: "white",
+    		        borderColor: theme.palette.chipStyle.borderColor,
+    		        color: theme.palette.chipStyle.color,
     		      }}
     		      label={parsedChip}
     		      onClick={() => {
@@ -3558,7 +3599,7 @@ const AppCreator = (defaultprops) => {
 										placeholder={"Query name (key)"}
 										label={"Query Key"}
 										helperText={
-											<span style={{ color: "white", marginBottom: "2px" }}>
+											<span style={{ color: theme.palette.text.primary, marginBottom: "2px" }}>
 												Click required to flip 
 											</span>
 										}
@@ -3570,7 +3611,7 @@ const AppCreator = (defaultprops) => {
 										style={{flex: 3}}
 										InputProps={{
 											style: {
-												color: "white",
+												color: theme.palette.text.primary,
 											},
 										}}
 									/>
@@ -3590,7 +3631,7 @@ const AppCreator = (defaultprops) => {
 										style={{flex: 2}}
 										InputProps={{
 											style: {
-												color: "white",
+												color: theme.palette.text.primary,
 											},
 										}}
 									/>
@@ -3663,7 +3704,7 @@ const AppCreator = (defaultprops) => {
   	    )}
   	    <TextField
   	      required
-  	      style={{ flex: "1", marginRight: "15px", backgroundColor: inputColor }}
+  	      style={{ flex: "1", marginRight: "15px", backgroundColor: theme.palette.textFieldStyle.backgroundColor }}
   	      fullWidth={true}
   	      placeholder={
   	        '{\n\t"example": "${example}",\n\t"apikey": "${apikey}",\n\t"search": "1.2.3.5"\n}'
@@ -3679,7 +3720,7 @@ const AppCreator = (defaultprops) => {
   	      }}
   	      key={currentAction}
   	      helperText={
-  	        <span style={{ color: "white", marginBottom: "2px" }}>
+  	        <span style={{ color: theme.palette.text.primary, marginBottom: "2px" }}>
   	          Shows an example body to the user. ${} creates variables.
   	        </span>
   	      }
@@ -3688,7 +3729,8 @@ const AppCreator = (defaultprops) => {
   	          notchedOutline: classes.notchedOutline,
   	        },
   	        style: {
-  	          color: "white",
+  	          color: theme.palette.textFieldStyle.color,
+              backgroundColor: theme.palette.textFieldStyle.backgroundColor,
   	        },
   	      }}
   	    />
@@ -3701,7 +3743,7 @@ const AppCreator = (defaultprops) => {
   	    <b>Example success response</b>
   	    <TextField
   	      required
-  	      style={{ flex: "1", marginRight: "15px", backgroundColor: inputColor }}
+  	      style={{ flex: "1", marginRight: "15px", backgroundColor: theme.palette.textFieldStyle.backgroundColor }}
   	      fullWidth={true}
   	      placeholder={
   	        '{\n\t"email": "testing@test.com",\n\t"firstname": "testing"\n}'
@@ -3713,14 +3755,15 @@ const AppCreator = (defaultprops) => {
   	      defaultValue={currentAction["example_response"]}
   	      onChange={(e) => setActionField("example_response", e.target.value)}
   	      helperText={
-  	        <span style={{ color: "white", marginBottom: "2px" }}>
+  	        <span style={{ color: theme.palette.text.primary, marginBottom: "2px" }}>
   	          Helps with autocompletion and understanding of the endpoint
   	        </span>
   	      }
   	      key={currentAction}
   	      InputProps={{
   	        style: {
-  	          color: "white",
+  	          color: theme.palette.textFieldStyle.color,
+  	          backgroundColor: theme.palette.textFieldStyle.backgroundColor,
   	        },
   	      }}
   	    />
@@ -3795,8 +3838,8 @@ const AppCreator = (defaultprops) => {
     		  fullWidth
 			  PaperProps={{
     		    style: {
-    		      backgroundColor: surfaceColor,
-    		      color: "white",
+    		      backgroundColor: theme.palette.drawer.backgroundColor,
+    		      color: theme.palette.text.primary,
     		      minWidth: 700,
     		      maxWidth: 700,
     		    },
@@ -3813,15 +3856,15 @@ const AppCreator = (defaultprops) => {
 			    setFileUploadEnabled(false);
     		  }}
     		>
-    		  <FormControl style={{ backgroundColor: surfaceColor, color: "white" }}>
+    		  <FormControl style={{ backgroundColor: theme.palette.drawer.backgroundColor, color: theme.palette.text.primary }}>
     		    <DialogTitle style={{marginTop: 45, }}>
-    		      <div style={{ color: "white" }}>New action</div>
+    		      <div style={{ color: theme.palette.text.primary }}>New action</div>
     		    </DialogTitle>
     		    <DialogContent style={{paddingBottom: 100, }}>
     		      <a
     		        target="_blank"
     		        href="https://shuffler.io/docs/app_creation#actions"
-    		        style={{ textDecoration: "none", color: "#f85a3e" }}
+    		        style={{ textDecoration: "none", color: theme.palette.linkColor }}
     		      >
     		        Learn more about actions
     		      </a>
@@ -3833,7 +3876,8 @@ const AppCreator = (defaultprops) => {
     		          flex: "1",
     		          marginTop: 5,
     		          marginRight: 15,
-    		          backgroundColor: inputColor,
+    		          backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                  color: theme.palette.textFieldStyle.color,
     		        }}
     		        fullWidth={true}
     		        placeholder="Name"
@@ -3858,7 +3902,7 @@ const AppCreator = (defaultprops) => {
 					  if (currentAction.url === "" && actions !== undefined && actions !== null && actions.length > 0) { 
 					    for (var i = 0; i < actions.length; i++) {
 						  if (actions[i].name.toLowerCase() === e.target.value.toLowerCase()) {
-						    toast("Action with name " + e.target.value + " already exists. If you keep this, it will be overwritten.") 
+						    //toast("Action with name " + e.target.value + " already exists. If you keep this, it will be overwritten.") 
 						    break
 						  }
 					    }
@@ -3872,7 +3916,8 @@ const AppCreator = (defaultprops) => {
     		            notchedOutline: classes.notchedOutline,
     		          },
     		          style: {
-    		            color: "white",
+    		            backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                    color: theme.palette.textFieldStyle.color,
     		          },
     		        }}
     		      />
@@ -3884,7 +3929,8 @@ const AppCreator = (defaultprops) => {
     		          flex: "1",
     		          marginTop: 5,
     		          marginRight: "15px",
-    		          backgroundColor: inputColor,
+    		          backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                  color: theme.palette.textFieldStyle.color,
     		        }}
     		        fullWidth={true}
     		        placeholder="Description"
@@ -3896,7 +3942,8 @@ const AppCreator = (defaultprops) => {
     		        onChange={(e) => setActionField("description", e.target.value)}
     		        InputProps={{
     		          style: {
-    		            color: "white",
+    		            backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                    color: theme.palette.textFieldStyle.color,
     		          },
     		        }}
     		      />
@@ -3918,14 +3965,18 @@ const AppCreator = (defaultprops) => {
     		        }}
     		        value={currentActionMethod}
     		        style={{
-    		          backgroundColor: inputColor,
     		          paddingLeft: "10px",
-    		          color: "white",
+    		          backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                  color: theme.palette.textFieldStyle.color,
     		          height: "50px",
     		        }}
     		        inputProps={{
     		          name: "Method",
     		          id: "method-option",
+                  style: {
+                    backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                    color: theme.palette.textFieldStyle.color,
+                  },
     		        }}
     		      >
 
@@ -3940,7 +3991,7 @@ const AppCreator = (defaultprops) => {
     		            >
 						  <Chip
 						  	style={{
-						  		color: "white",
+						  		color: theme.palette.text.primary,
 						  		borderRadius: theme.shape.borderRadius,
 						  		minWidth: 80,
 						  		marginRight: 10,
@@ -3964,7 +4015,8 @@ const AppCreator = (defaultprops) => {
     		          flex: "1",
     		          marginRight: "15px",
     		          marginTop: "5px",
-    		          backgroundColor: inputColor,
+    		          backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                  color: theme.palette.textFieldStyle.color,
     		        }}
     		        fullWidth={true}
     		        placeholder="URL path"
@@ -3977,7 +4029,7 @@ const AppCreator = (defaultprops) => {
     		          setUrlPath(e.target.value);
     		        }}
     		        helperText={
-    		          <span style={{ color: "white", marginBottom: "2px" }}>
+    		          <span style={{ color: theme.palette.text.primary, marginBottom: "2px" }}>
     		            The path to use. Must start with /. Use {"{variablename}"} to
     		            have path variables
     		          </span>
@@ -3988,7 +4040,8 @@ const AppCreator = (defaultprops) => {
     		            input: classes.input,
     		          },
     		          style: {
-    		            color: "white",
+    		            backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                    color: theme.palette.textFieldStyle.color,
     		          },
     		        }}
     		        onBlur={(event) => {
@@ -4271,7 +4324,7 @@ const AppCreator = (defaultprops) => {
     		          defaultValue={currentAction["file_field"]}
     		          onChange={(e) => setActionField("file_field", e.target.value)}
     		          helperText={
-    		            <span style={{ color: "white", marginBottom: "2px" }}>
+    		            <span style={{ color: theme.palette.text.primary, marginBottom: "2px" }}>
     		              The File field to interact with
     		            </span>
     		          }
@@ -4280,7 +4333,7 @@ const AppCreator = (defaultprops) => {
     		              notchedOutline: classes.notchedOutline,
     		            },
     		            style: {
-    		              color: "white",
+    		              color: theme.palette.text.primary,
     		            },
     		          }}
     		        />
@@ -4295,7 +4348,8 @@ const AppCreator = (defaultprops) => {
 											flex: "1",
 											marginRight: "15px",
 											marginTop: "5px",
-											backgroundColor: inputColor,
+											backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                      color: theme.palette.textFieldStyle.color,
 										}}
 										fullWidth={true}
 										placeholder={
@@ -4309,13 +4363,14 @@ const AppCreator = (defaultprops) => {
 										minRows="2"
 										onChange={(e) => setActionField("headers", e.target.value)}
 										helperText={
-											<span style={{ color: "white", marginBottom: "2px" }}>
+											<span style={{ color: theme.palette.text.primary, marginBottom: "2px" }}>
 												Headers that are part of the request. Default: EMPTY
 											</span>
 										}
 										InputProps={{
 											style: {
-												color: "white",
+												backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                        color: theme.palette.textFieldStyle.color,
 											},
 										}}
 									/>
@@ -4324,14 +4379,14 @@ const AppCreator = (defaultprops) => {
     		      {bodyInfo}
     		      <Divider
     		        style={{
-    		          backgroundColor: "rgba(255,255,255,0.5)",
+    		          backgroundColor: theme.palette.defaultBorder,
     		          marginTop: 15,
     		          marginBottom: 15,
     		        }}
     		      />
     		      {exampleResponse}
     		    </DialogContent>
-    		    <div style={{position: "fixed", backgroundColor: theme.palette.surfaceColor, bottom: 0, width: "100%", padding: 25, borderTop: "1px solid rgba(255,255,255,0.3)", }}>
+    		    <div style={{position: "fixed", backgroundColor: theme.palette.drawer.backgroundColor, bottom: 0, width: "100%", padding: 25, borderTop: theme.palette.defaultBorder, }}>
     		      <Button
     		        color="primary"
     		        variant={urlPath.length > 0 ? "contained" : "outlined"}
@@ -4450,7 +4505,7 @@ const AppCreator = (defaultprops) => {
 							<Chip
 								style={{
 									backgroundColor: bgColor,
-									color: "white",
+									color: theme.palette.text.primary,
 									borderRadius: theme.shape.borderRadius,
 									minWidth: 80,
 									marginRight: 10,
@@ -4502,9 +4557,9 @@ const AppCreator = (defaultprops) => {
 							style={{
 								border: data.action_label === undefined || data.action_label === "No Label" ? "" : `2px solid ${bgColor}`,
 								borderRadius: theme.shape.borderRadius,
-								backgroundColor: inputColor,
+								backgroundColor: theme.palette.backgroundColor,
 								paddingLeft: 10,
-								color: "white",
+								color: theme.palette.text.primary,
 								height: 30,
 								maxWidth: 35, 
 								marginLeft: 10, 
@@ -4621,13 +4676,13 @@ const AppCreator = (defaultprops) => {
 
 
   const tagView = (
-    <div style={{ color: "white" }}>
+    <div style={{ color: theme.palette.text.primary }}>
       {/*
 			<ChipInput
 				style={{marginTop: 10}}
 				InputProps={{
 					style:{
-						color: "white",
+						color: theme.palette.text.primary,
 					},
 				}}
 				placeholder="Categories"
@@ -4662,7 +4717,7 @@ const AppCreator = (defaultprops) => {
 				}}
 				value={newWorkflowCategories.length === 0 ? "Select a category" : newWorkflowCategories[0]}
 				
-				style={{ backgroundColor: inputColor, color: "white", height: "50px" }}
+				style={{ backgroundColor: theme.palette.backgroundColor, color: theme.palette.text.primary, height: "50px" }}
 			  >
 				{categories.map((data, index) => {
 					if (data === undefined || data === null || data === "" || data === undefined || data === null || data === "") {
@@ -4672,7 +4727,7 @@ const AppCreator = (defaultprops) => {
 					return (
 						<MenuItem
 							key={index}
-							style={{ backgroundColor: inputColor, color: "white" }}
+							sx={{ backgroundColor: theme.palette.backgroundColor, color: theme.palette.text.primary, "&:hover" : { backgroundColor:  theme.palette.hoverColor} }}
 							value={data.name}
 						>
 							{data.name}
@@ -4702,7 +4757,7 @@ const AppCreator = (defaultprops) => {
 	  			}}
 	  			InputProps={{
 	  				style: {
-	  					color: "white",
+	  					color: theme.palette.text.primary,
 	  				},
 	  			}}
 	  		/>
@@ -4714,7 +4769,7 @@ const AppCreator = (defaultprops) => {
         style={{ marginTop: 10 }}
         InputProps={{
           style: {
-            color: "white",
+            color: theme.palette.text.primary,
           },
         }}
         placeholder="Tags"
@@ -4787,7 +4842,7 @@ const AppCreator = (defaultprops) => {
             }}
             InputProps={{
               style: {
-                color: "white",
+                color: theme.palette.text.primary,
                 height: 50,
                 fontSize: "1em",
               },
@@ -5102,7 +5157,7 @@ const AppCreator = (defaultprops) => {
 
         /*
 					{selectedAction.authentication.map(data => (
-					<MenuItem key={data.id} style={{backgroundColor: inputColor, color: "white"}} value={data}>
+					<MenuItem key={data.id} style={{backgroundColor: inputColor, color: theme.palette.text.primary}} value={data}>
 				*/
       };
 
@@ -5121,7 +5176,7 @@ const AppCreator = (defaultprops) => {
               target="_blank"
               rel="norefferer"
               href="https://shuffler.io/docs/app_creation#authentication"
-              style={{ textDecoration: "none", color: "#f85a3e" }}
+              style={{ textDecoration: "none", color: theme.palette.linkColor }}
             >
               What is this?
             </a>
@@ -5136,7 +5191,7 @@ const AppCreator = (defaultprops) => {
               }}
               InputProps={{
                 style: {
-                  color: "white",
+                  color: theme.palette.text.primary,
                   marginLeft: "5px",
                   maxWidth: "95%",
                   height: 50,
@@ -5176,7 +5231,7 @@ const AppCreator = (defaultprops) => {
                     }}
                     InputProps={{
                       style: {
-                        color: "white",
+                        color: theme.palette.text.primary,
                         marginLeft: "5px",
                         maxWidth: "95%",
                         height: 50,
@@ -5226,7 +5281,7 @@ const AppCreator = (defaultprops) => {
   };
 
   const actionView = (
-    <div style={{ color: "white", position: "relative" }}>
+    <div style={{ color: theme.palette.text.primary, position: "relative" }}>
       <div style={{ position: "absolute", right: 0, top: 0 }}>
         {actionAmount > 0 && actionAmount < filteredActions.length ? (
           <Button
@@ -5278,15 +5333,14 @@ const AppCreator = (defaultprops) => {
                 key={index}
                 style={{
                   backgroundColor:
-                    tag === selectedCategory ? "#f86a3e" : "#3d3f43",
+                    tag === selectedCategory ? "#f86a3e" : theme.palette.chipStyle.backgroundColor,
                   height: 30,
                   margin: 3,
                   paddingLeft: 5,
                   paddingRight: 5,
-                  height: 28,
                   cursor: "pointer",
-                  borderColor: "#3d3f43",
-                  color: "white",
+                  borderColor: theme.palette.chipStyle.borderColor,
+                  color: theme.palette.chipStyle.color,
                 }}
                 label={newname}
                 onClick={() => {
@@ -5412,13 +5466,13 @@ const AppCreator = (defaultprops) => {
   );
 
   const testView = (
-    <div style={{ color: "white" }}>
+    <div style={{ color: theme.palette.text.primary }}>
       <h2>Test</h2>
       Test an action to see whether it performs in an expected way.
       <a
         target="_blank"
         href="https://shuffler.io/docs/app_creation#testing"
-        style={{ textDecoration: "none", color: "#f85a3e" }}
+        style={{ textDecoration: "none", color: theme.palette.linkColor }}
       >
         &nbsp;TBD: Click here to learn more about testing
       </a>
@@ -5573,7 +5627,7 @@ const AppCreator = (defaultprops) => {
       PaperProps={{
         style: {
           backgroundColor: surfaceColor,
-          color: "white",
+          color: theme.palette.text.primary,
           minWidth: "300px",
           minHeight: "300px",
         },
@@ -5722,7 +5776,7 @@ const AppCreator = (defaultprops) => {
       PaperProps={{
         style: {
           backgroundColor: surfaceColor,
-          color: "white",
+          color: theme.palette.text.primary,
           minWidth: "800px",
           minHeight: "320px",
         },
@@ -5742,7 +5796,7 @@ const AppCreator = (defaultprops) => {
             margin="normal"
             InputProps={{
               style: {
-                color: "white",
+                color: theme.palette.text.primary,
                 height: "50px",
                 fontSize: "1em",
               },
@@ -5769,7 +5823,7 @@ const AppCreator = (defaultprops) => {
               setOpenApi(e.target.value);
             }}
             helperText={
-              <span style={{ color: "white", marginBottom: "2px" }}>
+              <span style={{ color: theme.palette.text.primary, marginBottom: "2px" }}>
                 Must point to a version 2 or 3 OpenAPI specification.
               </span>
             }
@@ -5833,20 +5887,22 @@ const AppCreator = (defaultprops) => {
 
   // Random names for type & autoComplete. Didn't research :^)
   const landingpageDataBrowser = (
-    <div style={{ paddingBottom: 100, color: "white" }}>
+    <div style={{ paddingBottom: 100, color: theme.palette.text.primary, }}>
       <Breadcrumbs
         aria-label="breadcrumb"
         separator="›"
-        style={{ color: "white" }}
+        style={{ color: theme.palette.text.primary }}
       >
         <Link to="/apps" style={{ textDecoration: "none", color: "inherit" }}>
-          <h2 style={{ color: "rgba(255,255,255,0.5)" }}>
+          <h2 style={{ color: theme.palette.textColor }}>
             <AppsIcon style={{ marginRight: 10 }} />
             Apps
           </h2>
         </Link>
         <h2>
-          {name}{" "}
+	  	  <Link to={props?.match?.params?.appid !== undefined && props?.match?.params?.appid !== null && props?.match?.params?.appid.length > 0 ? `/apps/${props?.match?.params?.appid}` : "/apps" } style={{ textDecoration: "none", color: theme.palette.text.primary }}>
+          	{name}{" "}
+	  	  </Link>
           {actions === null ||
           actions === undefined ||
           actions.length === 0 ? null : (
@@ -5861,10 +5917,10 @@ const AppCreator = (defaultprops) => {
         ref={(ref) => (upload = ref)}
         onChange={editHeaderImage}
       />
-      <Paper style={boxStyle}>
+      <div style={boxStyle}>
 	  	<div style={{display: "flex", }}>
 			<div style={{flex: 1, }}>
-				<h2 style={{ marginBottom: "10px", color: "white" }}>
+				<h2 style={{ marginBottom: "10px", color: theme.palette.text.primary }}>
 				  General information
 				</h2>
 			</div>
@@ -5908,13 +5964,13 @@ const AppCreator = (defaultprops) => {
         <a
           target="_blank"
           href="https://shuffler.io/docs/app_creation#app-creator-instructions"
-          style={{ textDecoration: "none", color: "#f85a3e" }}
+          style={{ textDecoration: "none", color: theme.palette.linkColor }}
         >
           Click to learn more about app creation
         </a>
         <div
           style={{
-            color: "white",
+            color: theme.palette.text.primary,
             flex: "1",
             display: "flex",
             flexDirection: "row",
@@ -5945,7 +6001,7 @@ const AppCreator = (defaultprops) => {
               />
             </div>
           </Tooltip>
-          <div style={{ flex: "3", color: "white", marginLeft: 20, }}>
+          <div style={{ flex: "3", color: theme.palette.text.primary, marginLeft: 20, }}>
             <div style={{ marginTop: "10px" }} />
             Name
             <TextField
@@ -5954,7 +6010,7 @@ const AppCreator = (defaultprops) => {
                 flex: "1",
                 marginTop: "5px",
                 marginRight: "15px",
-                backgroundColor: inputColor,
+                backgroundColor: theme.palette.textFieldStyle.backgroundColor,
               }}
               fullWidth={true}
               placeholder="Name"
@@ -5990,7 +6046,8 @@ const AppCreator = (defaultprops) => {
               color="primary"
               InputProps={{
                 style: {
-                  color: "white",
+                  color: theme.palette.textFieldStyle.color,
+                  backgroundColor: theme.palette.textFieldStyle.backgroundColor,
                   height: "50px",
                   fontSize: "1em",
                 },
@@ -6006,13 +6063,19 @@ const AppCreator = (defaultprops) => {
               style={{
 				marginTop: 5, 
                 marginRight: 15,
-                backgroundColor: inputColor,
+                backgroundColor: theme.palette.textFieldStyle.backgroundColor,
 				maxHeight: 250,
 				overflowY: "auto"
               }}
               fullWidth={true}
               type="name"
               id="outlined-with-placeholder"
+              inputProps={{
+                style: {
+                  color: theme.palette.textFieldStyle.color,
+                  backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                }
+              }}
               margin="normal"
 			  multiline
               variant="outlined"
@@ -6034,7 +6097,7 @@ const AppCreator = (defaultprops) => {
         />
         <Typography
           variant="h6"
-          style={{ marginTop: 10, marginBottom: 10, color: "white" }}
+          style={{ marginTop: 10, marginBottom: 10, color: theme.palette.text.primary }}
         >
           API information
         </Typography>
@@ -6043,14 +6106,15 @@ const AppCreator = (defaultprops) => {
         </Typography>
         <TextField
           color="primary"
-          style={{ backgroundColor: inputColor, marginTop: "5px" }}
+          style={{ backgroundColor: theme.palette.textFieldStyle.backgroundColor, marginTop: "5px" }}
           InputProps={{
             classes: {
               notchedOutline: classes.notchedOutline,
             },
             style: {
               height: "50px",
-              color: "white",
+              color: theme.palette.textFieldStyle.color,
+              backgroundColor: theme.palette.textFieldStyle.backgroundColor,
               fontSize: "1em",
             },
           }}
@@ -6062,8 +6126,8 @@ const AppCreator = (defaultprops) => {
           variant="outlined"
           value={baseUrl}
           helperText={
-            <span style={{ color: "white", marginBottom: "2px" }}>
-              Must start with http(s):// and CANT end with /.{" "}
+            <span style={{ color: theme.palette.text.primary, marginBottom: "2px" }}>
+              Must start with http(s):// and can NOT end with /.{" "}
             </span>
           }
           placeholder="https://api.example.com"
@@ -6082,12 +6146,12 @@ const AppCreator = (defaultprops) => {
               toast("URL must start with http(s)://");
             }
 
-						if (tmpstring.includes("?")) {
-							var newtmp = tmpstring.split("?")
-							if (tmpstring.length > 1) {
-								tmpstring = newtmp[0]
-							}
-						}
+			if (tmpstring.includes("?")) {
+				var newtmp = tmpstring.split("?")
+				if (tmpstring.length > 1) {
+					tmpstring = newtmp[0]
+				}
+			}
 
             setBaseUrl(tmpstring);
           }}
@@ -6099,7 +6163,7 @@ const AppCreator = (defaultprops) => {
 						<a
 							target="_blank"
 							href="https://shuffler.io/docs/app_creation#authentication"
-							style={{ textDecoration: "none", color: "#f85a3e" }}
+							style={{ textDecoration: "none", color: theme.palette.linkColor }}
 						>
 							Learn more about app authentication
 						</a>
@@ -6123,15 +6187,15 @@ const AppCreator = (defaultprops) => {
 							}}
 							value={authenticationOption}
 							style={{
-								backgroundColor: inputColor,
-								color: "white",
+								backgroundColor: theme.palette.backgroundColor,
+								color: theme.palette.text.primary,
 								height: "50px",
 							}}
 						>
 							{authenticationOptions.map((data, index) => (
 								<MenuItem
 									key={index}
-									style={{ backgroundColor: inputColor, color: "white" }}
+									sx={{ backgroundColor: theme.palette.backgroundColor, color: theme.palette.text.primary, "&:hover": {backgroundColor: theme.palette.backgroundColor} }}
 									value={data}
 								>
 									{data}
@@ -6166,14 +6230,14 @@ const AppCreator = (defaultprops) => {
 									value={oauth2Type}
 									style={{
 										backgroundColor: inputColor,
-										color: "white",
+										color: theme.palette.text.primary,
 										height: "50px",
 									}}
 								>
 									{["delegated", "application"].map((data, index) => (
 										<MenuItem
 											key={index}
-											style={{ backgroundColor: inputColor, color: "white" }}
+											style={{ backgroundColor: inputColor, color: theme.palette.text.primary }}
 											value={data}
 										>
 											{data}
@@ -6194,14 +6258,14 @@ const AppCreator = (defaultprops) => {
 										value={oauth2GrantType}
 										style={{
 											backgroundColor: inputColor,
-											color: "white",
+											color: theme.palette.text.primary,
 											height: "50px",
 										}}
 									>
 										{["client_credentials", "password"].map((data, index) => (
 											<MenuItem
 												key={index}
-												style={{ backgroundColor: inputColor, color: "white" }}
+												style={{ backgroundColor: inputColor, color: theme.palette.text.primary }}
 												value={data}
 											>
 												{data}
@@ -6226,8 +6290,8 @@ const AppCreator = (defaultprops) => {
 
         {/*authenticationOption === "No authentication" ? null :
 						<FormControlLabel
-							style={{color: "white", marginBottom: 0, marginTop: 20}}
-							label=<div style={{color: "white"}}>Authentication required (default true)</div>
+							style={{color: theme.palette.text.primary, marginBottom: 0, marginTop: 20}}
+							label=<div style={{color: theme.palette.text.primary}}>Authentication required (default true)</div>
 							control={<Switch checked={authenticationRequired} onChange={() => {
 								setAuthenticationRequired(!authenticationRequired)
 							}} />}
@@ -6322,7 +6386,7 @@ const AppCreator = (defaultprops) => {
 		  {errorCode.length > 0 ? `Upload Error: ${errorCode}` : null}
 		</Typography>
 
-      </Paper>
+      </div>
     </div>
   );
 
diff --git a/frontend/src/views/AppExplorer.jsx b/frontend/src/views/AppExplorer.jsx
index b3cb0d99..f0069e4f 100644
--- a/frontend/src/views/AppExplorer.jsx
+++ b/frontend/src/views/AppExplorer.jsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useContext } from "react";
 
-import theme from "../theme.jsx";
+import {getTheme} from "../theme.jsx";
 import ReactGA from "react-ga4";
 import Markdown from "react-markdown";
 import algoliasearch from "algoliasearch/lite";
@@ -86,53 +86,6 @@ import { sortByKey } from "../views/AngularWorkflow.jsx";
 import { v4 as uuidv4 } from "uuid";
 import aa from "search-insights";
 
-const surfaceColor = "#27292D";
-const inputColor = "#383B40";
-
-const chipStyle = {
-  marginTop: 5,
-  backgroundColor: "#3d3f43",
-  height: 30,
-  marginRight: 5,
-  paddingLeft: 5,
-  paddingRight: 5,
-  height: 28,
-  cursor: "pointer",
-  borderColor: "#3d3f43",
-  color: "white",
-};
-
-const actionListStyle = {
-  paddingLeft: 10,
-  paddingRight: 10,
-  paddingTop: 10,
-  marginTop: 5,
-  backgroundColor: inputColor,
-  display: "flex",
-  color: "white",
-  maxWidth: 350,
-  minWidth: 350,
-  maxHeight: 54,
-  overflow: "hidden",
-};
-
-const boxStyle = {
-  color: "white",
-  flex: "3",
-  margin: 10,
-  paddingLeft: 30,
-  paddingRight: 30,
-  paddingBottom: 30,
-  paddingTop: 30,
-  display: "flex",
-  flexDirection: "column",
-  position: "relative",
-  maxHeight: 180,
-  overflow: "hidden",
-};
-
-const buttonBackground = "linear-gradient(to right, #f86a3e, #f34079)";
-
 
 // AppTypes:
 // 0 = OpenAPI (VALID)
@@ -140,7 +93,7 @@ const buttonBackground = "linear-gradient(to right, #f86a3e, #f34079)";
 // 2 = OpenAPI (Invalid)
 const searchClient = algoliasearch(
   "JNSS5CFDZZ",
-  "db08e40265e2941b9a7d8f644b6e5240"
+  "c8f882473ff42d41158430be09ec2b4e"
 )
 
 const AppExplorer = (props) => {
@@ -162,7 +115,54 @@ const AppExplorer = (props) => {
   const classes = useStyles()
   let navigate = useNavigate()
 
-  const { leftSideBarOpenByClick, } = useContext(Context);
+  const { leftSideBarOpenByClick, themeMode, supportEmail } = useContext(Context);
+  const theme = getTheme(themeMode);
+
+  const surfaceColor = "#27292D";
+const inputColor = theme.palette.textFieldStyle.backgroundColor;
+
+const chipStyle = {
+  marginTop: 5,
+  backgroundColor: theme.palette.chipStyle.backgroundColor,
+  height: 30,
+  marginRight: 5,
+  paddingLeft: 5,
+  paddingRight: 5,
+  cursor: "pointer",
+  borderColor: theme.palette.chipStyle.borderColor,
+  color: theme.palette.chipStyle.color,
+};
+
+const actionListStyle = {
+  paddingLeft: 10,
+  paddingRight: 10,
+  paddingTop: 10,
+  marginTop: 5,
+  backgroundColor: inputColor,
+  display: "flex",
+  color: theme.palette.text.primary,
+  maxWidth: 350,
+  minWidth: 350,
+  maxHeight: 54,
+  overflow: "hidden",
+};
+
+const boxStyle = {
+  color: theme.palette.text.primary,
+  flex: "3",
+  margin: 10,
+  paddingLeft: 30,
+  paddingRight: 30,
+  paddingBottom: 30,
+  paddingTop: 30,
+  display: "flex",
+  flexDirection: "column",
+  position: "relative",
+  maxHeight: 180,
+  overflow: "hidden",
+};
+
+const buttonBackground = "linear-gradient(to right, #f86a3e, #f34079)";
 
   const params = useParams();
   //var props = JSON.parse(JSON.stringify(defaultprops))
@@ -385,9 +385,9 @@ const AppExplorer = (props) => {
       extraInfo = (
         <div
           style={{
-            backgroundColor: theme.palette.inputColor,
+            backgroundColor: theme.palette.textFieldStyle.backgroundColor,
             padding: 15,
-            borderRadius: theme.palette?.borderRadius,
+            borderRadius: theme.palette?.textFieldStyle.borderRadius,
             marginBottom: 30,
             display: "flex",
           }}
@@ -555,7 +555,9 @@ const AppExplorer = (props) => {
 									}}
 									style={{
 										cursor: "pointer", 
-										color: "white",
+                    backgroundColor: theme.palette.chipStyle.backgroundColor,
+                    borderColor: theme.palette.chipStyle.borderColor,
+										color: theme.palette.chipStyle.color,
 										borderRadius: 40,
 										minWidth: 80,
 										marginRight: 10,
@@ -586,7 +588,9 @@ const AppExplorer = (props) => {
 									disabled={included === false}
 									style={{
 										cursor: included ? "pointer" : "default",
-										color: "white",
+										color: theme.palette.chipStyle.color,
+                    borderColor: theme.palette.chipStyle.borderColor,
+                    backgroundColor: theme.palette.chipStyle.backgroundColor,
 										borderRadius: 40,
 										minWidth: 80,
 										marginRight: 10,
@@ -776,7 +780,7 @@ const AppExplorer = (props) => {
 				if (responseJson.reason !== undefined) {
 					toast("Failed to perform action: "+responseJson.reason);
 				} else {
-					toast("Failed to perform action. Please try again or contact support@shuffler.io");
+					toast(`Failed to perform action. Please try again or contact ${supportEmail}`);
 				}
 			}
       } else {
@@ -1088,14 +1092,13 @@ const AppExplorer = (props) => {
       setNewWorkflowTags(newWorkflowTags);
     }
 
-    // This is annoying (:
-    var securitySchemes = data.components.securityDefinitions;
+    var securitySchemes = data?.components?.securityDefinitions;
     if (securitySchemes === undefined) {
-      securitySchemes = data.securitySchemes;
+      securitySchemes = data?.securitySchemes;
     }
 
     if (securitySchemes === undefined) {
-      securitySchemes = data.components.securitySchemes;
+      securitySchemes = data?.components?.securitySchemes;
     }
 
     const allowedfunctions = [
@@ -1681,7 +1684,7 @@ const AppExplorer = (props) => {
           setExecutionResult({
             valid: false,
             result:
-              "Couldn't finish execution (2). Please fill all the required fields, and validate the execution.",
+              "Couldn't finish execution OR no result was returned (2). Please fill all the required fields, and validate the execution.",
           });
         }
 
@@ -3094,7 +3097,7 @@ const AppExplorer = (props) => {
               margin: 10,
               padding: 30,
               backgroundColor: boxStyle.backgroundColor,
-              color: "white",
+              color: theme.palette.text.primary,
               textAlign: "left",
               paddingBottom: 50,
               overflow: "hidden",
@@ -3118,12 +3121,12 @@ const AppExplorer = (props) => {
               style={{ marginBottom: 0, marginLeft: 0, marginRight: 0, minWidth: 800, maxWidth: 800, margin: "auto", }}
               aria-label="disabled tabs example"
             >
-              <Tab style={{marginLeft: 0, }} icon={<DescriptionIcon />} label="Docs" />
-              <Tab icon={appType === 0 || appType === 2 ? <OpenInNewIcon /> : <AppsIcon />} label={appType === 0 || appType === 2 ? "Explore the API" : "Try it out"} />
+              <Tab style={{marginLeft: 0, color: theme.palette.text.primary, textTransform: "none",}} icon={<DescriptionIcon />} label="Docs" />
+              <Tab style={{color: theme.palette.text.primary, textTransform: "none", }} icon={appType === 0 || appType === 2 ? <OpenInNewIcon /> : <AppsIcon />} label={appType === 0 || appType === 2 ? "Try the API" : "Try it out"} />
 
-              <Tab icon={<ShowChartIcon />} label="Stats" />
-              <Tab icon={<PolylineIcon />} disabled label="Integrations" />
-              <Tab icon={<PersonIcon />} disabled={userdata.support !== true} label="Creator" value={4}  />
+              <Tab icon={<ShowChartIcon />} style={{color: theme.palette.text.primary, textTransform: "none", }} label="Stats & Downloads" />
+              <Tab icon={<PolylineIcon />} style={{color: theme.palette.text.primary, textTransform: "none", }} disabled style={{color: theme.palette.text.secondary}} label="Integrations" />
+              <Tab icon={<PersonIcon />} disabled={userdata.support !== true} style={{color: userdata.support !== true ? theme.palette.text.secondary: theme.palette.text.primary, textTransform: "none", }} label="Creator" value={4}  />
             </Tabs>
             <div style={{ marginTop: 25 }}>
               {selectedTab === 1 && app.skipped_build == false ? (
@@ -3132,8 +3135,8 @@ const AppExplorer = (props) => {
                     <SelectedActionView action={currentAction} />
                   </div>
                   <div style={{ marginLeft: 25, maxWidth: 350 }}>
-										{currentAction.description !== undefined && currentAction.description !== null && currentAction.description !== "" ? 
-											<div
+					{currentAction.description !== undefined && currentAction.description !== null && currentAction.description !== "" ? 
+						<div
                         style={{
                           maxHeight: 175,
                           overflowX: "hidden",
@@ -3250,11 +3253,11 @@ const AppExplorer = (props) => {
 				  	Use the App onprem (hybrid)
 				  </Typography> 
 				  <Typography variant="body2" color="textSecondary" style={{marginTop: 5, }}>
-				  	Due to using docker containers with privately uploaded containers, we had to use a custom registry. Use the command below to download the image to the server if it fails to run.
+				  	Custom uses a custom Docker registry for private containers. Use the command below to download the app image to a server if it fails to do so automatically.
 
-				  	It will authenticate and authorize you, before redirecting to a Signed URL on https://storage.googleapis.com
+				  	The downloadable image may not be ready until 5 minutes after the app was built.
 
-				  	<b>&nbsp;Now also works for ARM containers!</b>
+				  	<b>&nbsp;Now also works for ARM containers (?arch=arm)!</b>
 				  </Typography> 
 
 				  <div
@@ -3866,13 +3869,13 @@ const AppExplorer = (props) => {
         }
       }}
     >
-      <DialogTitle style={{ marginBottom: 0 }}>
+      <DialogTitle style={{ marginBottom: 0, padding: 50,  paddingBottom: 0, }}>
         <div style={{ textAlign: "center", color: "rgba(255,255,255,0.9)" }}>
           Are you sure you want to PUBLISH this app?
         </div>
       </DialogTitle>
       <DialogContent
-        style={{ color: "rgba(255,255,255,0.65)", textAlign: "center" }}
+        style={{ color: "rgba(255,255,255,0.65)", textAlign: "center", padding: 50, }}
       >
         <div>
           <Typography variant="body1" style={{ marginBottom: 20 }}>
@@ -3884,12 +3887,12 @@ const AppExplorer = (props) => {
         </div>
         <Button
           variant="contained"
-          style={{ borderRadius: "2px", textTransform: 'none', fontSize:16, color: "#1a1a1a", backgroundColor: "#ff8544" }}
+          color="primary"
+          style={{ borderRadius: "2px", textTransform: 'none', fontSize:16,  }}
           onClick={() => {
 			updateAppField(selectedApp.id, "sharing", true);
             setPublishModalOpen(false);
           }}
-          color="primary"
         >
           Yes
         </Button>
@@ -3920,13 +3923,13 @@ const AppExplorer = (props) => {
           <Breadcrumbs
             aria-label="breadcrumb"
             separator="›"
-            style={{ color: "white", marginLeft: 15, flex: 100 }}
+            style={{ color: theme.palette.text.primary, marginLeft: 15, flex: 100 }}
           >
             <Link
               to="/search"
               style={{ textDecoration: "none", color: "inherit" }}
             >
-              <h2 style={{ color: "rgba(255,255,255,0.5)" }}>
+              <h2 style={{ color: theme.palette.text.primary }}>
                 <AppsIcon style={{ marginRight: 10 }} />
                 Apps
               </h2>
@@ -3972,9 +3975,7 @@ const AppExplorer = (props) => {
           ) : null}
           {appType === 0 || appType === 2 ? (
             <IconButton
-              color="primary"
               style={{ marginRight: 20 }}
-              variant="contained"
               onClick={() => {
                 const data = openapi;
                 let exportFileDefaultName = name + ".json";
@@ -3995,7 +3996,7 @@ const AppExplorer = (props) => {
                 if (queryID !== undefined && queryID !== null) {
                   aa("init", {
                     appId: "JNSS5CFDZZ",
-                    apiKey: "db08e40265e2941b9a7d8f644b6e5240",
+                    apiKey: "c8f882473ff42d41158430be09ec2b4e",
                   });
 
                   const timestamp = new Date().getTime();
@@ -4021,12 +4022,12 @@ const AppExplorer = (props) => {
               }}
             >
               <Tooltip title="Download OpenAPI" placement="top">
-                <CloudDownloadIcon color="secondary" />
+                <CloudDownloadIcon color={theme.palette.text.primary} />
               </Tooltip>
             </IconButton>
           ) : null}
 
-	  	  {selectedOrganization !== undefined && selectedOrganization !== null && selectedOrganization.id !== undefined && userdata.support === true ?
+	  	  {selectedOrganization !== undefined && selectedOrganization !== null && selectedOrganization.id !== undefined  ?
 			// Iconbutton for authentication with just an icon. Link to /apps/authentication?app_id=app.id
 			<IconButton
 				color="secondary"
@@ -4037,7 +4038,7 @@ const AppExplorer = (props) => {
 				}}
 			>
 				<Tooltip title="Public Authentication link for the current Organization. Times out every 24 hours." placement="top">
-				  	<LockOpenIcon />
+				  	<LockOpenIcon color={theme.palette.text.primary}/>
 				</Tooltip>
 			</IconButton>
 		  : null}
@@ -4065,7 +4066,7 @@ const AppExplorer = (props) => {
             </Button>
           }
 
-          {isMobile ? null : (
+          {isMobile || app?.reference_org === userdata?.active_org?.id ? null : (
             <Button
 			  variant={userdata.active_apps !== undefined && userdata.active_apps !== null && userdata.active_apps.includes(appId) ? "outlined": "contained"}
               component="label"
@@ -4084,7 +4085,7 @@ const AppExplorer = (props) => {
                 if (queryID !== undefined && queryID !== null) {
                   aa("init", {
                     appId: "JNSS5CFDZZ",
-                    apiKey: "db08e40265e2941b9a7d8f644b6e5240",
+                    apiKey: "c8f882473ff42d41158430be09ec2b4e",
                   });
 
                   const timestamp = new Date().getTime();
@@ -4120,7 +4121,7 @@ const AppExplorer = (props) => {
             </Button>
           )}
 			{appType === 1 ? null : 
-				creatorProfile.self === true || userdata.support === true ? 
+  				userdata?.support || userdata?.id === app?.owner || (userdata?.admin === "true" && userdata?.active_org?.id === app?.reference_org) || app?.contributors?.includes(userdata?.id) || creatorProfile?.self === true ?
 				<Tooltip title="Edit App" placement="top">
 					<Button
 						variant="outlined"
@@ -4141,7 +4142,7 @@ const AppExplorer = (props) => {
 						component="label"
 						color="secondary"
 						onClick={() => {
-							navigate(`/apps/new?id=${appId}`)
+							navigate(`/apps/new?id=${appId}&fork=true`)
 						}}
 						style={{ height: 40, marginTop: 5, marginLeft: 5, }}
 					>
@@ -4164,12 +4165,12 @@ const AppExplorer = (props) => {
 			  		style={{ height: 40, marginTop: 5, marginLeft: 5, }}
 				  >
   					<OpenInNewIcon style={{marginRight: 5, }}/>
-					Explore API
+					Try the API
 				  </Button>
 				</a>
-        {(appdata?.owner === userdata?.id) ? (
                 <Select
                   value={sharingConfiguration}
+			  	  disabled={!isCloud}
                   onChange={(event) => {
                     if ((appdata.owner !== userdata.id) && (!userdata.support)) {
                       toast("You're not the owner of this app. You can't update it.");
@@ -4198,8 +4199,8 @@ const AppExplorer = (props) => {
                   }}
                   style={{
                     width: 150,
-                    backgroundColor: theme.palette.surfaceColor,
-                    color: "white",
+                    backgroundColor: theme.palette.backgroundColor,
+                    color: theme.palette.text.primary,
                     height: 40,
                     marginTop: 5
                   }}
@@ -4214,7 +4215,7 @@ const AppExplorer = (props) => {
                     return (
                       <MenuItem
                         key={data}
-                        style={{ backgroundColor: inputColor, color: "white", display: 'flex' }}
+                        sx={{ backgroundColor: inputColor, color: theme.palette.text.primary, display: 'flex', "&:hover": { backgroundColor: theme.palette.hoverColor } }}
                         value={data}
                       >
                         {data}
@@ -4222,7 +4223,6 @@ const AppExplorer = (props) => {
                     );
                   })}
                 </Select>
-        ): null }
 			</div>
           ) : (
             <a
@@ -4375,8 +4375,8 @@ const AppExplorer = (props) => {
                       style={{
                         borderRadius: 25,
                         fontSize: 11,
-                        color: "white",
-                        backgroundColor: "rgba(255,255,255,0)",
+                        color: theme.palette.text.primary,
+                        backgroundColor: theme.palette.platformColor,
                         border: "1px solid #ddf4e1",
                         textTransform: "none",
                         marginLeft: 4,
@@ -4468,6 +4468,11 @@ const AppExplorer = (props) => {
             color: "white",
             textAlign: "center",
           }}
+          sx={{
+            "&:hover": {
+              backgroundColor: theme.palette.hoverColor,
+            },
+          }}
         >
           <CardActionArea
             component={Link}
@@ -4555,6 +4560,11 @@ const AppExplorer = (props) => {
               color: "white",
               textAlign: "center",
             }}
+            sx={{
+              "&:hover": {
+                backgroundColor: theme.palette.hoverColor,
+              },
+            }}
           >
             <CardActionArea
               component={Link}
diff --git a/frontend/src/views/Apps.jsx b/frontend/src/views/Apps.jsx
index 8b4eadd4..684d8e9c 100755
--- a/frontend/src/views/Apps.jsx
+++ b/frontend/src/views/Apps.jsx
@@ -280,7 +280,7 @@ export const GetParsedPaths = (inputdata, basekey) => {
   return parsedValues;
 };
 
-const searchClient = algoliasearch("JNSS5CFDZZ", "db08e40265e2941b9a7d8f644b6e5240")
+const searchClient = algoliasearch("JNSS5CFDZZ", "c8f882473ff42d41158430be09ec2b4e")
 const Apps = (props) => {
   const { globalUrl, isLoggedIn, isLoaded, userdata, serverside, } = props;
 
@@ -1305,7 +1305,7 @@ const Apps = (props) => {
             		    if (queryID !== undefined && queryID !== null) {
             		      aa("init", {
             		        appId: "JNSS5CFDZZ",
-            		        apiKey: "db08e40265e2941b9a7d8f644b6e5240",
+            		        apiKey: "c8f882473ff42d41158430be09ec2b4e",
             		      });
 
             		      const timestamp = new Date().getTime();
@@ -2036,7 +2036,7 @@ const Apps = (props) => {
                     if (queryID !== undefined && queryID !== null) {
                       aa('init', {
                         appId: "JNSS5CFDZZ",
-                        apiKey: "db08e40265e2941b9a7d8f644b6e5240",
+                        apiKey: "c8f882473ff42d41158430be09ec2b4e",
                       })
 
                       const timestamp = new Date().getTime()
diff --git a/frontend/src/views/Apps2.jsx b/frontend/src/views/Apps2.jsx
index c78eabe6..cdfebe78 100644
--- a/frontend/src/views/Apps2.jsx
+++ b/frontend/src/views/Apps2.jsx
@@ -1,6 +1,7 @@
 import React, { useState, useEffect, useContext, useCallback, memo, useMemo, useRef } from "react";
-import theme from "../theme.jsx";
+import {getTheme} from "../theme.jsx";
 import { isMobile } from "react-device-detect";
+
 import { useLocation, useNavigate } from "react-router-dom";
 import {
   TextField, Button, Typography, MenuItem, Select, Tabs, Tab, Zoom,
@@ -45,19 +46,20 @@ import AppCreationModal from "../components/AppCreationModal.jsx";
 
 const searchClient = algoliasearch(
   "JNSS5CFDZZ",
-  "db08e40265e2941b9a7d8f644b6e5240"
+  "c8f882473ff42d41158430be09ec2b4e"
 );
 
 // AppCard Component
 const AppCard = ({ data, index, mouseHoverIndex, setMouseHoverIndex, globalUrl, deactivatedIndexes, currTab, handleAppClick, leftSideBarOpenByClick, userdata, fetchApps, appsToShow, setAppsToShow, setUserApps, }) => {
   const navigate = useNavigate();
   const isCloud = window.location.host === "localhost:3002" || window.location.host === "shuffler.io" || window.location.host === "localhost:3000";
-  const appUrl = isCloud ? `/apps/${data.id}` : `https://shuffler.io/apps/${data.id}`;
-
-  var canEditApp = userdata?.support || 
-                  userdata?.id === data?.owner || 
-                  (userdata?.admin === "true" && userdata?.active_org?.id === data?.reference_org) || 
-                  data?.contributors?.includes(userdata?.id)
+  //const appUrl = isCloud ? `/apps/${data.id}` : `https://shuffler.io/apps/${data.id}`;
+  const appUrl = `/apps/${data.id}` 
+  const { themeMode } = useContext(Context);
+  const theme = getTheme(themeMode);
+  
+  var canEditApp = userdata?.support || userdata?.id === data?.owner || 
+        (userdata?.admin === "true" && userdata?.active_org?.id === data?.reference_org) || data?.contributors?.includes(userdata?.id)
 
   const paperStyle = {
     backgroundColor: mouseHoverIndex === index ? "rgba(26, 26, 26, 1)" : "#212121",
@@ -71,7 +73,7 @@ const AppCard = ({ data, index, mouseHoverIndex, setMouseHoverIndex, globalUrl,
     boxShadow: "0px 0px 10px 0px rgba(0, 0, 0, 0.1)",
     marginBottom: 20,
     transition: "width 0.3s ease",
-  };
+  }
 
   return (
     <Grid item xs={12} key={index}>
@@ -104,7 +106,7 @@ const AppCard = ({ data, index, mouseHoverIndex, setMouseHoverIndex, globalUrl,
               display: "flex",
               fontFamily: theme?.typography?.fontFamily,
               width: '100%',
-              backgroundColor: mouseHoverIndex === index ? "#2F2F2F" : "#212121"
+              backgroundColor: mouseHoverIndex === index ? theme.palette.hoverColor :  theme.palette.platformColor,
             }}
             onClick={() => {
               handleAppClick(data);
@@ -133,6 +135,7 @@ const AppCard = ({ data, index, mouseHoverIndex, setMouseHoverIndex, globalUrl,
               margin: "12px 0",
               fontFamily: theme?.typography?.fontFamily,
             }}>
+
               <div style={{
                 display: 'flex',
                 flexDirection: 'row',
@@ -144,31 +147,34 @@ const AppCard = ({ data, index, mouseHoverIndex, setMouseHoverIndex, globalUrl,
                 maxWidth: "90%",
                 gap: 8
               }}>
+
                 <div style={{
                   overflow: "hidden",
                   textOverflow: "ellipsis",
                   whiteSpace: "nowrap",
-                  color: '#F1F1F1'
+                  color: theme.palette.text.primary,
                 }}>
-                  {data.name.replace(/_/g, ' ').replace(/\b\w/g, char => char.toUpperCase())}
+                  {data?.name?.replace(/_/g, ' ')?.replace(/\b\w/g, char => char?.toUpperCase())}
                 </div>
+
               </div>
               <div style={{
                 overflow: "hidden",
                 textOverflow: "ellipsis",
                 whiteSpace: "nowrap",
                 marginLeft: 8,
-                color: "rgba(158, 158, 158, 1)"
+                color: theme.palette.text.secondary,
               }}>
-                {data.categories ? data.categories.join(", ") : "NA"}
+                {data?.categories ? data?.categories?.join(", ") : "NA"}
               </div>
+
               <div style={{
                 overflow: "hidden",
                 textOverflow: "ellipsis",
                 whiteSpace: "nowrap",
                 width: "100%",
                 marginLeft: 8,
-                color: "rgba(158, 158, 158, 1)",
+                color: theme.palette.text.secondary,
                 display: "flex",
                 justifyContent: 'space-between',
                 paddingRight: 15,
@@ -180,13 +186,14 @@ const AppCard = ({ data, index, mouseHoverIndex, setMouseHoverIndex, globalUrl,
                   whiteSpace: "nowrap",
                   color: "rgba(158, 158, 158, 1)",
                 }}>
-                  {data.generated !== true && data.tags && data.tags.slice(0, 2).map((tag, tagIndex) => (
+                  {data?.generated !== true && data?.tags && data?.tags?.slice(0, 2).map((tag, tagIndex) => (
                     <span key={tagIndex}>
                       {tag}
                       {tagIndex < data.tags.length - 1 ? ", " : ""}
                     </span>
                   ))}
                 </div>
+
                 {/* Deactivate button */}
                 {(currTab === 0 || currTab === 1) && !deactivatedIndexes.includes(index) && mouseHoverIndex === index && data.generated === true && (
                   <div style={{
@@ -197,7 +204,7 @@ const AppCard = ({ data, index, mouseHoverIndex, setMouseHoverIndex, globalUrl,
                   }}>
                     {
                       canEditApp ? (
-                        <button style={{ backgroundColor: "rgba(73, 73, 73, 1)", border: "none", cursor: "pointer", color: "white", borderRadius: 3, display: "flex", alignItems: "center", justifyContent: "center", height: 35 }}
+                        <Button style={{  border: "none", cursor: "pointer", borderRadius: 3, display: "flex", alignItems: "center", justifyContent: "center", height: 35 }}
                           onClick={(event) => {
                             event.preventDefault();
                             event.stopPropagation();
@@ -206,11 +213,13 @@ const AppCard = ({ data, index, mouseHoverIndex, setMouseHoverIndex, globalUrl,
                               navigate(editUrl)
                             }
                           }}
+                          variant="contained"
+                          color="secondary"
                         >
                           <EditIcon />
-                        </button>
+                        </Button>
                       ) : (
-                        <button style={{ backgroundColor: "rgba(73, 73, 73, 1)", border: "none", cursor: "pointer", color: "white", borderRadius: 3, display: "flex", alignItems: "center", justifyContent: "center", height: 35 }}
+                        <Button variant="contained" color="secondary" style={{ border: "none", cursor: "pointer", color: "white", borderRadius: 3, display: "flex", alignItems: "center", justifyContent: "center", height: 35 }}
                         onClick={(event) => {
                           event.preventDefault();
                           event.stopPropagation();
@@ -219,25 +228,23 @@ const AppCard = ({ data, index, mouseHoverIndex, setMouseHoverIndex, globalUrl,
                         }}
                         >
                         <ForkRightIcon />
-                        </button>
+                        </Button>
                       )
                     }
+
                     <Button
-					  disabled={data?.reference_org === userdata?.active_org?.id}
+					            disabled={data?.reference_org === userdata?.active_org?.id}
+                      variant="contained"
+                      color="secondary"
                       className="deactivate-button"
                       sx={{
                         width: 110,
                         height: 35,
                         borderRadius: 0.75,
-                        bgcolor: "rgba(73, 73, 73, 1)",
-                        color: "rgba(241, 241, 241, 1)",
                         textTransform: "none",
                         fontSize: 16,
                         fontFamily: theme?.typography?.fontFamily,
                         transition: "background-color 0.3s ease",
-                        "&:hover": {
-                          bgcolor: "rgba(93, 93, 93, 1)",
-                        },
                       }}
                       onMouseDown={(e) => e.stopPropagation()}
                       onMouseUp={(e) => e.stopPropagation()}
@@ -264,18 +271,6 @@ const AppCard = ({ data, index, mouseHoverIndex, setMouseHoverIndex, globalUrl,
 							  }
                             } else {
                               toast.success("App deactivated successfully. Will take effect on refresh..")
-
-							  /*
-							  // This somehow didn't work
-							  if (appsToShow !== undefined && appsToShow !== null && appsToShow.length > 0) {
-								  const newApps = appsToShow?.filter((app) => app.id !== data.id)
-								  if (newApps !== undefined && newApps !== null && newApps.length > 0) {
-									  setAppsToShow(newApps)
-									  setUserApps(newApps)
-								  }
-								}
-							  }
-							  */
 							}
                           })
                           .catch(error => {
@@ -314,6 +309,8 @@ const Hits = ({
   const isCloud = window.location.host === "localhost:3002" || window.location.host === "shuffler.io";
   const [deactivatedIndexes, setDeactivatedIndexes] = React.useState([]);
   const [isLoading, setIsLoading] = useState(false)
+  const { themeMode } = useContext(Context);
+  const theme = getTheme(themeMode);
 
   useEffect(() => {
     var baseurl = globalUrl;
@@ -350,7 +347,6 @@ const Hits = ({
     }
   }, [currTab, window.location]);
 
-
   //Function for activation and deactivation of app
   const handleActivateButton = (event, data, type) => {
 
@@ -513,11 +509,10 @@ const Hits = ({
                             overflow: "hidden",
                             display: "flex",
                             width: '100%',
-                            backgroundColor: hoverEffect === index ? "#2F2F2F" : "#212121",
+                            backgroundColor: hoverEffect === index ? theme.palette.hoverColor :  theme.palette.platformColor,
                             fontFamily: theme?.typography?.fontFamily
                           }}
                             onClick={() => {
-                              console.log("App modal", data)
                               handleAppClick(data);
                             }}
                           >
@@ -557,7 +552,7 @@ const Hits = ({
                                   maxWidth: "90%",
                                   textOverflow: "ellipsis",
                                   whiteSpace: "nowrap",
-                                  color: '#F1F1F1'
+                                  color: theme.palette.text.primary
                                 }}
                               >
                                 {(allActivatedAppIds && allActivatedAppIds.includes(data.objectID)) && <Box sx={{ width: 8, height: 8, backgroundColor: "#02CB70", borderRadius: '50%' }} />}
@@ -565,7 +560,7 @@ const Hits = ({
                                   overflow: "hidden",
                                   textOverflow: "ellipsis",
                                   whiteSpace: "nowrap",
-                                  color: '#F1F1F1'
+                                  color: theme.palette.text.primary,
                                 }}>
                                   {normalizedString(data.name)}
                                 </div>
@@ -576,7 +571,7 @@ const Hits = ({
                                   overflow: "hidden",
                                   textOverflow: "ellipsis",
                                   whiteSpace: "nowrap",
-                                  color: "rgba(158, 158, 158, 1)",
+                                  color: theme.palette.text.secondary,
                                   marginTop: 5,
                                 }}
                               >
@@ -598,7 +593,7 @@ const Hits = ({
                                 <div style={{
                                   flex: 1
                                 }}>
-                                  {hoverEffect === index && isCloud ? (
+                                  {hoverEffect === index ? (
                                     <div>
                                       {data.tags && (
                                         <Tooltip
@@ -607,12 +602,12 @@ const Hits = ({
                                           componentsProps={{
                                             tooltip: {
                                               sx: {
-                                                backgroundColor: "rgba(33, 33, 33, 1)",
-                                                color: "rgba(241, 241, 241, 1)",
+                                                backgroundColor: theme.palette.tooltip.backgroundColor,
+                                                color: theme.palette.tooltip.color,
                                                 width: "auto",
                                                 height: "auto",
                                                 fontSize: 16,
-                                                border: "1px solid rgba(73, 73, 73, 1)",
+                                                border: theme.palette.tooltip.border,
                                               }
                                             }
                                           }}
@@ -645,6 +640,7 @@ const Hits = ({
                                     </div>
                                   )}
                                 </div>
+
                                 <div style={{
                                   display: 'flex',
                                   justifyContent: 'flex-end',
@@ -654,17 +650,17 @@ const Hits = ({
                                 }}>
                                   {hoverEffect === index && (
                                     <div>
-                                      {allActivatedAppIds && allActivatedAppIds.includes(data.objectID) ? (
+                                      {allActivatedAppIds && allActivatedAppIds?.includes(data.objectID) ? (
                                         <Button
-                                          style={{
-                                            width: 110,
-                                            height: 35,
-                                            borderRadius: 4,
-                                            backgroundColor: "rgba(73, 73, 73, 1)",
-                                            color: "rgba(241, 241, 241, 1)",
+                                         variant="contained"
+                                         color="secondary"
+                                          sx={{
+                                            width: "110px",
+                                            height: "35px",
+                                            borderRadius: "4px",
                                             textTransform: "none",
                                             fontFamily: theme?.typography?.fontFamily,
-                                            fontSize: 16,
+                                            fontSize: "16px",
                                           }}
                                           onMouseDown={(e) => e.stopPropagation()}
                                           onMouseUp={(e) => e.stopPropagation()}
@@ -673,11 +669,13 @@ const Hits = ({
                                           }}>
                                           Deactivate
                                         </Button>
+
                                       ) : (
+
                                         <Button
+                                          variant="contained"
+                                          color="primary"
                                           style={{
-                                            backgroundColor: "#FF8544",
-                                            color: "black",
                                             width: 102,
                                             height: 35,
                                             borderRadius: 4,
@@ -723,6 +721,8 @@ const SearchBox = ({ refine, searchQuery, setSearchQuery }) => {
   const inputRef = useRef(null);
   const [localQuery, setLocalQuery] = useState(searchQuery);
   const location = useLocation();
+  const { themeMode } = useContext(Context);
+  const theme = getTheme(themeMode);
   // Initialize search when component mounts or when switching to Discover tab
   useEffect(() => {
     if (searchQuery) {
@@ -769,7 +769,7 @@ const SearchBox = ({ refine, searchQuery, setSearchQuery }) => {
     <TextField
       fullWidth
       variant="outlined"
-      placeholder="Search for apps"
+      placeholder="Search from 2500+ public apps"
       value={localQuery}
       id="shuffle_search_field"
       inputRef={inputRef}
@@ -783,7 +783,8 @@ const SearchBox = ({ refine, searchQuery, setSearchQuery }) => {
       InputProps={{
         style: {
           borderRadius: 4,
-          height: 45
+          height: 45,
+          backgroundColor: theme.palette.textFieldStyle.backgroundColor,
         },
         endAdornment: (
           <InputAdornment position="end">
@@ -813,6 +814,8 @@ const CustomHits = connectHits(Hits);
 
 // Custom Category Dropdown Component
 const CategoryDropdown = ({ items, currentRefinement, refine }) => {
+  const { themeMode } = useContext(Context);
+  const theme = getTheme(themeMode);
   const handleChange = (event) => {
     const value = event.target.value;
     refine(value);
@@ -827,7 +830,7 @@ const CategoryDropdown = ({ items, currentRefinement, refine }) => {
         onChange={handleChange}
         displayEmpty
         multiple
-        style={{ borderRadius: 4, height: 45, fontFamily: theme?.typography?.fontFamily, flex: 1 }}
+        style={{ borderRadius: 4, height: 45, fontFamily: theme?.typography?.fontFamily, flex: 1, backgroundColor: theme.palette.textFieldStyle.backgroundColor, color:  theme.palette.textFieldStyle.color }}
         renderValue={(selected) => {
           if (selected.length === 0) return 'All Categories';
           return (
@@ -879,6 +882,9 @@ const LabelDropdown = ({ items, currentRefinement, refine }) => {
     refine(value);
   };
 
+  const { themeMode } = useContext(Context);
+  const theme = getTheme(themeMode);
+
   return (
     <div style={{ position: 'relative', width: '100%' }}>
       <Select
@@ -888,7 +894,7 @@ const LabelDropdown = ({ items, currentRefinement, refine }) => {
         onChange={handleChange}
         displayEmpty
         multiple
-        style={{ borderRadius: 4, height: 45, fontFamily: theme?.typography?.fontFamily, flex: 1 }}
+        style={{ borderRadius: 4, height: 45, fontFamily: theme?.typography?.fontFamily, flex: 1, backgroundColor: theme.palette.textFieldStyle.backgroundColor, color:  theme.palette.textFieldStyle.color }}
         renderValue={(selected) => {
           if (selected.length === 0) return 'All Labels';
           return (
@@ -934,6 +940,7 @@ const LabelDropdown = ({ items, currentRefinement, refine }) => {
     </div>
   );
 };
+
 const CustomLabelDropdown = connectRefinementList(LabelDropdown);
 
 
@@ -974,6 +981,8 @@ const filterApps = (apps, searchQuery, selectedCategory, selectedLabel) => {
 
 const LoginPrompt = () => {
   const navigate = useNavigate();
+  const { themeMode } = useContext(Context);
+  const theme = getTheme(themeMode);
   return (
     <div style={{
       display: "flex",
@@ -1010,9 +1019,11 @@ const LoginPrompt = () => {
 
 // Add this new component for the app skeleton
 const AppSkeleton = () => {
+  const { themeMode } = useContext(Context);
+  const theme = getTheme(themeMode);
   return (
     <Paper elevation={0} style={{
-      backgroundColor: "#212121",
+      backgroundColor: theme.palette.platformColor,
       width: "100%",
       height: 120,
       borderRadius: 4,
@@ -1029,7 +1040,7 @@ const AppSkeleton = () => {
           height={90}
           style={{
             borderRadius: 4,
-            backgroundColor: "rgba(255, 255, 255, 0.1)"
+            backgroundColor: theme.palette.loaderColor
           }}
         />
         <div style={{
@@ -1043,19 +1054,19 @@ const AppSkeleton = () => {
             variant="text"
             width="40%"
             height={24}
-            style={{ backgroundColor: "rgba(255, 255, 255, 0.1)" }}
+            style={{ backgroundColor: theme.palette.loaderColor }}
           />
           <Skeleton
             variant="text"
             width="60%"
             height={20}
-            style={{ backgroundColor: "rgba(255, 255, 255, 0.1)" }}
+            style={{ backgroundColor: theme.palette.loaderColor }}
           />
           <Skeleton
             variant="text"
             width="30%"
             height={20}
-            style={{ backgroundColor: "rgba(255, 255, 255, 0.1)" }}
+            style={{ backgroundColor: theme.palette.loaderColor }}
           />
         </div>
       </div>
@@ -1110,6 +1121,7 @@ const Apps2 = (props) => {
   const [defaultSearch, setDefaultSearch] = useState("");
 
   const [apps, setApps] = useState([]);
+  const [backupApps, setBackupApps] = useState([]);
   const [filteredApps, setFilteredApps] = useState([]);
   const [appSearchLoading, setAppSearchLoading] = useState(false);
   const [creatorProfile, setCreatorProfile] = useState({});
@@ -1121,6 +1133,9 @@ const Apps2 = (props) => {
   const [validation, setValidation] = useState(null);
   const [createAppModalOpen, setCreateAppModalOpen] = useState(false);
 
+  const {themeMode, brandColor} = useContext(Context);
+  const theme = getTheme(themeMode, brandColor);
+
   const baseRepository = "https://github.com/frikky/shuffle-apps";
 
   const isCloud =
@@ -1183,61 +1198,13 @@ const Apps2 = (props) => {
     getFramework();
   }, []);
 
-  // Fetch apps based on the current tab : 0 -> org_apps, 1 -> my_apps, 2 -> all_apps
-  const fetchApps = async () => {
-    const baseUrl = globalUrl;
-    let url;
-    setIsLoading(true);
-    const userId = userdata?.id;
-    if (currTab === 1 && userId) {
-      url = `${baseUrl}/api/v1/users/${userId}/apps`;
-    } else if (currTab === 0) {
-      url = `${baseUrl}/api/v1/apps`;
-    }
-    try {
-      const response = await fetch(url, {
-        method: "GET",
-        credentials: "include",
-        headers: {
-          "Content-Type": "application/json",
-        },
-      });
-      const data = await response.json();
-      if (currTab === 1) {
-        setAppsToShow(data);
-        setUserApps(data);
-      } else if (currTab === 0) {
-        setAppsToShow(data);
-        setOrgApps(data);
-        // For testing the empty state
-        // setAppsToShow([]);
-        // setOrgApps([]);
-      }
-      setIsLoading(false);
-    } catch (err) {
-      console.error("Error fetching apps:", err);
-      setIsLoading(false);
-    }
-  };
-
   useEffect(() => {
-
-    // Only fetch if we have required data
-    if (globalUrl && (currTab === 0 || (currTab === 1 && userdata?.id))) {
-      fetchApps();
-    }
-  }, [currTab, globalUrl, userdata?.id]); // Remove location.search dependency
-
-  // useEffect(() => {
-  //   // setSearchQuery("");
-  //   setSelectedCategory([]);
-  //   setSelectedLabel([]);
-  // }, [currTab])
-
+	  getApps()
+  }, [])
 
   // Find top categories and tags based on the current tab
   useEffect(() => {
-    if (currTab === 0 || currTab === 1) {
+    if (currTab === 0 || currTab === 1 || currTab === 3) {
       setCategories(findTopCategories());
       setLabels(findTopTags());
     }
@@ -1278,11 +1245,13 @@ const Apps2 = (props) => {
       });
   };
 
+  /*
   useEffect(() => {
     if (serverside) {
       return null;
     }
   }, [serverside]);
+  */
 
   const getApps = () => {
     // Get apps from localstorage
@@ -1293,7 +1262,7 @@ const Apps2 = (props) => {
       if (storageApps === null || storageApps === undefined || storageApps.length === 0) {
         storageApps = []
       } else {
-        setAppsToShow(storageApps)
+        //setAppsToShow(storageApps)
         setOrgApps(storageApps)
         setApps(storageApps)
         // setFilteredApps(storageApps)
@@ -1303,6 +1272,8 @@ const Apps2 = (props) => {
       //console.log("Failed to get apps from localstorage: ", e)
     }
 
+    setIsLoading(true);
+
     fetch(globalUrl + "/api/v1/apps", {
       method: "GET",
       headers: {
@@ -1327,18 +1298,25 @@ const Apps2 = (props) => {
         var privateapps = [];
         var valid = [];
         var invalid = [];
+
+		var backups = [] 
         for (var key in responseJson) {
           const app = responseJson[key];
 
-          if (app.categories !== undefined && app.categories !== null && app?.categories.includes("Eradication")) {
+		  if (app?.reference_info?.onprem_backup === true) {
+			  backups.push(app)
+			  continue
+		  }
+
+          if (app?.categories !== undefined && app?.categories !== null && app?.categories?.includes("Eradication")) {
             app.categories = ["EDR"]
           }
 
-          if (app.is_valid && !(!app.activated && app.generated)) {
+          if (app?.is_valid && !(!app?.activated && app?.generated)) {
             privateapps.push(app);
           } else if (
-            app.private_id !== undefined &&
-            app.private_id.length > 0
+            app?.private_id !== undefined &&
+            app?.private_id.length > 0
           ) {
             valid.push(app);
           } else {
@@ -1346,49 +1324,39 @@ const Apps2 = (props) => {
           }
         }
 
+		if (backups.length > 0) {
+			setBackupApps(backups)
+		}
+
         privateapps.push(...valid);
         privateapps.push(...invalid);
-        console.log("privateapps: setting apps ", privateapps)
+
         setAppsToShow(privateapps);
         setOrgApps(privateapps);
         setApps(privateapps);
 
-        // setFilteredApps(privateapps);
+        //setFilteredApps(privateapps);
+      	const filteredOrgApps = filterApps(privateapps, searchQuery, selectedCategory, selectedLabel);
+      	setAppsToShow(filteredOrgApps)
+
         if (privateapps.length > 0) {
-          if (selectedApp.id === undefined || selectedApp.id === null) {
-            if (privateapps[0].owner !== undefined && privateapps[0].owner !== null) {
-              getUserProfile(privateapps[0].owner);
+          if (selectedApp?.id === undefined || selectedApp?.id === null) {
+            if (privateapps[0]?.owner !== undefined && privateapps[0]?.owner !== null) {
+              getUserProfile(privateapps[0]?.owner);
             }
-
-            // setContact(privateapps[0].contact_info)
-
-            // setSelectedApp(privateapps[0]);
-            // setSharingConfiguration(privateapps[0].sharing === true ? "public" : "you")
           }
-
-          // if (
-          //   privateapps[0].actions !== null &&
-          //   privateapps[0].actions.length > 0
-          // ) {
-          //   setSelectedAction(privateapps[0].actions[0]);
-          // } else {
-          //   setSelectedAction({});
-          // }
         }
 
-        if (privateapps.length > 0 && storageApps.length === 0) {
+        if (privateapps?.length > 0 && storageApps?.length === 0) {
           try {
             localStorage.setItem("apps", JSON.stringify(privateapps))
           } catch (e) {
             console.log("Failed to set apps in localstorage: ", e)
           }
         }
-
-        //setTimeout(() => {
-        //	setFirstLoad(false)
-        //}, 5000)
       })
       .catch((error) => {
+		console.log("Failed to get apps: ", error.toString());
         toast(error.toString());
         setIsLoading(false);
       });
@@ -1764,7 +1732,6 @@ const Apps2 = (props) => {
     // setOpenModal(true);
   };
 
-
   useEffect(() => {
     const apps = currTab === 1 ? userApps : orgApps;
     const filteredUserAppdata = filterApps(apps, searchQuery, selectedCategory, selectedLabel);
@@ -1782,33 +1749,38 @@ const Apps2 = (props) => {
     } else if (newTab === 1) {
       const filteredUserApps = filterApps(userApps, searchQuery, selectedCategory, selectedLabel);
       setAppsToShow(filteredUserApps);
-    }
+    } else if (newTab === 3) {
+      const filteredUserApps = filterApps(backupApps, searchQuery, selectedCategory, selectedLabel);
+      setAppsToShow(filteredUserApps);
+	  return
+	}
 
     // Update URL query params based on tab index
     const tabMapping = {
       0: 'org_apps',
       1: 'my_apps',
-      2: 'all_apps'
+      2: 'all_apps',
+      3: 'backup_apps',
     };
 
-    const queryParams = new URLSearchParams(location.search);
-    queryParams.set('tab', tabMapping[newTab]);
+	const queryParams = new URLSearchParams(location.search);
+	queryParams.set('tab', tabMapping[newTab]);
 
-    // Maintain search query in URL regardless of tab
-    if (searchQuery) {
-      queryParams.set('q', searchQuery);
-    } else {
-      queryParams.delete('q');
-    }
+	// Maintain search query in URL regardless of tab
+	if (searchQuery) {
+	  queryParams.set('q', searchQuery);
+	} else {
+	  queryParams.delete('q');
+	}
 
-    navigate(`${location.pathname}?${queryParams.toString()}`);
+	navigate(`${location.pathname}?${queryParams.toString()}`);
   };
 
   // Update useEffect for filtering without URL manipulation
   useEffect(() => {
     if (currTab === 2) return; // Skip for "Discover Apps" tab as it uses Algolia
 
-    const apps = currTab === 1 ? userApps : orgApps;
+    const apps = currTab === 1 ? userApps : currTab === 3 ? backupApps : orgApps;
     const filteredApps = filterApps(apps, searchQuery, selectedCategory, selectedLabel);
     setAppsToShow(filteredApps);
   }, [searchQuery, selectedCategory, selectedLabel, currTab, userApps, orgApps]);
@@ -1871,13 +1843,13 @@ const Apps2 = (props) => {
   }
 
   const tabActive = {
-    borderBottom: "5px solid #FF8544",
+    borderBottom: `5px solid ${theme.palette.primary.main}`,
     borderRadius: "2px",
-    color: "#FF8544"
+    color: theme.palette.primary.main,
   }
 
   return (
-    <div style={{ paddingTop: 70, paddingLeft: leftSideBarOpenByClick ? 200 : 0, transition: "padding-left 0.3s ease", backgroundColor: "#1A1A1A", fontFamily: theme?.typography?.fontFamily, zoom: 0.7, }}>
+    <div style={{ paddingTop: 70, paddingLeft: leftSideBarOpenByClick ? 200 : 0, transition: "padding-left 0.3s ease", backgroundColor: theme.palette.backgroundColor, fontFamily: theme?.typography?.fontFamily, zoom: 0.7, }}>
       <InstantSearch searchClient={searchClient} indexName="appsearch">
         <AppModal
           open={openModal}
@@ -1898,7 +1870,7 @@ const Apps2 = (props) => {
         <div style={boxStyle}>
           <div style={{ display: "flex", flexDirection: "row", width: "100%", justifyContent: "space-between" }}>
             <Typography variant="h4" style={{ marginBottom: 20, paddingLeft: 15, textTransform: 'none', fontFamily: theme?.typography?.fontFamily }}>
-				{currTab === 0 ? "Org" : currTab === 1 ?  "Your" : "Discover"} Apps
+				{currTab === 0 ? "Org" : currTab === 1 ? "Your" : currTab === 3 ? "Backup" :  "Discover"} Apps
             </Typography>
             {isCloud ? null : (
               <span style={{ display: "flex", gap: 15 }}>
@@ -1924,7 +1896,7 @@ const Apps2 = (props) => {
                       style={{
                         height: 45,
                         minWidth: 45,
-                        backgroundColor: "#2F2F2F",
+                        backgroundColor: theme.palette.platformColor,
                         borderRadius: 4,
                         padding: "8px 16px",
                       }}
@@ -1934,9 +1906,9 @@ const Apps2 = (props) => {
                       }}
                     >
                       {isLoading ? (
-                        <CircularProgress size={20} style={{ color: "#FF8544" }} />
+                        <CircularProgress size={20} style={{ color: theme.palette.primary.main }} />
                       ) : (
-                        <CachedIcon style={{ color: "#F1F1F1" }} />
+                        <CachedIcon style={{ color: theme.palette.text.primary }} />
                       )}
                     </Button>
                   </Tooltip>
@@ -1964,7 +1936,7 @@ const Apps2 = (props) => {
                       style={{
                         height: 45,
                         minWidth: 45,
-                        backgroundColor: "#2F2F2F",
+                        backgroundColor: theme.palette.platformColor,
                         borderRadius: 4,
                         padding: "8px 16px",
                       }}
@@ -1976,9 +1948,9 @@ const Apps2 = (props) => {
                       }}
                     >
                       {isLoading ? (
-                        <CircularProgress size={20} style={{ color: "#FF8544" }} />
+                        <CircularProgress size={20} style={{ color: theme.palette.primary.main }} />
                       ) : (
-                        <CloudDownloadIcon style={{ color: "#F1F1F1" }} />
+                        <CloudDownloadIcon style={{ color: theme.palette.text.primary }} />
                       )}
                     </Button>
                   </Tooltip>
@@ -1986,7 +1958,7 @@ const Apps2 = (props) => {
               </span>
             )}
           </div>
-          <div style={{ borderBottom: '1px solid gray', marginBottom: 30 }}>
+          <div style={{ borderBottom: themeMode === "dark" ? "1px solid #808080" : theme.palette.defaultBorder, marginBottom: 30 }}>
             <Tabs
               value={currTab}
               onChange={(event, newTab) => handleTabChange(event, newTab)}
@@ -2011,14 +1983,26 @@ const Apps2 = (props) => {
                   ...(currTab === 1 ? tabActive : {})
                 }}
               />
+
               <Tab
-                label="Discover Apps"
+                label="Discover Public Apps"
                 style={{
                   ...tabStyle,
                   marginRight: 0,
                   ...(currTab === 2 ? tabActive : {})
                 }}
               />
+
+				{backupApps.length > 0 &&
+					<Tab
+						label={`Onprem Backup (${backupApps.length})`}
+						style={{
+							...tabStyle,
+							marginLeft: 25, 
+							...(currTab === 3 ? tabActive : {})
+						}}
+					/>
+				}
             </Tabs>
           </div>
           <div style={{ display: "flex", justifyContent: "space-between", gap: 10, marginBottom: 20, height: 45, paddingRight: 25 }}>
@@ -2027,15 +2011,19 @@ const Apps2 = (props) => {
               minWidth: "25%",
               maxWidth: "25%"
             }}>
-              {(currTab === 0 || currTab === 1) ? (
+              {(currTab === 0 || currTab === 1 || currTab === 3) ? (
                 <TextField
                   fullWidth
                   variant="outlined"
-                  placeholder="Search for apps"
+                  placeholder={currTab === 1 ? "Search your apps" : "Search org apps"}
                   disabled={!isLoggedIn}
                   value={searchQuery}
                   id="shuffle_search_field"
                   onChange={handleSearchChange}
+                  style={{
+                    backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                    color: theme.palette.textFieldStyle.color,
+                  }}
                   onKeyDown={(event) => {
                     if (event.key === "Enter") {
                       event.preventDefault();
@@ -2045,7 +2033,10 @@ const Apps2 = (props) => {
                   InputProps={{
                     style: {
                       borderRadius: 4,
-                      height: 45
+                      height: 45,
+                      backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                      color: theme.palette.textFieldStyle.color,
+                      fontSize: 18,
                     },
                     endAdornment: (
                       <InputAdornment position="end">
@@ -2089,7 +2080,9 @@ const Apps2 = (props) => {
                     style={{
                       borderRadius: 4,
                       height: 45,
-                      fontFamily: theme?.typography?.fontFamily
+                      fontFamily: theme?.typography?.fontFamily,
+                      backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                      fontSize: 18,
                     }}
                     renderValue={(selected) => {
                       if (selected.length === 0) return 'All Categories';
@@ -2115,6 +2108,7 @@ const Apps2 = (props) => {
                       </MenuItem>
                     ))}
                   </Select>
+
                   {selectedCategory.length > 0 && (
                     <ClearIcon
                       style={{
@@ -2154,7 +2148,9 @@ const Apps2 = (props) => {
                     style={{
                       borderRadius: 4,
                       height: 45,
-                      fontFamily: theme?.typography?.fontFamily
+                      fontFamily: theme?.typography?.fontFamily,
+                      backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                      fontSize: 18,
                     }}
                     renderValue={(selected) => {
                       if (selected.length === 0) return 'All Labels';
@@ -2213,13 +2209,11 @@ const Apps2 = (props) => {
                   width: '100%',
                   borderRadius: '4px',
                   textTransform: 'none',
-                  backgroundColor: "#FF8544",
-                  color: "#1A1A1A",
                   fontFamily: theme?.typography?.fontFamily,
                   fontSize: 16,
                   fontWeight: 500
                 }}
-                startIcon={<AddIcon style={{ color: "#1A1A1A" }} />}
+                startIcon={<AddIcon />}
               >
                 Create an App
               </Button>
@@ -2228,7 +2222,10 @@ const Apps2 = (props) => {
           <div>
 
             {
-              currTab === 0 && (
+              currTab !== 0 && currTab !== 3 ? 
+				null 
+				: 
+				(
                 <div style={{ minHeight: 570 }}>
                   {isLoading ? (
                     <LoadingGrid />
@@ -2260,7 +2257,7 @@ const Apps2 = (props) => {
                                 handleAppClick={handleAppClick}
                                 leftSideBarOpenByClick={leftSideBarOpenByClick}
                                 userdata={userdata}
-                                fetchApps={fetchApps}
+                                fetchApps={getApps}
 
 								setUserApps={setUserApps}
 								appsToShow={appsToShow}
@@ -2313,7 +2310,7 @@ const Apps2 = (props) => {
                             {appsToShow.map((data, index) => (
                               <AppCard key={index} data={data} index={index} mouseHoverIndex={mouseHoverIndex} setMouseHoverIndex={setMouseHoverIndex} globalUrl={globalUrl} deactivatedIndexes={deactivatedIndexes} currTab={currTab} userdata={userdata}
                                 handleAppClick={handleAppClick} leftSideBarOpenByClick={leftSideBarOpenByClick}
-                                fetchApps={fetchApps}
+                                fetchApps={getApps}
 								setUserApps={setUserApps}
 								appsToShow={appsToShow}
 								setAppsToShow={setAppsToShow}
diff --git a/frontend/src/views/DashboardViews.jsx b/frontend/src/views/DashboardViews.jsx
index 9de1db29..7905a21a 100644
--- a/frontend/src/views/DashboardViews.jsx
+++ b/frontend/src/views/DashboardViews.jsx
@@ -6,9 +6,6 @@ import classNames from "classnames";
 import theme from '../theme.jsx';
 import { useNavigate, Link, useParams } from "react-router-dom";
 
-// react plugin used to create charts
-//import { Line, Bar } from "react-chartjs-2";
-//import { useAlert
 import { ToastContainer, toast } from "react-toastify" 
 import Draggable from "react-draggable";
 import DashboardBarchart, { LoadStats } from '../components/DashboardBarchart.jsx';
@@ -311,9 +308,13 @@ const RadialChart = ({keys, setSelectedCategory}) => {
   //axis={<RadialAxis type="category" />}
 }
 
+
+// 0x0elliot: not cleaning this up. this seems clearly experimental. not worth my time.
+
 // This is the start of a dashboard that can be used.
 // What data do we fill in here? Idk
 const Dashboard = (props) => {
+
   const { globalUrl, isLoggedIn } = props;
   //const alert = useAlert();
   const [bigChartData, setBgChartData] = useState("data1");
@@ -397,7 +398,7 @@ const Dashboard = (props) => {
 		if (foundQuery !== null && foundQuery !== undefined) {
 			setSelectedUsecaseCategory(foundQuery)
 
-      const newitem = removeParam("selected", cursearch);
+      		const newitem = removeParam("selected", cursearch);
 			navigate(curpath + newitem)
 		}
 
diff --git a/frontend/src/views/Docs.jsx b/frontend/src/views/Docs.jsx
index 836ada35..2456f63d 100755
--- a/frontend/src/views/Docs.jsx
+++ b/frontend/src/views/Docs.jsx
@@ -1,11 +1,11 @@
-import React, { useEffect, useLayoutEffect, useRef, useState, useContext, memo } from "react"
+import React, { useEffect, useLayoutEffect, useRef, useState, useContext, memo,  } from "react"
 import { toast } from 'react-toastify';
 import Markdown from 'react-markdown'
-import theme from '../theme.jsx';
+import {getTheme} from '../theme.jsx';
 import ReactJson from "react-json-view-ssr";
 import { isMobile } from "react-device-detect";
 import { BrowserView, MobileView } from "react-device-detect";
-import { useParams, useNavigate, Link } from "react-router-dom";
+import { useParams, useNavigate, Link, useLocation } from "react-router-dom";
 import { validateJson, GetIconInfo } from "../views/Workflows.jsx";
 import remarkGfm from 'remark-gfm'
 import { Context } from "../context/ContextApi.jsx";
@@ -23,16 +23,27 @@ import {
     List,
     Collapse,
     ListItemButton,
-    ListItemText
+    ListItemText,
+    Dialog,
+    DialogTitle,
+    Box,
+    DialogContent,
+    InputAdornment,
+    CircularProgress
 } from "@mui/material";
 import {
     Link as LinkIcon,
     Edit as EditIcon,
     KeyboardArrowRight as KeyboardArrowRightIcon,
     ExpandMore as ExpandMoreIcon,
-    FileCopy as FileCopyIcon
+    FileCopy as FileCopyIcon,
+    ChevronLeft,
+    ChevronRight,
+    Search as SearchIcon,
+    Close as CloseIcon
 } from "@mui/icons-material";
 import { fontGrid } from "@mui/material/styles/cssUtils.js";
+import SearchBox from "../components/SearchData.jsx";
 
 const Body = {
     //maxWidth: 1000,
@@ -51,6 +62,7 @@ const dividerColor = "rgb(225, 228, 232)";
 const hrefStyle = {
     color: "rgba(255, 255, 255, 0.8)",
     textDecoration: "none",
+    marginRight: window.location.pathname.includes("/articles/") ? "0.8em" : undefined,
 };
 
 
@@ -152,11 +164,37 @@ export const OuterLink = (props) => {
 }
 
 
+
 export const Img = (props) => {
 	// Find parent container and check width
-
+    const isArticlePage = window.location.pathname.includes("/articles/")
+    const isFormPage = window.location.pathname.includes("/forms/")
 	var height = "auto" 
-	var width = 750
+	var width = isArticlePage ? 1000 : isFormPage ? 400: 750
+
+    const { themeMode } = useContext(Context)
+    const theme = getTheme(themeMode)
+
+    const docsImageStyle = {
+		border: isFormPage ? null : "1px solid rgba(255,255,255,0.3)", 
+        borderRadius: theme.palette?.borderRadius, 
+        width: width, 
+        maxWidth: width, 
+        margin: "auto", 
+        marginTop: 10, 
+        marginBottom: 10
+    }
+    
+    const articleImageStyle = {
+        borderRadius: theme.palette?.borderRadius,
+        minWidth: 350, 
+        maxWidth: "100%", 
+        textAlign: "center", 
+        margin: "auto", 
+        marginTop: 20, 
+        marginBottom: 20, 
+    }
+
 	if (props.height !== undefined && props.height !== null) {
 		height = props.height
 	}
@@ -166,11 +204,13 @@ export const Img = (props) => {
 	}
 
     return(
-	  <img 
-		style={{border: "1px solid rgba(255,255,255,0.3)", borderRadius: theme.palette?.borderRadius, width: width, maxWidth: width, margin: "auto", marginTop: 10, marginBottom: 10, }} 
-		alt={props.alt} 
-		src={props.src} 
-	  />
+	  <div style={{width: "100%", textAlign: "center", }}> 
+		  <img 
+			style={isArticlePage ? articleImageStyle : docsImageStyle} 
+			alt={props.alt} 
+			src={props.src} 
+		  />
+	  </div>
 	)
 }
 
@@ -179,6 +219,8 @@ export const CodeHandler = (props) => {
     const propvalue = props.value !== undefined && props.value !== null ? props.value : props.children !== undefined && props.children !== null && props.children.length > 0 ? props.children[0] : ""
 
     const validate = validateJson(propvalue)
+    const {themeMode } = useContext(Context)
+    const theme = getTheme(themeMode)
 
     var newprop = propvalue
     if (validate.valid === false) {
@@ -251,8 +293,13 @@ export const CodeHandler = (props) => {
 }
 
 const Docs = (defaultprops) => {
-    const { globalUrl, selectedDoc, serverside, serverMobile, isLoggedIn, isLoaded } = defaultprops;
+    const { globalUrl, selectedDoc, serverside, serverMobile, isLoggedIn, isLoaded, userdata } = defaultprops;
+
+    const { searchBarModalOpen, setSearchBarModalOpen, isDocSearchModalOpen, setIsDocSearchModalOpen, leftSideBarOpenByClick } = useContext(Context);
+
     let navigate = useNavigate();
+    const location = useLocation();
+    const pathname = location.pathname
     // Quickfix for react router 5 -> 6 
     const params = useParams();
     //var props = JSON.parse(JSON.stringify(defaultprops))
@@ -261,6 +308,8 @@ const Docs = (defaultprops) => {
     props.match.params = params
 
     //console.log("PARAMS: ", params)
+    const { themeMode } = useContext(Context)
+    const theme = getTheme(themeMode)
 
     const [mobile, setMobile] = useState(serverMobile === true || isMobile === true ? true : false);
     const [data, setData] = useState("");
@@ -283,16 +332,75 @@ const Docs = (defaultprops) => {
         serverside === true ? "" : window.location.href
     );
     const [hashRendered, setHashRendered] = React.useState(false)
-
+    const [sidebarOpen, setSidebarOpen] = useState(false);
+    const [activeSubItem, setActiveSubItem] = useState(false);
     const headingElementsRef = useRef({})
+    const [hasRedirected, setHasRedirected] = useState(false)
+    var isArticlePage = window.location.pathname.includes("/articles/") || window.location.pathname === "/articles" ? true : false;
+    const searchFieldRef = useRef(null);
+
+    const handleDocRedirectForPartners = () => {
+        if (hasRedirected) return;
+
+        if (
+            userdata &&
+            userdata?.org_status?.includes("integration_partner") &&
+            userdata?.active_org?.branding?.documentation_link?.length > 0
+        ) {
+            const docLink = userdata?.active_org?.branding?.documentation_link;
+            if (docLink && docLink !== "") {
+                setHasRedirected(true);
+                if (docLink.startsWith('http')) {
+                    window.location.replace(docLink);
+                } else {
+                    navigate(docLink);
+                }
+            }
+        }
+    };
+
 
     useEffect(() => {
-        //if (params["key"] === undefined) {
-        //	navigate("/docs/about")
-        //	return
-        //}
-    }, [])
+        if (isLoggedIn && isLoaded) {
+            handleDocRedirectForPartners()
+        }
 
+    }, [isLoggedIn, isLoaded]);
+
+    useEffect(() => {
+        fetchDocList();
+        setSidebarOpen(false);
+
+		if (props.match.params === undefined || props.match.params === null) {
+			return
+		}
+
+		const propkey = props.match.params.key
+		if (propkey === undefined || propkey === null) {
+			return
+		}
+
+		console.log("PROPKEY: ", propkey)
+		if (location.pathname.includes("/docs/")) {
+			if (propkey === "cookie_policy" || propkey === "compliance" || propkey === "privacy_policy" || propkey === "terms_of_service") {
+				navigate(`/legal/${propkey}`)
+			}
+
+			if (propkey === "app_creation") {
+				navigate('/docs/apps#app-creation-introduction')
+			}
+		}
+
+        
+    }, [location]);
+
+    useEffect(() => {
+        return () => {
+            setIsDocSearchModalOpen(false);
+            setSearchBarModalOpen(false);
+        };
+    }, []); 
+    
     const handleClick = (event) => {
         setAnchorEl(event.currentTarget);
     }
@@ -422,6 +530,77 @@ const Docs = (defaultprops) => {
         return headings;
     };
 
+    const modalView = (
+        <Dialog
+          open={searchBarModalOpen && isDocSearchModalOpen}
+          onClose={() => {
+            setSearchBarModalOpen(false);
+            if (searchFieldRef.current) {
+                searchFieldRef.current.blur();
+            }
+          }}
+          PaperProps={{
+            sx: {
+              color: theme.palette.DialogStyle.color,
+              minWidth: "750px",
+              minHeight: "180px",
+              maxHeight: "85vh",
+              borderRadius: theme.palette.DialogStyle.borderRadius,
+              border: "1px solid var(--Container-Stroke, #494949)",
+              background: theme.palette.DialogStyle.backgroundColor,
+              boxShadow: "0px 16px 24px 8px rgba(0, 0, 0, 0.25)",
+              position: "fixed",
+              top: "70px",
+              left: "50%",
+              transform: "translateX(-50%)",
+              '& .MuiDialogContent-root': {
+                backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+                },
+                '& .MuiDialogTitle-root': {
+                backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+                },
+            },
+          }}
+          sx={{
+            zIndex: 50005,
+            '& .MuiBackdrop-root': {
+              backgroundColor: 'rgba(0, 0, 0, 0.8)',
+            },
+          }}
+        >
+          <Box sx={{ display: "flex", justifyContent: "space-between", alignItems: "center", px: 2, pr: 3, pt: 2 }}>
+            <DialogTitle
+              sx={{ 
+                color: theme.palette.DialogStyle.color,
+                p: 0,
+                m: 0,
+                ml: 1.5,
+                fontFamily: theme.typography.fontFamily,
+              }}
+            >
+              Search for Documentation
+            </DialogTitle>
+            <IconButton 
+              onClick={() => setSearchBarModalOpen(false)}
+              sx={{ 
+                color: 'white',
+                '&:hover': {
+                  backgroundColor: 'rgba(255, 255, 255, 0.1)'
+                }
+              }}
+            >
+              <CloseIcon />
+            </IconButton>
+          </Box>
+          <DialogContent>
+            <Box sx={{ pt: 3 }}>
+              <SearchBox globalUrl={globalUrl} serverside={serverside} userdata={userdata} />
+            </Box>
+          </DialogContent>
+          <Divider sx={{ backgroundColor: 'rgba(255, 255, 255, 0.1)' }}/>
+        </Dialog>
+      );
+
 
     // extract TOC from actual markdown
     const tocvalue = (markdown) => {
@@ -460,8 +639,13 @@ const Docs = (defaultprops) => {
     }
 
     const SidebarPaperStyle = {
-        backgroundColor: "rgb(26,26,26)",
+        backgroundColor: isArticlePage ? "transparent" : theme.palette.backgroundColor,
+        border: isArticlePage ? "none" : undefined,
+        borderRadius: isArticlePage ? "none" : undefined,
+        boxShadow: isArticlePage ? "none" : undefined,
         backgroundImage: "none",
+        width: isArticlePage ? "100%" : undefined,
+        height: isArticlePage ? "100%" : undefined,
         overflowX: "hidden",
         position: "relative",
         paddingLeft: 15,
@@ -524,10 +708,10 @@ const Docs = (defaultprops) => {
             extraInfo = (
                 <div
                     style={{
-                        backgroundColor: theme.palette.inputColor,
+                        backgroundColor: theme.palette.textFieldStyle.backgroundColor,
                         padding: 15,
-                        borderRadius: theme.palette?.borderRadius,
-                        marginBottom: 25,
+                        borderRadius: theme.palette?.textFieldStyle.borderRadius,
+                        marginBottom: isArticlePage ? 25 : 30,
                         display: "flex",
                     }}
                 >
@@ -540,7 +724,7 @@ const Docs = (defaultprops) => {
                                     href={selectedMeta.link}
                                     style={{ textDecoration: "none", color: "#f85a3e" }}
                                 >
-                                    <Button style={{ color: "white", }} variant="outlined" color="secondary">
+                                    <Button variant="outlined" color="secondary">
                                         <EditIcon /> &nbsp;&nbsp;Edit
                                     </Button>
                                 </a>
@@ -620,7 +804,7 @@ const Docs = (defaultprops) => {
                         style={{
                             width: "90%",
                             marginTop: 60,
-							marginBottom: 20, 
+							marginBottom: isArticlePage ? 40 : 20, 
                             backgroundColor: theme.palette.inputColor,
                         }}
                     />
@@ -630,16 +814,29 @@ const Docs = (defaultprops) => {
                     marginBlock: "0.85em", alignItems: "center"
                 }}>
                     {element}
-                    <Link to={`#${id}`} style={{
+                    <Link to={`#${id}`}
+                     onClick={(e) => {
+                        e.preventDefault(); // Prevent default navigation
+                        document.getElementById(id)?.scrollIntoView({
+                            behavior: 'smooth'
+                        });
+
+                        const url = `${window.location.origin}${window.location.pathname}#${id}`;
+                        navigator.clipboard.writeText(url);
+                        toast("Link copied to clipboard", {
+                            position: "bottom-center",
+                            autoClose: 2000,
+                        });
+                    }}
+                    style={{
                         textDecoration: "none", color: "white",
                         paddingLeft: "0.3em", rotate: "-30deg",
                         paddingTop: "0.9em", display: props.level === 1 ? "none" : "block",
                     }}>
-                        <LinkIcon />
+                        <LinkIcon style={{color: theme.palette.textColor}} />
                     </Link>
                 </div>
-
-                {extraInfo}
+                {isArticlePage ? (userdata?.support ? extraInfo : "") : extraInfo}
             </Typography>
         )
     }
@@ -647,21 +844,56 @@ const Docs = (defaultprops) => {
 
     const SideBar = {
         width: "17%",
+        borderRight: !isArticlePage ? "1px solid rgba(255,255,255,0.3)" : undefined,
+        minWidth: isArticlePage ? "250px" : "17%",
+        maxWidth: isArticlePage ? "250px" : "17%",
+        marginLeft: isArticlePage ? sidebarOpen ? 40 : 50 : undefined,
         position: "sticky",
-        top: 50,
-        paddingTop: "0.25em",
-        minHeight: "95vh",
-        maxHeight: "95vh",
+        top: isArticlePage ? 120 : 50,
+        paddingTop: isArticlePage ? "0.65em" : "0.25em",
+        paddingRight: isArticlePage ? "1em" : undefined,
+        minHeight: isArticlePage ? "80vh" : "95vh",
+        maxHeight: isArticlePage ? "80vh" : "95vh",
         overflowX: "hidden",
         overflowY: "auto",
         zIndex: 1000,
-        //borderRight: "1px solid rgba(255,255,255,0.3)",
+        backgroundColor: isArticlePage ? "#212121" : undefined,
+        borderRadius: isArticlePage ? theme.palette?.borderRadius : undefined,
+        transition: isArticlePage ? "width 0.3s ease, min-width 0.3s ease" : undefined,
+    };
+
+    const sideBarToggleButton = {
+        position: "absolute",
+        bottom: sidebarOpen ? 20 : "50%",
+        right: sidebarOpen ? 30 : 21,
+        zIndex: 1000,
+        backgroundColor: "#212121",
+        border: "1px solid rgba(255,255,255,0.3)",
+        borderRadius: "50%",
+        width: 40,
+        height: 40,
+        display: "flex",
+        alignItems: "center",
+        justifyContent: "center",
+        cursor: "pointer",
+        transition: "transform 0.3s ease",
+        "&:hover": {
+            backgroundColor: "#2c2c2c",
+        }
+    };
+
+    const collapsedSideBar = {
+        ...SideBar,
+        width: "40px",
+        minWidth: "40px",
+        maxWidth: "40px",
+        overflow: "hidden",
     };
 
     const IndexBar = {
         alignSelf: "flex-start",
         position: "sticky",
-        top: 80,
+        top: 120,
         overflowY: "auto",
         minHeight: "93vh",
         maxHeight: "93vh",
@@ -670,8 +902,15 @@ const Docs = (defaultprops) => {
 		overflow: "hidden", 
     }
 
-    const fetchDocList = () => {
-        fetch(`${globalUrl}/api/v1/docs`, {
+    const fetchDocList = (resetCache = false) => {
+        var url = `${globalUrl}/api/v1/docs`
+		if (location.pathname.includes("/legal")) {
+			url = `${globalUrl}/api/v1/docs?folder=legal&resetCache=${resetCache}`
+		} else if (location.pathname.includes("/articles")) {
+			url = `${globalUrl}/api/v1/docs?folder=articles&resetCache=${resetCache}`
+		}
+
+        fetch(url, {
             method: "GET",
             headers: {
                 "Content-Type": "application/json",
@@ -691,8 +930,19 @@ const Docs = (defaultprops) => {
             .catch((error) => { });
     };
 
-    const fetchDocs = (docId) => {
-        fetch(`${globalUrl}/api/v1/docs/${docId}`, {
+    const fetchDoc = (docId) => {
+		if (docId === undefined) {
+			return 
+		}
+
+        var url = `${globalUrl}/api/v1/docs/${docId}`
+		if (location.pathname.includes("/legal")) {
+			url = `${globalUrl}/api/v1/docs/${docId}?folder=legal`
+		} else if (location.pathname.includes("/articles")) {
+			url = `${globalUrl}/api/v1/docs/${docId}?folder=articles`
+		}
+
+        fetch(url, {
             method: "GET",
             headers: {
                 "Content-Type": "application/json",
@@ -706,19 +956,33 @@ const Docs = (defaultprops) => {
                 }
 
                 if (responseJson.success && responseJson.reason !== undefined) {
+
+                    if(isArticlePage && window.location.pathname.includes("/articles/")) {
+                        if (responseJson.reason !== undefined && responseJson.reason !== null && responseJson.reason.includes("404: Not Found")) {
+                            setData("# Error\nThis page doesn't exist.");
+                            toast("This page doesn't exist. Redirecting to the latest article...", {
+                                position: "bottom-center",
+                                autoClose: 2000,
+                            });
+                            setTimeout(() => {
+                                navigate(`/articles/2.0_release`)
+                            }, 2000)
+                            return
+                        }
+                    }
                     // Find <img> tags and translate them into ![]() format
                     const imgRegex = /<img.*?src="(.*?)"/g;
                     const tocRegex = /^## Table of contents[\s\S]*?(?=^## )|^## Table of contents[\s\S]*$/gm;
                     const newdata = responseJson.reason.replace(imgRegex, '![]($1)').replace(tocRegex, "");
                     setData(newdata);
                     if (docId === undefined) {
-                        document.title = "Shuffle automation documentation";
+                        document.title = isArticlePage ? "Shuffle Articles introduction" : "Shuffle documentation";
                     } else {
-                        document.title = "Shuffle " + docId.replace("_", " ") + " documentation";
+                        document.title = "Shuffle " + docId.replace("_", " ") + (isArticlePage ? " articles" : " documentation");
                     }
 
-                    if (responseJson.reason !== undefined && responseJson.reason !== null && responseJson.reason.includes("404: Not Found")) {
-                        navigate("/docs")
+                    if (responseJson.reason !== undefined && responseJson.reason !== null && responseJson.reason.includes("404: Not Found") && !isArticlePage) {
+                        //navigate("/docs")
                         return
                     }
 
@@ -747,6 +1011,11 @@ const Docs = (defaultprops) => {
             .catch((error) => { });
     };
 
+    const handleResetCache = () => {
+        fetchDocList(true);
+        toast("Cache has been reset");
+    }
+
     if (firstrequest) {
         setFirstrequest(false);
         if (!serverside) {
@@ -769,11 +1038,29 @@ const Docs = (defaultprops) => {
                 //	return null
                 //}
                 //
-                if (props.match.params.key === undefined) {
-
+                if (props.match.params.key === undefined && isArticlePage) {
+                    fetch(`${globalUrl}/api/v1/articles`, {
+                        method: "GET",
+                        headers: {
+                            "Content-Type": "application/json",
+                            Accept: "application/json",
+                        },
+                    })
+                        .then((response) => response.json())
+                        .then((responseJson) => {
+                            if (responseJson.success && responseJson.list && responseJson.list.length > 0) {
+                                // Navigate to the latest article
+                                if (responseJson?.list[0]?.name) {
+                                    navigate(`/articles/${responseJson?.list[0].name}`);
+                                }
+                            }
+                        })
+                        .catch((error) => {
+                            console.error("Error fetching articles:", error);
+                        });
                 } else {
                     console.log("DOCID: ", props.match.params.key)
-                    fetchDocs(props.match.params.key)
+                    fetchDoc(props.match.params.key)
                 }
             }
         }
@@ -782,18 +1069,17 @@ const Docs = (defaultprops) => {
     // Handles search-based changes that origin from outside this file
     if (serverside !== true && window.location.href !== baseUrl) {
         setBaseUrl(window.location.href);
-        fetchDocs(props.match.params.key);
+        fetchDoc(props.match.params.key);
     }
 
     const markdownStyle = {
-        color: "rgba(255, 255, 255, 0.90)",
+        color: theme.palette.textColor,
         overflow: "hidden",
         paddingBottom: 100,
         margin: "auto",
         maxWidth: "100%",
         minWidth: "100%",
-        overflow: "hidden",
-        fontSize: isMobile ? "1.3rem" : "1rem",
+        fontSize: isMobile ? "1.3rem" : "1.1rem",
     };
 
     const alertNote = {
@@ -872,6 +1158,7 @@ const Docs = (defaultprops) => {
         marginTop: 25,
     }
 
+  	const showPartnerLogo = userdata?.org_status?.includes("integration_partner") && userdata?.active_org?.image !== undefined && userdata?.active_org?.image !== null && userdata?.active_org?.image.length > 0 
     const mainpageInfo =
         <div style={{
             color: "rgba(255, 255, 255, 0.65)",
@@ -887,10 +1174,12 @@ const Docs = (defaultprops) => {
             <Typography variant="h4" style={{ textAlign: "center", marginTop: 20 }}>
                 Documentation
             </Typography>
-            <div style={{ display: "flex", marginTop: 25, }}>
-                <CustomButton title="Talk to Support" icon=<img src="/images/Shuffle_logo_new.png" style={{ height: 35, width: 35, border: "", borderRadius: theme.palette?.borderRadius, }} /> />
-                <CustomButton title="Ask the community" icon=<img src="/images/social/discord.png" style={{ height: 35, width: 35, border: "", borderRadius: theme.palette?.borderRadius, }} /> link="https://discord.gg/B2CBzUm" />
-            </div>
+			{showPartnerLogo === true ? null : 
+				<div style={{ display: "flex", marginTop: 25, }}>
+					<CustomButton title="Talk to Support" icon=<img src="/images/Shuffle_logo_new.png" style={{ height: 35, width: 35, border: "", borderRadius: theme.palette?.borderRadius, }} /> />
+					<CustomButton title="Ask the community" icon=<img src="/images/social/discord.png" style={{ height: 35, width: 35, border: "", borderRadius: theme.palette?.borderRadius, }} /> link="https://discord.gg/B2CBzUm" />
+				</div>
+			}
 
             <div style={{ textAlign: "left" }}>
                 <Typography variant="h6" style={headerStyle} >Tutorial</Typography>
@@ -940,20 +1229,94 @@ const Docs = (defaultprops) => {
     }
 
 
+    const activeHrefStyleToc2 = {
+        ...hrefStyleToc2,
+        color: "#f86a3e",
+        fontFamily: theme.typography.fontFamily,
+    };
+
+    const activeListItemStyle = {
+        backgroundColor: "rgba(248, 106, 62, 0.08)", // Slight orange tint
+        marginRight: window.location.pathname.includes("/articles/") ? "0.8em" : undefined,
+        borderLeft: "3px solid #f86a3e",
+        paddingLeft: "13px", // Compensate for the border
+    };
+
+    const toggleSidebar = () => {
+        setSidebarOpen(!sidebarOpen);
+    };
+    
+
 
     // PostDataBrowser Section
     const postDataBrowser =
         list === undefined || list === null ? null : (
             <div style={Body}>
-                <div style={SideBar}>
+                <div style={!isArticlePage ? SideBar : (sidebarOpen ? SideBar : collapsedSideBar)}>
                     <Paper style={SidebarPaperStyle}>
-                        <List style={{ listStyle: "none", paddingLeft: "0" }}>
+                        {modalView}
+                        {
+                            !isArticlePage && (
+                                <TextField
+                                    variant="outlined"
+                                    placeholder="Search Docs..."
+                                    size="small"
+                                    onClick={() => {
+                                        setIsDocSearchModalOpen(true)
+                                        setSearchBarModalOpen(true)
+                                    }}
+                                    inputRef={searchFieldRef}
+                                    InputProps={{
+                                        endAdornment: (
+                                            <InputAdornment position="end">
+                                                <SearchIcon style={{ color: "white" }} />
+                                            </InputAdornment>
+                                        ),
+                                        style: {
+                                            backgroundColor: theme.palette.platformColor,
+                                            borderRadius: 4,
+                                            fontSize: 18,
+                                            color: theme.palette.textColor,
+                                        },
+                                    }}
+                                    style={{
+                                        marginTop: 10,
+                                        marginLeft: 10,
+                                        borderRadius: 4,
+                                        width: !isLoggedIn ? "14%" : !leftSideBarOpenByClick ?  "12%" : "11%",
+                                        maxWidth: "285px",
+                                        position: "fixed",
+                                        zIndex: 1100,
+                                    }}
+                                    inputProps={{
+                                        readOnly: true,
+                                    }}
+                                />
+                            )
+                        }
+                        <List style={{ 
+                            listStyle: "none", 
+                            paddingLeft: "0",
+                            paddingTop: !isArticlePage ? "60px" : undefined,
+                            paddingBottom: !isArticlePage ? "30px" : undefined,
+                            display: isArticlePage ? sidebarOpen ? "block" : "none" : undefined,
+                            opacity: isArticlePage ? sidebarOpen ? 1 : 0 : undefined,
+                            transition: isArticlePage ? "opacity 0.3s ease" : undefined,
+                            height: isArticlePage ? "90%" : undefined,  
+                            }}>
                             {list.map((data, index) => {
                                 const item = data.name;
                                 if (item === undefined) {
                                     return null;
                                 }
-                                const path = "/docs/" + item;
+
+                                var path = "/docs/" + item;
+								if (location.pathname.includes("/legal")) {
+									path = "/legal/" + item
+								} else if (location.pathname.includes("/articles")) {
+									path = "/articles/" + item
+								}
+
                                 const newname =
                                     item.charAt(0).toUpperCase() +
                                     item.substring(1).split("_").join(" ").split("-").join(" ");
@@ -965,23 +1328,63 @@ const Docs = (defaultprops) => {
                                         <ListItemButton
                                             component={Link}
                                             key={index}
-                                            style={hrefStyle}
+                                            style={{
+                                                ...hrefStyle,
+                                                ...(itemMatching ? activeListItemStyle : {}),
+                                            }}
                                             to={path}
                                         >
                                             <ListItemText
-                                                style={{ color: itemMatching ? "#f86a3e" : "inherit" }}
-                                                variant="body1"
-                                            >
-                                                {newname}
-                                            </ListItemText>
+                                                style={{ 
+                                                    color: itemMatching ? "#f86a3e" : theme.palette.textColor,
+                                                    flex: 1,
+                                                }}
+                                                primary={
+                                                    <Typography
+                                                        style={{
+                                                            whiteSpace: "nowrap",
+                                                            overflow: "hidden",
+                                                            color : "inherit",
+                                                            textOverflow: "ellipsis",
+                                                            fontSize: "18px",
+                                                        }}
+                                                    >
+                                                        {newname}
+                                                    </Typography>
+                                                }
+                                            />
+                                            <KeyboardArrowRightIcon 
+                                                style={{ 
+                                                    color: itemMatching ? "#f86a3e" : "inherit",
+                                                    fontSize: "1.1rem",
+                                                    marginRight: "-6px",
+                                                }}
+                                            />
                                         </ListItemButton>
                                     </li>
                                 );
                             })}
                         </List>
+                        {
+                            isArticlePage && (
+                                <IconButton
+                                    onClick={toggleSidebar}
+                                    style={sideBarToggleButton}
+                                >
+                                    {sidebarOpen ? <ChevronLeft /> : <ChevronRight />}
+                                </IconButton>
+                            )
+                        }
                     </Paper>
                 </div>
-                <div style={{ width: "60%", margin: "30px 0px 30px 30px", overflow: "hidden", paddingRight: 50, paddingLeft: 40 }}>
+                <div style={{
+                    width: isArticlePage ? sidebarOpen ? "60%" : "70%" : "60%", 
+                    margin: isArticlePage ? sidebarOpen ? "0 0px 30px 30px" : "0 0px 30px 60px" : "30px 0px 30px 30px", 
+                    overflow: "hidden", 
+                    paddingRight: 50, 
+                    paddingLeft: 40,
+                    transition: "width 0.3s ease, margin 0.3s ease",
+                }}>
                     {props.match.params.key === undefined ?
                         mainpageInfo
                         :
@@ -1003,12 +1406,26 @@ const Docs = (defaultprops) => {
                     }
                 </div>
                 <div style={IndexBar}>
+                     {userdata?.support && isArticlePage && (
+                        <Button 
+                            variant="contained" 
+                            color="secondary" 
+                            onClick={handleResetCache}
+                            style={{marginBottom: "15px"}}
+                        >
+                            Reset Cache
+                        </Button>
+                    )}
                     {tocLines.length > 0 ?
                         (
-                            <h4 style={{ fontWeight: 600, margin: 0, fontSize: "16px", marginBottom: "8px" }}>Table of Content</h4>
+                            <h4 style={{ fontWeight: 600, margin: 0, fontSize: "16px", marginBottom: "8px", color: theme.palette.text.primary, }}>Table Of Content</h4>
 
                         ) : null}
-                    <nav>
+                    <div
+                    style={{
+                        overflowY: "auto",
+                        maxHeight: "90vh",
+                    }}>
                         {tocLines.map((data, index) => {
                             return (
                                 <div className="toc"
@@ -1019,17 +1436,21 @@ const Docs = (defaultprops) => {
                                         style={{
                                             fontSize: "14px",
                                             fontWeight: 400,
-											padding: "4px 8px 4px 8px",
+											padding: isArticlePage ? "4px 0" : "4px 8px 4px 8px",
+                                            paddingLeft: isArticlePage ? "0" : "8px",
+                                            paddingRight: isArticlePage ? "0" : "8px",
                                             lineHeight: "20px",
-                                            color: activeId === data.id ? "#f86a3e" : "rgba(255,255,255,0.6)", 
                                         }}
                                         onClick={(e) => {
                                             handleCollapse(index)
+                                            setActiveId(data.id)
                                         }}
                                     >
-                                        {data.title}
+                                        <Typography style={{ fontSize: 14, fontWeight: 400, color: activeId === data.id ? "#f86a3e" : theme.palette.textColor, }}>
+                                            {data.title}
+                                        </Typography>
                                         {data.items.length > 0 ? (
-                                            <>{isopen == index ? <ExpandMoreIcon /> : <KeyboardArrowRightIcon />}</>
+                                            <>{isopen === index ? <ExpandMoreIcon style={{color: theme.palette.text.secondary}} /> : <KeyboardArrowRightIcon style={{color: theme.palette.text.secondary}} />}</>
                                         ) : null}
                                     </ListItemButton>
                                     {
@@ -1041,8 +1462,12 @@ const Docs = (defaultprops) => {
                                                     return (
                                                         <ListItemButton
                                                             key={i}
-                                                            style={hrefStyleToc2}
+                                                            style={activeSubItem === d.id ? activeHrefStyleToc2 : {...hrefStyleToc2, color: theme.palette.text.secondary,  fontFamily: theme.typography.fontFamily,}}
                                                             href={`#${d.id}`}
+                                                            onClick={(e) => {
+                                                                // e.preventDefault()
+                                                                setActiveSubItem(d.id)
+                                                            }}
                                                         >
                                                             {d.title}
                                                         </ListItemButton>
@@ -1055,7 +1480,7 @@ const Docs = (defaultprops) => {
 
                             )
                         })}
-                    </nav>
+                    </div>
                 </div >
 
             </div >
@@ -1083,7 +1508,7 @@ const Docs = (defaultprops) => {
                         color="primary"
                         onClick={handleClick}
                     >
-                        <div style={{ color: "white" }}>More docs</div>
+                        <div style={{ color: "white" }}>More {isArticlePage ? "articles" : "docs"}</div>
                     </Button>
                     <Menu
                         id="simple-menu"
@@ -1099,7 +1524,7 @@ const Docs = (defaultprops) => {
                                 return null;
                             }
 
-                            const path = "/docs/" + item;
+                            const path = isArticlePage ? "/articles/" + item : "/docs/" + item;
                             const newname =
                                 item.charAt(0).toUpperCase() +
                                 item.substring(1).split("_").join(" ").split("-").join(" ");
@@ -1108,7 +1533,8 @@ const Docs = (defaultprops) => {
                                     key={index}
                                     style={{ color: "white" }}
                                     onClick={() => {
-                                        window.location.pathname = path;
+                                        navigate(path)
+                                        handleClose()
                                     }}
                                 >
                                     {newname}
@@ -1140,8 +1566,22 @@ const Docs = (defaultprops) => {
                                 <MenuItem
                                     key={index}
                                     style={{ color: "white" }}
+                                    component={Link}
+                                    to={`#${data.id}`}
+                                    onClick={() => {
+                                        console.log(`Scrolling to: ${data.id}`);
+                                        setTimeout(() => {
+                                            const element = document.getElementById(data?.id);
+                                            if (element) {
+                                                element.scrollIntoView({ behavior: 'smooth' });
+                                            } else {
+                                                console.error(`Element with id ${data.id} not found.`);
+                                            }
+                                        }, 100); // Delay to ensure the content is loaded
+                                        handleCloseToc();
+                                    }}
                                 >
-                                    <a href={`#${data.id}`} style={hrefStyle}>{data.title}</a>
+                                    {data.title}
                                 </MenuItem>
                             )
                         })}
@@ -1178,14 +1618,14 @@ const Docs = (defaultprops) => {
                     color="primary"
                     onClick={handleClick}
                 >
-                    <div style={{ color: "white" }}>More docs</div>
+                    <div style={{ color: "white" }}>More {isArticlePage ? "articles" : "docs"}</div>
                 </Button>
             </div>
         );
 
     // Padding and zIndex etc set because of footer in cloud.
 const loadedCheck = (
-    <DocsWrapper isLoggedIn={isLoggedIn} isLoaded={isLoaded}>
+    <DocsWrapper isLoggedIn={isLoggedIn} isLoaded={isLoaded} userdata={userdata}>
         <DocsContent postDataBrowser={postDataBrowser} postDataMobile={postDataMobile}/>
     </DocsWrapper>
 );
@@ -1197,25 +1637,41 @@ return <div>{loadedCheck}</div>;
 export default Docs;
 
 const DocsContent = memo(({postDataBrowser, postDataMobile}) => {
+    const { themeMode } = useContext(Context);
+    const theme = getTheme(themeMode);
     return(
-        <div>
+        <div style={{fontFamily: theme?.palette?.fontFamily}}>
             <BrowserView>{postDataBrowser}</BrowserView>
             <MobileView>{postDataMobile}</MobileView>
         </div>
 )})
 
-const DocsWrapper = memo(({isLoggedIn, isLoaded, children })=>{
+const DocsWrapper = memo(({isLoggedIn, isLoaded, children, userdata })=>{
     
     const { leftSideBarOpenByClick, windowWidth } = useContext(Context);
 
+    useEffect(() => {
+        if (isLoaded && isLoggedIn && userdata?.org_status?.includes("integration_partner") && userdata?.active_org?.branding.documentation_link?.length > 0) {
+            window.location.href = userdata?.active_org?.branding.documentation_link;
+        }
+    }, [isLoaded, isLoggedIn, userdata]);
+
+    if (isLoaded && isLoggedIn && userdata?.org_status?.includes("integration_partner") && userdata?.active_org?.branding.documentation_link?.length > 0) {
+        return <CircularProgress style={{position: "absolute", top: "50%", left: "50%", transform: "translate(-50%, -50%)"}} />;
+    }
+
+    
+
     return (
         <div style={{
+            marginTop: window.location.pathname.includes("/articles/") ? 50 : undefined, 
+            paddingBottom: 50,
             minHeight: 1000, zIndex: 1, 
             maxWidth: Math.min(!(isLoggedIn && isLoaded) ? 1920 : leftSideBarOpenByClick ? windowWidth - 300 : windowWidth - 200, 1920), 
             minWidth: isMobile ? null : (isLoggedIn && isLoaded) ? leftSideBarOpenByClick ? 800 : 900 : null, margin: "auto", 
             position: (isLoggedIn && isLoaded) && leftSideBarOpenByClick ? "relative" : "static", 
             left: (isLoggedIn && isLoaded) && leftSideBarOpenByClick ? 120 : (isLoggedIn && isLoaded) && !leftSideBarOpenByClick ? 80 : 0, 
-            marginLeft: windowWidth < 1920 ? leftSideBarOpenByClick && (isLoggedIn && isLoaded) ? 90 : (isLoggedIn && isLoaded) && !leftSideBarOpenByClick ? 80 : 0 : "auto", width: "100%", 
+            marginLeft: windowWidth < 1920 ? leftSideBarOpenByClick && (isLoggedIn && isLoaded) ? window.location.pathname.includes("/articles/") ? 0 : 90 : (isLoggedIn && isLoaded) && !leftSideBarOpenByClick ? 80 : 0 : "auto", width: "100%", 
             transition: "left 0.3s ease-in-out, min-width 0.3s ease-in-out, max-width 0.3s ease-in-out, position 0.3s ease-in-out, margin 0.3s ease-in-out, margin-left 0.3s ease"
             }}>
             {children}
diff --git a/frontend/src/views/LoginPage.jsx b/frontend/src/views/LoginPage.jsx
index 719a4717..b717b9f6 100755
--- a/frontend/src/views/LoginPage.jsx
+++ b/frontend/src/views/LoginPage.jsx
@@ -1,546 +1,1049 @@
 /* eslint-disable react/no-multi-comp */
-import React, { useState, useEffect } from "react";
-import { makeStyles } from "@mui/styles";
+import React, { useState, useEffect, } from 'react';
+import { makeStyles } from '@mui/styles';
+import { useNavigate, Link, useParams } from "react-router-dom";
+import { isMobile } from "react-device-detect";
+import { toast } from 'react-toastify';
 import { useInterval } from "react-powerhooks";
-import theme from '../theme.jsx';
+import VisibilityOutlinedIcon from '@mui/icons-material/VisibilityOutlined';
+import VisibilityOffOutlinedIcon from '@mui/icons-material/VisibilityOffOutlined';
+import {
+	ConnectingAirportsOutlined,
+	ConstructionOutlined,
+	DoneRounded,
+	Done as DoneIcon
+} from '@mui/icons-material';
 
 import {
-  CircularProgress,
-  TextField,
-  Button,
-  Paper,
-  Typography,
-} from "@mui/material";
-
-import { useNavigate } from "react-router-dom";
+	Checkbox,
+	CircularProgress,
+	TextField,
+	Button,
+	Paper,
+	Typography,
+	Tooltip,
+	TableHead,
+	TableRow,
+	TableContainer,
+	TableCell,
+	TableBody,
+	Table,
+} from '@mui/material';
 
 const hrefStyle = {
-  color: "white",
-  textDecoration: "none",
-};
+	color: "#FF8444",
+	fontSize: "14px",
+	textDecoration: "none",
+	display: "flex",
+}
 
-const bodyDivStyle = {
-  margin: "auto",
-  marginTop: 150,
-  width: "500px",
-};
+const googleLoginIcon = {
+	boxSizing: "border-box",
+	display: "flex",
+	flexDirection: "row",
+	justifyContent: "center",
+	alignItems: "center",
+	padding: "16px",
+	gap: "8px",
+	// position: "sticky",
+	width: 171,
+	height: "51px",
+	left: "352px",
+	top: "725px",
+	background: "#1A1A1A",
+	border: "1px solid #494949",
+	borderRadius: "8px",
+
+}
+
+const githubLoginIcon = {
+	boxSizing: "border-box",
+	display: "flex",
+	flexDirection: "row",
+	justifyContent: "center",
+	alignItems: "center",
+	padding: "16px",
+	gap: "8px",
+	position: "sticky",
+	width: "173px",
+	height: "51px",
+	left: "539px",
+	top: "725px",
+	backgroundColor: "#1A1A1A",
+	border: "1px solid #494949",
+	borderRadius: "8px",
+}
+
+const surfaceColor = "#27292D"
+const inputColor = "#383B40"
 
 const useStyles = makeStyles({
-  notchedOutline: {
-    borderColor: "#f85a3e !important",
-  },
+	notchedOutline: {
+		borderColor: "#f85a3e !important"
+	},
+	marketplaceIcon: {
+		width: 28,
+		height: 28,
+		marginRight: 12
+	},
+	divider: {
+		display: "flex",
+		alignItems: "center",
+		margin: "0 20px",
+		'&::before, &::after': {
+			content: '""',
+			flex: 1,
+			borderBottom: "1px solid #494949"
+		},
+		'& span': {
+			margin: "0 10px",
+			color: "#9E9E9E"
+		}
+	},
+	freePlanCard: {
+		padding: "40px",
+		background: "#212121",
+		borderRadius: "12px",
+		width: "100%",
+		maxWidth: "500px"
+	},
+	freePlanTitle: {
+		fontSize: "28px",
+		fontWeight: 600,
+		color: "white",
+		marginTop: 0,
+		marginBottom: "32px"
+	},
+	featureItem: {
+		display: "flex",
+		alignItems: "center",
+		marginBottom: "20px",
+		color: "white",
+		fontSize: "16px",
+		fontWeight: 500
+	},
+	checkIcon: {
+		color: "#4CAF50",
+		marginRight: "16px",
+		width: "24px",
+		height: "24px"
+	}
 });
 
-const LoginDialog = (props) => {
-  const {
-    globalUrl,
-    isLoaded,
-    isLoggedIn,
-    setIsLoggedIn,
-    setCookie,
-    register,
-    checkLogin,
-  } = props;
 
+const FreePlanCard = ({ classes }) => {
+	const features = [
+		"Access to All Apps",
+		"10,000 App Runs",
+		"Monthly Runs Refresh",
+		"Unlimited Users & Workflows",
+		"Multi-Tenancy & -Region",
+		"Support & Discord Access"
+	];
+
+	return (
+		<div className={classes.freePlanCard}>
+			<h2 className={classes.freePlanTitle}>
+				The free plan includes:
+			</h2>
+
+			{features.map((feature, index) => (
+				<div key={index} className={classes.featureItem}>
+					<DoneRounded className={classes.checkIcon} />
+					<span>{feature}</span>
+				</div>
+			))}
+		</div>
+	);
+};
+
+const MarketplaceCard = ({ classes }) => {
+	const marketplaceOptions = [
+		{
+			name: "Open Source Install",
+			logo: "https://static.cdnlogo.com/logos/g/69/github-icon.svg",
+			tooltipText: "Click to install!",
+			valid: true,
+
+			link: "https://github.com/shuffle/shuffle/blob/main/.github/install-guide.md"
+		},
+		{
+			name: "Amazon Web Services",
+			logo: "https://cdn.cdnlogo.com/logos/a/19/aws.svg",
+			tooltipText: "Coming soon to AWS Marketplace!",
+			valid: false,
+		},
+		{
+			name: "Microsoft Azure",
+			logo: "https://cdn.cdnlogo.com/logos/a/12/azure.svg",
+			tooltipText: "Coming soon to Azure Marketplace!",
+			valid: false,
+		},
+		{
+			name: "Google Cloud Platform",
+			logo: "https://cdn.cdnlogo.com/logos/g/75/google-cloud.svg",
+			tooltipText: "Coming soon to Google Cloud Marketplace!",
+			valid: false,
+		}
+	];
+
+	return (
+		<div style={{
+			padding: "40px",
+			background: "#212121",
+			borderRadius: "12px",
+			width: "100%",
+			maxWidth: "500px"
+		}}>
+			<h2 style={{
+				marginTop: 0,
+				marginBottom: "32px",
+				fontSize: "28px",
+				fontWeight: 600,
+				color: "white",
+				textAlign: "center", 
+			}}>
+				Self Host
+			</h2>
+
+			{marketplaceOptions.map((option, index) => {
+				return (
+					<Tooltip
+						key={index}
+						title={option.tooltipText}
+						placement="top"
+						arrow
+					>
+						<button
+							onClick={() => {
+								if (option.valid === true) {
+									window.open(option.link, "_blank")
+								}
+								
+							}}
+							style={{
+								width: "100%",
+								justifyContent: "flex-start",
+								padding: "12px",
+								marginBottom: "12px",
+								backgroundColor: "#1A1A1A", 
+								border: "1px solid #494949",
+								borderRadius: "8px",
+								color: "white",
+								opacity: 0.7,
+								cursor: option.valid === true ? "pointer" : "not-allowed",
+							}}
+							disabled={option.valid === false}
+						>
+							<img
+								src={option.logo}
+								alt={option.name}
+								className={classes.marketplaceIcon}
+								style={{
+									filter: option.valid === true ? null : "grayscale(1)",
+								}}
+							/>
+							<Typography className={classes.marketplaceText}>
+								{option.name}
+							</Typography>
+						</button>
+					</Tooltip>
+				)
+			})}
+
+			<div style={{
+				marginTop: "0.5rem",
+				display: "flex",
+				flexDirection: "column",
+				gap: "0.5rem",
+				textAlign: "center", 
+			}}>
+				{/*
+				<a
+					href="https://shuffler.io/docs/configuration#marketplace-setup"
+					target="_blank"
+					style={{ color: "rgba(255, 132, 68, 1)", textDecoration: "underline" }}
+				>
+					Read more about marketplaces
+				</a>
+				*/}
+				<a
+					href="/docs/configuration#installation"
+					target="_blank"
+					style={{ color: "rgba(255, 132, 68, 1)", textDecoration: "underline" }}
+				>
+					Learn more about self hosting
+				</a>
+			</div >
+
+		</div >
+	);
+};
+
+
+const LoginPage = props => {
+	const { globalUrl, isLoaded, isLoggedIn, setIsLoggedIn, setCookie, inregister, serverside, checkLogin, } = props;
 	let navigate = useNavigate();
-  const classes = useStyles();
+	const [username, setUsername] = useState("");
+	const [password, setPassword] = useState("");
+	const [message, setMessage] = useState("");
+	const [loginLoading, setLoginLoading] = useState(false);
 
-  const [username, setUsername] = useState("");
-  const [password, setPassword] = useState("");
-  const [firstRequest, setFirstRequest] = useState(true);
-  const [loginLoading, setLoginLoading] = useState(false);
-  const [loginViewLoading, setLoginViewLoading] = useState(false);
-  const [ssoUrl, setSSOUrl] = useState("");
+	const [MFAField, setMFAField] = useState(false);
+	const [MFAValue, setMFAValue] = useState("");
+	const [register, setRegister] = useState(inregister);
+	const [checkboxClicked, setCheckboxClicked] = useState(false);
+	const [loginWithSSO, setLoginWithSSO] = useState(false)
+	const [showPassword, setShowPassword] = useState(false)
+	const [ssoUrl, setSSOUrl] = useState("");
 
-  const [MFAField, setMFAField] = useState(false);
-  const [MFAValue, setMFAValue] = useState("");
-
-
-  // Used to swap from login to register. True = login, false = register
+    const isCloud = window.location.host === "localhost:3002" || window.location.host === "shuffler.io" || window.location.host === "migration.shuffler.io" || window.location.host === "sandbox.shuffler.io";
+	const parsedsearch = serverside === true ? "" : window.location.search
 
 	useEffect(() => {
-		checkAdmin() 
-	}, [loginViewLoading])
+		if (!isCloud) {
+			checkAdmin() 
+		} 
+	}, [])
 
-  // Error messages etc
-  const [loginInfo, setLoginInfo] = useState("");
-
-  const handleValidateForm = () => {
-    return username.length > 1 && password.length > 1;
-  };
-
-  if (isLoggedIn === true) {
-    //window.location.pathname = "/workflows";
-    navigate("/workflows")
-  }
-
-  const checkAdmin = () => {
-    const url = globalUrl + "/api/v1/checkusers";
-    fetch(url, {
-      method: "GET",
-      headers: {
-        "Content-Type": "application/json",
+    const { start, stop } = useInterval({
+      duration: 3000,
+      startImmediate: false,
+      callback: () => {
+        checkAdmin()
       },
     })
-      .then((response) =>
-        response.json().then((responseJson) => {
-          if (responseJson["success"] === false) {
-            setLoginInfo(responseJson["reason"]);
-          } else {
 
-            if (responseJson.sso_url !== undefined && responseJson.sso_url !== null) {
-              setSSOUrl(responseJson.sso_url);
-            }
+	useEffect(() => {
+		if (serverside !== true) {
+			const tmpMessage = new URLSearchParams(window.location.search).get("message")
+			if (tmpMessage !== undefined && tmpMessage !== null && message !== tmpMessage) {
+				setMessage(tmpMessage)
+				toast(tmpMessage)
+			}
+		}
+	}, [])
 
-            if (loginViewLoading) {
-              setLoginViewLoading(false);
-              checkLogin();
-              stop();
-
-              if (
-                responseJson.reason !== undefined &&
-                responseJson.reason !== null
-              ) {
-                setLoginInfo(responseJson.reason);
-              }
-            }
-
-            if (responseJson.reason === "stay") {
-              navigate("/adminsetup")
-            }
-          }
-        })
-      )
-      .catch((error) => {
-        if (!loginViewLoading) {
-          setLoginViewLoading(true);
-          start();
-        }
-      });
-  };
-
-  const { start, stop } = useInterval({
-    duration: 3000,
-    startImmediate: false,
-    callback: () => {
-      checkAdmin();
-    },
-  });
-
-  if (firstRequest) {
-    setFirstRequest(false);
-    checkAdmin();
+	if (document !== undefined) {
+		if (register) {
+			if (isCloud) { 
+				document.title = "Login to Shuffle SaaS"
+			} else {
+				document.title = "Login to Shuffle"
+			}
+		} else {
+			if (isCloud) {
+				document.title = "Register to Shuffle SaaS"
+			} else {
+				document.title = "Register to Shuffle"
+			}
+		}
   }
+  
+  useEffect(() => {
 
-  const onSubmit = (e) => {
-    setLoginLoading(true);
-    e.preventDefault();
-    setLoginInfo("");
-    // FIXME - add some check here ROFL
-
-    // Just use this one?
-    var data = { username: username, password: password };
-    if (MFAValue !== undefined && MFAValue !== null && MFAValue.length > 0) {
-      data["mfa_code"] = MFAValue;
+    if (loginWithSSO && window?.location?.pathname === "/register") {
+      setLoginWithSSO(false)
     }
 
-    var baseurl = globalUrl;
-    if (register) {
-      var url = baseurl + "/api/v1/login";
+  },[window?.location?.pathname])
+
+	// Just a way to force location loading properly
+	// Register & login should be split :3
+	if (window !== undefined) {
+		const path = window.location.pathname;
+		if (path.includes("/login") && register === false) {
+			console.log("Should register instead of login!")
+			setRegister(!register)
+		} else if (path.includes("/register") && register === true) {
+			if (!isCloud) {
+				setRegister(true)
+				navigate("/login")
+			}
+
+			console.log("Should login instead of register!")
+			setRegister(!register)
+		} else {
+			//console.log("Path: " + path, "Register: " + register)
+		}
+	}
+
+	const bodyDivStyle = {
+		marginTop: 100,
+		width: isMobile ? "100%" : "100%",
+		maxWidth: "1200px", // Increased max-width to accommodate larger cards
+		background: "#1A1A1A",
+		margin: "auto",
+		display: isMobile ? "block" : "flex",
+		padding: "40px",
+		gap: "40px",
+		overflow: "hidden",
+		alignItems: "center"
+	};
+
+	const boxStyle = {
+		color: "white",
+		padding: "40px",
+		flex: 1,
+		maxWidth: isMobile ? "100%" : 410,
+		minWidth: isCloud ? 410 : 475, 
+		background: "#212121",
+		borderRadius: "12px",
+		display: "flex",
+		// flexDirection: "column",
+	};
+
+
+
+	const paperStyleReg = {
+		width: 300,
+		height: 350,
+		background: "#212121",
+		borderRadius: "8px",
+		marginLeft: isMobile ? 80 : register ? "455px" : "485px",
+		marginTop: isMobile ? 10 : 110,
+		position: isMobile ? "" : "absolute",
+
+	}
+	const paperStyleLog = {
+		position: "absolute",
+		width: isMobile ? "400px" : "532px",
+		padding: "0px 30px 0px",
+		// marginTop: "135px",
+		// background: "#212121",
+		borderRadius: "8px",
+	}
+	const createData = (icon, title) => {
+		return {
+			icon,
+			title,
+		}
+	}
+
+	// Used to swap from login to register. True = login, false = register
+	const activeIcon = <DoneIcon style={{ color: "green" }} />
+	const rows = [
+		createData(activeIcon, "Access to All Apps"),
+		createData(activeIcon, "10,000 App Runs"),
+		createData(activeIcon, "Monthly Runs Refresh"),
+		createData(activeIcon, "Unlimited Users & Workflows"),
+		createData(activeIcon, "Multi-Tenancy & -Region"),
+		createData(activeIcon, "Support & Discord Access"),
+	];
+	const classes = useStyles();
+	// Error messages etc
+	const [loginInfo, setLoginInfo] = useState("");
+
+	const handleValidateForm = (username, password) => {
+		if (loginWithSSO) {
+			return username.length > 1
+		}
+
+		if (!isCloud) {
+			return (username.length > 0 && password.length > 0);
+		}
+
+		return (username.length > 1 && password.length > 8);
+	}
+
+	if (isLoggedIn === true && serverside !== true) {
+		setTimeout(() => {
+			const tmpView = new URLSearchParams(window.location.search).get("view");
+			if (tmpView !== undefined && tmpView !== null) {
+				let pathOnly = tmpView.split("?")[0];
+				if (!pathOnly.startsWith("/")) pathOnly = "/" + pathOnly;
+
+				if (pathOnly === "/pricing" || pathOnly === "admin") {
+					window.location.replace(pathOnly + window.location.search);
+				} else {
+					if(localStorage.getItem("redirectId") !== null && localStorage.getItem("redirectId") !== undefined) {
+						const redirectId = localStorage.getItem("redirectId")
+						localStorage.removeItem("redirectId")
+						pathOnly = pathOnly + "/" + redirectId
+					}
+					window.location.replace(pathOnly);
+				}
+				return;
+			}
+
+			window.location.pathname = "/workflows"
+		}, 2000);
+	}
+
+    const checkAdmin = () => {
+      const url = globalUrl + "/api/v1/checkusers";
       fetch(url, {
-        mode: "cors",
-        method: "POST",
-        body: JSON.stringify(data),
-        credentials: "include",
-        crossDomain: true,
-        withCredentials: true,
-        headers: {
-          "Content-Type": "application/json; charset=utf-8",
-        },
-      })
-        .then((response) =>
-          response.json().then((responseJson) => {
-            setLoginLoading(false);
-            if (responseJson["success"] === false) {
-              setLoginInfo(responseJson["reason"]);
-            } else {
-              if (responseJson["reason"] === "MFA_REDIRECT") {
-                setLoginInfo(
-                  "MFA required. Please enter the 6-digit code from your authenticator"
-                );
-                setMFAField(true);
-                return;
-              }  else if (responseJson["reason"] === "MFA_SETUP") {
-                window.location.href = `/login/${responseJson.url}/mfa-setup`;
-                return;
-              }
-
-              setLoginInfo("Successful login, rerouting");
-              for (var key in responseJson["cookies"]) {
-                setCookie(
-                  responseJson["cookies"][key].key,
-                  responseJson["cookies"][key].value,
-                  { path: "/" }
-                );
-              }
-
-			  if (responseJson.tutorials === undefined || responseJson.tutorials === null || !responseJson.tutorials.includes("welcome")) {
-			  	console.log("RUN Welcome!!")
-          setTimeout(() => {
-            navigate("/welcome?tab=2")
-          },200)
-			  	// window.location.pathname = "" 
-			  	return
-			  }
-
-			  const tmpView = new URLSearchParams(window.location.search).get("view")
-			  if (tmpView !== undefined && tmpView !== null) {
-			  	//const newUrl = `/${tmpView}${decodeURIComponent(window.location.search)}`
-			  	const newUrl = `/${tmpView}`
-			  	window.location.pathname = newUrl
-			  } else {
-			  	window.location.pathname = "/workflows"		
-			  }
-
-              setIsLoggedIn(true);
-            }
-          })
-        )
-        .catch((error) => {
-          setLoginLoading(false);
-          setLoginInfo("Error logging in: " + error);
-        });
-    } else {
-      url = baseurl + "/api/v1/users/register";
-      fetch(url, {
-        method: "POST",
-        body: JSON.stringify(data),
+        method: "GET",
         headers: {
           "Content-Type": "application/json",
         },
       })
-        .then((response) =>
-          response.json().then((responseJson) => {
-            if (responseJson["success"] === false) {
-              setLoginInfo(responseJson["reason"]);
-            } else {
-              setLoginInfo("Successful register!");
-            }
-          })
-        )
-        .catch((error) => {
-          setLoginInfo("Error in from backend: ", error);
-        });
-    }
-  };
+      .then((response) =>
+        response.json().then((responseJson) => {
+          if (responseJson["success"] === false) {
+            setLoginInfo(responseJson["reason"]);
 
-  const onChangeUser = (e) => {
-    setUsername(e.target.value);
-  };
-
-  const onChangePass = (e) => {
-    setPassword(e.target.value);
-  };
-
-  //const onClickRegister = () => {
-  //	if (props.location.pathname === "/login") {
-  //		window.location.pathname = "/register"
-  //	} else {
-  //		window.location.pathname = "/login"
-  //	}
-
-  //	setLoginCheck(!register)
-  //}
-
-  //var loginChange = register ? (<div><p onClick={setLoginCheck(false)}>Want to register? Click here.</p></div>) : (<div><p onClick={setLoginCheck(true)}>Go back to login? Click here.</p></div>);
-  var formtitle = register ? <div>Login</div> : <div>Register</div>;
-  const imgsize = 100;
-  const basedata = (
-    <div style={bodyDivStyle}>
-      <Paper
-        style={{
-          paddingLeft: "30px",
-          paddingRight: "30px",
-          paddingBottom: "30px",
-          paddingTop: "30px",
-          position: "relative",
-          backgroundColor: theme.palette.surfaceColor,
-        }}
-      >
-        <div
-          style={{
-            position: "absolute",
-            top: -imgsize / 2 - 10,
-            left: 250 - imgsize / 2,
-            height: imgsize,
-            width: imgsize,
-          }}
-        >
-          <img
-            src="images/Shuffle_logo.png"
-            style={{
-              height: imgsize + 10,
-              width: imgsize + 10,
-              border: "2px solid rgba(255,255,255,0.6)",
-              borderRadius: imgsize,
-            }}
-          />
-        </div>
-
-        {loginViewLoading ? (
-          <div style={{ textAlign: "center", marginTop: 50 }}>
-            <Typography
-              variant="body2"
-              style={{ marginBottom: 20, color: "white" }}
-            >
-              Waiting for the Shuffle database to become available. This may
-              take up to a minute.
-            </Typography>
-
-            {loginInfo === undefined ||
-            loginInfo === null ||
-            loginInfo.length === 0 ? null : (
-              <div style={{ marginTop: "10px" }}>Database Response: {loginInfo}</div>
-            )}
-            <CircularProgress color="secondary" style={{ color: "white" }} />
-
-            <Paper
-              style={{
-                paddingLeft: "30px",
-                paddingRight: "30px",
-                paddingBottom: "30px",
-                paddingTop: "30px",
-                position: "relative",
-                textAlign: "left",
-                marginTop: 15,
-              }}
-            >
-              <Typography
-                variant="body2"
-                style={{ marginBottom: 20, color: "white" }}
-              >
-                <b>
-                  Are you sure Shuffle is{" "}
-                  <a
-                    rel="norefferer"
-                    target="_blank"
-                    href="https://github.com/frikky/Shuffle/blob/master/.github/install-guide.md"
-                    style={{ textDecoration: "none", color: "#f86a3e" }}
-                  >
-                    installed correctly
-                  </a>
-                  ?
-                </b>
-              </Typography>
-              <Typography
-                variant="body2"
-                style={{ marginBottom: 20, color: "white" }}
-              >
-                <b>1.</b> Make sure shuffle-database folder has correct access, and that you have a minimum of <b>2Gb of RAM available</b>:{" "}
-                <br />
-                <br />
-                sudo chown -R 1000:1000 shuffle-database
-              </Typography>
-              <Typography
-                variant="body2"
-                style={{ marginBottom: 20, color: "white" }}
-              >
-                <b>2.</b> Disable memory swap on the host:
-                <br />
-                <br />
-				sudo swapoff -a
-              </Typography>
-              <Typography
-                variant="body2"
-                style={{ marginBottom: 20, color: "white" }}
-              >
-                <b>3</b>. Restart the database:
-                <br />
-                <br />
-                sudo docker restart shuffle-opensearch
-              </Typography>
-            </Paper>
-            <Typography
-              variant="body2"
-              style={{ marginBottom: 10, color: "white", marginTop: 20 }}
-            >
-              Need help?{" "}
-              <a
-                rel="norefferer"
-                target="_blank"
-                href="https://discord.gg/B2CBzUm"
-                style={{ textDecoration: "none", color: "#f86a3e" }}
-              >
-                Join the Discord!
-              </a>
-            </Typography>
-          </div>
-        ) : (
-          <form
-            onSubmit={onSubmit}
-            style={{ margin: "15px 15px 15px 15px", color: "white" }}
-          >
-            <h2>{formtitle}</h2>
-            Username
-            <div>
-              <TextField
-                color="primary"
-                style={{
-                  backgroundColor: theme.palette.inputColor,
-                  marginTop: 5,
-                }}
-                autoFocus
-                InputProps={{
-                  classes: {
-                    notchedOutline: classes.notchedOutline,
-                  },
-                  style: {
-                    height: "50px",
-                    color: "white",
-                    fontSize: "1em",
-                  },
-                }}
-                required
-                fullWidth={true}
-                autoComplete="username"
-                placeholder="username@example.com"
-                id="emailfield"
-                margin="normal"
-                variant="outlined"
-                onChange={onChangeUser}
-              />
-            </div>
-            Password
-            <div>
-              <TextField
-                color="primary"
-                style={{
-                  backgroundColor: theme.palette.inputColor,
-                  marginTop: 5,
-                }}
-                InputProps={{
-                  classes: {
-                    notchedOutline: classes.notchedOutline,
-                  },
-                  style: {
-                    height: "50px",
-                    color: "white",
-                    fontSize: "1em",
-                  },
-                }}
-                required
-                id="outlined-password-input"
-                fullWidth={true}
-                type="password"
-                autoComplete="current-password"
-                placeholder="**********"
-                margin="normal"
-                variant="outlined"
-                onChange={onChangePass}
-              />
-            </div>
-            {MFAField === true ? (
-              <div style={{ marginTop: 15 }}>
-                2-factor code
-                <TextField
-                  color="primary"
-                  style={{
-                    backgroundColor: theme.palette.inputColor,
-                    marginTop: 5,
-                  }}
-                  InputProps={{
-                    classes: {
-                      notchedOutline: classes.notchedOutline,
-                    },
-                    style: {
-                      height: "50px",
-                      color: "white",
-                      fontSize: "1em",
-                    },
-                  }}
-                  required
-                  id="outlined-password-input"
-                  fullWidth={true}
-                  type="text"
-                  placeholder="6-digit code"
-                  margin="normal"
-                  variant="outlined"
-                  onChange={(event) => {
-                    setMFAValue(event.target.value);
-                  }}
-                />
-              </div>
-            ) : null}
-            <div style={{ display: "flex", marginTop: "15px" }}>
-              <Button
-                color="primary"
-                variant="contained"
-                type="submit"
-                style={{ flex: "1" }}
-                disabled={!handleValidateForm() || loginLoading}
-              >
-                {loginLoading ? (
-                  <CircularProgress
-                    color="secondary"
-                    style={{ color: "white" }}
-                  />
-                ) : (
-                  "SUBMIT"
-                )}
-              </Button>
-            </div>
-            <div style={{ marginTop: "10px" }}>{loginInfo}</div>
-            {ssoUrl !== undefined && ssoUrl !== null && ssoUrl.length > 0 ? (
-              <div>
-                <Typography style={{ textAlign: "center" }}>Or</Typography>
-                <div style={{ textAlign: "center", margin: 10 }}>
-                  <Button
-                    fullWidth
-										id="sso_button"
-                    color="secondary"
-                    variant="outlined"
-                    type="button"
-                    style={{ flex: "1", marginTop: 5 }}
-                    onClick={() => {
-                      //console.log("CLICK SSO");
-											window.location.href = ssoUrl
-                      //navigate(ssoUrl)
-                    }}
-                  >
-                    Use SSO
-                  </Button>
-                </div>
-              </div>
-            ) : null}
-          </form>
-        )}
-      </Paper>
-    </div>
-  );
-
-  const loadedCheck = isLoaded ? <div>{basedata}</div> : <div></div>;
-
-	useEffect(() => {
-		setTimeout(() => {
-			if (ssoUrl !== undefined && ssoUrl !== null && ssoUrl.length > 0) {
-				//id="sso_button"
-    		const ssoBtn = document.getElementById("sso_button");
-				if (ssoBtn !== undefined && ssoBtn !== null) {
-					//console.log("SSO BTN: ", ssoBtn)
-					const cursearch = typeof window === "undefined" || window.location === undefined ? "" : window.location.search;
-					var tmpView = new URLSearchParams(cursearch).get("autologin");
-					if (tmpView !== undefined && tmpView !== null) {
-						if (tmpView === "true") {
-							console.log("Tmp: ", tmpView)
-							ssoBtn.click()
-						}
-					}
-				}
+			if (responseJson?.reason?.toLowerCase().includes("connection refused")) { 
+				navigate("/loginsetup")
 			}
-		}, 200);
-	}, [ssoUrl])
 
-  return <div style={{paddingBottom: 150, }}>{loadedCheck}</div>;
-};
+          } else {
+            if (responseJson.sso_url !== undefined && responseJson.sso_url !== null) {
+              setSSOUrl(responseJson.sso_url);
+            }
 
-export default LoginDialog;
+			// Stay = 0 users 
+			// Redirect = >1 user
+            if (responseJson.reason === "stay") {
+				setTimeout(() => {
+              		navigate("/adminsetup")
+				}, 2500)
+			}
+          }
+        })
+      )
+      .catch((error) => {
+		  setTimeout(() => {
+		  	navigate("/adminsetup")
+		  }, 2500)
+      })
+    }
+
+	const onSubmit = (e) => {
+		//toast("Testing from login page")
+
+		setMessage("")
+		setLoginLoading(true)
+		e.preventDefault()
+
+		// Just use this one?
+		var data = { "username": username, "password": password }
+		if (MFAValue !== undefined && MFAValue !== null && MFAValue.length > 0) {
+			data["mfa_code"] = MFAValue
+		}
+
+		localStorage.setItem("globalUrl", "")
+
+		var baseurl = globalUrl
+		if (register) {
+			var url = baseurl + '/api/v1/login';
+
+			if (loginWithSSO === true) {
+				url = baseurl + '/api/v1/login/sso'
+				setLoginInfo("Logging in with SSO. Please wait while we find a relevant org...")
+			}
+
+			fetch(url, {
+				mode: 'cors',
+				method: 'POST',
+				body: JSON.stringify(data),
+				credentials: 'include',
+				crossDomain: true,
+				withCredentials: true,
+				headers: {
+					'Content-Type': 'application/json; charset=utf-8',
+				},
+			})
+			.then((response) => {
+				if (response.status !== 200) {
+					console.log("Status not 200 for login:O!");
+				}
+
+				return response.json();
+			})
+			.then((responseJson) => {
+
+				setLoginLoading(false)
+
+				if (responseJson["success"] === false) {
+					setLoginInfo(responseJson["reason"])
+				} else {
+					if (responseJson?.region_url !== undefined && responseJson?.region_url !== null && responseJson?.region_url !== "") {
+						toast.info("Set region to " + responseJson.region_url)
+						localStorage.setItem("globalUrl", responseJson.region_url)
+					}
+
+					if (responseJson["reason"] === "MFA_REDIRECT") {
+						setLoginInfo("Enter the 6-digit MFA code.")
+						setMFAField(true)
+						return
+
+					}
+					else if (responseJson["reason"] === "MFA_SETUP") {
+						window.location.href = `/login/${responseJson.url}/mfa-setup`;
+						return;
+					}
+					else if (responseJson["reason"] === "SSO_REDIRECT") {
+						//navigate(responseJson["url"])
+						window.location.href = responseJson["url"]
+						return
+					}
+					else if (responseJson["reason"] !== undefined && responseJson["reason"] !== null && responseJson["reason"].includes("error")) {
+						setLoginInfo(responseJson["reason"])
+						return
+					}
+
+
+					setLoginInfo("Successful login! Redirecting you in 3 seconds...")
+					for (var key in responseJson["cookies"]) {
+						setCookie(responseJson["cookies"][key].key, responseJson["cookies"][key].value, { path: "/" })
+					}
+
+					setTimeout(() => {
+						const tmpView = new URLSearchParams(window.location.search).get("view");
+						if (tmpView !== undefined && tmpView !== null) {
+							let pathOnly = tmpView.split("?")[0];
+							if (!pathOnly.startsWith("/")) pathOnly = "/" + pathOnly;
+
+							if (pathOnly === "/pricing" || pathOnly === "admin") {
+								window.location.replace(pathOnly + window.location.search);
+							} else {
+								if(localStorage.getItem("redirectId") !== null && localStorage.getItem("redirectId") !== undefined) {
+									const redirectId = localStorage.getItem("redirectId")
+									localStorage.removeItem("redirectId")
+									pathOnly = pathOnly + "/" + redirectId
+								}
+								window.location.replace(pathOnly);
+							}
+							return;
+						}
+
+						if (responseJson.tutorials !== undefined && responseJson.tutorials !== null) {
+							// Find welcome in responseJson.tutorials under key name
+							const welcome = responseJson.tutorials.find(function (element) {
+								return element.name === "welcome";
+							})
+							console.log("Welcome: ", welcome)
+							if (welcome === undefined || welcome === null) {
+								  console.log("RUN login Welcome!!")
+									// window.location.pathname = "/welcome?tab=2"
+									// window.location = "/welcome?tab=2"
+									window.location.href = "/welcome?tab=2"
+									return
+							}
+						}
+
+						window.location.pathname = "/workflows"
+					}, 2000);
+				}
+			})
+			.catch(error => {
+				setLoginInfo("Error from login API: " + error)
+				setLoginLoading(false)
+			});
+		} else {
+			url = baseurl + '/api/v1/register';
+			fetch(url, {
+				method: 'POST',
+				body: JSON.stringify(data),
+				headers: {
+					'Content-Type': 'application/json',
+				},
+			})
+				.then(response =>
+					response.json().then(responseJson => {
+						if (responseJson["success"] === false) {
+							setLoginInfo(responseJson["reason"])
+						} else {
+							if (responseJson["reason"] === "shuffle_account") {
+								window.location.href = "/login?message=Please+login+with+your+Shuffle+account"
+								return
+							}
+
+							//setLoginInfo("Successful register!")
+							//var newpath = "/login?message=Successfully signed up. You can now sign in."
+							//const tmpMessage = new URLSearchParams(window.location.search).get("message")
+							
+							for (var key in responseJson["cookies"]) {
+								setCookie(responseJson["cookies"][key].key, responseJson["cookies"][key].value, { path: "/" })
+							}
+
+							setLoginLoading(false)
+							setLoginInfo("Successful registration! Redirecting in 3 seconds...")
+
+
+							setTimeout(() => {
+								console.log("LOGIN DATA: ", responseJson)
+
+								const tmpView = new URLSearchParams(window.location.search).get("view")
+								if (tmpView !== undefined && tmpView !== null) {
+									let pathOnly = tmpView.split("?")[0];
+									if (!pathOnly.startsWith("/")) pathOnly = "/" + pathOnly;
+
+									if (pathOnly === "/pricing" || pathOnly === "admin") {
+										window.location.replace(pathOnly + window.location.search);
+									} else {
+										if(localStorage.getItem("redirectId") !== null && localStorage.getItem("redirectId") !== undefined) {
+											const redirectId = localStorage.getItem("redirectId")
+											localStorage.removeItem("redirectId")
+											pathOnly = pathOnly + "/" + redirectId
+										}
+										window.location.replace(pathOnly);
+									}
+									return
+								}
+
+								//if (responseJson.tutorials === undefined || responseJson.tutorials === null || !responseJson.tutorials.includes("welcome")) {
+								console.log("RUN Welcome!!")
+								//window.location.pathname = "/welcome?tab=2"
+								window.location.href = "/welcome"
+							}, 2000);
+						}
+					}),
+				)
+				.catch(error => {
+					setLoginInfo("Error in login. Please try again, or contact support@shuffler.io if the problem persists.")
+					setLoginLoading(false)
+				});
+		}
+	}
+
+	const onChangeUser = (e) => {
+		setUsername(e.target.value)
+	}
+
+	const onChangePass = (e) => {
+		setPassword(e.target.value)
+	}
+
+	const HandleLoginWithSSO = () => {
+		setPassword("")
+		setLoginInfo("")
+		setLoginWithSSO(true)
+	}
+
+	var formtitle = register ? <div>Welcome Back!</div> : <div>Create your account</div>
+	var formButton = !isCloud ? "" : register ? <div style={{ display: "flex" }}> <div style={{ fontSize: "14px", paddingRight: "7px", textDecoration: "none", }}>Don’t have an account yet?</div> <Link style={hrefStyle} to={`/register${parsedsearch}`}><div>Register here</div></Link></div> : <>
+
+		<div style={{ display: "flex", marginTop: 40, marginBottom: -10 }}> <div style={{ fontSize: "14px", paddingRight: "7px", textDecoration: "none", }}>Already have an account?</div> <Link style={hrefStyle} to={`/login${parsedsearch}`}><div>Login here</div></Link></div>
+	</>
+	//<Link to={`/login${parsedsearch}`} style={hrefStyle}><div>Click here to Login</div></Link>
+
+	//	<DialogTitle>{formtitle}</DialogTitle>
+
+  const buttonBackground = "linear-gradient(89.83deg, #FF8444 0.13%, #F2643B 99.84%)"
+
+	const buttonStyle = { borderRadius: 25, height: 50, fontSize: 18, backgroundImage: handleValidateForm(username, password) || loginLoading || (checkboxClicked && register) ? buttonBackground : "grey", color: "white" }
+	//<Button variant="contained" type="submit" fullWidth style={buttonStyle} disabled={!handleValidateForm() || loginLoading}>
+	const basedata =
+		(
+			<div style={bodyDivStyle}>
+				<Paper
+					style={{
+						...boxStyle,
+						width: "max-content",
+					}}
+				>
+					<form onSubmit={onSubmit} style={{ margin: 15, width: isMobile ? "100%" : "360px", width: "max-content", overflow: "hidden", textAlign: "center", }}>
+						<img
+							style={{
+								height: isMobile ? 44 : 60,
+								width: isMobile ? 44 : 60,
+								paddingBottom: isMobile ? null : 40
+							}}
+							src="images/logos/orange_logo.svg"
+							alt="Shuffle Logo"
+						/>
+
+						<Typography
+							color="textSecondary"
+							style={{
+								textAlign: isMobile ? "center" : null,
+								marginTop: 10,
+								marginBottom: 10
+							}}
+						>
+							{message}
+						</Typography>
+
+						<h2 style={{
+							marginBottom: 2,
+							textAlign: isMobile ? "center" : null
+						}}>
+							{formtitle}
+						</h2>
+
+						<Typography
+							color="textSecondary"
+							style={{
+								marginBottom: register ? 28 : 10,
+								textAlign: isMobile ? "center" : null
+							}}
+							variant="body2"
+						>
+							{register
+								? "Find new ways to automate by discovering usecases Shufflers"
+								: "Please fill in the information to continue to discover the power of Shuffle"
+							}
+						</Typography>
+
+						<div style={{ marginBottom: 20, textAlign: "left", }}>
+							<div style={{ marginBottom: 5 }}>{isCloud ? "Email" : "Username"}</div>
+							<TextField
+								color="primary"
+								style={{
+									backgroundColor: inputColor,
+									marginTop: 5,
+									width: "100%"
+								}}
+								autoFocus
+								InputProps={{
+									classes: {
+										notchedOutline: classes.notchedOutline,
+									},
+									style: {
+										height: "50px",
+										color: "white",
+										fontSize: "1em",
+									},
+								}}
+								required
+								fullWidth={true}
+								autoComplete="username"
+								placeholder="username@example.com"
+								id="emailfield"
+								margin="normal"
+								variant="outlined"
+								onChange={onChangeUser}
+							/>
+						</div>
+
+						{!loginWithSSO && (
+							<div style={{ marginBottom: 20, textAlign: "left", }}>
+								<div style={{ marginBottom: 5 }}>Password</div>
+								<TextField
+									color="primary"
+									style={{
+										backgroundColor: inputColor,
+										marginTop: 5,
+										width: "100%"
+									}}
+									InputProps={{
+										classes: {
+											notchedOutline: classes.notchedOutline,
+										},
+										style: {
+											height: "50px",
+											color: "white",
+											fontSize: "1em",
+										},
+										endAdornment: (
+											<Tooltip title={showPassword ? "Hide password" : "Show password"} arrow>
+												<div
+													style={{
+														cursor: "pointer",
+														marginRight: 10,
+														color: "white"
+													}}
+													onClick={() => setShowPassword(!showPassword)}
+												>
+													{showPassword ? <VisibilityOutlinedIcon /> : <VisibilityOffOutlinedIcon />}
+												</div>
+											</Tooltip>
+										)
+									}}
+									required
+									id="outlined-password-input"
+									fullWidth={true}
+									autoComplete="current-password"
+									placeholder="at least 10 characters"
+									margin="normal"
+									variant="outlined"
+									type={showPassword ? "text" : "password"}
+									onChange={onChangePass}
+									helperText={
+										handleValidateForm(username, password)
+											? ""
+											: "Password must be at least 9 characters long"
+									}
+								/>
+							</div>
+						)}
+
+						{MFAField && (
+							<div style={{ marginBottom: 20 }}>
+								<div style={{ marginBottom: 5 }}>2-factor code</div>
+								<TextField
+									autoFocus
+									color="primary"
+									style={{
+										backgroundColor: inputColor,
+										marginTop: 5,
+										width: "100%"
+									}}
+									InputProps={{
+										classes: {
+											notchedOutline: classes.notchedOutline,
+										},
+										style: {
+											height: "50px",
+											color: "white",
+											fontSize: "1em",
+										},
+									}}
+									required
+									id="outlined-mfa-input"
+									fullWidth={true}
+									type="text"
+									placeholder="6-digit code"
+									margin="normal"
+									variant="outlined"
+									onChange={(event) => {
+										setMFAValue(event.target.value)
+									}}
+								/>
+							</div>
+						)}
+
+						<div style={{
+							display: "flex",
+							flexDirection: "column",
+							marginTop: "0px"
+						}}>
+							{isCloud && register && !loginWithSSO && (
+								<Link
+									to={`/passwordreset${parsedsearch}`}
+									style={{
+										...hrefStyle,
+										alignSelf: isMobile ? "center" : "flex-end"
+									}}
+								>
+									<div>Forgot password?</div>
+								</Link>
+							)}
+						</div>
+
+						{!register && (
+							<Typography
+								color="textSecondary"
+								style={{ marginTop: 5 }}
+								variant="body2"
+							>
+								<Checkbox
+									style={{ color: "#F85A3E" }}
+									onChange={(event) => {
+										setCheckboxClicked(!checkboxClicked)
+									}}
+								/>
+								I agree to{' '}
+								<a
+									href="https://shuffler.io/docs/terms_of_service"
+									style={{ textDecoration: "none", color: "#f85a3e" }}
+									rel="noopener noreferrer"
+									target="_blank"
+								>
+									Shuffle's Terms of Service
+								</a>
+								.
+							</Typography>
+						)}
+
+						<div style={{
+							display: "flex",
+							marginTop: "15px",
+							paddingBottom: register ? "40px" : ""
+						}}>
+							<Button
+								variant="contained"
+								type="submit"
+								fullWidth
+								style={buttonStyle}
+								disabled={!handleValidateForm(username, password) || loginLoading || (!checkboxClicked && !register)}
+							>
+								{loginLoading ? (
+									<CircularProgress color="secondary" style={{ color: "white" }} />
+								) : (
+									"Continue"
+								)}
+							</Button>
+						</div>
+
+						<div style={{
+							display: "flex",
+							flexDirection: "column",
+							marginTop: "0px",
+							alignItems: isMobile ? "center" : null
+						}}>
+							<div style={{ flex: 1 }}>
+								{formButton}
+							</div>
+						</div>
+
+						<div style={{ marginTop: "10px", color: "white" }}>
+							{loginInfo}
+						</div>
+
+						{(
+							ssoUrl !== undefined && ssoUrl !== null && ssoUrl.length) > 0 
+							//|| (isCloud && !loginWithSSO && window?.location?.pathname !== "/register")   
+							? (
+						  <div>
+							<Typography style={{ textAlign: "center" }}>Or</Typography>
+							<div style={{ textAlign: "center", margin: 10 }}>
+							  <Button
+								fullWidth
+								id="sso_button"
+								color="secondary"
+								variant="outlined"
+								type="button"
+								style={{ flex: "1", marginTop: 5, textTransform: 'none', fontSize: 16 }}
+								onClick={(e) => {
+								  //console.log("CLICK SSO");
+								  e.preventDefault();				
+								  //navigate(ssoUrl)
+								  if (isCloud) {
+									setLoginWithSSO(true)
+									setPassword("")
+								  }else {
+									window.location.href = ssoUrl
+								  }
+								}}
+							  >
+								Use SSO
+							  </Button>
+							</div>
+						  </div>
+						) : null}
+						{isCloud && loginWithSSO && (
+							<Button 
+								variant="outlined"
+								color="secondary"
+								onClick={() => {
+									setLoginWithSSO(false)
+									setLoginInfo("")
+								}}
+								style={{ width: '100%', marginTop: 5, flex: "1", textTransform: 'none', fontSize: 16 }}
+							>
+								Back to login
+							</Button>
+						)}
+					</form>
+				</Paper>
+
+				{isMobile ? null : (
+					<>
+						<div className={classes.divider}>
+							<span>OR</span>
+						</div>
+						<MarketplaceCard classes={classes} />
+					</>
+				)}
+			</div>
+		);
+
+	const loadedCheck = isLoaded ?
+		<div>
+			{basedata}
+		</div>
+		:
+		<div>
+		</div>
+
+	return (
+		<div style={{zoom: 0.8, minHeight: "75vh", paddingTop: 75, paddingBottom: 90 }}>
+			{loadedCheck}
+		</div>
+	)
+}
+
+export default LoginPage;
diff --git a/frontend/src/views/LoginPageOld.jsx b/frontend/src/views/LoginPageOld.jsx
new file mode 100755
index 00000000..aaee73d6
--- /dev/null
+++ b/frontend/src/views/LoginPageOld.jsx
@@ -0,0 +1,554 @@
+/* eslint-disable react/no-multi-comp */
+import React, { useState, useEffect } from "react";
+import { makeStyles } from "@mui/styles";
+import { useInterval } from "react-powerhooks";
+import theme from '../theme.jsx';
+
+import {
+  CircularProgress,
+  TextField,
+  Button,
+  Paper,
+  Typography,
+} from "@mui/material";
+
+import { useNavigate } from "react-router-dom";
+
+const hrefStyle = {
+  color: "white",
+  textDecoration: "none",
+};
+
+const bodyDivStyle = {
+  margin: "auto",
+  marginTop: 150,
+  width: "500px",
+};
+
+const useStyles = makeStyles({
+  notchedOutline: {
+    borderColor: "#f85a3e !important",
+  },
+});
+
+const LoginDialog = (props) => {
+  const {
+    globalUrl,
+    isLoaded,
+    isLoggedIn,
+    setIsLoggedIn,
+    setCookie,
+    register,
+    checkLogin,
+  } = props;
+
+	let navigate = useNavigate();
+  const classes = useStyles();
+
+  const [username, setUsername] = useState("");
+  const [password, setPassword] = useState("");
+  const [firstRequest, setFirstRequest] = useState(true);
+  const [loginLoading, setLoginLoading] = useState(false);
+  const [loginViewLoading, setLoginViewLoading] = useState(false);
+  const [ssoUrl, setSSOUrl] = useState("");
+
+  const [MFAField, setMFAField] = useState(false);
+  const [MFAValue, setMFAValue] = useState("");
+
+
+  // Used to swap from login to register. True = login, false = register
+
+  useEffect(() => {
+  	checkAdmin() 
+  }, [loginViewLoading])
+
+  // Error messages etc
+  const [loginInfo, setLoginInfo] = useState("");
+
+  const handleValidateForm = () => {
+    return username.length > 1 && password.length > 1;
+  };
+
+  if (isLoggedIn === true) {
+    //window.location.pathname = "/workflows";
+    navigate("/workflows")
+  }
+
+  const checkAdmin = () => {
+    const url = globalUrl + "/api/v1/checkusers";
+    fetch(url, {
+      method: "GET",
+      headers: {
+        "Content-Type": "application/json",
+      },
+    })
+      .then((response) =>
+        response.json().then((responseJson) => {
+          if (responseJson["success"] === false) {
+            setLoginInfo(responseJson["reason"])
+
+			if (responseJson?.reason?.toLowerCase().includes("connection refused")) { 
+        		setLoginViewLoading(true) 
+          		start()
+			}
+
+          } else {
+
+            if (responseJson.sso_url !== undefined && responseJson.sso_url !== null) {
+              setSSOUrl(responseJson.sso_url);
+            }
+			  
+			navigate("/login")
+
+            if (loginViewLoading) {
+              setLoginViewLoading(false);
+              checkLogin();
+              stop();
+
+              if (
+                responseJson.reason !== undefined &&
+                responseJson.reason !== null
+              ) {
+                setLoginInfo(responseJson.reason);
+              }
+            }
+
+            if (responseJson.reason === "stay") {
+              navigate("/adminsetup")
+            }
+          }
+        })
+      )
+      .catch((error) => {
+        if (!loginViewLoading) {
+          setLoginViewLoading(true);
+          start();
+        }
+      });
+  };
+
+  const { start, stop } = useInterval({
+    duration: 3000,
+    startImmediate: false,
+    callback: () => {
+      checkAdmin();
+    },
+  })
+
+  if (firstRequest) {
+    setFirstRequest(false);
+    checkAdmin();
+  }
+
+  const onSubmit = (e) => {
+    setLoginLoading(true);
+    e.preventDefault();
+    setLoginInfo("");
+    // FIXME - add some check here ROFL
+
+    // Just use this one?
+    var data = { username: username, password: password };
+    if (MFAValue !== undefined && MFAValue !== null && MFAValue.length > 0) {
+      data["mfa_code"] = MFAValue;
+    }
+
+    var baseurl = globalUrl;
+    if (register) {
+      var url = baseurl + "/api/v1/login";
+      fetch(url, {
+        mode: "cors",
+        method: "POST",
+        body: JSON.stringify(data),
+        credentials: "include",
+        crossDomain: true,
+        withCredentials: true,
+        headers: {
+          "Content-Type": "application/json; charset=utf-8",
+        },
+      })
+        .then((response) =>
+          response.json().then((responseJson) => {
+            setLoginLoading(false);
+            if (responseJson["success"] === false) {
+              setLoginInfo(responseJson["reason"]);
+            } else {
+              if (responseJson["reason"] === "MFA_REDIRECT") {
+                setLoginInfo(
+                  "MFA required. Please enter the 6-digit code from your authenticator"
+                );
+                setMFAField(true);
+                return;
+              }  else if (responseJson["reason"] === "MFA_SETUP") {
+                window.location.href = `/login/${responseJson.url}/mfa-setup`;
+                return;
+              }
+
+              setLoginInfo("Successful login, rerouting");
+              for (var key in responseJson["cookies"]) {
+                setCookie(
+                  responseJson["cookies"][key].key,
+                  responseJson["cookies"][key].value,
+                  { path: "/" }
+                );
+              }
+
+			  if (responseJson.tutorials === undefined || responseJson.tutorials === null || !responseJson.tutorials.includes("welcome")) {
+			  	console.log("RUN Welcome!!")
+			    setTimeout(() => {
+			      navigate("/welcome?tab=2")
+			    },200)
+			  	// window.location.pathname = "" 
+			  	return
+			  }
+
+			  const tmpView = new URLSearchParams(window.location.search).get("view")
+			  if (tmpView !== undefined && tmpView !== null) {
+			  	//const newUrl = `/${tmpView}${decodeURIComponent(window.location.search)}`
+			  	const newUrl = `/${tmpView}`
+			  	window.location.pathname = newUrl
+			  } else {
+			  	window.location.pathname = "/workflows"		
+			  }
+
+              setIsLoggedIn(true);
+            }
+          })
+        )
+        .catch((error) => {
+          setLoginLoading(false);
+          setLoginInfo("Error logging in: " + error);
+        });
+    } else {
+      url = baseurl + "/api/v1/users/register";
+      fetch(url, {
+        method: "POST",
+        body: JSON.stringify(data),
+        headers: {
+          "Content-Type": "application/json",
+        },
+      })
+        .then((response) =>
+          response.json().then((responseJson) => {
+            if (responseJson["success"] === false) {
+              setLoginInfo(responseJson["reason"]);
+            } else {
+              setLoginInfo("Successful register!");
+            }
+          })
+        )
+        .catch((error) => {
+          setLoginInfo("Error in from backend: ", error);
+        });
+    }
+  };
+
+  const onChangeUser = (e) => {
+    setUsername(e.target.value);
+  };
+
+  const onChangePass = (e) => {
+    setPassword(e.target.value);
+  };
+
+  //const onClickRegister = () => {
+  //	if (props.location.pathname === "/login") {
+  //		window.location.pathname = "/register"
+  //	} else {
+  //		window.location.pathname = "/login"
+  //	}
+
+  //	setLoginCheck(!register)
+  //}
+
+  //var loginChange = register ? (<div><p onClick={setLoginCheck(false)}>Want to register? Click here.</p></div>) : (<div><p onClick={setLoginCheck(true)}>Go back to login? Click here.</p></div>);
+  var formtitle = register ? <div>Login</div> : <div>Register</div>;
+  const imgsize = 100;
+  const basedata = (
+    <div style={bodyDivStyle}>
+      <Paper
+        style={{
+          paddingLeft: "30px",
+          paddingRight: "30px",
+          paddingBottom: "30px",
+          paddingTop: "30px",
+          position: "relative",
+          backgroundColor: theme.palette.surfaceColor,
+        }}
+      >
+        <div
+          style={{
+            position: "absolute",
+            top: -imgsize / 2 - 10,
+            left: 250 - imgsize / 2,
+            height: imgsize,
+            width: imgsize,
+          }}
+        >
+          <img
+            src="images/Shuffle_logo.png"
+            style={{
+              height: imgsize + 10,
+              width: imgsize + 10,
+              border: "2px solid rgba(255,255,255,0.6)",
+              borderRadius: imgsize,
+            }}
+          />
+        </div>
+
+        {loginViewLoading ? (
+          <div style={{ textAlign: "center", marginTop: 50 }}>
+            <Typography
+              variant="body2"
+              style={{ marginBottom: 20, color: "white" }}
+            >
+              Waiting for the Shuffle database to become available. This may
+              take up to two minutes.
+            </Typography>
+
+            {loginInfo === undefined ||
+            loginInfo === null ||
+            loginInfo.length === 0 ? null : (
+              <div style={{ marginTop: "10px" }}>Database Response: {loginInfo}</div>
+            )}
+            <CircularProgress color="secondary" style={{ color: "white" }} />
+
+            <Paper
+              style={{
+                paddingLeft: "30px",
+                paddingRight: "30px",
+                paddingBottom: "30px",
+                paddingTop: "30px",
+                position: "relative",
+                textAlign: "left",
+                marginTop: 15,
+              }}
+            >
+              <Typography
+                variant="body2"
+                style={{ marginBottom: 20, color: "white" }}
+              >
+                <b>
+                  Are you sure Shuffle is{" "}
+                  <a
+                    rel="norefferer"
+                    target="_blank"
+                    href="https://github.com/frikky/Shuffle/blob/master/.github/install-guide.md"
+                    style={{ textDecoration: "none", color: "#f86a3e" }}
+                  >
+                    installed correctly
+                  </a>
+                  ?
+                </b>
+              </Typography>
+              <Typography
+                variant="body2"
+                style={{ marginBottom: 20, color: "white" }}
+              >
+                <b>1.</b> Make sure shuffle-database folder has correct access, and that you have a minimum of <b>2Gb of RAM available</b>:{" "}
+                <br />
+                <br />
+                sudo chown -R 1000:1000 shuffle-database
+              </Typography>
+              <Typography
+                variant="body2"
+                style={{ marginBottom: 20, color: "white" }}
+              >
+                <b>2.</b> Disable memory swap on the host:
+                <br />
+                <br />
+				sudo swapoff -a
+              </Typography>
+              <Typography
+                variant="body2"
+                style={{ marginBottom: 20, color: "white" }}
+              >
+                <b>3</b>. Restart the database:
+                <br />
+                <br />
+                sudo docker restart shuffle-opensearch
+              </Typography>
+            </Paper>
+            <Typography
+              variant="body2"
+              style={{ marginBottom: 10, color: "white", marginTop: 20 }}
+            >
+              Need help?{" "}
+              <a
+                rel="norefferer"
+                target="_blank"
+                href="https://discord.gg/B2CBzUm"
+                style={{ textDecoration: "none", color: "#f86a3e" }}
+              >
+                Join the Discord!
+              </a>
+            </Typography>
+          </div>
+        ) : (
+          <form
+            onSubmit={onSubmit}
+            style={{ margin: "15px 15px 15px 15px", color: "white" }}
+          >
+            <h2>{formtitle}</h2>
+            Username
+            <div>
+              <TextField
+                color="primary"
+                style={{
+                  backgroundColor: theme.palette.inputColor,
+                  marginTop: 5,
+                }}
+                autoFocus
+                InputProps={{
+                  classes: {
+                    notchedOutline: classes.notchedOutline,
+                  },
+                  style: {
+                    height: "50px",
+                    color: "white",
+                    fontSize: "1em",
+                  },
+                }}
+                required
+                fullWidth={true}
+                autoComplete="username"
+                placeholder="username@example.com"
+                id="emailfield"
+                margin="normal"
+                variant="outlined"
+                onChange={onChangeUser}
+              />
+            </div>
+            Password
+            <div>
+              <TextField
+                color="primary"
+                style={{
+                  backgroundColor: theme.palette.inputColor,
+                  marginTop: 5,
+                }}
+                InputProps={{
+                  classes: {
+                    notchedOutline: classes.notchedOutline,
+                  },
+                  style: {
+                    height: "50px",
+                    color: "white",
+                    fontSize: "1em",
+                  },
+                }}
+                required
+                id="outlined-password-input"
+                fullWidth={true}
+                type="password"
+                autoComplete="current-password"
+                placeholder="**********"
+                margin="normal"
+                variant="outlined"
+                onChange={onChangePass}
+              />
+            </div>
+            {MFAField === true ? (
+              <div style={{ marginTop: 15 }}>
+                2-factor code
+                <TextField
+                  color="primary"
+                  style={{
+                    backgroundColor: theme.palette.inputColor,
+                    marginTop: 5,
+                  }}
+                  InputProps={{
+                    classes: {
+                      notchedOutline: classes.notchedOutline,
+                    },
+                    style: {
+                      height: "50px",
+                      color: "white",
+                      fontSize: "1em",
+                    },
+                  }}
+                  required
+                  id="outlined-password-input"
+                  fullWidth={true}
+                  type="text"
+                  placeholder="6-digit code"
+                  margin="normal"
+                  variant="outlined"
+                  onChange={(event) => {
+                    setMFAValue(event.target.value);
+                  }}
+                />
+              </div>
+            ) : null}
+            <div style={{ display: "flex", marginTop: "15px" }}>
+              <Button
+                color="primary"
+                variant="contained"
+                type="submit"
+                style={{ flex: "1" }}
+                disabled={!handleValidateForm() || loginLoading}
+              >
+                {loginLoading ? (
+                  <CircularProgress
+                    color="secondary"
+                    style={{ color: "white" }}
+                  />
+                ) : (
+                  "SUBMIT"
+                )}
+              </Button>
+            </div>
+            <div style={{ marginTop: "10px" }}>{loginInfo}</div>
+            {ssoUrl !== undefined && ssoUrl !== null && ssoUrl.length > 0 ? (
+              <div>
+                <Typography style={{ textAlign: "center" }}>Or</Typography>
+                <div style={{ textAlign: "center", margin: 10 }}>
+                  <Button
+                    fullWidth
+					id="sso_button"
+                    color="secondary"
+                    variant="outlined"
+                    type="button"
+                    style={{ flex: "1", marginTop: 5 }}
+                    onClick={() => {
+                      //console.log("CLICK SSO");
+											window.location.href = ssoUrl
+                      //navigate(ssoUrl)
+                    }}
+                  >
+                    Use SSO
+                  </Button>
+                </div>
+              </div>
+            ) : null}
+          </form>
+        )}
+      </Paper>
+    </div>
+  );
+
+  const loadedCheck = isLoaded ? <div>{basedata}</div> : <div></div>;
+
+	useEffect(() => {
+		setTimeout(() => {
+			if (ssoUrl !== undefined && ssoUrl !== null && ssoUrl.length > 0) {
+				//id="sso_button"
+    		const ssoBtn = document.getElementById("sso_button");
+				if (ssoBtn !== undefined && ssoBtn !== null) {
+					//console.log("SSO BTN: ", ssoBtn)
+					const cursearch = typeof window === "undefined" || window.location === undefined ? "" : window.location.search;
+					var tmpView = new URLSearchParams(cursearch).get("autologin");
+					if (tmpView !== undefined && tmpView !== null) {
+						if (tmpView === "true") {
+							console.log("Tmp: ", tmpView)
+							ssoBtn.click()
+						}
+					}
+				}
+			}
+		}, 200);
+	}, [ssoUrl])
+
+  return <div style={{paddingBottom: 150, }}>{loadedCheck}</div>;
+};
+
+export default LoginDialog;
diff --git a/frontend/src/views/RunWorkflow.jsx b/frontend/src/views/RunWorkflow.jsx
index 883051a3..a9a6cf5c 100644
--- a/frontend/src/views/RunWorkflow.jsx
+++ b/frontend/src/views/RunWorkflow.jsx
@@ -1,5 +1,5 @@
 /* eslint-disable react/no-multi-comp */
-import React, {useState, useEffect} from 'react';
+import React, {useState, useEffect, useContext} from 'react';
 import ReactDOM from "react-dom"
 
 import ReactJson from "react-json-view-ssr";
@@ -19,6 +19,7 @@ import RecentWorkflow from "../components/RecentWorkflow.jsx";
 
 import {
   	Tooltip,
+  	Fade,
 	Select,
 	IconButton,
 	CircularProgress, 
@@ -33,6 +34,7 @@ import {
 	DialogTitle,
 	DialogContent,
 	MenuItem,
+    Autocomplete,
 } from '@mui/material';
 
 import {
@@ -44,7 +46,9 @@ import {
   LockOpen as LockOpenIcon,
   OpenInNew as OpenInNewIcon,
   Edit as EditIcon,
+  Polyline as PolylineIcon,
 } from '@mui/icons-material';
+import { Context } from '../context/ContextApi.jsx';
 
 const hrefStyle = {
 	color: "white", 
@@ -55,6 +59,7 @@ const hrefStyle = {
 const RunWorkflow = (defaultprops) => {
   const { globalUrl, userdata, isLoaded, isLoggedIn, setIsLoggedIn, setCookie, register, serverside } = defaultprops;
 
+  const { supportEmail } = useContext(Context);
   let navigate = useNavigate();
   const [_, setUpdate] = useState(""); // Used to force rendring, don't remove
   const [explorerUi, setExplorerUi] = useState(false)
@@ -74,6 +79,7 @@ const RunWorkflow = (defaultprops) => {
   const [sharingOpen, setSharingOpen] = React.useState(false)
   const [realtimeMarkdown, setRealtimeMarkdown] = React.useState("")
   const [forms, setForms] = React.useState([])
+  const [workflows, setWorkflows] = React.useState([])
   const [boxWidth, setBoxWidth] = React.useState(500)
   const [inputQuestions, setInputQuestions] = React.useState([])
 
@@ -180,6 +186,37 @@ const RunWorkflow = (defaultprops) => {
 		return true
 	}
 
+	const getWorkflows = () => {
+		const url = `${globalUrl}/api/v1/workflows`
+		fetch(url, {
+			method: "GET",
+			headers: {
+				"Content-Type": "application/json",
+				Accept: "application/json",
+			},
+			credentials: "include",
+		})
+		.then((response) => {
+			if (response.status !== 200) {
+				console.log("Status not 200 for org forms");
+			}
+
+			return response.json()
+		})
+		.then((responseJson) => {
+			if (responseJson.success === false) {
+				toast.error("Failed saving workflow. Please try again.")
+			} else {
+				if (responseJson?.length > 0) {
+					setWorkflows(responseJson)
+				}
+			}
+		})
+		.catch((error) => {
+			//toast.error("Load form error: " + error)
+		})
+	}
+
 	const loadForms = (orgId) => {
 		const url = `${globalUrl}/api/v1/orgs/${orgId}/forms`
 		fetch(url, {
@@ -436,7 +473,7 @@ const RunWorkflow = (defaultprops) => {
 			}
 
 			if (response.status === 401 || response.status === 403) {
-				toast("This Form is not available for you to run. If you this is an error, contact support@shuffler.io with a link to this form")
+				toast(`This Form is not available for you to run. If you this is an error, contact ${supportEmail} with a link to this form`)
 			}
 
 			return response.json()
@@ -462,6 +499,8 @@ const RunWorkflow = (defaultprops) => {
 			} else {
 				console.log("Started execution")
 
+				start()
+				setExecutionRunning(true);
 				if (answer !== undefined && answer !== null) {
 					console.log("Skipping start")
 				} else {
@@ -590,7 +629,7 @@ const RunWorkflow = (defaultprops) => {
         }
 
 		if (response.status === 401 || response.status === 403) {
-			toast("This Form is not available to you. If you think this is an error, please contact support@shuffler.io with the URL.")
+			toast(`This Form is not available to you. If you think this is an error, please contact ${supportEmail} with the URL.`)
 		}
 
         return response.json()
@@ -875,6 +914,7 @@ const RunWorkflow = (defaultprops) => {
     // Just use this one?
     var url = execution_id !== undefined && authorization !== undefined ?  `${globalUrl}/api/v1/orgs/${orgId}?reference_execution=${execution_id}&authorization=${authorization}` : `${globalUrl}/api/v1/orgs/${orgId}`;
 
+	getWorkflows() 
 	loadForms(orgId)
 
     fetch(url, {
@@ -1055,7 +1095,7 @@ const RunWorkflow = (defaultprops) => {
 
 				if (parsedresult.click_info !== undefined && parsedresult.click_info !== null) {
 					if (parsedresult.click_info.user !== undefined && parsedresult.click_info.user !== null && parsedresult.click_info.user.length > 0) {
-						setMessage("Already answered by " + parsedresult.click_info.user)
+						setMessage("Answered by " + parsedresult.click_info.user)
   
 					}
 				} else {
@@ -1149,10 +1189,100 @@ const RunWorkflow = (defaultprops) => {
 							No Forms Found
 						</Typography>
 						<Typography variant="body1" color="textSecondary">
-							<b>Every</b> Workflow is a form, and can be accessed by going to /forms/{`{workflow_id}`}. You can control the form by editing the workflow details in the "Forms" section.
-						</Typography>
+							<b>ALL</b> Workflows are forms, and can be accessed by going to /forms/{`{workflow_id}`}. You can control the form by editing the workflow details in the "Forms" section.
+						</Typography>	
 					</div>
 				}
+
+				{workflows === undefined || workflows === null || workflows.length === 0 ? null : 
+					<Autocomplete
+						disabled={workflows === undefined || workflows === null || workflows.length === 0}
+						id="form-workflow-search"
+						autoHighlight
+						value={""}
+						ListboxProps={{
+						  style: {
+							backgroundColor: theme.palette.inputColor,
+							color: "white",
+						  },
+						}}
+						sx={{
+						  '& .MuiOutlinedInput-root': {
+							height: 40, // Adjust the input height
+						  },
+						  '& .MuiAutocomplete-input': {
+							padding: '8px', // Adjust the text padding
+						  },
+						}}
+						getOptionSelected={(option, value) => option.id === value.id}
+						getOptionLabel={(option) => {
+						  if (
+							option === undefined ||
+							option === null ||
+							option.name === undefined ||
+							option.name === null
+						  ) {
+							return "No Workflow Selected";
+						  }
+
+						  const newname = (
+							option.name.charAt(0).toUpperCase() + option.name.substring(1)
+						  ).replaceAll("_", " ");
+						  return newname;
+						}}
+						options={workflows}
+						fullWidth
+						style={{
+						  backgroundColor: theme.palette.inputColor,
+						  borderRadius: theme.palette?.borderRadius,
+						  marginTop: 75, 
+						}}
+						renderOption={(props, data, state) => {
+						  if (data.id === workflow.id) {
+							data = workflow;
+						  }
+
+						  //key={index}
+						  return (
+							<Tooltip arrow placement="left" title={
+							  <span style={{}}>
+								{data.image !== undefined && data.image !== null && data.image.length > 0 ?
+								  <img src={data.image} alt={data.name} style={{ backgroundColor: theme.palette.surfaceColor, maxHeight: 200, minHeigth: 200, maxWidth: 285, borderRadius: theme.palette?.borderRadius, }} />
+								  : null}
+								<Typography>
+								  Choose Subflow '{data.name}'
+								</Typography>
+							  </span>
+							}>
+							  <MenuItem
+								style={{
+								  backgroundColor: theme.palette.inputColor,
+								}}
+							  	onClick={() => {
+									window.location.href = `/forms/${data.id}`
+								}}
+								value={data}
+							  >
+								<PolylineIcon style={{ marginRight: 8 }} />
+								{data.name}
+							  </MenuItem>
+							</Tooltip>
+						  )
+						}}
+						renderInput={(params) => {
+						  return (
+							<div style={{ display: "flex", }}>
+							  <TextField
+								style={theme.palette.textFieldStyle}
+								{...params}
+								label="Find your form"
+								variant="outlined"
+							  />
+							</div>
+						  )
+						}}
+					/>
+				}
 			</div> 
 		)
 	}
@@ -1197,6 +1327,7 @@ const RunWorkflow = (defaultprops) => {
       				<form onSubmit={(e) => {onSubmit(e)}} style={{margin: "25px 0px 15px 0px",}}>
 						{workflowQuestion !== "" || (workflow.form_control.input_markdown !== undefined && workflow.form_control.input_markdown !== null && workflow.form_control.input_markdown.length > 0) ? null : 
 						<div>
+							{/*
 							<img
 								alt={workflow.name}
 								src={image}
@@ -1211,6 +1342,7 @@ const RunWorkflow = (defaultprops) => {
 									left: 200,
 								}}
 							/>
+							*/}
 
 							<Typography variant="h6" style={{marginBottom: 10, marginTop: 50, textAlign: "center", }}>
 								{organization}
@@ -1323,7 +1455,8 @@ const RunWorkflow = (defaultprops) => {
 								})}
 							</div>
 						: 
-						answer !== undefined && answer !== null ? null :
+						(answer !== undefined && answer !== null) || message !== ""  ? null :
+						
 							<span>
 								Runtime Argument
 								<div style={{marginBottom: 5}}>
@@ -1332,7 +1465,13 @@ const RunWorkflow = (defaultprops) => {
 										style={{backgroundColor: theme.palette.inputColor, marginTop: 5, }}
 										multiLine
 										maxRows={2}
+										type="text"
+										autoComplete="off"
 										InputProps={{
+											autocomplete: "off",
+											form: {
+												autocomplete: "off",
+											},
 											style:{
 												height: "50px", 
 												color: "white",
@@ -1373,9 +1512,11 @@ const RunWorkflow = (defaultprops) => {
 											{message}. You may close this window.
 										</Typography>
 									: 
-										<Typography variant="body1" style={{textAlign: "center", marginTop: 30, marginBottom: 20, }}>
-											{disabledButtons ? "Answered. You may close this window." : ""}
-										</Typography>
+										<Fade in={true} timeout={2500}>
+											<Typography variant="body1" style={{textAlign: "center", marginTop: 30, marginBottom: 20, }}>
+												{disabledButtons ? "Answered. You may close this window." : ""}
+											</Typography>
+										</Fade>
 									}
 
 									{disabledButtons ? null :
@@ -1385,25 +1526,47 @@ const RunWorkflow = (defaultprops) => {
 									}
 
 									<div fullWidth style={{width: "100%", marginTop: 10, marginBottom: 10, display: "flex", }}>
-										<Button fullWidth id="continue_execution" variant="contained" disabled={!handleValidateForm(executionArgument) || disabledButtons} color="primary" style={{flex: 1,}} onClick={() => {
-											setButtonClicked("FINISHED")
-											setExecutionData({
-												status: "FINISHED",
-											})
+										<Button 
+											fullWidth 
+											id="continue_execution" 
+											variant="contained" 
+											disabled={!handleValidateForm(executionArgument) || disabledButtons} 
+											color="primary" 
+											style={{
+												flex: 1,
+												textTransform: "none",
+											}} 
+											onClick={() => {
+												setButtonClicked("FINISHED")
+												setExecutionData({
+													status: "FINISHED",
+												})
 
-											onSubmit(null, execution_id, authorization, true) 
-										}}>Continue</Button>
+												onSubmit(null, execution_id, authorization, true) 
+											}}>
+											Continue</Button>
 										<Typography variant="body1" style={{marginLeft: 3, marginRight: 3, marginTop: 3, }}>
 											&nbsp;or&nbsp;
 										</Typography>
-										<Button fullWidth id="abort_execution" variant="contained" disabled={!handleValidateForm(executionArgument) || disabledButtons} color="primary" style={{ flex: 1, }} onClick={() => {
-											setButtonClicked("ABORTED")
-											setExecutionData({
-												status: "ABORTED",
-											})
+										<Button 
+											fullWidth 
+											id="abort_execution" 
+											variant="outlined"
+											disabled={!handleValidateForm(executionArgument) || disabledButtons} 
+											color="primary" 
+											style={{ 
+												flex: 1, 
+												textTransform: "none", 
+											}} onClick={() => {
+												setButtonClicked("ABORTED")
+												setExecutionData({
+													status: "ABORTED",
+												})
 
-											onSubmit(null, execution_id, authorization, false) 
-										}}>Stop</Button>
+												onSubmit(null, execution_id, authorization, false) 
+										}}>
+											Stop
+										</Button>
 									</div>
 								</span>
 							:
@@ -1414,6 +1577,9 @@ const RunWorkflow = (defaultprops) => {
 									color="primary" 
 									fullWidth 
 									disabled={!handleValidateForm(executionArgument) || executionLoading}
+									style={{
+										textTransform: "none",
+									}}
 								>
 									{executionLoading ? 
 										<CircularProgress color="secondary" style={{color: "white",}} /> 
@@ -1599,7 +1765,10 @@ const RunWorkflow = (defaultprops) => {
 						disabled={workflow.id === undefined || workflow.id === null}
 						variant={"outlined"}
 						color={"secondary"}
-						style={{marginRight: 10, }}
+						style={{
+							marginRight: 10, 
+							textTransform: "none",
+						}}
 						onClick={() => {
 							window.open(`/workflows/${workflow.id}`, "_blank")
 						}}
@@ -1612,7 +1781,10 @@ const RunWorkflow = (defaultprops) => {
 						disabled={workflow.id === undefined || workflow.id === null}
 						variant={workflow.sharing === "form" ? "outlined" : "contained"}
 						color={"secondary"}
-						style={{marginRight: 10, }}
+						style={{
+							marginRight: 10, 
+							textTransform: "none",
+						}}
 						onClick={() => {
 							setSharingOpen(true)
 						}}
@@ -1634,7 +1806,9 @@ const RunWorkflow = (defaultprops) => {
 						disabled={workflow.id === undefined || workflow.id === null}
 						variant={"contained"}
 						color={"primary"}
-						style={{}}
+						style={{
+							textTransform: "none",
+						}}
 						onClick={() => {
 							setEditWorkflowModalOpen(true)
 						}}
diff --git a/frontend/src/views/SetAuthentication.jsx b/frontend/src/views/SetAuthentication.jsx
index 63aec23c..2ec3e780 100755
--- a/frontend/src/views/SetAuthentication.jsx
+++ b/frontend/src/views/SetAuthentication.jsx
@@ -1,13 +1,14 @@
-import React, { useState } from "react";
+import React, { useContext, useState } from "react";
 
 import { Typography, CircularProgress } from "@mui/material";
 import theme from '../theme.jsx';
 
 import { red,  } from "../views/AngularWorkflow.jsx"
+import { Context } from "../context/ContextApi.jsx";
 
 const SetAuthentication = (props) => {
   const { globalUrl } = props;
-
+  const { supportEmail } = useContext(Context);
 	var headers = {
 		"Content-Type": "application/json",
 		"Accept": "application/json",
@@ -328,7 +329,7 @@ const SetAuthentication = (props) => {
         <b>{failed ? "Failed auth. Error: " : ""}</b> {response}
 				<br/>
 				<br/>
-        {failed ? "If the error persists, try to use fewer scopes. Contact support@shuffler.io if you need further assistance, and include the current URL and a screenshot. You may now close this window." : ""}
+        {failed ? `If the error persists, try to use fewer scopes. Contact ${supportEmail} if you need further assistance, and include the current URL and a screenshot. You may now close this window.` : ""}
       </Typography>
     </div>
   );
diff --git a/frontend/src/views/SettingsPage.jsx b/frontend/src/views/SettingsPage.jsx
index a507857f..ec5ba658 100755
--- a/frontend/src/views/SettingsPage.jsx
+++ b/frontend/src/views/SettingsPage.jsx
@@ -1,7 +1,7 @@
-import React, { useState, useEffect } from "react";
+import React, { useState, useEffect, useContext } from "react";
 
 import { useNavigate } from "react-router-dom";
-import theme from '../theme.jsx';
+import {getTheme} from '../theme.jsx';
 import {
   Grid,
   Typography,
@@ -15,6 +15,7 @@ import {
 //import { useAlert
 import { ToastContainer, toast } from "react-toastify";
 import "../codeeditor-index.css";
+import { Context } from "../context/ContextApi.jsx";
 
 import { FileCopy, Visibility, VisibilityOff } from "@mui/icons-material";
 import IconButton from "@mui/material/IconButton";
@@ -40,6 +41,8 @@ const Settings = (props) => {
   const [MFARequired, setMFARequired] = React.useState(false);
   const [image2FA, setImage2FA] = React.useState("");
   const [value2FA, setValue2FA] = React.useState("");
+  const {themeMode, supportEmail} = useContext(Context);
+  const theme = getTheme(themeMode);
 
   // const [file, setFile] = React.useState("");
   // const [fileBase64, setFileBase64] = React.useState(
@@ -83,7 +86,7 @@ const Settings = (props) => {
 
   const boxStyle = {
     flex: "1",
-    color: "white",
+    color: theme.palette.text.primary,
     position: "relative",
     marginLeft: "10px",
     marginRight: "10px",
@@ -213,8 +216,8 @@ const Settings = (props) => {
       left: "50%",
       transform: "translate(-50%, -50%)",
       zIndex: "9999",
-      backgroundColor: "#1a1a1a",
-      color: "white",
+      backgroundColor: theme.palette.backgroundColor,
+      color: theme.palette.text.primary,
       padding: 20,
       borderRadius: 5,
       boxShadow: "0 0 10px rgba(0, 0, 0, 0.3)",
@@ -223,7 +226,7 @@ const Settings = (props) => {
     };
 
     const closeIconButtonStyling = {
-      color: "white",
+      color: theme.palette.text.primary,
       border: "none",
       backgroundColor: "transparent",
       marginLeft: "90%",
@@ -243,7 +246,7 @@ const Settings = (props) => {
       width: "100%",
       fontSize: 16,
       backgroundColor: disabled ? "gray" : "red",
-      color: "white",
+      color: theme.palette.text.primary,
       cursor: disabled === false && "pointer",
     };
     const checkboxStyle = {
@@ -381,7 +384,7 @@ const Settings = (props) => {
               className="ais-RefinementList-checkbox"
               onClick={handleCheckBoxEvent}
             />
-            <label style={{ fontSize: "16px", color: "white" }}>
+            <label style={{ fontSize: "16px", color: theme.palette.text.primary }}>
               I have read the above information and I agree to it completely
             </label>
           </div>
@@ -410,7 +413,7 @@ const Settings = (props) => {
                   endAdornment: (
                     <IconButton
                       onClick={handlePasswordVisibility}
-                      style={{color:"white"}}
+                      style={{color:theme.palette.text.primary}}
                     >
                       {showPassword ? <VisibilityOff /> : <Visibility />}
                     </IconButton>
@@ -455,7 +458,12 @@ const Settings = (props) => {
           if (responseJson["success"] === false) {
             setPasswordFormMessage(responseJson["reason"]);
           } else {
-            toast("Changed password!");
+			var reason = ""
+			if (responseJson.reason !== undefined && responseJson.reason !== null && responseJson.reason.length > 0) {
+				reason += responseJson.reason
+			}
+
+            toast.success("Changed password! " + reason);
             setPasswordFormMessage("");
           }
         })
@@ -527,6 +535,8 @@ const Settings = (props) => {
   };
 
   const generateApikey = () => {
+	toast.info("Generating new API key. This may take a bit.");
+
     fetch(globalUrl + "/api/v1/generateapikey", {
       method: "GET",
       headers: {
@@ -538,7 +548,7 @@ const Settings = (props) => {
       .then((response) => {
         if (response.status !== 200) {
           console.log("Status not 200 for WORKFLOW EXECUTION :O!");
-        }
+		}
 
         return response.json();
       })
@@ -702,7 +712,7 @@ const Settings = (props) => {
             InputProps={{
               style: {
                 height: "50px",
-                color: "white",
+                color: theme.palette.text.primary,
               },
             }}
             color="primary"
@@ -730,7 +740,7 @@ const Settings = (props) => {
             InputProps={{
               style: {
                 height: "50px",
-                color: "white",
+                color: theme.palette.text.primary,
               },
             }}
             color="primary"
@@ -755,7 +765,7 @@ const Settings = (props) => {
             InputProps={{
               style: {
                 height: "50px",
-                color: "white",
+                color: theme.palette.text.primary,
               },
             }}
             color="primary"
@@ -786,7 +796,7 @@ const Settings = (props) => {
           InputProps={{
             style: {
               height: "50px",
-              color: "white",
+              color: theme.palette.text.primary,
             },
           }}
           color="primary"
@@ -804,7 +814,7 @@ const Settings = (props) => {
         InputProps={{
           style: {
             height: "50px",
-            color: "white",
+            color: theme.palette.text.primary,
           },
           endAdornment: (
             <>
@@ -836,7 +846,12 @@ const Settings = (props) => {
         variant="outlined"
       />
         <Button
-          style={{ width: "100%", height: "40px", marginTop: "10px" }}
+          style={{ 
+			width: "100%", 
+			height: "40px", 
+			marginTop: "10px",
+			textTransform: "none",
+		  }}
           variant="outlined"
           color="primary"
           onClick={() => generateApikey()}
@@ -850,7 +865,7 @@ const Settings = (props) => {
 							InputProps={{
 								style:{
 									height: "50px", 
-									color: "white",
+									color: theme.palette.text.primary,
 								},
 							}}
 							color="primary"
@@ -870,7 +885,7 @@ const Settings = (props) => {
 							InputProps={{
 								style:{
 									height: "50px", 
-									color: "white",
+									color: theme.palette.text.primary,
 								},
 							}}
 							color="primary"
@@ -892,7 +907,7 @@ const Settings = (props) => {
 							InputProps={{
 								style:{
 									height: "50px", 
-									color: "white",
+									color: theme.palette.text.primary,
 								},
 							}}
 							color="primary"
@@ -912,7 +927,7 @@ const Settings = (props) => {
 							InputProps={{
 								style:{
 									height: "50px", 
-									color: "white",
+									color: theme.palette.text.primary,
 								},
 							}}
 							color="primary"
@@ -947,7 +962,7 @@ const Settings = (props) => {
             InputProps={{
               style: {
                 height: "50px",
-                color: "white",
+                color: theme.palette.text.primary,
               },
             }}
             color="primary"
@@ -972,7 +987,7 @@ const Settings = (props) => {
             InputProps={{
               style: {
                 height: "50px",
-                color: "white",
+                color: theme.palette.text.primary,
               },
             }}
             color="primary"
@@ -995,7 +1010,7 @@ const Settings = (props) => {
             InputProps={{
               style: {
                 height: "50px",
-                color: "white",
+                color: theme.palette.text.primary,
               },
             }}
             color="primary"
@@ -1039,7 +1054,7 @@ const Settings = (props) => {
 			{isCloud ?
 					<span>
 						<Typography variant="body1" color="textSecondary">
-							By <a href="/creators" target="_blank" style={{ textDecoration: "none", color: "#f86a3e"}}>joining the Creator Incentive Program</a> and connecting your Github account, you agree to our <a href="/docs/terms_of_service" target="_blank" style={{ textDecoration: "none", color: "#f86a3e"}}>Terms of Service</a>, and acknowledge that your non-sensitive data will be turned into a <a target="_blank" style={{ textDecoration: "none", color: "#f86a3e"}} href="https://shuffler.io/creators">creator account</a>. This enables you to earn a passive income from Shuffle. This IS reversible. Support: support@shuffler.io
+							By <a href="/creators" target="_blank" style={{ textDecoration: "none", color: "#f86a3e"}}>joining the Creator Incentive Program</a> and connecting your Github account, you agree to our <a href="/docs/terms_of_service" target="_blank" style={{ textDecoration: "none", color: "#f86a3e"}}>Terms of Service</a>, and acknowledge that your non-sensitive data will be turned into a <a target="_blank" style={{ textDecoration: "none", color: "#f86a3e"}} href="https://shuffler.io/creators">creator account</a>. This enables you to earn a passive income from Shuffle. This IS reversible. Support: {supportEmail}
 						</Typography>
 						<Button
 							style={{ height: 40, marginTop: 10 }}
@@ -1126,7 +1141,7 @@ const Settings = (props) => {
             height: "60px",
             marginTop: "10px",
             backgroundColor: "#d52b2b",
-            color: "white",
+            color: theme.palette.text.primary,
           }}
           // variant="contained"
           // color="primary"
diff --git a/frontend/src/views/UpdateAuthentication.jsx b/frontend/src/views/UpdateAuthentication.jsx
index c3309cf4..b55d844b 100644
--- a/frontend/src/views/UpdateAuthentication.jsx
+++ b/frontend/src/views/UpdateAuthentication.jsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from "react";
+import React, { useState, useEffect, useContext } from "react";
 
 import ReactGA from "react-ga4";
 import { 
@@ -15,10 +15,11 @@ import { ToastContainer, toast } from "react-toastify"
 import AuthenticationOauth2 from "../components/Oauth2Auth.jsx";
 import AuthenticationWindow from "../components/AuthenticationWindow.jsx";
 import { base64_decode, appCategories } from "../views/AppCreator.jsx";
+import { Context } from "../context/ContextApi.jsx";
 
 const SetAuthentication = (props) => {
   const { globalUrl, serverside } = props;
-
+  const { supportEmail } = useContext(Context);
   const [app, setApp] = useState({});
   const [isAppLoaded, setIsAppLoaded] = useState(false);
   const [loadFail, setLoadFail] = useState("");
@@ -114,7 +115,7 @@ const SetAuthentication = (props) => {
 			setLoadFail(
 				<span>
 					<Typography variant="h4">
-						Failed to load the app. Please contact your provider or support@shuffler.io if this persists
+						Failed to load the app. Please contact your provider or {supportEmail} if this persists
 					</Typography>
 					<Button 
 						variant="contained"
@@ -190,6 +191,7 @@ const SetAuthentication = (props) => {
 									appAuthentication={appAuthentication} />}
 					</Typography>
 
+					{/*
 					<Typography variant="h6" style={{ marginTop: 50, marginBottom: 20, }}>
 						What can they do with this?
 					</Typography>
@@ -216,6 +218,7 @@ const SetAuthentication = (props) => {
 							</div>
 						</div>
 					</Typography>
+					*/}
 				</div>
 					<>
 					<div style={{ height: 100, }}></div>
diff --git a/frontend/src/views/Usecases2.jsx b/frontend/src/views/Usecases2.jsx
index 886427b3..036c26a4 100644
--- a/frontend/src/views/Usecases2.jsx
+++ b/frontend/src/views/Usecases2.jsx
@@ -9,7 +9,7 @@ import { Context } from "../context/ContextApi.jsx"
 import { ToastContainer, toast } from "react-toastify" 
 import { makeStyles, } from "@mui/styles"
 import classNames from "classnames"
-import theme from '../theme.jsx'
+import {getTheme} from '../theme.jsx'
 
 import {
 	Autocomplete,
@@ -123,8 +123,16 @@ const ParseUsecaseDesc = (priority, appFramework) => {
 
 const UsecaseListComponent = (props) => {
 	const { keys, userdata, isCloud, globalUrl, frameworkData, isLoggedIn, workflows, setWorkflows, getFramework, setFrameworkData, } = props
+	const { themeMode, brandName } = useContext(Context)
+	const theme = getTheme(themeMode)
 
-
+	const usecaseLightThemeColor = {
+		"collect": "#FB47A0",
+		"enrich": "#F38B14",
+		"detect": "#0AAD65",
+		"respond": "#289BDB",
+		"verify": "#624CE9",
+	}
 	const [expandedIndex, setExpandedIndex] = useState(-1);
 	const [expandedItem, setExpandedItem] = useState(-1);
 	const [inputUsecase, setInputUsecase] = useState({});
@@ -199,8 +207,8 @@ const UsecaseListComponent = (props) => {
 	const LoadingSkeleton = () => (
 		<div style={{paddingTop: 75, minHeight: 1000, textAlign: "left"}}>
 			{/* Header skeleton */}
-			<Skeleton variant="text" width={200} height={40} sx={{ bgcolor: 'grey.800' }} />
-			<Skeleton variant="text" width="60%" height={24} sx={{ marginTop: 3, bgcolor: 'grey.800' }} />
+			<Skeleton variant="text" width={200} height={40}  />
+			<Skeleton variant="text" width="60%" height={24} sx={{ marginTop: 3,  }} />
 
 			{/* Apps selection skeleton */}
 			<Skeleton variant="text" width={150} height={24} sx={{ marginTop: 5, marginBottom: 10 }} />
@@ -220,7 +228,7 @@ const UsecaseListComponent = (props) => {
 							variant="circular"
 							width={40}
 							height={40}
-							sx={{ bgcolor: 'grey.800' }}
+							sx={{ bgcolor: theme.palette.loaderColor}}
 						/>
 					))}
 				</div>
@@ -232,7 +240,7 @@ const UsecaseListComponent = (props) => {
 					sx={{ 
 						marginTop: "10px",
 						borderRadius: 20,
-						bgcolor: 'grey.800'
+						bgcolor: theme.palette.loaderColor
 					}} 
 				/>
 			</Paper>
@@ -275,13 +283,13 @@ const UsecaseListComponent = (props) => {
 											variant="circular" 
 											width={30} 
 											height={30} 
-											sx={{ bgcolor: 'grey.800' }} 
+											sx={{ bgcolor: theme.palette.loaderColor}} 
 										/>
 										<Skeleton 
 											variant="circular" 
 											width={30} 
 											height={30} 
-											sx={{ bgcolor: 'grey.800' }} 
+											sx={{ bgcolor: theme.palette.loaderColor }} 
 										/>
 									</div>
 									{/* Usecase title */}
@@ -289,7 +297,7 @@ const UsecaseListComponent = (props) => {
 										variant="text" 
 										width="70%" 
 										height={24} 
-										sx={{ bgcolor: 'grey.800' }} 
+										sx={{ bgcolor: theme.palette.loaderColor}} 
 									/>
 								</Paper>
 							</Grid>
@@ -596,10 +604,10 @@ const UsecaseListComponent = (props) => {
 
 	return (
 		<div style={{paddingTop: 75, minHeight: 1000, textAlign: "left",}}>
-			<Typography variant="h4" style={{color: "white", }}>
-				<b>Usecases</b>
+			<Typography variant="h4" color="textPrimary" style={{fontWeight: "bold"}}>
+				Usecases
 			</Typography>
-			<Typography variant="body1" style={{marginTop: 25, }}>
+			<Typography variant="body1" color="textPrimary" style={{marginTop: 25, }}>
 				Choose a template tailored to your automation requirements, ready for immediate use.
 			</Typography>
 
@@ -742,7 +750,7 @@ const UsecaseListComponent = (props) => {
 			{keys.map((usecase, index) => {
 				return (
 					<div key={index} style={{marginTop: 75, }}>
-						<Typography variant="body1" style={{color: usecase.color, textAlign: "left", marginBottom: 10, }}>
+						<Typography variant="body1" style={{color: themeMode === "dark" ? usecase.color : usecaseLightThemeColor[usecase.name.slice(3, 100).toLowerCase()], textAlign: "left", marginBottom: 10, }}>
 							<b>{index+1}. {usecase.name.slice(3, 100)}</b>
 						</Typography>
       					<Grid container spacing={1}>
@@ -887,6 +895,9 @@ const Usecases2 = (props) => {
 	const [keys, setKeys] = useState([])
 	const [treeKeys, setTreeKeys] = useState([])
 
+ const { themeMode, brandName } = useContext(Context)
+ const theme = getTheme(themeMode)
+
   const [selectedUsecaseCategory, setSelectedUsecaseCategory] = useState("");
   const [selectedUsecases, setSelectedUsecases] = useState([]);
   const [usecases, setUsecases] = useState([])
@@ -987,7 +998,7 @@ const Usecases2 = (props) => {
 	}
 
 
-  document.title = "Shuffle - usecases";
+  document.title = brandName?.length > 0 ? `${brandName} - usecases` : "Shuffle - usecases";
   var dayGraphLabels = [60, 80, 65, 130, 80, 105, 90, 130, 70, 115, 60, 130];
   var dayGraphData = [60, 80, 65, 130, 80, 105, 90, 130, 70, 115, 60, 130];
 
diff --git a/frontend/src/views/Workflows.jsx b/frontend/src/views/Workflows.jsx
index 1eee8317..3fe551f4 100755
--- a/frontend/src/views/Workflows.jsx
+++ b/frontend/src/views/Workflows.jsx
@@ -440,6 +440,10 @@ export const collapseField = (field, inputdata) => {
     return true
   }
 
+  if (field.name === "result") {
+	  return false
+  }
+
   if (field.type === "array") {
     return true
   }
@@ -454,6 +458,112 @@ export const collapseField = (field, inputdata) => {
   return false
 }
 
+export const HandleJsonCopy = (base, copy, base_node_name) => {
+    if (typeof copy.name === "string") {
+      copy.name = copy.name.replaceAll(" ", "_");
+    }
+
+    //lol
+    if (typeof base === 'object' || typeof base === 'dict') {
+      base = JSON.stringify(base)
+    }
+
+    if (base_node_name === "execution_argument" || base_node_name === "Runtime Argument") {
+      base_node_name = "exec"
+    }
+
+    //console.log("COPY: ", base_node_name, copy);
+
+    //var newitem = JSON.parse(base);
+    var newitem = validateJson(base).result
+
+    var to_be_copied = "$" + base_node_name.toLowerCase().replaceAll(" ", "_");
+    for (let copykey in copy.namespace) {
+      if (copy.namespace[copykey].includes("Results for")) {
+        continue;
+      }
+
+      if (newitem !== undefined && newitem !== null) {
+        newitem = newitem[copy.namespace[copykey]];
+        if (!isNaN(copy.namespace[copykey])) {
+          to_be_copied += ".#";
+        } else {
+          to_be_copied += "." + copy.namespace[copykey];
+        }
+      }
+    }
+
+    if (newitem !== undefined && newitem !== null) {
+      newitem = newitem[copy.name];
+      if (!isNaN(copy.name)) {
+        to_be_copied += ".#";
+      } else {
+        to_be_copied += "." + copy.name;
+      }
+    }
+
+    to_be_copied = to_be_copied.replaceAll(" ", "_");
+	console.log("COPY: ", to_be_copied);
+    const elementName = "copy_element_shuffle";
+    var copyText = document.getElementById(elementName);
+    if (copyText !== null && copyText !== undefined) {
+      //console.log("NAVIGATOR: ", navigator);
+      const clipboard = navigator.clipboard;
+      if (clipboard === undefined) {
+        toast("Can only copy over HTTPS (port 3443)");
+        return;
+      }
+
+      navigator.clipboard.writeText(to_be_copied);
+      copyText.select();
+      copyText.setSelectionRange(0, 99999); /* For mobile devices */
+
+      /* Copy the text inside the text field */
+      document.execCommand("copy");
+      //console.log("COPYING!");
+      toast("Copied JSON path to clipboard.")
+    } else {
+      console.log("Couldn't find element ", elementName);
+    }
+}
+
+export const handleReactJsonClipboard = (copy) => {
+	const elementName = "copy_element_shuffle";
+	var copyText = document.getElementById(elementName);
+	if (copyText !== null && copyText !== undefined) {
+	  if (
+		copy.namespace !== undefined &&
+		copy.name !== undefined &&
+		copy.src !== undefined
+	  ) {
+		copy = copy.src;
+	  }
+
+	  const clipboard = navigator.clipboard;
+	  if (clipboard === undefined) {
+		toast("Can only copy over HTTPS (port 3443)");
+		return;
+	  }
+
+	  var stringified = JSON.stringify(copy);
+	  if (stringified.startsWith('"') && stringified.endsWith('"')) {
+		stringified = stringified.substring(1, stringified.length - 1);
+	  }
+
+	  navigator.clipboard.writeText(stringified);
+	  copyText.select();
+	  copyText.setSelectionRange(0, 99999); /* For mobile devices */
+
+	  /* Copy the text inside the text field */
+	  document.execCommand("copy");
+
+	  console.log("COPYING!");
+	  toast("Copied value to clipboard, NOT json path.")
+	} else {
+	  console.log("Failed to copy from " + elementName + ": ", copyText);
+	}
+}
+
 export const validateJson = (showResult) => {
 	if (showResult === undefined || showResult === null) {
 		return {
@@ -1946,7 +2056,10 @@ const Workflows = (props) => {
       .then((response) => {
         if (response.status !== 200) {
           console.log("Status not 200 for setting workflows :O!");
-          toast("Failed deleting workflow. Do you have access?");
+
+		  if (bulk !== true) {
+          	toast(`Failed deleting workflow ${id}. Do you have access?`);
+		  }
         } else {
           if (bulk !== true) {
             toast(`Deleted workflow ${id}. Child Workflows in Suborgs were also removed.`)
diff --git a/frontend/src/views/Workflows2.jsx b/frontend/src/views/Workflows2.jsx
index 33f8618f..d702f24f 100644
--- a/frontend/src/views/Workflows2.jsx
+++ b/frontend/src/views/Workflows2.jsx
@@ -2,6 +2,7 @@
 import React, { useEffect, useContext, memo, useState, useRef } from "react";
 import { useLocation, useNavigate, Link } from "react-router-dom";
 import ReactDOM from "react-dom"
+import { getTheme } from "../theme.jsx";
 
 // Material UI Icons
 import Add from '@mui/icons-material/Add';
@@ -93,6 +94,11 @@ import {
     Visibility as VisibilityIcon,
     EditNote as EditNoteIcon,
 	ErrorOutline as ErrorOutlineIcon,
+	Coronavirus as CoronavirusIcon, 
+	Fingerprint as FingerprintIcon,
+	Psychology as PsychologyIcon,
+	Wifi as WifiIcon,
+	Devices as DevicesIcon,
 } from "@mui/icons-material";
 
 // Additional Components
@@ -103,7 +109,7 @@ import Dropzone from "../components/Dropzone.jsx";
 import { ToastContainer, toast } from "react-toastify"
 import { MuiChipsInput } from "mui-chips-input";
 import { v4 as uuidv4 } from "uuid";
-import theme from "../theme.jsx";
+// import theme from "./theme.jsx";
 import algoliasearch from 'algoliasearch/lite';
 import { InstantSearch, Configure, connectHits, connectSearchBox, connectRefinementList } from 'react-instantsearch-dom';
 import { debounce } from "lodash";
@@ -112,43 +118,12 @@ import { removeQuery } from "../components/ScrollToTop.jsx";
 import {green, yellow, red, grey } from "../views/AngularWorkflow.jsx"
 
 
-const searchClient = algoliasearch("JNSS5CFDZZ", "db08e40265e2941b9a7d8f644b6e5240");
+const searchClient = algoliasearch("JNSS5CFDZZ", "c8f882473ff42d41158430be09ec2b4e");
 
 const svgSize = 24;
 const imagesize = 22;
 
-const useStyles = makeStyles(() => {
 
-    return {
-        datagrid: {
-            border: 0,
-            "& .MuiDataGrid-columnsContainer": {
-                backgroundColor:
-                    theme?.palette?.type === "light" ? "#fafafa" : theme?.palette?.inputColor,
-            },
-            "& .MuiDataGrid-iconSeparator": {
-                display: "none",
-            },
-            "& .MuiDataGrid-colCell, .MuiDataGrid-cell": {
-                borderRight: `1px solid ${theme?.palette?.type === "light" ? "white" : "#303030"
-                    }`,
-            },
-            "& .MuiDataGrid-columnsContainer, .MuiDataGrid-cell": {
-                borderBottom: `1px solid ${theme?.palette?.type === "light" ? "#f0f0f0" : "#303030"
-                    }`,
-            },
-            "& .MuiDataGrid-cell": {
-                color:
-                    theme?.palette?.type === "light" ? "white" : "rgba(255,255,255,0.65)",
-            },
-            "& .MuiPaginationItem-root, .MuiTablePagination-actions, .MuiTablePagination-caption":
-            {
-                borderRadius: 0,
-                color: "white",
-            },
-        },
-    }
-})
 
 
 
@@ -160,19 +135,20 @@ const useStyles = makeStyles(() => {
 export const GetIconInfo = (action) => {
     // Finds the icon based on the action. Should be verbs.
     const iconList = [
-        { key: "cases", values: ["cases"] },
+        { key: "cases", values: ["cases", "ticket", "alert"] },
         { key: "cache_add", values: ["set_cache"] },
         { key: "cache_get", values: ["get_cache"] },
         { key: "filter", values: ["filter"] },
         { key: "merge", values: ["join", "merge", "route", "router"] },
         {
             key: "search",
-            values: ["search", "find", "locate", "index", "analyze", "anal", "match", "check cache", "check", "verify", "validate"],
+            values: ["search", "find", "locate", "index", "analyze", "anal", "match", "check cache", "check", "verify", "validate", "siem", ],
         },
         { key: "list", values: ["list", "head", "options"] },
         {
             key: "download",
             values: [
+				"ingest",
                 "capture",
                 "get",
                 "download",
@@ -186,20 +162,6 @@ export const GetIconInfo = (action) => {
         },
         { key: "add", values: ["add", "accept",] },
         { key: "delete", values: ["delete", "remove", "clear", "clean", "dismiss",] },
-        {
-            key: "send",
-            values: [
-                "send",
-                "dispatch",
-                "mail",
-                "forward",
-                "post",
-                "submit",
-                "mark",
-                "set",
-                "release",
-            ],
-        },
         {
             key: "repeat",
             values: ["repeat", "retry", "pause", "skip", "copy", "replicat", "demo",],
@@ -229,8 +191,29 @@ export const GetIconInfo = (action) => {
             key: "compare",
             values: ["compare", "convert", "to", "filter", "translate", "parse"],
         },
+        { key: "assets", values: ["cmdb", "assets", "asset", "cmdb", "inventory", "host", "hosts", "device", "devices"] },
         { key: "close", values: ["close", "stop", "cancel", "block"] },
         { key: "communication", values: ["communication", "comms", "email", "mail",] },
+        { key: "eradication", values: ["eradication", "edr", "xdr"] },
+        { key: "iam", values: ["iam", "identity", "access", "auth", "authentication", "authorization", "oauth", "sso", "openid"] },
+		{ key: "intel", values: ["intel", "feed", "threat intel", "threat intelligence", "ti", "t.i.", "t.i", "ti.", "rule", "technique", "tactic", "techniques", "tactics", "ioc", "indicator",] },
+		{ key: "network", values: ["network", "net", "networking", "firewall", "proxy", "vpn", "sdwan", "sd-wan"] },
+        {
+            key: "send",
+            values: [
+                "send",
+                "dispatch",
+                "mail",
+                "forward",
+                "post",
+                "submit",
+                "mark",
+                "set",
+                "release",
+            ],
+        },
+
+
     ];
 
     var selectedKey = ""
@@ -389,7 +372,45 @@ export const GetIconInfo = (action) => {
             iconBackgroundColor: "green",
             originalIcon: <SearchIcon />,
         },
-    };
+		eradication: {
+            icon: "",
+            iconColor: "white",
+            iconBackgroundColor: "green",
+            originalIcon: <CoronavirusIcon />,
+		},
+		iam: {
+            icon: "",
+            iconColor: "white",
+            iconBackgroundColor: "green",
+            originalIcon: <FingerprintIcon />,
+		},
+		intel: {
+            icon: "",
+            iconColor: "white",
+            iconBackgroundColor: "green",
+            originalIcon: <PsychologyIcon />,
+		},
+		network: {
+            icon: "",
+            iconColor: "white",
+            iconBackgroundColor: "green",
+            originalIcon: <WifiIcon />,
+		},
+		assets: {
+            icon: "",
+            iconColor: "white",
+            iconBackgroundColor: "green",
+            originalIcon: <DevicesIcon />,
+		},
+    }
+
+		/*
+        { key: "eradication", values: ["eradication", "edr", "xdr"] },
+        { key: "iam", values: ["iam", "identity", "access", "auth", "authentication", "authorization", "oauth", "sso", "openid"] },
+		{ key: "intel", values: ["intel", "threat intel", "threat intelligence", "ti", "t.i.", "t.i", "ti."] },
+		{ key: "network", values: ["network", "net", "networking", "firewall", "proxy", "vpn", "sdwan", "sd-wan"] },
+		{ key: "siem", values: ["siem", "security information and event management", "security information and event management", "security information and event management"] },
+		*/
 
     var selectedItem = parsedIcons[selectedKey];
     if (selectedItem === undefined || selectedItem === null) {
@@ -406,11 +427,8 @@ export const GetIconInfo = (action) => {
         selectedItem.iconBackgroundColor = defaultColor;
     }
 
-    if (selectedItem.icon === "" || selectedItem.icon === undefined) {
-        console.log(
-            `MISSING PATH FOR ${selectedKey} (find in scope): `,
-            selectedItem.originalIcon.type.type
-        );
+    if ((selectedItem.icon === "" || selectedItem.icon === undefined) && (selectedItem.originalIcon === undefined || selectedItem.originalIcon === "")) {
+        console.log(`MISSING PATH FOR ${selectedKey} (find in scope): `, selectedItem.originalIcon.type.type)
     }
 
     if (
@@ -436,19 +454,7 @@ export const GetIconInfo = (action) => {
     return selectedItem;
 };
 
-const chipStyle = {
-    backgroundColor: "#2F2F2F",
-    marginRight: 5,
-    paddingLeft: 5,
-    paddingRight: 5,
-    height: 35,
-    cursor: "pointer",
-    borderColor: "#2F2F2F",
-    color: "#C8C8C8",
-    fontSize: "14px",
-    fontFamily: theme?.typography?.fontFamily,
-    borderRadius: "17.5px"
-};
+
 
 export const collapseField = (field) => {
     if (field === undefined || field === null) {
@@ -626,12 +632,14 @@ export const validateJson = (showResult) => {
 //Custom hook for handling styling of the dropzone
 const useDropzoneStyles = () => {
     const { leftSideBarOpenByClick } = useContext(Context);
+    const { themeMode, brandColor } = useContext(Context);
+    const theme = getTheme(themeMode, brandColor);
 
     return {
         paddingTop: 70,
         // minHeight: 1000,
-        backgroundColor: "#1A1A1A",
-        fontFamily: theme?.typography?.fontFamily,
+        backgroundColor: theme.palette.backgroundColor,
+        fontFamily: theme.typography?.fontFamily,
         // maxWidth: window.innerWidth > 1366 ? 1366 : isMobile ? "100%" : 1200,
         paddingLeft: leftSideBarOpenByClick ? 200 : 0,
         transition: "padding-left 0.3s ease",
@@ -661,15 +669,66 @@ const Workflows2 = (props) => {
     const [mouseHoverIndex, setMouseHoverIndex] = useState(-1);
     const [isLoadingWorkflow, setIsLoadingWorkflow] = useState(false);
     const [isLoadingPublicWorkflow, setIsLoadingPublicWorkflow] = useState(false);
-    const [view, setView] = useState("grid");
-    const classes = useStyles(theme)
+    const [view, setView] = useState(localStorage?.getItem("workflowView") || "grid");
     const imgSize = 60;
 
+    const { themeMode, brandColor, brandName } = useContext(Context);
+    const theme = getTheme(themeMode, brandColor);
+    const chipStyle = {
+        backgroundColor: theme.palette.chipStyle.backgroundColor,
+        marginRight: 5,
+        paddingLeft: 5,
+        paddingRight: 5,
+        height: 35,
+        cursor: "pointer",
+        borderColor: theme.palette.chipStyle.borderColor,
+        color: theme.palette.chipStyle.color,
+        fontSize: "14px",
+        fontFamily: theme.typography?.fontFamily,
+        borderRadius: "17.5px"
+    };
+
+    const newStyles = makeStyles(() => {
+
+        return {
+            datagrid: {
+                border: 0,
+                "& .MuiDataGrid-columnsContainer": {
+                    backgroundColor:
+                        theme.palette?.type === "light" ? "#fafafa" : theme.palette?.inputColor,
+                },
+                "& .MuiDataGrid-iconSeparator": {
+                    display: "none",
+                },
+                "& .MuiDataGrid-colCell, .MuiDataGrid-cell": {
+                    borderRight: `1px solid ${theme.palette?.type === "light" ? "white" : "#303030"
+                        }`,
+                },
+                "& .MuiDataGrid-columnsContainer, .MuiDataGrid-cell": {
+                    borderBottom: `1px solid ${theme.palette?.type === "light" ? "#f0f0f0" : "#303030"
+                        }`,
+                },
+                "& .MuiDataGrid-cell": {
+                    color:
+                        theme.palette?.type === "light" ? "white" : "rgba(255,255,255,0.65)",
+                },
+                "& .MuiPaginationItem-root, .MuiTablePagination-actions, .MuiTablePagination-caption":
+                {
+                    borderRadius: 0,
+                    color: "white",
+                },
+            },
+        }
+    })
+
+    const classes = newStyles(theme);
+
     const referenceUrl = globalUrl + "/api/v1/hooks/";
 
     var upload = "";
 
     const [workflows, setWorkflows] = React.useState([]);
+    const [backupWorkflows, setBackupWorkflows] = React.useState([]);
     const [_, setUpdate] = React.useState(""); // Used for rendering, don't remove
     const [selectedUsecases, setSelectedUsecases] = React.useState([]);
     const [filteredWorkflows, setFilteredWorkflows] = React.useState([]);
@@ -724,7 +783,9 @@ const Workflows2 = (props) => {
 
     const [apps, setApps] = React.useState([]);
 
-    document.title = "Shuffle - Workflows";
+    const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
+
+    document.title = brandName?.length > 0 ? `${brandName} - Workflows` : "Shuffle - Workflows";
 
     useEffect(() => {
         const queryParams = new URLSearchParams(location.search);
@@ -742,11 +803,18 @@ const Workflows2 = (props) => {
 
     const handleTabChange = (event, newValue) => {
         setCurrTab(newValue);
+
+		//if (view === "list" && currTab > 0) {
+		//	setView("grid")
+		//	setUpdate(Math.random())
+		//}
+
         // Update URL query params based on tab index
         const tabMapping = {
             0: 'org_workflows',
             1: 'my_workflows',
-            2: 'all_workflows'
+            2: 'all_workflows',
+            3: 'backup_apps',
         };
         const queryParams = new URLSearchParams(location.search);
         queryParams.set('tab', tabMapping[newValue]);
@@ -755,9 +823,6 @@ const Workflows2 = (props) => {
         navigate(`${location.pathname}?${queryParams.toString()}`);
     };
 
-
-
-
     const handleCreateWorkflow = () => {
         setModalOpen(true)
         setIsEditing(false)
@@ -810,9 +875,10 @@ const Workflows2 = (props) => {
 
     }
 
-    const isCloud =
-        window.location.host === "localhost:3002" ||
-        window.location.host === "shuffler.io";
+    //const isCloud =
+    //    window.location.host === "localhost:3002" ||
+    //    window.location.host === "shuffler.io";
+	const isCloud = false
 
     const findWorkflow = (filters) => {
         console.log("Using filters: ", filters)
@@ -1096,23 +1162,31 @@ const Workflows2 = (props) => {
                 setSelectedWorkflowId("");
             }}
             PaperProps={{
-                style: {
-                    backgroundColor: theme.palette.surfaceColor,
-                    color: "white",
-                    minWidth: 500,
-                    padding: 50,
-                },
-            }}
+                sx: {
+                    borderRadius: theme?.palette?.DialogStyle?.borderRadius,
+                    border: theme?.palette?.DialogStyle?.border,
+                    minWidth: '440px',
+                    fontFamily: theme?.typography?.fontFamily,
+                    backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+                    zIndex: 1000,
+                    '& .MuiDialogContent-root': {
+                    backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+                    },
+                    '& .MuiDialogTitle-root': {
+                    backgroundColor: theme?.palette?.DialogStyle?.backgroundColor,
+                    },
+                }
+                }}
         >
             <DialogTitle>
-                <div style={{ textAlign: "center", color: "rgba(255,255,255,0.9)" }}>
+                <div style={{ textAlign: "center", color: theme.palette.DialogStyle?.color }}>
                     Are you sure you want to delete {selectedWorkflowId.length > 0 ? filteredWorkflows.find((w) => w.id === selectedWorkflowId)?.name : `${selectedWorkflowIndexes.length} workflow${selectedWorkflowIndexes.length === 1 ? '' : 's'}`}? <div />
 
                     Other workflows relying on {selectedWorkflowIndexes.length > 0 ? "them" : "it"} one will stop working
                 </div>
             </DialogTitle>
             <DialogContent
-                style={{ color: "rgba(255,255,255,0.65)", textAlign: "center" }}
+                style={{ color: theme.palette.DialogStyle.color, textAlign: "center" }}
             >
                 <Button
                     style={{}}
@@ -1205,7 +1279,7 @@ const Workflows2 = (props) => {
 							data.status
 						).then((response) => {
 							if (response !== undefined) {
-								toast(`Successfully imported ${data.name}`);
+								toast.success(`Successfully imported ${data.name}`);
 							}
 						});
 					}
@@ -1264,7 +1338,20 @@ const Workflows2 = (props) => {
     }
 
 
-
+    useEffect(() => {
+        const queryParams = new URLSearchParams(window.location.search);
+        const paramType = queryParams.get("type");
+    
+        if (paramType === "sso_login") {
+            localStorage.removeItem("workflows");
+            queryParams.delete("type");
+            const newUrl = window.location.pathname +  (queryParams.toString() ? `?${queryParams.toString()}` : '');
+    
+            window.history.replaceState({}, '', newUrl);
+         window.location.reload();
+        }
+    }, []);
+    
     const getAvailableWorkflows = (amount) => {
         var storageWorkflows = []
         setIsLoadingWorkflow(true)
@@ -1317,21 +1404,33 @@ const Workflows2 = (props) => {
                         // When there are no workflows, we can set the loading to false
                         setIsLoadingWorkflow(false)
 						if (currTab !== 2) {
-							toast("No workflows found. Showing workflow discovery")
+							toast.info("No workflows found in this org. Feel free to look into our public workflows!" , {
+								timeout: 7500,
+							})
 							setCurrTab(2)
 						}
 					}
 
                     var newarray = []
+					var backupWf = []
                     for (var wfkey in responseJson) {
                         const wf = responseJson[wfkey]
                         if (wf.public === true || wf.hidden === true) {
                             continue
                         }
 
+						if (wf?.backup_config?.onprem_backup === true) {
+							backupWf.push(wf)
+							continue
+						}
+
                         newarray.push(wf)
                     }
 
+					if (backupWf.length > 0) {
+						setBackupWorkflows(backupWf)
+					}
+
                     var setProdFilter = false
 
                     var actionnamelist = [];
@@ -1565,7 +1664,7 @@ const Workflows2 = (props) => {
         width: "100%",
         color: "white",
         display: "flex",
-        fontFamily: theme?.typography?.fontFamily,
+        fontFamily: theme.typography?.fontFamily,
         boxSizing: "border-box",
         position: "relative",
         borderRadius: "8px",
@@ -1586,7 +1685,7 @@ const Workflows2 = (props) => {
         width: 160,
         height: 44,
         justifyContent: "space-between",
-        fontFamily: theme?.typography?.fontFamily,
+        fontFamily: theme.typography?.fontFamily,
     };
 
     const exportAllWorkflows = (allWorkflows) => {
@@ -1758,9 +1857,17 @@ const Workflows2 = (props) => {
         let exportFileDefaultName = data.name + ".json";
 
         data["owner"] = "";
+        data["updated_by"] = "";
         data["org"] = [];
         data["org_id"] = "";
         data["execution_org"] = {};
+        data["created"] = 0
+        data["due_date"] = 0
+        data["edited"] = 0
+
+        data["validation"] = {};
+        data["suborg_distribution"] = []
+        data["parentorg_workflow"] = ""
 
         // These are backwards.. True = saved before. Very confuse.
         data["previously_saved"] = false;
@@ -1800,9 +1907,9 @@ const Workflows2 = (props) => {
         data = JSON.parse(JSON.stringify(data));
         data = sanitizeWorkflow(data);
         toast("Sanitizing and publishing " + data.name);
-
+    
         // This ALWAYS talks to Shuffle cloud
-        fetch(globalUrl + "/api/v1/workflows/" + data.id + "/publish", {
+        fetch(globalUrl + "/api/v1/workflows/" + data.id + "/publish" , {
             method: "POST",
             headers: {
                 "Content-Type": "application/json",
@@ -2035,10 +2142,13 @@ const Workflows2 = (props) => {
             .then((response) => {
                 if (response.status !== 200) {
                     console.log("Status not 200 for setting workflows :O!");
-                    toast("Failed deleting workflow. Do you have access?");
+		  
+					if (bulk !== true) {
+                    	toast("Failed deleting workflow. Do you have access?");
+					}
                 } else {
                     if (bulk !== true) {
-                        toast(`Deleted workflow ${id}. Child Workflows in Suborgs were also removed.`)
+                        toast.success(`Deleted workflow ${id}. Child Workflows in Suborgs were also removed.`)
                     }
                 }
 
@@ -2052,7 +2162,7 @@ const Workflows2 = (props) => {
                 }
             })
             .catch((error) => {
-                toast(error.toString());
+                toast.error(error.toString());
             })
     }
 
@@ -2061,55 +2171,6 @@ const Workflows2 = (props) => {
     };
 
     const hasWorkflows = workflows === undefined || workflows === null || workflows.length === 0
-    const NewWorkflowPaper = () => {
-        const [hover, setHover] = React.useState(false);
-
-        const innerColor = "rgba(255,255,255,0.3)"
-
-        const setupPaperStyle = {
-            minHeight: paperAppStyle.minHeight,
-            maxWidth: "100%",
-            minWidth: paperAppStyle.width,
-            color: innerColor,
-            padding: paperAppStyle.padding,
-            display: "flex",
-            boxSizing: "border-box",
-            position: "relative",
-            border: hasWorkflows ? `2px solid #f85a3e` : `2px solid ${innerColor}`,
-            cursor: "pointer",
-            backgroundColor: hover ? "rgba(39,41,45,0.5)" : "rgba(39,41,45,1)",
-            borderRadius: paperAppStyle.borderRadius,
-        }
-
-        return (
-            <Grid item xs={isMobile ? 12 : hasWorkflows ? 12 : 4} style={{ padding: "12px 10px 12px 10px" }}>
-                <Paper
-                    square
-                    style={setupPaperStyle}
-                    onClick={() => {
-                        setModalOpen(true)
-                        setIsEditing(false)
-                    }}
-                    onMouseOver={() => {
-                        setHover(true);
-                    }}
-                    onMouseOut={() => {
-                        setHover(false);
-                    }}
-                >
-                    <Tooltip title={`New Workflow`} placement="bottom">
-                        <span style={{ textAlign: "center", minWidth: 240, margin: "auto" }}>
-                            <AddCircleIcon style={{ height: 65, width: 65 }} />
-                            <Typography variant="h6" style={{ color: innerColor, margin: "auto" }}>
-                                New Workflow
-                            </Typography>
-                        </span>
-                    </Tooltip>
-                </Paper>
-            </Grid>
-        );
-    };
-
     const getWorkflowAppgroup = (data) => {
         if (currTab !== 2) {
             if (data.actions === undefined || data.actions === null) {
@@ -2159,7 +2220,7 @@ const Workflows2 = (props) => {
     const WorkflowSkeleton = () => {
         return (
             <Paper elevation={0} style={{
-                backgroundColor: "#212121",
+                backgroundColor: theme.palette.platformColor,
                 width: "100%",
                 height: 120,
                 borderRadius: 8,
@@ -2176,7 +2237,7 @@ const Workflows2 = (props) => {
                         height={90}
                         style={{
                             borderRadius: 6,
-                            backgroundColor: "rgba(255, 255, 255, 0.1)"
+                            backgroundColor: theme.palette.loaderColor,
                         }}
                     />
                     <div style={{
@@ -2190,19 +2251,19 @@ const Workflows2 = (props) => {
                             variant="text"
                             width="40%"
                             height={24}
-                            style={{ backgroundColor: "rgba(255, 255, 255, 0.1)" }}
+                            style={{ backgroundColor: theme.palette.loaderColor }}
                         />
                         <Skeleton
                             variant="text"
                             width="60%"
                             height={20}
-                            style={{ backgroundColor: "rgba(255, 255, 255, 0.1)" }}
+                            style={{ backgroundColor: theme.palette.loaderColor }}
                         />
                         <Skeleton
                             variant="text"
                             width="30%"
                             height={20}
-                            style={{ backgroundColor: "rgba(255, 255, 255, 0.1)" }}
+                            style={{ backgroundColor: theme.palette.loaderColor }}
                         />
                     </div>
                 </div>
@@ -2275,6 +2336,11 @@ const Workflows2 = (props) => {
                     setOpen(false);
                     setAnchorEl(null);
                 }}
+                MenuListProps={{
+                    sx: {
+                        backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                    }
+                }}
             >
                 {isDistributed ?
                     <MenuItem
@@ -2288,7 +2354,7 @@ const Workflows2 = (props) => {
                     </MenuItem>
                     : null}
                 <MenuItem
-                    style={{ backgroundColor: theme.palette.inputColor, color: "white" }}
+                    sx={{ backgroundColor: theme.palette.textFieldStyle.backgroundColor, color: theme.palette.text.primary, "&:hover": {backgroundColor: theme.palette.hoverColor}  }}
                     disabled={isDistributed}
                     onClick={(event) => {
                         event.stopPropagation()
@@ -2309,20 +2375,20 @@ const Workflows2 = (props) => {
                 </MenuItem>
 
                 <MenuItem
-                    style={{ backgroundColor: theme.palette.inputColor, color: "white" }}
+                    sx={{ backgroundColor: theme.palette.textFieldStyle.backgroundColor, color: theme.palette.text.primary, "&:hover": {backgroundColor: theme.palette.hoverColor}  }}
                     onClick={(event) => {
                         window.open(`/forms/${data.id}`, "_blank")
                     }}
                     key={"explore forms"}
                 >
                     <EditNoteIcon style={{ marginLeft: 0, marginRight: 8 }} />
-                    {"Create Form"}
+                    {"Edit Form"}
                 </MenuItem>
 
                 <Divider />
 
                 <MenuItem
-                    style={{ backgroundColor: theme.palette.inputColor, color: "white" }}
+                    sx={{ backgroundColor: theme.palette.textFieldStyle.backgroundColor, color: theme.palette.text.primary, "&:hover": {backgroundColor: theme.palette.hoverColor}  }}
                     disabled={isDistributed}
                     onClick={() => {
                         sideloadWorkflow(data.id, "publish")
@@ -2336,8 +2402,8 @@ const Workflows2 = (props) => {
                 </MenuItem>
 
                 <MenuItem
-                    style={{ backgroundColor: theme.palette.inputColor, color: "white" }}
-                    disabled={isDistributed}
+                    sx={{ backgroundColor: theme.palette.textFieldStyle.backgroundColor, color: theme.palette.text.primary, "&:hover": {backgroundColor: theme.palette.hoverColor}  }}
+                    //disabled={isDistributed}
                     onClick={() => {
                         sideloadWorkflow(data.id, "export", setOpen)
 
@@ -2352,7 +2418,7 @@ const Workflows2 = (props) => {
                 <Divider />
 
                 <MenuItem
-                    style={{ backgroundColor: theme.palette.inputColor, color: "white" }}
+                    sx={{ backgroundColor: theme.palette.textFieldStyle.backgroundColor, color: theme.palette.text.primary, "&:hover": {backgroundColor: theme.palette.hoverColor}  }}
                     disabled={isDistributed}
                     onClick={() => {
                         duplicateWorkflow(data)
@@ -2365,7 +2431,7 @@ const Workflows2 = (props) => {
                 </MenuItem>
 
                 <MenuItem
-                    style={{ backgroundColor: theme.palette.inputColor, color: "white" }}
+                    sx={{ backgroundColor: theme.palette.textFieldStyle.backgroundColor, color: theme.palette.text.primary, "&:hover": {backgroundColor: theme.palette.hoverColor}  }}
                     onClick={() => {
                         setDeleteModalOpen(true);
                         setSelectedWorkflowId(data.id);
@@ -2482,7 +2548,7 @@ const Workflows2 = (props) => {
 
 
         return (
-            <div style={{ width: "100%", minWidth: 320, position: "relative", border: highlightIds.includes(data.id) ? "2px solid #f85a3e" : isDistributed || hasSuborgs ? `2px solid ${theme.palette.distributionColor}` : "inherit", borderRadius: theme.palette?.borderRadius, backgroundColor: "#212121", fontFamily: theme?.typography?.fontFamily }}>
+            <div style={{ width: "100%", minWidth: 320, position: "relative", border: highlightIds.includes(data.id) ? "2px solid #f85a3e" : isDistributed || hasSuborgs ? `2px solid ${theme.palette.distributionColor}` : "inherit", borderRadius: theme.palette?.borderRadius, backgroundColor: "#212121", fontFamily: theme.typography?.fontFamily }}>
                 <Paper square style={paperAppStyle}>
                     {selectedCategory !== "" ?
                         <Tooltip title={`Usecase Category: ${selectedCategory}`} placement="bottom">
@@ -2496,7 +2562,7 @@ const Workflows2 = (props) => {
                                     width: 3,
                                     backgroundColor: boxColor,
                                     borderRadius: "0 100px 0 0",
-                                    fontFamily: theme?.typography?.fontFamily,
+                                    fontFamily: theme.typography?.fontFamily,
                                 }}
                                 onClick={() => {
                                     addFilter(selectedCategory)
@@ -2504,21 +2570,24 @@ const Workflows2 = (props) => {
                             />
                         </Tooltip>
                         : null}
+
                     <Grid
                         item
-                        style={{ display: "flex", flexDirection: "column", width: "100%", fontFamily: theme?.typography?.fontFamily }}
+                        style={{ display: "flex", flexDirection: "column", width: "100%", fontFamily: theme.typography?.fontFamily }}
                     >
                         <Grid item style={{ display: "flex", maxHeight: 34 }}>
-                            <Tooltip title={`Org "${orgName}". Click to edit image.`} placement="bottom">
-                                <div
-                                    styl={{ cursor: "pointer" }}
-                                    onClick={() => {
-                                        navigate("/admin")
-                                    }}
-                                >
-                                    {image}
-                                </div>
-                            </Tooltip>
+							{currTab === 2 ? null : 
+								<Tooltip title={`Org "${orgName}". Click to edit image.`} placement="bottom">
+									<div
+										styl={{ cursor: "pointer" }}
+										onClick={() => {
+											navigate("/admin")
+										}}
+									>
+										{image}
+									</div>
+								</Tooltip>
+							}
                             <Tooltip arrow
                                 onMouseEnter={() => {
                                     /*
@@ -2558,7 +2627,7 @@ const Workflows2 = (props) => {
                                         <Typography style={{
                                             color: "rgba(255,255,255,0.9)",
                                             fontSize: "16px",
-                                            fontFamily: theme?.typography?.fontFamily,
+                                            fontFamily: theme.typography?.fontFamily,
                                         }}>
                                             Edit: {data.name}
                                         </Typography>
@@ -2585,22 +2654,31 @@ const Workflows2 = (props) => {
                                 } placement="right">
 
                                 <Typography
-                                    variant="body1"
                                     style={{
                                         marginBottom: 0,
                                         paddingBottom: 0,
+                                        fontSize: 18,
                                         maxHeight: 30,
                                         flex: 10,
-                                        fontFamily: theme?.typography?.fontFamily,
+                                        fontFamily: theme.typography?.fontFamily,
                                         fontWeight: 500,
                                     }}
                                 >
                                     <Link
                                         to={
-                                            type === "public" ? parsedUrl : data.workflow_as_code ? `/workflows/${data.id}/code` : `/workflows/${data.id}`
+                                            currTab === 2 ? `https://shuffler.io${parsedUrl}` : type === "public" ? parsedUrl : data.workflow_as_code ? `/workflows/${data.id}/code` : `/workflows/${data.id}`
                                         }
-                                        style={{ textDecoration: "none", color: "inherit" }}
-                                    >
+                                        style={{ 
+											textDecoration: "none", 
+											color: "inherit", 
+											overflow: "hidden", 
+											textOverflow: "ellipsis", 
+											whiteSpace: "nowrap", 
+											maxWidth: "90%", 
+											display: "block" 
+										}}
+										target={currTab === 2 ? "_blank" : "_self"}
+									>
                                         {parsedName}
                                     </Link>
                                 </Typography>
@@ -2617,7 +2695,7 @@ const Workflows2 = (props) => {
                                                     style={{
                                                         height: 24,
                                                         width: 24,
-                                                        filter: "brightness(0.6)",
+                                                        filter: themeMode === "dark" ? "brightness(0.6)" : "brightness(0.9)",
                                                         cursor: "pointer",
                                                     }}
                                                     onClick={() => {
@@ -2774,7 +2852,7 @@ const Workflows2 = (props) => {
                                 overflow: "hidden",
                                 marginTop: 8,
                                 maxHeight: 35,
-                                fontFamily: theme?.typography?.fontFamily,
+                                fontFamily: theme.typography?.fontFamily,
                             }}
                         >
                             {data.tags !== undefined && data.tags !== null
@@ -2813,7 +2891,7 @@ const Workflows2 = (props) => {
 
                         {(data.sharing !== undefined && data.sharing !== null && data.sharing === "form") || (data?.form_control?.input_markdown !== undefined && data?.form_control?.input_markdown !== null && data?.form_control?.input_markdown !== "") && type !== "public" ?
                             <Tooltip title="Edit Form" placement="top">
-                                <div style={{ position: "absolute", top: 45, right: 8, }}>
+                                <div style={{ position: "absolute", top: 50, right: 8, }}>
                                     <IconButton
                                         aria-label="more"
                                         aria-controls="long-menu"
@@ -2830,8 +2908,8 @@ const Workflows2 = (props) => {
                         : null}
 
 						{(data?.validation?.validation_ran === true && data?.validation?.valid === false && data?.validation?.errors?.length > 0 ) ?                            
-							<Tooltip title={`Explore more than  ${data?.validation?.errors?.length} errors. When the last execution finishes without errors AND notifications stop occuring, this icon disappears.`} placement="top">
-                                <div style={{ position: "absolute", top: 45, right: 8, }}>
+							<Tooltip title={`Explore more than  ${data?.validation?.errors?.length} notifications. When the last execution finishes without errors AND notifications stop occuring, this icon disappears.`} placement="top">
+                                <div style={{ position: "absolute", top: 85, right: 8, }}>
                                     <IconButton
                                         aria-label="more"
                                         aria-controls="long-menu"
@@ -2850,8 +2928,8 @@ const Workflows2 = (props) => {
                                     </IconButton>
                                 </div>
                             </Tooltip>
-
 						: null}
+
                     </Grid>
                 </Paper>
             </div>
@@ -3037,7 +3115,7 @@ const Workflows2 = (props) => {
                                     data.status,
                                 ).then((response) => {
                                     if (response !== undefined) {
-                                        toast("Successfully imported " + data.name);
+                                        toast.success("Imported " + data.name);
                                     }
                                 });
                             }
@@ -3227,6 +3305,7 @@ const Workflows2 = (props) => {
                                             </span>
                                         </Tooltip>
                                     }
+
                                     <Tooltip
                                         color="primary"
                                         title="Amount of triggers"
@@ -3388,6 +3467,8 @@ const Workflows2 = (props) => {
                 return obj;
             })
 
+			console.log("ROWS: ", rows)
+
             workflowData = (
                 <DataGrid
                     color="primary"
@@ -3417,7 +3498,7 @@ const Workflows2 = (props) => {
             );
         }
         return (
-            <div style={{ ...gridContainer, backgroundColor: "#212121" }}>
+            <div style={{ ...gridContainer, backgroundColor: theme.palette.platformColor }}>
                 <Tooltip title={`New Workflow`} placement="bottom">
                     <IconButton
                         style={{ position: "absolute", top: 10, right: 50, zIndex: 1000 }}
@@ -3825,6 +3906,8 @@ const Workflows2 = (props) => {
                         onClick={() => {
                             localStorage.setItem("view", "list");
                             setView("list");
+
+							setCurrTab(0)
                         }}
                     >
                         <ListIcon />
@@ -3979,20 +4062,30 @@ const Workflows2 = (props) => {
     // 	}
 
     useEffect(() => {
-        if (currTab === 2) return;
-        if (userdata !== undefined && userdata !== null && filteredWorkflows.length > 0) {
+        if (filteredWorkflows.length > 0) {
+
             var categoryWorkflows = []
             if (currTab === 0) {
                 categoryWorkflows = filteredWorkflows.filter(workflow => workflow?.org_id === userdata?.active_org?.id)
-                setOrgWorkflows(categoryWorkflows)
+
+				if (categoryWorkflows.length === 0) { 
+					setOrgWorkflows(filteredWorkflows)
+				} else {
+                	setOrgWorkflows(categoryWorkflows)
+				}
             }
             else if (currTab === 1) {
                 categoryWorkflows = filteredWorkflows.filter(workflow => workflow?.org_id === userdata?.active_org?.id && workflow?.owner === userdata?.id)
                 setMyWorkflows(categoryWorkflows)
             }
+
             setIsLoadingWorkflow(false);
 
-        }
+        } else {
+            if (currTab === 0 && workflows?.length > 0) {
+				setOrgWorkflows(workflows)
+			}
+		}
     }, [currTab, workflows, userdata, filteredWorkflows, filters])
 
 
@@ -4006,8 +4099,8 @@ const Workflows2 = (props) => {
 
 
     const iconButtonStyle = {
-        color: 'white',
-        backgroundColor: '#212121',
+        color: theme.palette.text.primary,
+        backgroundColor: theme.palette.platformColor,
         borderRadius: '4px',
         padding: "12px 16px",
         cursor: 'pointer',
@@ -4107,20 +4200,20 @@ const Workflows2 = (props) => {
                     maxWidth: "25%",
                     minWidth: "25%",
                     height: 47,
-                    backgroundColor: "#212121",
+                    backgroundColor: theme.palette.textFieldStyle.backgroundColor,
                 }}
                 InputProps={{
                     style: {
-                        color: "white",
+                        color: theme.palette.textFieldStyle.color,
                         height: "100%",
-                        backgroundColor: "#212121",
+                        backgroundColor: theme.palette.textFieldStyle.backgroundColor,
                     },
                     placeholder: "Search Workflows",
                 }}
                 sx={{
                     '& .MuiOutlinedInput-root': {
                         borderRadius: '4px',
-                        backgroundColor: "#212121",
+                        backgroundColor: theme.palette.textFieldStyle.backgroundColor,
                     },
                 }}
                 value={localQuery}
@@ -4162,9 +4255,9 @@ const Workflows2 = (props) => {
                     maxWidth: "25%",
                     height: 47,
                     borderRadius: 4,
-                    backgroundColor: "#212121",
-                    fontFamily: theme?.typography?.fontFamily,
-                    color: "#FFFFFF", 
+                    backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                    fontFamily: theme.typography?.fontFamily,
+                    color: theme.palette.textFieldStyle.color, 
                 }}
                 MenuProps={{
                     anchorOrigin: {
@@ -4177,9 +4270,9 @@ const Workflows2 = (props) => {
                     },
                     PaperProps: {
                         style: {
-                            backgroundColor: '#212121',
-                            color: '#FFFFFF',
-                            fontFamily: theme?.typography?.fontFamily,
+                            backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                            color: theme.palette.textFieldStyle.color,
+                            fontFamily: theme.typography?.fontFamily,
                         }
                     }
                 }}
@@ -4215,7 +4308,7 @@ const Workflows2 = (props) => {
                     )
                 }
             >
-                <MenuItem disabled value="" style={{ fontFamily: theme?.typography?.fontFamily, fontSize: 16 }}>
+                <MenuItem disabled value="" style={{ fontFamily: theme.typography?.fontFamily, fontSize: 16 }}>
                     All Usecases
                 </MenuItem>
                 {items.map((usecase, index) => (
@@ -4228,13 +4321,13 @@ const Workflows2 = (props) => {
                             '&:hover': {
                                 backgroundColor: '#3A3A3A', // Darker background on hover
                             },
-                            fontFamily: theme?.typography?.fontFamily,
+                            fontFamily: theme.typography?.fontFamily,
                             fontSize: 16
                         }}
                     >
                         <Checkbox
                             checked={currentRefinement.includes(usecase.label)}
-                            style={{ marginRight: 8, color: '#FFFFFF', fontSize: 16 }}
+                            style={{ marginRight: 8, fontSize: 16 }}
                         />
                         {usecase.label} ({usecase.count})
                     </MenuItem>
@@ -4247,7 +4340,7 @@ const Workflows2 = (props) => {
     const tabStyle = {
         textTransform: 'none',
         marginRight: 20,
-        fontFamily: theme?.typography?.fontFamily,
+        fontFamily: theme.typography?.fontFamily,
         fontSize: 16,
         borderBottom: "5px solid transparent",
         minHeight: "48px",
@@ -4255,9 +4348,9 @@ const Workflows2 = (props) => {
     }
 
     const tabActive = {
-        borderBottom: "5px solid #FF8544",
+        borderBottom: `5px solid ${theme.palette.primary.main}`,
         borderRadius: "2px",
-        color: "#FF8544"
+        color: theme.palette.primary.main
     }
 
 
@@ -4277,26 +4370,26 @@ const Workflows2 = (props) => {
                         display: "flex",
                         flexDirection: "column",
                         width: "100%",
-                        maxWidth: "70%",
+                        maxWidth: isSafari ? "100%" : "70%",
                         margin: "auto",
                     }}>
-                        <Typography variant="h4" style={{ marginBottom: 20, paddingLeft: 15, textTransform: 'none', fontFamily: theme?.typography?.fontFamily }}>
+                        <Typography variant="h4" color="textPrimary" style={{ marginBottom: 20, paddingLeft: 15, textTransform: 'none', fontFamily: theme.typography?.fontFamily }}>
 							{currTab === 0 ? "Org" : currTab === 1 ?  "Your" : "Discover"} Workflows
                         </Typography>
 
-                        <div style={{ borderBottom: '1px solid gray', marginBottom: 30 }}>
+                        <div style={{ borderBottom: themeMode === "dark" ? "1px solid #808080" : theme.palette.defaultBorder, marginBottom: 30 }}>
                             <Tabs
                                 value={currTab}
                                 onChange={(event, newTab) => handleTabChange(event, newTab)}
                                 style={{
-                                    fontFamily: theme?.typography?.fontFamily,
+                                    fontFamily: theme.typography?.fontFamily,
                                     fontSize: 16,
                                     marginBottom: "-2px"
                                 }}
                                 TabIndicatorProps={{ style: { display: 'none' } }}
                             >
                                 <Tab
-                                    label="Organization Workflows"
+                                    label="Org Workflows"
                                     style={{
                                         ...tabStyle,
                                         ...(currTab === 0 ? tabActive : {})
@@ -4316,6 +4409,30 @@ const Workflows2 = (props) => {
                                         marginRight: 0,
                                         ...(currTab === 2 ? tabActive : {})
                                     }}
+                                />
+
+								{backupWorkflows.length > 0 &&
+									<Tab
+										label={`Onprem Backup (${backupWorkflows.length})`}
+										style={{
+											...tabStyle,
+											marginLeft: 25, 
+											...(currTab === 3 ? tabActive : {})
+										}}
+									/>
+								}
+
+                                <Tab
+                                    label="Org Forms"
+									onClick={() => {
+										navigate("/forms")
+									}}
+                                    style={{
+                                        ...tabStyle,
+                                        marginRight: 0,
+										marginLeft: 25, 
+                                        ...(currTab === 4 ? tabActive : {})
+                                    }}
                                 />
                             </Tabs>
                         </div>
@@ -4336,16 +4453,17 @@ const Workflows2 = (props) => {
                                         minWidth: "25%",
                                         height: 43,
                                         maxHeight: "fit-content",
-                                        backgroundColor: "#212121",
-                                        zIndex: 1000,
+                                            backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                                            zIndex: 1000,
+                                        color: theme.palette.textFieldStyle.color
                                     }}
                                     disabled={currTab === 2}
                                     InputProps={{
                                         style: {
-                                            color: "white",
                                             height: "fit-content",
                                             maxHeight: "fit-content",
-                                            backgroundColor: "#212121",
+                                            backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                                            color: theme.palette.textFieldStyle.color
                                         },
                                         placeholder: "Filter Workflows",
                                         // endAdornment: (
@@ -4368,7 +4486,8 @@ const Workflows2 = (props) => {
                                         '& .MuiOutlinedInput-root': {
                                             height: "fit-content",
                                             borderRadius: '4px',
-                                            backgroundColor: '#212121',
+                                            color: theme.palette.textFieldStyle.color,
+                                            backgroundColor: theme.palette.textFieldStyle.backgroundColor,
                                             '& fieldset': {
                                                 borderColor: 'rgba(255, 255, 255, 0.23)',
                                             },
@@ -4382,10 +4501,12 @@ const Workflows2 = (props) => {
                                             display: 'flex',
                                             flexWrap: 'wrap',
                                             gap: '4px',
+                                            fontSize: 18,
                                             padding: '4px 8px',
                                             alignItems: 'center',
                                             height: "fit-content", // Match height
-                                            backgroundColor: "#212121",
+                                            backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                                            color: theme.palette.textFieldStyle.color
                                         },
 
                                         // Rest of the styling remains the same...
@@ -4433,8 +4554,9 @@ const Workflows2 = (props) => {
                                             maxWidth: "25%",
                                             height: 47,
                                             borderRadius: 4,
-                                            backgroundColor: "#212121",
-                                            fontFamily: theme?.typography?.fontFamily
+                                            fontSize: 18,
+                                            backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+                                            fontFamily: theme.typography?.fontFamily,
                                         }}
                                         sx={{
                                             '& .MuiOutlinedInput-root': {
@@ -4469,12 +4591,12 @@ const Workflows2 = (props) => {
                                                             removeFilter(filters.indexOf(usecase?.name.toLowerCase()))
                                                         }
                                                     }}
-                                                    style={{
+                                                    sx={{
                                                         padding: "12px 16px",
                                                         borderBottom: index === usecases.length - 2 ? "none" : "1px solid rgba(255,255,255,0.05)",
                                                         "&:hover": {
                                                             backgroundColor: "rgba(255,255,255,0.1)"
-                                                        }
+                                                        },
                                                     }}
                                                 >
                                                     <div style={{
@@ -4488,7 +4610,7 @@ const Workflows2 = (props) => {
                                                             style={{
                                                                 padding: 0,
                                                                 marginRight: 8,
-                                                                color: "rgba(255,255,255,0.7)"
+                                                                color: theme.palette.textFieldStyle.color,
                                                             }}
                                                         />
                                                         <div style={{
@@ -4500,7 +4622,7 @@ const Workflows2 = (props) => {
                                                             <Typography
                                                                 variant="body1"
                                                                 style={{
-                                                                    color: "rgba(255,255,255,0.9)",
+                                                                    color: theme.palette.textFieldStyle.color,
                                                                     fontWeight: selectedCategory.includes(category) ? 500 : 400
                                                                 }}
                                                             >
@@ -4509,8 +4631,8 @@ const Workflows2 = (props) => {
                                                             <Typography
                                                                 variant="body2"
                                                                 style={{
-                                                                    color: "rgba(255,255,255,0.5)",
-                                                                    backgroundColor: "rgba(255,255,255,0.1)",
+                                                                    color: theme.palette.textFieldStyle.color,
+                                                                    backgroundColor: theme.palette.textFieldStyle.backgroundColor,
                                                                     padding: "2px 8px",
                                                                     borderRadius: "12px",
                                                                     fontSize: "0.75rem"
@@ -4548,23 +4670,27 @@ const Workflows2 = (props) => {
                                             onClick={() => navigate("/workflows/debug")}
                                             disabled={currTab === 2}
                                         >
-                                            <QueryStatsIcon style={{ color: currTab === 2 ? "rgba(241, 241, 241, 0.5)" : "#F1F1F1" }} />
+                                            <QueryStatsIcon style={{ color: theme.palette.text.primary, opacity: currTab === 2 ? 0.5 : 1 }} />
                                         </IconButton>
                                     </Tooltip>
 
-                                    <Tooltip title={view === "grid" ? "List view" : "Grid view"} placement="top">
+                                    <Tooltip title={view === "grid" ? "List view (Org Workflows only)" : "Grid view"} placement="top">
                                         <IconButton
                                             style={currTab === 2 ? iconButtonDisabledStyle : iconButtonStyle}
                                             onClick={() => {
                                                 const newView = view === "grid" ? "list" : "grid";
                                                 localStorage.setItem("workflowView", newView);
                                                 setView(newView);
+
+												if (view === "grid") {
+													setCurrTab(0)
+												}
                                             }}
                                             disabled={currTab === 2}
                                         >
                                             {view === "grid" ?
-                                                <ListIcon style={{ color: currTab === 2 ? "rgba(255, 255, 255, 0.5)" : "white" }} /> :
-                                                <GridOnIcon style={{ color: currTab === 2 ? "rgba(255, 255, 255, 0.5)" : "white" }} />
+                                                <ListIcon style={{ color: theme.palette.text.primary, opacity: currTab === 2 ? 0.5 : 1 }} /> :
+                                                <GridOnIcon style={{ color: theme.palette.text.primary, opacity: currTab === 2 ? 0.5 : 1 }} />
                                             }
                                         </IconButton>
                                     </Tooltip>
@@ -4577,7 +4703,7 @@ const Workflows2 = (props) => {
                                         >
                                             {submitLoading ?
                                                 <CircularProgress color="secondary" /> :
-                                                <PublishIcon style={{ color: currTab === 2 ? "rgba(255, 255, 255, 0.5)" : "white" }} />
+                                                <PublishIcon style={{ color: theme.palette.text.primary, opacity: currTab === 2 ? 0.5 : 1}} />
                                             }
                                         </IconButton>
                                     </Tooltip>
@@ -4596,7 +4722,7 @@ const Workflows2 = (props) => {
                                             disabled={isCloud || currTab === 2}
                                             onClick={() => exportAllWorkflows(workflows)}
                                         >
-                                            <GetAppIcon style={{ color: (isCloud || currTab === 2) ? "rgba(255, 255, 255, 0.5)" : "white" }} />
+                                            <GetAppIcon style={{ color: theme.palette.text.primary, opacity: currTab === 2 ? 0.5 : 1}} />
                                         </IconButton>
                                     </Tooltip>
                                 </div>
@@ -4604,17 +4730,16 @@ const Workflows2 = (props) => {
                                     variant="contained"
                                     color="primary"
                                     onClick={handleCreateWorkflow}
+                                    id="create_workflow_button"
                                     style={{
                                         borderRadius: 4,
                                         flex: 0.8,
                                         textTransform: 'none',
-                                        backgroundColor: "#FF8544",
-                                        color: "#1A1A1A",
-                                        fontFamily: theme?.typography?.fontFamily,
+                                        fontFamily: theme.typography?.fontFamily,
                                         fontSize: 16,
                                         fontWeight: 500
                                     }}
-                                    startIcon={<Add style={{ color: "#1A1A1A" }} />}
+                                    startIcon={<Add/>}
                                 >
                                     Create Workflow
                                 </Button>
@@ -4645,9 +4770,33 @@ const Workflows2 = (props) => {
                                                 paddingBottom: 40
                                             }}>
 
+                                                {currTab !== 0 ? null :
+														orgWorkflows.length === 0 ? 
+														<Typography variant="h6" style={{margin: "auto", minWidth: 500, }} >
+															No workflows found in this org with the Org ID filter. If this is an error, please click the "List View" button at the top to see ALL available workflows ({workflows.length}). 
+														</Typography> :
+													orgWorkflows.map((data, index) => {
+														// Shouldn't be a part of this list
+														if (data.public === true) {
+															return null
+														}
 
+														// if (firstLoad) {
+														//     workflowDelay += 75
+														// } else {
+														//     return <WorkflowPaper key={index} data={data} />
+														// }
 
-                                                {currTab === 0 && orgWorkflows.map((data, index) => {
+														return (
+															<span key={index}>
+																{/*<Zoom key={index} in={true} style={{ transitionDelay: `${workflowDelay}ms` }}>*/}
+																<WorkflowPaper data={data} />
+																{/*</Zoom>*/}
+															</span>
+														)
+                                                })}
+
+                                                {currTab === 3 && backupWorkflows.map((data, index) => {
                                                     // Shouldn't be a part of this list
                                                     if (data.public === true) {
                                                         return null
@@ -4669,24 +4818,29 @@ const Workflows2 = (props) => {
                                                 })}
 
                                                 {
-                                                    currTab === 1 && myWorkflows.map((data, index) => {
-                                                        if (data.public === true) {
-                                                            return null
-                                                        }
+                                                    currTab !== 1 ? null :
+														myWorkflows.length === 0 ? 
+														<Typography variant="h6" style={{margin: "auto", width: 500, }} >
+															No workflows found in this org for your user. 
+														</Typography> :
+														myWorkflows.map((data, index) => {
+															if (data.public === true) {
+																return null
+															}
 
-                                                        // if (firstLoad) {
-                                                        //     workflowDelay += 75
-                                                        // } else {
-                                                        //     return <WorkflowPaper key={index} data={data} />
-                                                        // }
+															// if (firstLoad) {
+															//     workflowDelay += 75
+															// } else {
+															//     return <WorkflowPaper key={index} data={data} />
+															// }
 
-                                                        return (
-                                                            <span key={index}>
-                                                                {/*<Zoom key={index} in={true} style={{ transitionDelay: `${workflowDelay}ms` }}>*/}
-                                                                <WorkflowPaper data={data} />
-                                                                {/*</Zoom>*/}
-                                                            </span>
-                                                        )
+															return (
+																<span key={index}>
+																	{/*<Zoom key={index} in={true} style={{ transitionDelay: `${workflowDelay}ms` }}>*/}
+																	<WorkflowPaper data={data} />
+																	{/*</Zoom>*/}
+																</span>
+															)
                                                     })
                                                 }
                                             </div>
@@ -5048,8 +5202,9 @@ const Workflows2 = (props) => {
             </iframe>
         </Dialog>
 
+    //isLoaded && isLoggedIn && workflowDone ? (
     const loadedCheck =
-        isLoaded && isLoggedIn && workflowDone ? (
+        workflowDone && isLoaded ? (
             <div>
                 {/*
 				<ShepherdTour steps={newSteps} tourOptions={tourOptions}>
@@ -5112,12 +5267,20 @@ const Workflows2 = (props) => {
                 }}
             >
                 <CircularProgress />
-                <Typography>Loading Workflows</Typography>
+                <Typography style={{marginTop: 5, }}>
+					Loading Workflows and Apps
+				</Typography>
             </div>
         );
 
+    const safariStyle = {
+        transform: 'scale(0.7)',
+        transformOrigin: 'top',
+        width: '100%',
+        height: '100%',
+    }
     // Maybe use gridview or something, idk
-    return <div style={{zoom: 0.7, }}>{loadedCheck}</div>;
+    return <div style={isSafari ? safariStyle : {zoom: 0.7, minHeight: "80vh",}}>{loadedCheck}</div>;
 };
 
 
diff --git a/functions/extensions/aws-s3-lambda/README.md b/functions/extensions/aws-s3-lambda/README.md
deleted file mode 100644
index f665851a..00000000
--- a/functions/extensions/aws-s3-lambda/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# AWS Lambda forwarder to Shuffle
-This function is made to forward S3 notifications to Shuffle to run a workflow when an object is made or updated. 
diff --git a/functions/extensions/aws-s3-lambda/s3_function.py b/functions/extensions/aws-s3-lambda/s3_function.py
deleted file mode 100644
index d83d6154..00000000
--- a/functions/extensions/aws-s3-lambda/s3_function.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import json
-import urllib.parse
-import urllib3 
-import os
-
-print('Loading function')
-
-def lambda_handler(event, context):
-    # Get the object from the event and show its content type
-    bucket = event['Records'][0]['s3']['bucket']['name']
-    
-    webhook = os.environ.get("SHUFFLE_WEBHOOK")
-    if not webhook:
-        return "No webhook environment defined: SHUFFLE_WEBHOOK"
-        
-    http = urllib3.PoolManager()
-    ret = http.request('POST', webhook, body=json.dumps(event["Records"][0]).encode("utf-8"))
-    if ret.status != 200:
-        return "Bad status code for webhook: %d" % ret.status
-        
-    print("Status code: %d\nData: %s" % (ret.status, ret.data))
-    return "Successfully started with data %s" % ret.data
diff --git a/functions/extensions/cortex-responders/Shuffle/requirements.txt b/functions/extensions/cortex-responders/Shuffle/requirements.txt
deleted file mode 100755
index 6aabc3cf..00000000
--- a/functions/extensions/cortex-responders/Shuffle/requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-cortexutils
-requests
diff --git a/functions/extensions/cortex-responders/Shuffle/shuffle.json b/functions/extensions/cortex-responders/Shuffle/shuffle.json
deleted file mode 100755
index db755b49..00000000
--- a/functions/extensions/cortex-responders/Shuffle/shuffle.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "name": "Shuffle",
-  "version": "1.0",
-  "author": "@frikkylikeme",
-  "url": "https://github.com/frikky/shuffle",
-  "license": "AGPL-V3",
-  "description": "Execute a workflow in Shuffle",
-  "dataTypeList": ["thehive:case", "thehive:alert", "thehive:case_artifact"],
-  "command": "Shuffle/shuffle.py",
-  "baseConfig": "Shuffle",
-  "configurationItems": [
-    {
-      "name": "url",
-      "description": "The URL to your shuffle instance",
-      "type": "string",
-      "multi": false,
-      "required": true,
-      "defaultValue": "https://shuffler.io"
-    },
-		{
-      "name": "api_key",
-      "description": "The API key to your Shuffle user",
-      "type": "string",
-      "multi": false,
-      "required": true
-    },
-    {
-      "name": "verifyssl",
-      "description": "Verify SSL certificate",
-      "type": "boolean",
-      "multi": false,
-      "required": true,
-      "defaultValue": true
-    },
-    {
-      "name": "workflow_id",
-      "description": "The ID of the workflow to execute",
-      "type": "string",
-      "multi": false,
-      "required": true
-    }
-  ]
-}
diff --git a/functions/extensions/cortex-responders/Shuffle/shuffle.py b/functions/extensions/cortex-responders/Shuffle/shuffle.py
deleted file mode 100755
index db343230..00000000
--- a/functions/extensions/cortex-responders/Shuffle/shuffle.py
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env python3
-#encoding: utf-8
-
-from cortexutils.responder import Responder
-import requests
-
-class Shuffle(Responder):
-   def __init__(self):
-      Responder.__init__(self)
-      self.api_key = self.get_param("config.api_key", "")
-      self.url = self.get_param("config.url", "")
-      self.workflow_id = self.get_param("config.workflow_id", "")
-      self.verify = self.get_param('config.verifyssl', True, None)
-
-   def run(self):
-      Responder.run(self)
-      parsed_url = "%s/api/v1/workflows/%s/execute" % (self.url, self.workflow_id)
-      headers = {
-         "Authorization": "Bearer %s"  % self.api_key,
-         "User-Agent": "Cortex-Analyzer"
-      }
-      requests.post(parsed_url, headers=headers,verify=self.verify)
-
-      self.report({'message': 'message sent'})
-
-if __name__ == '__main__':
-    Shuffle().run()
diff --git a/functions/extensions/cortex-responders/Shuffle_Webhook/requirements.txt b/functions/extensions/cortex-responders/Shuffle_Webhook/requirements.txt
deleted file mode 100755
index 6aabc3cf..00000000
--- a/functions/extensions/cortex-responders/Shuffle_Webhook/requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-cortexutils
-requests
diff --git a/functions/extensions/cortex-responders/Shuffle_Webhook/shuffle_webhook.json b/functions/extensions/cortex-responders/Shuffle_Webhook/shuffle_webhook.json
deleted file mode 100755
index a6d3e9d8..00000000
--- a/functions/extensions/cortex-responders/Shuffle_Webhook/shuffle_webhook.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "name": "Shuffle_webhook",
-  "version": "1.0",
-  "author": "@azgaviperr",
-  "url": "https://github.com/frikky/shuffle",
-  "license": "AGPL-V3",
-  "description": "Execute a webhook in Shuffle",
-  "dataTypeList": ["thehive:case", "thehive:alert", "thehive:case_artifact"],
-  "command": "Shuffle_Webhook/shuffle_webhook.py",
-  "baseConfig": "Shuffle_Webhook",
-  "configurationItems": [
-    {
-      "name": "webhook_url",
-      "description": "The URL to your shuffle instance",
-      "type": "string",
-      "multi": false,
-      "required": true
-    },
-		{
-      "name": "verifyssl",
-      "description": "Verify SSL certificate",
-      "type": "boolean",
-      "multi": false,
-      "required": true,
-      "defaultValue": true
-    }
-  ]
-}
diff --git a/functions/extensions/cortex-responders/Shuffle_Webhook/shuffle_webhook.py b/functions/extensions/cortex-responders/Shuffle_Webhook/shuffle_webhook.py
deleted file mode 100755
index daed501c..00000000
--- a/functions/extensions/cortex-responders/Shuffle_Webhook/shuffle_webhook.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env python3
-#encoding: utf-8
-
-from cortexutils.responder import Responder
-import requests
-
-class Shuffle(Responder):
-   def __init__(self):
-      Responder.__init__(self)
-      self.api_key = self.get_param("config.api_key", "")
-      self.webhook_url = self.get_param("config.webhook_url", "")
-      self.webhook_id = self.get_param("config.webhook_id", "")
-      self.verify = self.get_param('config.verifyssl', True, None)
-      self.data = self.get_param('data')
-
-   def run(self):
-      Responder.run(self)
-      headers = {
-         "Content-Type": "application/json",
-         "Accept": "application/json",
-         "User-Agent": "Cortex-Analyzer"
-      }
-      requests.post(self.webhook_url, headers=headers,verify=self.verify, json=self.data)
-
-      self.report({'message': 'message sent'})
-
-if __name__ == '__main__':
-    Shuffle().run()
diff --git a/functions/extensions/elasticsearch/run.sh b/functions/extensions/elasticsearch/run.sh
deleted file mode 100755
index 666b1d95..00000000
--- a/functions/extensions/elasticsearch/run.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#docker run -d -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" -e ELASTICSEARCH_USERNAME=frikky -e ELASTICSEARCH_PASSWORD=likeme -e xpack.security.enabled=true docker.elastic.co/elasticsearch/elasticsearch:7.12.1 
-#docker run -d -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" docker.elastic.co/elasticsearch/elasticsearch:7.12.1 
-#
-#
-#
-#echo "\nWaiting for 1.5 minute, then adding data"
-#sleep 90
-#echo "\nSlept 90 seconds: ADDING DATA"
-#curl -XPOST http://localhost:9200/_security/user/frikky -H "Content-Type: application/json" -d '{"enabled": true, "email": "frikky@shuffler.io"}'
-
-#curl -XPOST -u frikky:likeme http://localhost:9200/samples/_doc -H "Content-Type: application/json" -d '{"src": "122.14.137.67", "dst": "103.35.191.16", "message": "alert", "md5": "CAEF973033E593C625FB2AA34F7026DC", "sha256": "DB1AEC5222075800EDA75D7205267569679B424E5C58A28102417F46D3B5790D", "hits": 0}'
-#echo
-#curl -XPOST -u frikky:likeme http://localhost:9200/samples/_doc -H "Content-Type: application/json" -d '{"src": "134.119.219.71", "dst": "103.35.191.41", "message": "alert", "md5": "9498FF82A64FF445398C8426ED63EA5B", "sha256": "8B2E701E91101955C73865589A4C72999AEABC11043F712E05FDB1C17C4AB19A", "hits": 0}'
-#
-#echo
-#curl -XPOST -u frikky:likeme http://localhost:9200/samples2/_doc -H "Content-Type: application/json" -d '{"src": "122.14.137.67", "dst": "103.35.191.16", "message": "alert", "md5": "CAEF973033E593C625FB2AA34F7026DC", "sha256": "DB1AEC5222075800EDA75D7205267569679B424E5C58A28102417F46D3B5790D"}'
-#echo
-#curl -XPOST -u frikky:likeme http://localhost:9200/samples2/_doc -H "Content-Type: application/json" -d '{"src": "134.119.219.71", "dst": "103.35.191.41", "message": "alert", "md5": "9498FF82A64FF445398C8426ED63EA5B", "sha256": "8B2E701E91101955C73865589A4C72999AEABC11043F712E05FDB1C17C4AB19A"}'
-#echo
diff --git a/functions/extensions/k8s/shuffle/.helmignore b/functions/extensions/k8s/shuffle/.helmignore
deleted file mode 100755
index 0e8a0eb3..00000000
--- a/functions/extensions/k8s/shuffle/.helmignore
+++ /dev/null
@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/functions/extensions/k8s/shuffle/Chart.yaml b/functions/extensions/k8s/shuffle/Chart.yaml
deleted file mode 100755
index bd42981f..00000000
--- a/functions/extensions/k8s/shuffle/Chart.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-apiVersion: v2
-name: shuffle
-description: A Helm chart for Kubernetes
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
-appVersion: "1.16.0"
diff --git a/functions/extensions/k8s/shuffle/templates/NOTES.txt b/functions/extensions/k8s/shuffle/templates/NOTES.txt
deleted file mode 100755
index eaba4460..00000000
--- a/functions/extensions/k8s/shuffle/templates/NOTES.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range $host := .Values.ingress.hosts }}
-  {{- range .paths }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
-  {{- end }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "shuffle.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "shuffle.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "shuffle.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "shuffle.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
-{{- end }}
diff --git a/functions/extensions/k8s/shuffle/templates/_helpers.tpl b/functions/extensions/k8s/shuffle/templates/_helpers.tpl
deleted file mode 100755
index 66efef07..00000000
--- a/functions/extensions/k8s/shuffle/templates/_helpers.tpl
+++ /dev/null
@@ -1,62 +0,0 @@
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "shuffle.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "shuffle.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "shuffle.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "shuffle.labels" -}}
-helm.sh/chart: {{ include "shuffle.chart" . }}
-{{ include "shuffle.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "shuffle.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "shuffle.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "shuffle.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "shuffle.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
diff --git a/functions/extensions/k8s/shuffle/templates/deployment.yaml b/functions/extensions/k8s/shuffle/templates/deployment.yaml
deleted file mode 100755
index f2050d82..00000000
--- a/functions/extensions/k8s/shuffle/templates/deployment.yaml
+++ /dev/null
@@ -1,253 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ .Values.name }}frontend
-  namespace: {{ .Values.namespace | quote }}
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      service: shuffle
-      app: shuffle-frontend
-  template:
-    metadata:
-      labels:
-        service: shuffle
-        app: shuffle-frontend
-    spec:
-      containers:
-        - name: shuffle-frontend
-          image: ghcr.io/frikky/shuffle-frontend:nightly
-          imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
-          env:
-            - name: BACKEND_HOSTNAME
-              value: backend-service
-            - name: TZ
-              value: Asia/Shanghai
-          ports:
-            - name: http
-              containerPort: 80
-              hostPort: 3001
-            - name: https
-              containerPort: 443
-      hostname: shuffle-frontend
-      restartPolicy: Always
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ .Values.name }}backend
-  namespace: {{ .Values.namespace | quote }}
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      service: shuffle
-      app: shuffle-backend
-  template:
-    metadata:
-      labels:
-        service: shuffle
-        app: shuffle-backend
-    spec:
-      containers:
-        - name: shuffle-backend
-          image: ghcr.io/frikky/shuffle-backend:nightly
-          env:
-            - name: BACKEND_HOSTNAME
-              value: "backend-service"
-            - name: BACKEND_PORT
-              value: "5001"
-            - name: ENVIRONMENT_NAME
-              value: "Shuffle"
-            - name: HTTPS_PROXY
-            - name: HTTP_PROXY
-            - name: ORG_ID
-              value: "Shuffle"
-            - name: OUTER_HOSTNAME
-              value: "backend-service"
-            - name: SHUFFLE_APP_FORCE_UPDATE
-              value: "false"
-            - name: SHUFFLE_APP_HOTLOAD_FOLDER
-              value: "/shuffle-apps"
-            - name: SHUFFLE_APP_HOTLOAD_LOCATION
-              value: "/shuffle-apps"
-            - name: SHUFFLE_CONTAINER_AUTO_CLEANUP
-              value: "false"
-            - name: SHUFFLE_DEFAULT_APIKEY
-            - name: SHUFFLE_DEFAULT_PASSWORD
-            - name: SHUFFLE_DEFAULT_USERNAME
-            - name: SHUFFLE_DOWNLOAD_AUTH_BRANCH
-            - name: SHUFFLE_DOWNLOAD_AUTH_PASSWORD
-            - name: SHUFFLE_DOWNLOAD_AUTH_USERNAME
-            - name: SHUFFLE_DOWNLOAD_WORKFLOW_BRANCH
-            - name: SHUFFLE_DOWNLOAD_WORKFLOW_LOCATION
-            - name: SHUFFLE_DOWNLOAD_WORKFLOW_PASSWORD
-            - name: SHUFFLE_DOWNLOAD_WORKFLOW_USERNAME
-            - name: SHUFFLE_ELASTIC
-              value: "true"
-            - name: SHUFFLE_OPENSEARCH_APIKEY
-            - name: SHUFFLE_OPENSEARCH_CERTIFICATE_FILE
-            - name: SHUFFLE_OPENSEARCH_CLOUDID
-            - name: SHUFFLE_OPENSEARCH_PASSWORD
-            - name: SHUFFLE_OPENSEARCH_PROXY
-            - name: SHUFFLE_OPENSEARCH_SKIPSSL_VERIFY
-              value: "true"
-            - name: SHUFFLE_OPENSEARCH_URL
-              value: http://opensearch-service:9200
-            - name: SHUFFLE_OPENSEARCH_USERNAME
-              value: ""
-            - name: SHUFFLE_PASS_APP_PROXY
-              value: "FALSE"
-            - name: SHUFFLE_PASS_WORKER_PROXY
-              value: "FALSE"
-          volumeMounts:
-            - mountPath: /var/run/docker.sock
-              name: docker-sock
-            - mountPath: /shuffle-apps
-              name: shuffle-app-hotload-location
-            - mountPath: /shuffle-files
-              name: shuffle-file-location
-      hostname: shuffle-backend
-      volumes:
-        - name: docker-sock
-          hostPath:
-            path: /var/run/docker.sock
-        - name: shuffle-app-hotload-location
-          hostPath:
-            path: /data/kubernetes/shuffle-apps
-            type: DirectoryOrCreate
-        - name: shuffle-file-location
-          hostPath:
-            path: /data/kubernetes/shuffle-files
-            type: DirectoryOrCreate
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ .Values.name }}orborus
-  namespace: {{ .Values.namespace | quote }}
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      service: shuffle
-      app: shuffle-orborus
-  template:
-    metadata:
-      labels:
-        service: shuffle
-        app: shuffle-orborus
-    spec:
-      containers:
-        - name: shuffle-orborus
-          image: ghcr.io/frikky/shuffle-orborus:nightly
-          env:
-            - name: RUNNING_MODE
-              value: kubernetes
-            - name: BASE_URL
-              value: http://backend-service:5001
-            - name: CLEANUP
-              value: "false"
-            - name: DOCKER_API_VERSION
-              value: "1.40"
-            - name: ENVIRONMENT_NAME
-              value: Shuffle
-            - name: HTTPS_PROXY
-            - name: HTTP_PROXY
-            - name: ORG_ID
-              value: Shuffle
-            - name: SHUFFLE_APP_SDK_VERSION
-              value: 0.8.97
-            - name: SHUFFLE_BASE_IMAGE_NAME
-              value: frikky
-            - name: SHUFFLE_BASE_IMAGE_REGISTRY
-              value: ghcr.io
-            - name: SHUFFLE_BASE_IMAGE_TAG_SUFFIX
-              value: "-0.8.80"
-            - name: SHUFFLE_ORBORUS_EXECUTION_TIMEOUT
-              value: "600"
-            - name: SHUFFLE_ORBORUS_EXECUTION_CONCURRENCY
-              value: "50"
-            - name: SHUFFLE_PASS_WORKER_PROXY
-              value: "TRUE"
-            - name: SHUFFLE_WORKER_VERSION
-              value: nightly
-            - name: TZ
-              value: Asia/Shanghai
-          volumeMounts:
-            - mountPath: /var/run/docker.sock
-              name: docker-sock
-      hostname: shuffle-orborus
-      volumes:
-        - name: docker-sock
-          hostPath:
-            path: /var/run/docker.sock
-#---
-#apiVersion: apps/v1
-#kind: Deployment
-#metadata:
-#  name: {{ .Values.name }}opensearch
-#  namespace: {{ .Values.namespace | quote }}
-#spec:
-#  replicas: 1
-#  selector:
-#    matchLabels:
-#      service: shuffle
-#      app: shuffle-opensearch
-#  template:
-#    metadata:
-#      labels:
-#        service: shuffle
-#        app: shuffle-opensearch
-#    spec:
-#      nodeSelector:
-#        node.bdlab-venus.com/opensearch: available
-#      initContainers:
-#        - name: permissions-fix
-#          image: frikky/busybox
-#          #volumeMounts:
-#          #  - name: opensearch-claim0
-#          #    mountPath: /usr/share/elasticsearch/data
-#          command: [ 'chown' ]
-#          args: [ '1000:1000', '/usr/share/elasticsearch/data' ]
-#      containers:
-#        - name: shuffle-opensearch
-#          image: opensearchproject/opensearch:1.0.1
-#          env:
-#            - name: TZ
-#              value: Asia/Shanghai
-#            - name: bootstrap.memory_lock
-#              value: "false"
-#            - name: OPENSEARCH_JAVA_OPTS
-#              value: "-Xms1024m -Xmx1024m"
-#            - name: opendistro_security.disabled
-#              value: "true"
-#            - name: cluster.routing.allocation.disk.threshold_enabled
-#              value: "false"
-#            - name: cluster.name
-#              value: shuffle-cluster
-#            - name: node.name
-#              value: opensearch-service
-#            - name: discovery.seed_hosts
-#              value: opensearch-service
-#            - name: cluster.initial_master_nodes
-#              value: opensearch-service
-      #    volumeMounts:
-      #      - mountPath: /usr/share/opensearch/data
-      #        name: opensearch-claim0
-      #volumes:
-      #  - name: opensearch-claim0
-      #    persistentVolumeClaim:
-      #      claimName: opensearch-claim0
-#          volumeMounts:
-#            - mountPath: /usr/share/opensearch/data
-#              readOnly: true
-#              name: db-location
-#      volumes:
-#        - name: db-location
-#          hostPath:
-#            path: /data/kubernetes/shuffle-opensearch
-#            type: DirectoryOrCreate
diff --git a/functions/extensions/k8s/shuffle/templates/hpa.yaml b/functions/extensions/k8s/shuffle/templates/hpa.yaml
deleted file mode 100755
index 49f84ca2..00000000
--- a/functions/extensions/k8s/shuffle/templates/hpa.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-{{- if .Values.autoscaling.enabled }}
-apiVersion: autoscaling/v2beta1
-kind: HorizontalPodAutoscaler
-metadata:
-  name: {{ include "shuffle.fullname" . }}
-  labels:
-    {{- include "shuffle.labels" . | nindent 4 }}
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: {{ include "shuffle.fullname" . }}
-  minReplicas: {{ .Values.autoscaling.minReplicas }}
-  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
-  metrics:
-    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: cpu
-        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
-    {{- end }}
-    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: memory
-        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    {{- end }}
-{{- end }}
diff --git a/functions/extensions/k8s/shuffle/templates/ingress.yaml b/functions/extensions/k8s/shuffle/templates/ingress.yaml
deleted file mode 100755
index e35d2ae0..00000000
--- a/functions/extensions/k8s/shuffle/templates/ingress.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "shuffle.fullname" . -}}
-{{- $svcPort := .Values.service.port -}}
-{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
-  {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
-  {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
-  {{- end }}
-{{- end }}
-{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1
-{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
-apiVersion: extensions/v1beta1
-{{- end }}
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    {{- include "shuffle.labels" . | nindent 4 }}
-  {{- with .Values.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
-  ingressClassName: {{ .Values.ingress.className }}
-  {{- end }}
-  {{- if .Values.ingress.tls }}
-  tls:
-    {{- range .Values.ingress.tls }}
-    - hosts:
-        {{- range .hosts }}
-        - {{ . | quote }}
-        {{- end }}
-      secretName: {{ .secretName }}
-    {{- end }}
-  {{- end }}
-  rules:
-    {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
-      http:
-        paths:
-          {{- range .paths }}
-          - path: {{ .path }}
-            {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
-            pathType: {{ .pathType }}
-            {{- end }}
-            backend:
-              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
-              service:
-                name: {{ $fullName }}
-                port:
-                  number: {{ $svcPort }}
-              {{- else }}
-              serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
-              {{- end }}
-          {{- end }}
-    {{- end }}
-{{- end }}
diff --git a/functions/extensions/k8s/shuffle/templates/persistent-volume.yaml b/functions/extensions/k8s/shuffle/templates/persistent-volume.yaml
deleted file mode 100755
index 934c68e2..00000000
--- a/functions/extensions/k8s/shuffle/templates/persistent-volume.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-#apiVersion: v1
-#kind: PersistentVolume
-#metadata:
-#  name: opensearch-claim0
-#  labels:
-#    app: opensearch-claim0
-#spec:
-#  capacity:
-#    storage: "10G"
-#  volumeMode: Filesystem
-#  persistentVolumeReclaimPolicy: Retain
-#  storageClassName: local-storage
-#  accessModes:
-#    - "ReadWriteOnce"
-#  local:
-#    path: "/data/kubernetes/shuffle-opensearch"
-#  nodeAffinity:
-#    required:
-#      nodeSelectorTerms:
-#        - matchExpressions:
-#            - key: node.dollar.com/opensearch
-#              operator: In
-#              values:
-#                - available
diff --git a/functions/extensions/k8s/shuffle/templates/persistentvolumeclaim.yaml b/functions/extensions/k8s/shuffle/templates/persistentvolumeclaim.yaml
deleted file mode 100755
index 7d1736a4..00000000
--- a/functions/extensions/k8s/shuffle/templates/persistentvolumeclaim.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-#apiVersion: v1
-#kind: PersistentVolumeClaim
-#metadata:
-#  name: opensearch-claim0
-#  namespace: {{ .Values.namespace }}
-#  labels:
-#    app: opensearch-claim0
-#spec:
-#  selector:
-#    matchLabels:
-#      app: opensearch-claim0
-#  accessModes:
-#    - ReadWriteOnce
-#  storageClassName: local-storage
-#  resources:
-#    requests:
-#      storage: 5Gi
diff --git a/functions/extensions/k8s/shuffle/templates/service.yaml b/functions/extensions/k8s/shuffle/templates/service.yaml
deleted file mode 100755
index 8fc78dfa..00000000
--- a/functions/extensions/k8s/shuffle/templates/service.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: backend-service
-  namespace: {{ .Values.namespace | quote }}
-spec:
-  ports:
-    - name: "5001"
-      port: 5001
-      targetPort: 5001
-  selector:
-    app: shuffle-backend
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: frontend-service
-  namespace: {{ .Values.namespace | quote }}
-spec:
-  type: NodePort
-  externalTrafficPolicy: Local
-  ports:
-    - name: "3001"
-      port: 3001
-      nodePort: 3001
-      targetPort: 80
-    - name: "3443"
-      port: 3443
-      nodePort: 3443 
-      targetPort: 443
-      protocol: TCP
-  selector:
-    app: shuffle-frontend
-
-#---
-#apiVersion: v1
-#kind: Service
-#metadata:
-#  name: opensearch-service
-#  namespace: {{ .Values.namespace | quote }}
-#spec:
-#  type: NodePort
-#  externalTrafficPolicy: Local
-#  ports:
-#    - name: "9200"
-#      port: 9200
-#      targetPort: 9200
-#      nodePort: 9200
-#      protocol: TCP
-#  selector:
-#    app: shuffle-opensearch
diff --git a/functions/extensions/k8s/shuffle/templates/serviceaccount.yaml b/functions/extensions/k8s/shuffle/templates/serviceaccount.yaml
deleted file mode 100755
index 11e9bdb7..00000000
--- a/functions/extensions/k8s/shuffle/templates/serviceaccount.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "shuffle.serviceAccountName" . }}
-  labels:
-    {{- include "shuffle.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}
diff --git a/functions/extensions/k8s/shuffle/templates/tests/test-connection.yaml b/functions/extensions/k8s/shuffle/templates/tests/test-connection.yaml
deleted file mode 100755
index e68f3142..00000000
--- a/functions/extensions/k8s/shuffle/templates/tests/test-connection.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: "{{ include "shuffle.fullname" . }}-test-connection"
-  labels:
-    {{- include "shuffle.labels" . | nindent 4 }}
-  annotations:
-    "helm.sh/hook": test
-spec:
-  containers:
-    - name: wget
-      image: busybox
-      command: ['wget']
-      args: ['{{ include "shuffle.fullname" . }}:{{ .Values.service.port }}']
-  restartPolicy: Never
diff --git a/functions/extensions/k8s/shuffle/values.yaml b/functions/extensions/k8s/shuffle/values.yaml
deleted file mode 100755
index 07e935c6..00000000
--- a/functions/extensions/k8s/shuffle/values.yaml
+++ /dev/null
@@ -1,82 +0,0 @@
-# Default values for shuffle.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
-image:
-  repository: nginx
-  pullPolicy: IfNotPresent
-  # Overrides the image tag whose default is the chart appVersion.
-  tag: ""
-
-imagePullSecrets: []
-nameOverride: ""
-fullnameOverride: ""
-
-serviceAccount:
-  # Specifies whether a service account should be created
-  create: true
-  # Annotations to add to the service account
-  annotations: {}
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: ""
-
-podAnnotations: {}
-
-podSecurityContext: {}
-  # fsGroup: 2000
-
-securityContext: {}
-  # capabilities:
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
-
-ingress:
-  enabled: false
-  className: ""
-  annotations: {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
-  hosts:
-    - host: chart-example.local
-      paths:
-        - path: /
-          pathType: ImplementationSpecific
-  tls: []
-  #  - secretName: chart-example-tls
-  #    hosts:
-  #      - chart-example.local
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
-autoscaling:
-  enabled: false
-  minReplicas: 1
-  maxReplicas: 100
-  targetCPUUtilizationPercentage: 80
-  # targetMemoryUtilizationPercentage: 80
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
diff --git a/functions/extensions/misp/Dockerfile b/functions/extensions/misp/Dockerfile
deleted file mode 100755
index f2b8ae3f..00000000
--- a/functions/extensions/misp/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-FROM python:3.9.4-alpine as base
-
-FROM base as builder 
-
-RUN mkdir /install
-WORKDIR /install
-
-FROM base
-RUN apk add g++
-
-COPY --from=builder /install /usr/local
-COPY requirements.txt /requirements.txt
-RUN pip3 install -r /requirements.txt
-
-
-RUN mkdir /app
-WORKDIR /app
-COPY requirements.txt /app/requirements.txt
-RUN python3 -m pip install -r /app/requirements.txt
-
-COPY sub.py /app/sub.py
-
-CMD ["python3", "sub.py"]
diff --git a/functions/extensions/misp/docker-compose.yml b/functions/extensions/misp/docker-compose.yml
deleted file mode 100755
index 5b0130c0..00000000
--- a/functions/extensions/misp/docker-compose.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-version: '3'
-services:
-  zmq:
-    image: ghcr.io/frikky/shuffle-zmq:latest
-    environment:
-      - ZMQ_HOSTNAME=localhost
-      - ZMQ_PORT=50000
-      - ZMQ_FORWARD_URL=https://shuffler.io/api/v1/hooks/webhook_e09bea36-9976-1421-82bc-b8764ca83c1e
-    restart: unless-stopped
diff --git a/functions/extensions/misp/requirements.txt b/functions/extensions/misp/requirements.txt
deleted file mode 100755
index a1cdf7dd..00000000
--- a/functions/extensions/misp/requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-pyzmq
-requests
diff --git a/functions/extensions/misp/sub.py b/functions/extensions/misp/sub.py
deleted file mode 100755
index feb78c08..00000000
--- a/functions/extensions/misp/sub.py
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-print("Running imports")
-import sys
-import zmq
-import json
-import time
-import pprint
-import os
-import sys
-import requests
-
-forward_url = os.getenv("ZMQ_FORWARD_URL", "")
-print("Checking forward url (ZMQ_FORWARD_URL): %s" % forward_url)
-def handle_hook(data):
-    ret = requests.post(forward_url, json=data)
-    print(ret.text)
-    print(ret.status_code)
-
-def main():
-    host = os.getenv("ZMQ_HOST", "localhost")
-    port = os.getenv("ZMQ_PORT", "50000")
-
-    if len(forward_url) == 0:
-        print("Failed to start - define ZMQ_FORWARD_URL for webhook forwarder")
-        exit(0)
-
-    print("Starting connection setup to %s:%s" % (host, port))
-    context = zmq.Context()
-    socket = context.socket(zmq.SUB)
-    socket.connect ("tcp://%s:%s" % (host, port))
-    socket.setsockopt(zmq.SUBSCRIBE, b'')
-    
-    poller = zmq.Poller()
-    poller.register(socket, zmq.POLLIN)
-    
-    print("Starting zmq check for %s:%s" % (host, port))
-    while True:
-        socks = dict(poller.poll(timeout=None))
-        if socket in socks and socks[socket] == zmq.POLLIN:
-            message = socket.recv()
-            #print(message)
-            topic, s, m = message.decode('utf-8').partition(" ")
-    
-            d = json.loads(m)
-            try:
-                # print test if you want status (heartbeat)
-                test = d["status"]
-            except KeyError:
-                handle_hook(d)
-    
-            time.sleep(1)
-
-if __name__ == "__main__":
-    print("In init ")
-    main()
diff --git a/functions/extensions/scripts/disable_disk_check.sh b/functions/extensions/scripts/disable_disk_check.sh
deleted file mode 100755
index cadda899..00000000
--- a/functions/extensions/scripts/disable_disk_check.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-curl -XPUT -u admin:admin https://localhost:9200/_cluster/settings -H "Content-Type:application/json" -k -d \
-'{
-	"transient": {
-		"cluster.routing.allocation.disk.threshold_enabled": false
-	}
-}'
-
-curl -XPUT -u admin:admin https://localhost:9200/_all/_settings -H "Content-Type: application/json" -k -d \
-'{
-	    "index.blocks.read_only_allow_delete": null
-}'
diff --git a/functions/extensions/swarm/.gitignore b/functions/extensions/swarm/.gitignore
deleted file mode 100644
index 9ce4a537..00000000
--- a/functions/extensions/swarm/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-shuffle-database/nodes
diff --git a/functions/extensions/swarm/docker-compose.yml b/functions/extensions/swarm/docker-compose.yml
deleted file mode 100644
index 57ea9b49..00000000
--- a/functions/extensions/swarm/docker-compose.yml
+++ /dev/null
@@ -1,131 +0,0 @@
-version: '3.4'
-services:
-  backend:
-    image: ghcr.io/frikky/shuffle-backend:nightly
-    #hostname: shuffle-backend
-    environment:
-      BACKEND_HOSTNAME: backend
-      OUTER_HOSTNAME: backend
-      BACKEND_PORT: '5001'
-      HTTPS_PROXY: ''
-      HTTP_PROXY: ''
-      SHUFFLE_APP_DOWNLOAD_LOCATION: https://github.com/frikky/shuffle-apps
-      SHUFFLE_APP_FORCE_UPDATE: 'false'
-      SHUFFLE_APP_HOTLOAD_FOLDER: /shuffle-apps
-      SHUFFLE_APP_HOTLOAD_LOCATION: ./shuffle-apps
-      DATASTORE_EMULATOR_HOST: "shuffle-database:8000"
-      DOCKER_API_VERSION: '1.40'
-      SHUFFLE_BASE_IMAGE_NAME: frikky
-      SHUFFLE_BASE_IMAGE_REGISTRY: ghcr.io
-      SHUFFLE_BASE_IMAGE_TAG_SUFFIX: '-0.9.30'
-      SHUFFLE_CONTAINER_AUTO_CLEANUP: 'true'
-      SHUFFLE_DEFAULT_APIKEY: ''
-      SHUFFLE_FILE_LOCATION: /shuffle-files
-      SHUFFLE_OPENSEARCH_APIKEY: ''
-      SHUFFLE_OPENSEARCH_CERTIFICATE_FILE: ''
-      SHUFFLE_OPENSEARCH_CLOUDID: ''
-      SHUFFLE_OPENSEARCH_PROXY: ''
-      SHUFFLE_OPENSEARCH_SKIPSSL_VERIFY: 'true'
-      SHUFFLE_OPENSEARCH_URL: http://opensearch:9200
-      SHUFFLE_PASS_APP_PROXY: 'FALSE'
-      SHUFFLE_PASS_WORKER_PROXY: 'TRUE'
-      SHUFFLE_ELASTIC: 'true'
-      #SHUFFLE_ENCRYPTION_MODIFIER:
-    ports:
-      - "5001:5001"
-    volumes:
-     - /var/run/docker.sock:/var/run/docker.sock
-     - ./shuffle-apps:/shuffle-apps
-     - ./shuffle-files:/shuffle-files
-    networks:
-     - shuffle_prod
-     #- reverseproxy
-    depends_on:
-     - opensearch 
-    logging:
-      driver: json-file
-  frontend:
-    image: ghcr.io/frikky/shuffle-frontend:nightly
-    healthcheck:
-      test: curl -fs http://localhost:80 || exit 1
-      interval: 30s
-      timeout: 5s
-      retries: 3
-    ports:
-      - "3001:80"
-      - "3443:443"
-    networks:
-      - shuffle_prod
-      #- reverseproxy
-    environment:
-      - "BACKEND_HOSTNAME=backend"
-    depends_on:
-      - backend
-    deploy:
-      update_config:
-        order: start-first           
-  opensearch:
-    image: opensearchproject/opensearch:1.1.0
-    healthcheck:
-      test: curl -fs http://localhost:9200/_cat/health || exit 1
-      interval: 30s
-      timeout: 5s
-      retries: 3
-    environment:
-      - bootstrap.memory_lock=false
-      - "OPENSEARCH_JAVA_OPTS=-Xms1024m -Xmx1024m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM
-      - plugins.security.disabled=true
-      - cluster.routing.allocation.disk.threshold_enabled=false
-      - cluster.name=shuffle-cluster
-      - node.name=opensearch
-      - discovery.seed_hosts=opensearch
-      - cluster.initial_master_nodes=opensearch
-      - node.store.allow_mmap=false
-    volumes:
-     - ./shuffle-database:/usr/share/opensearch/data:rw
-    networks:
-     - shuffle_prod
-     #- reverseproxy
-    logging:
-      driver: json-file
-      
-  orborus:
-    image: ghcr.io/frikky/shuffle-orborus:nightly
-    #hostname: shuffle-orborus 
-    environment:
-      #SHUFFLE_WORKER_VERSION: nightly
-      SHUFFLE_APP_SDK_VERSION: 0.8.97
-      SHUFFLE_WORKER_VERSION: nightly
-      BASE_URL: http://backend:5001
-      #BASE_URL: http://192.168.86.37:5001
-      CLEANUP: 'true'
-      DOCKER_API_VERSION: '1.40'
-      ENVIRONMENT_NAME: Shuffle
-      HTTPS_PROXY: ''
-      HTTP_PROXY: ''
-      ORG_ID: Shuffle
-      SHUFFLE_BASE_IMAGE_NAME: frikky
-      SHUFFLE_BASE_IMAGE_REGISTRY: ghcr.io
-      SHUFFLE_BASE_IMAGE_TAG_SUFFIX: -0.8.80
-      SHUFFLE_ORBORUS_EXECUTION_CONCURRENCY: '50'
-      SHUFFLE_ORBORUS_EXECUTION_TIMEOUT: '800'
-      SHUFFLE_PASS_APP_PROXY: 'FALSE'
-      SHUFFLE_PASS_WORKER_PROXY: 'TRUE'
-      SHUFFLE_SCALE_REPLICAS: 5
-      SHUFFLE_SWARM_NETWORK_NAME: shuffle_prod
-      SHUFFLE_SWARM_CONFIG: "run"
-    volumes:
-     - /var/run/docker.sock:/var/run/docker.sock
-    networks:
-     - shuffle_prod
-     #- reverseproxy
-    logging:
-      driver: json-file
-
-networks:
-  shuffle_prod:
-    driver: overlay
-    external: true
-  #reverseproxy:
-  #  driver: overlay
-  #  #external: true
diff --git a/functions/extensions/swarm/network.sh b/functions/extensions/swarm/network.sh
deleted file mode 100644
index f3a323ed..00000000
--- a/functions/extensions/swarm/network.sh
+++ /dev/null
@@ -1 +0,0 @@
-docker network create -d overlay shuffle_prod
diff --git a/functions/extensions/swarm/orborus.yml b/functions/extensions/swarm/orborus.yml
deleted file mode 100644
index fb90b10f..00000000
--- a/functions/extensions/swarm/orborus.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-version: '3.4'
-services:
-  orborus:
-      image: ghcr.io/frikky/shuffle-orborus:nightly
-      #hostname: shuffle-orborus 
-      environment:
-        #SHUFFLE_WORKER_VERSION: nightly
-        SHUFFLE_APP_SDK_VERSION: 0.8.97
-        SHUFFLE_WORKER_VERSION: nightly
-        BASE_URL: http://<BACKEND>:5001
-        #BASE_URL: http://192.168.86.37:5001
-        CLEANUP: 'true'
-        DOCKER_API_VERSION: '1.40'
-        ENVIRONMENT_NAME: Shuffle
-        HTTPS_PROXY: ''
-        HTTP_PROXY: ''
-        ORG_ID: Shuffle
-        SHUFFLE_BASE_IMAGE_NAME: frikky
-        SHUFFLE_BASE_IMAGE_REGISTRY: ghcr.io
-        SHUFFLE_BASE_IMAGE_TAG_SUFFIX: -0.8.80
-        SHUFFLE_ORBORUS_EXECUTION_CONCURRENCY: '50'
-        SHUFFLE_ORBORUS_EXECUTION_TIMEOUT: '800'
-        SHUFFLE_PASS_APP_PROXY: 'FALSE'
-        SHUFFLE_PASS_WORKER_PROXY: 'TRUE'
-        SHUFFLE_SCALE_REPLICAS: 5
-        SHUFFLE_SWARM_NETWORK_NAME: shuffle_prod
-        SHUFFLE_SWARM_CONFIG: "run"
-      volumes:
-       - /var/run/docker.sock:/var/run/docker.sock
-      networks:
-       - shuffle_prod
-       #- reverseproxy
-      logging:
-        driver: json-file
-
-networks:
-  shuffle_prod:
-    driver: overlay
-    external: true
diff --git a/functions/extensions/swarm/run.sh b/functions/extensions/swarm/run.sh
deleted file mode 100644
index faeadab8..00000000
--- a/functions/extensions/swarm/run.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-docker swarm init
-chown 1000:1000 -R shuffle-database/
-docker network create -d overlay shuffle_prod
-docker stack deploy --compose-file=docker-compose.yml shuffle_swarm
diff --git a/functions/extensions/swarm/run_orborus.sh b/functions/extensions/swarm/run_orborus.sh
deleted file mode 100644
index bcbd626f..00000000
--- a/functions/extensions/swarm/run_orborus.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-docker swarm init
-chown 1000:1000 -R shuffle-database/
-docker network create -d overlay shuffle_prod
-docker stack deploy --compose-file=orborus.yml shuffle_orborus
diff --git a/functions/extensions/swarm/shuffle-apps/tmp b/functions/extensions/swarm/shuffle-apps/tmp
deleted file mode 100644
index e69de29b..00000000
diff --git a/functions/extensions/swarm/shuffle-database/tmp b/functions/extensions/swarm/shuffle-database/tmp
deleted file mode 100644
index e69de29b..00000000
diff --git a/functions/extensions/swarm/shuffle-files/tmp b/functions/extensions/swarm/shuffle-files/tmp
deleted file mode 100644
index e69de29b..00000000
diff --git a/functions/extensions/swarm/stop.sh b/functions/extensions/swarm/stop.sh
deleted file mode 100644
index c516f348..00000000
--- a/functions/extensions/swarm/stop.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-docker stack rm shuffle_swarm
-
-# 
diff --git a/functions/extensions/wazuh/custom-shuffle b/functions/extensions/wazuh/custom-shuffle
deleted file mode 100755
index bd540414..00000000
--- a/functions/extensions/wazuh/custom-shuffle
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-# Created by Shuffle, AS. <frikky@shuffler.io>.
-
-WPYTHON_BIN="framework/python/bin/python3"
-
-SCRIPT_PATH_NAME="$0"
-
-DIR_NAME="$(cd $(dirname ${SCRIPT_PATH_NAME}); pwd -P)"
-SCRIPT_NAME="$(basename ${SCRIPT_PATH_NAME})"
-
-case ${DIR_NAME} in
-    */active-response/bin | */wodles*)
-        if [ -z "${WAZUH_PATH}" ]; then
-            WAZUH_PATH="$(cd ${DIR_NAME}/../..; pwd)"
-        fi
-
-        PYTHON_SCRIPT="${DIR_NAME}/${SCRIPT_NAME}.py"
-    ;;
-    */bin)
-        if [ -z "${WAZUH_PATH}" ]; then
-            WAZUH_PATH="$(cd ${DIR_NAME}/..; pwd)"
-        fi
-
-        PYTHON_SCRIPT="${WAZUH_PATH}/framework/scripts/${SCRIPT_NAME}.py"
-    ;;
-     */integrations)
-        if [ -z "${WAZUH_PATH}" ]; then
-            WAZUH_PATH="$(cd ${DIR_NAME}/..; pwd)"
-        fi
-
-        PYTHON_SCRIPT="${DIR_NAME}/${SCRIPT_NAME}.py"
-    ;;
-esac
-
-
-${WAZUH_PATH}/${WPYTHON_BIN} ${PYTHON_SCRIPT} "$@"
diff --git a/functions/extensions/wazuh/custom-shuffle.py b/functions/extensions/wazuh/custom-shuffle.py
deleted file mode 100755
index 8e555ea9..00000000
--- a/functions/extensions/wazuh/custom-shuffle.py
+++ /dev/null
@@ -1,206 +0,0 @@
-#!/usr/bin/env python3
-# Created by Shuffle, AS. <frikky@shuffler.io>.
-# Based on the Slack integration using Webhooks
-
-import json
-import sys
-import time
-import os
-
-try:
-    import requests
-    from requests.auth import HTTPBasicAuth
-except Exception as e:
-    print("No module 'requests' found. Install: pip install requests")
-    sys.exit(1)
-
-# ADD THIS TO ossec.conf configuration:
-#  <integration>
-#      <name>custom-shuffle</name>
-#      <hook_url>http://<IP>:3001/api/v1/hooks/<HOOK_ID></hook_url>
-#      <level>3</level>
-#      <alert_format>json</alert_format>
-#  </integration>
-
-# Global vars
-debug_enabled = False 
-pwd = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
-json_alert = {}
-now = time.strftime("%a %b %d %H:%M:%S %Z %Y")
-
-# Set paths
-log_file = '{0}/logs/integrations.log'.format(pwd)
-
-try:
-    with open("/tmp/shuffle_start.txt", "w+") as tmp:
-        tmp.write("Script started")
-except:
-    pass
-
-
-def main(args):
-    debug("# Starting")
-
-    # Read args
-    alert_file_location = args[1]
-    webhook = args[3]
-
-    debug("# Webhook")
-    debug(webhook)
-
-    debug("# File location")
-    debug(alert_file_location)
-
-    # Load alert. Parse JSON object.
-    try:
-        with open(alert_file_location) as alert_file:
-            json_alert = json.load(alert_file)
-    except:
-        debug("# Alert file %s doesn't exist" % alert_file_location)
-
-    debug("# Processing alert")
-    try:
-        debug(json_alert)
-    except Exception as e:
-        debug("Failed getting json_alert %s" % e)
-        sys.exit(1)
-
-    debug("# Generating message")
-    msg = generate_msg(json_alert)
-    if isinstance(msg, str):
-        if len(msg) == 0:
-            return
-    debug(msg)
-
-    debug("# Sending message")
-
-    try:
-        with open("/tmp/shuffle_end.txt", "w+") as tmp:
-            tmp.write("Script done pre-msg sending")
-    except:
-        pass
-
-
-    send_msg(msg, webhook)
-
-
-def debug(msg):
-    if debug_enabled:
-        msg = "{0}: {1}\n".format(now, msg)
-        print(msg)
-        f = open(log_file, "a")
-        f.write(msg)
-        f.close()
-
-# Skips container kills to stop self-recursion
-def filter_msg(alert):
-    # These are things that recursively happen because Shuffle starts Docker containers
-    skip = ["87924", "87900", "87901", "87902", "87903", "87904", "86001", "86002", "86003", "87932", "80710", "87929", "87928", "5710"]
-    if alert["rule"]["id"] in skip:
-        return False
-
-    #try:
-    #    if "docker" in alert["rule"]["description"].lower() and "
-    #msg['text'] = alert.get('full_log')
-    #except:
-    #    pass
-    #msg['title'] = alert['rule']['description'] if 'description' in alert['rule'] else "N/A"
-
-    return True
-
-def generate_msg(alert):
-    if not filter_msg(alert):
-        print("Skipping rule %s" % alert["rule"]["id"])
-        return ""
-
-    level = alert['rule']['level']
-
-    if (level <= 4):
-        severity = 1
-    elif (level >= 5 and level <= 7):
-        severity = 2
-    else:
-        severity = 3
-
-    msg = {}
-    msg['severity'] = severity 
-    msg['pretext'] = "WAZUH Alert"
-    msg['title'] = alert['rule']['description'] if 'description' in alert['rule'] else "N/A"
-    msg['text'] = alert.get('full_log')
-    msg['rule_id'] = alert["rule"]["id"]
-    msg['timestamp'] = alert["timestamp"]
-    msg['id'] = alert['id']
-    msg["all_fields"] = alert
-
-    #msg['fields'] = []
-    #    msg['fields'].append({
-    #        "title": "Agent",
-    #        "value": "({0}) - {1}".format(
-    #            alert['agent']['id'],
-    #            alert['agent']['name']
-    #        ),
-    #    })
-    #if 'agentless' in alert:
-    #    msg['fields'].append({
-    #        "title": "Agentless Host",
-    #        "value": alert['agentless']['host'],
-    #    })
-
-    #msg['fields'].append({"title": "Location", "value": alert['location']})
-    #msg['fields'].append({
-    #    "title": "Rule ID",
-    #    "value": "{0} _(Level {1})_".format(alert['rule']['id'], level),
-    #})
-
-    #attach = {'attachments': [msg]}
-
-    return json.dumps(msg)
-
-
-def send_msg(msg, url):
-    debug("# In send msg")
-    headers = {'content-type': 'application/json', 'Accept-Charset': 'UTF-8'}
-    res = requests.post(url, data=msg, headers=headers, verify=False)
-    debug("# After send msg: %s" % res)
-
-
-if __name__ == "__main__":
-    try:
-        # Read arguments
-        bad_arguments = False
-        if len(sys.argv) >= 4:
-            msg = '{0} {1} {2} {3} {4}'.format(
-                now,
-                sys.argv[1],
-                sys.argv[2],
-                sys.argv[3],
-                sys.argv[4] if len(sys.argv) > 4 else '',
-            )
-            #debug_enabled = (len(sys.argv) > 4 and sys.argv[4] == 'debug')
-            debug_enabled = True
-        else:
-            msg = '{0} Wrong arguments'.format(now)
-            bad_arguments = True
-
-        # Logging the call
-        try:
-            f = open(log_file, 'a')
-        except:
-            f = open(log_file, 'w+')
-            f.write("")
-            f.close()
-
-        f = open(log_file, 'a')
-        f.write(msg + '\n')
-        f.close()
-
-        if bad_arguments:
-            debug("# Exiting: Bad arguments. Inputted: %s" % sys.argv)
-            sys.exit(1)
-
-        # Main function
-        main(sys.argv)
-
-    except Exception as e:
-        debug(str(e))
-        raise
diff --git a/functions/extensions/wazuh/ossec.conf b/functions/extensions/wazuh/ossec.conf
deleted file mode 100755
index e87bc53d..00000000
--- a/functions/extensions/wazuh/ossec.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-<integration>
-  <name>custom-shuffle</name>
-  <level>9</level>
-  <hook_url>http://<IP>:<PORT>/api/v1/hooks/webhook_hookid</hook_url>
-  <alert_format>json</alert_format>
-</integration>
diff --git a/functions/kubernetes/charts/shuffle/Chart.yaml b/functions/kubernetes/charts/shuffle/Chart.yaml
index f11f1726..0a4e4fa3 100644
--- a/functions/kubernetes/charts/shuffle/Chart.yaml
+++ b/functions/kubernetes/charts/shuffle/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: shuffle
 description: A Helm chart for deploying Shuffle on Kubernetes
 type: application
-version: 0.0.0
-appVersion: 0.0.0
+version: 0.0.0 # Set during publishing in GitHub actions
+appVersion: nightly # Overwritten during publishing in GitHub actions
 dependencies:
   - name: common
     version: ^2.23.0
diff --git a/functions/kubernetes/charts/shuffle/README.md b/functions/kubernetes/charts/shuffle/README.md
index 495d2690..6c3a4ed2 100644
--- a/functions/kubernetes/charts/shuffle/README.md
+++ b/functions/kubernetes/charts/shuffle/README.md
@@ -18,7 +18,7 @@ SPDX-License-Identifier: APACHE-2.0
 
 ```sh
 # Install shuffle via helm (the shuffle namespace is hardcoded into the shuffle source code)
-helm install shuffle oci://ghcr.io/shuffle/shuffle/charts/shuffle --namespace shuffle --create-namespace
+helm install shuffle oci://ghcr.io/shuffle/charts/shuffle --namespace shuffle --create-namespace
 ```
 
 Make sure that no other application is deployed to the shuffle namespace, as shuffle deletes kubernetes resources in this namespace.
@@ -105,6 +105,15 @@ SHUFFLE_DEFAULT_APIKEY: "72E41083-A6F6-4A1B-8538-B06B577F47F0" # Shuffle uses uu
 SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier"
 ```
 
+## OpenSearch
+
+Shuffle uses OpenSearch as its database. This helm chart installs a single-node OpenSearch cluster using [the Bitnami Helm Chart](https://github.com/bitnami/charts/blob/main/bitnami/opensearch/values.yaml).
+You can customize the helm chart using the values of the Bitnami helm chart under the `opensearch` prefix (e.g. `opensearch.master.replicaCOunt`).
+
+Alternatively, you can disable the built-in OpenSearch installation using `opensearch.enabled=false`.
+Provide your own OpenSearch url and username with `backend.openSearch.url` and `backend.openSearch.username`.
+The password should be provided with the `SHUFFLE_OPENSEARCH_PASSWORD` env variable to the backend.
+
 ## Parameters
 
 ### Global parameters
@@ -148,6 +157,7 @@ SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier"
 | ----------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------- |
 | `backend.image.registry`                                    | backend image registry                                                                                                                                                                                                             | `ghcr.io`                                    |
 | `backend.image.repository`                                  | backend image repository                                                                                                                                                                                                           | `shuffle/shuffle-backend`                    |
+| `backend.image.tag`                                         | backend image tag (immutable tags are recommended, defaults to appVersion)                                                                                                                                                         | `""`                                         |
 | `backend.image.digest`                                      | backend image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended)                                                                                 | `""`                                         |
 | `backend.image.pullPolicy`                                  | backend image pull policy                                                                                                                                                                                                          | `IfNotPresent`                               |
 | `backend.image.pullSecrets`                                 | backend image pull secrets                                                                                                                                                                                                         | `[]`                                         |
@@ -184,8 +194,8 @@ SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier"
 | `backend.podSecurityContext.fsGroup`                        | Set fsGroup in backend pods' Security Context                                                                                                                                                                                      | `1001`                                       |
 | `backend.containerSecurityContext.enabled`                  | Enabled backend container' Security Context                                                                                                                                                                                        | `true`                                       |
 | `backend.containerSecurityContext.seLinuxOptions`           | Set SELinux options in backend container                                                                                                                                                                                           | `{}`                                         |
-| `backend.containerSecurityContext.runAsUser`                | Set runAsUser in backend container' Security Context                                                                                                                                                                               | `1000`                                       |
-| `backend.containerSecurityContext.runAsGroup`               | Set runAsGroup in backend container' Security Context                                                                                                                                                                              | `1000`                                       |
+| `backend.containerSecurityContext.runAsUser`                | Set runAsUser in backend container' Security Context                                                                                                                                                                               | `1001`                                       |
+| `backend.containerSecurityContext.runAsGroup`               | Set runAsGroup in backend container' Security Context                                                                                                                                                                              | `1001`                                       |
 | `backend.containerSecurityContext.runAsNonRoot`             | Set runAsNonRoot in backend container' Security Context                                                                                                                                                                            | `true`                                       |
 | `backend.containerSecurityContext.readOnlyRootFilesystem`   | Set readOnlyRootFilesystem in backend container' Security Context                                                                                                                                                                  | `true`                                       |
 | `backend.containerSecurityContext.privileged`               | Set privileged in backend container' Security Context                                                                                                                                                                              | `false`                                      |
@@ -196,9 +206,7 @@ SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier"
 | `backend.args`                                              | Override default backend container args (useful when using custom images)                                                                                                                                                          | `[]`                                         |
 | `backend.automountServiceAccountToken`                      | Mount Service Account token in backend pods                                                                                                                                                                                        | `true`                                       |
 | `backend.hostAliases`                                       | backend pods host aliases                                                                                                                                                                                                          | `[]`                                         |
-| `backend.daemonsetAnnotations`                              | Annotations for backend daemonset                                                                                                                                                                                                  | `{}`                                         |
 | `backend.deploymentAnnotations`                             | Annotations for backend deployment                                                                                                                                                                                                 | `{}`                                         |
-| `backend.statefulsetAnnotations`                            | Annotations for backend statefulset                                                                                                                                                                                                | `{}`                                         |
 | `backend.podLabels`                                         | Extra labels for backend pods                                                                                                                                                                                                      | `{}`                                         |
 | `backend.podAnnotations`                                    | Annotations for backend pods                                                                                                                                                                                                       | `{}`                                         |
 | `backend.podAffinityPreset`                                 | Pod affinity preset. Ignored if `backend.affinity` is set. Allowed values: `soft` or `hard`                                                                                                                                        | `""`                                         |
@@ -209,9 +217,7 @@ SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier"
 | `backend.affinity`                                          | Affinity for backend pods assignment                                                                                                                                                                                               | `{}`                                         |
 | `backend.nodeSelector`                                      | Node labels for backend pods assignment                                                                                                                                                                                            | `{}`                                         |
 | `backend.tolerations`                                       | Tolerations for backend pods assignment                                                                                                                                                                                            | `[]`                                         |
-| `backend.updateStrategy.type`                               | backend deployment strategy type                                                                                                                                                                                                   | `RollingUpdate`                              |
-| `backend.updateStrategy.type`                               | backend statefulset strategy type                                                                                                                                                                                                  | `RollingUpdate`                              |
-| `backend.podManagementPolicy`                               | Pod management policy for backend statefulset                                                                                                                                                                                      | `OrderedReady`                               |
+| `backend.updateStrategy.type`                               | backend deployment strategy type                                                                                                                                                                                                   | `Recreate`                                   |
 | `backend.priorityClassName`                                 | backend pods' priorityClassName                                                                                                                                                                                                    | `""`                                         |
 | `backend.topologySpreadConstraints`                         | Topology Spread Constraints for backend pod assignment spread across your cluster among failure-domains                                                                                                                            | `[]`                                         |
 | `backend.schedulerName`                                     | Name of the k8s scheduler (other than default) for backend pods                                                                                                                                                                    | `""`                                         |
@@ -238,6 +244,7 @@ SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier"
 | `backend.autoscaling.hpa.maxReplicas`                       | Maximum number of replicas                                                                                                                                                                                                         | `""`                                         |
 | `backend.autoscaling.hpa.targetCPU`                         | Target CPU utilization percentage                                                                                                                                                                                                  | `""`                                         |
 | `backend.autoscaling.hpa.targetMemory`                      | Target Memory utilization percentage                                                                                                                                                                                               | `""`                                         |
+| `backend.service.labels`                                    | Extra labels for backend service                                                                                                                                                                                                   | `{}`                                         |
 | `backend.serviceAccount.create`                             | Specifies whether a ServiceAccount should be created                                                                                                                                                                               | `true`                                       |
 | `backend.serviceAccount.name`                               | The name of the ServiceAccount to use.                                                                                                                                                                                             | `""`                                         |
 | `backend.serviceAccount.annotations`                        | Additional Service Account annotations (evaluated as a template)                                                                                                                                                                   | `{}`                                         |
@@ -265,6 +272,7 @@ SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier"
 | ------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------- |
 | `frontend.image.registry`                                    | frontend image registry                                                                                                                                                                                                               | `ghcr.io`                  |
 | `frontend.image.repository`                                  | frontend image repository                                                                                                                                                                                                             | `shuffle/shuffle-frontend` |
+| `frontend.image.tag`                                         | frontend image tag (immutable tags are recommended, defaults to appVersion)                                                                                                                                                           | `""`                       |
 | `frontend.image.digest`                                      | frontend image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended)                                                                                   | `""`                       |
 | `frontend.image.pullPolicy`                                  | frontend image pull policy                                                                                                                                                                                                            | `IfNotPresent`             |
 | `frontend.image.pullSecrets`                                 | frontend image pull secrets                                                                                                                                                                                                           | `[]`                       |
@@ -302,8 +310,8 @@ SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier"
 | `frontend.podSecurityContext.fsGroup`                        | Set fsGroup in frontend pods' Security Context                                                                                                                                                                                        | `1001`                     |
 | `frontend.containerSecurityContext.enabled`                  | Enabled frontend container' Security Context                                                                                                                                                                                          | `false`                    |
 | `frontend.containerSecurityContext.seLinuxOptions`           | Set SELinux options in frontend container                                                                                                                                                                                             | `{}`                       |
-| `frontend.containerSecurityContext.runAsUser`                | Set runAsUser in frontend container' Security Context                                                                                                                                                                                 | `101`                      |
-| `frontend.containerSecurityContext.runAsGroup`               | Set runAsGroup in frontend container' Security Context                                                                                                                                                                                | `101`                      |
+| `frontend.containerSecurityContext.runAsUser`                | Set runAsUser in frontend container' Security Context                                                                                                                                                                                 | `1001`                     |
+| `frontend.containerSecurityContext.runAsGroup`               | Set runAsGroup in frontend container' Security Context                                                                                                                                                                                | `1001`                     |
 | `frontend.containerSecurityContext.runAsNonRoot`             | Set runAsNonRoot in frontend container' Security Context                                                                                                                                                                              | `true`                     |
 | `frontend.containerSecurityContext.readOnlyRootFilesystem`   | Set readOnlyRootFilesystem in frontend container' Security Context                                                                                                                                                                    | `true`                     |
 | `frontend.containerSecurityContext.privileged`               | Set privileged in frontend container' Security Context                                                                                                                                                                                | `false`                    |
@@ -314,9 +322,7 @@ SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier"
 | `frontend.args`                                              | Override default frontend container args (useful when using custom images)                                                                                                                                                            | `[]`                       |
 | `frontend.automountServiceAccountToken`                      | Mount Service Account token in frontend pods                                                                                                                                                                                          | `false`                    |
 | `frontend.hostAliases`                                       | frontend pods host aliases                                                                                                                                                                                                            | `[]`                       |
-| `frontend.daemonsetAnnotations`                              | Annotations for frontend daemonset                                                                                                                                                                                                    | `{}`                       |
 | `frontend.deploymentAnnotations`                             | Annotations for frontend deployment                                                                                                                                                                                                   | `{}`                       |
-| `frontend.statefulsetAnnotations`                            | Annotations for frontend statefulset                                                                                                                                                                                                  | `{}`                       |
 | `frontend.podLabels`                                         | Extra labels for frontend pods                                                                                                                                                                                                        | `{}`                       |
 | `frontend.podAnnotations`                                    | Annotations for frontend pods                                                                                                                                                                                                         | `{}`                       |
 | `frontend.podAffinityPreset`                                 | Pod affinity preset. Ignored if `frontend.affinity` is set. Allowed values: `soft` or `hard`                                                                                                                                          | `""`                       |
@@ -328,8 +334,6 @@ SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier"
 | `frontend.nodeSelector`                                      | Node labels for frontend pods assignment                                                                                                                                                                                              | `{}`                       |
 | `frontend.tolerations`                                       | Tolerations for frontend pods assignment                                                                                                                                                                                              | `[]`                       |
 | `frontend.updateStrategy.type`                               | frontend deployment strategy type                                                                                                                                                                                                     | `RollingUpdate`            |
-| `frontend.updateStrategy.type`                               | frontend statefulset strategy type                                                                                                                                                                                                    | `RollingUpdate`            |
-| `frontend.podManagementPolicy`                               | Pod management policy for frontend statefulset                                                                                                                                                                                        | `OrderedReady`             |
 | `frontend.priorityClassName`                                 | frontend pods' priorityClassName                                                                                                                                                                                                      | `""`                       |
 | `frontend.topologySpreadConstraints`                         | Topology Spread Constraints for frontend pod assignment spread across your cluster among failure-domains                                                                                                                              | `[]`                       |
 | `frontend.schedulerName`                                     | Name of the k8s scheduler (other than default) for frontend pods                                                                                                                                                                      | `""`                       |
@@ -356,6 +360,7 @@ SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier"
 | `frontend.autoscaling.hpa.maxReplicas`                       | Maximum number of replicas                                                                                                                                                                                                            | `""`                       |
 | `frontend.autoscaling.hpa.targetCPU`                         | Target CPU utilization percentage                                                                                                                                                                                                     | `""`                       |
 | `frontend.autoscaling.hpa.targetMemory`                      | Target Memory utilization percentage                                                                                                                                                                                                  | `""`                       |
+| `frontend.service.labels`                                    | Extra labels for frontend service                                                                                                                                                                                                     | `{}`                       |
 | `frontend.serviceAccount.create`                             | Specifies whether a ServiceAccount should be created                                                                                                                                                                                  | `true`                     |
 | `frontend.serviceAccount.name`                               | The name of the ServiceAccount to use.                                                                                                                                                                                                | `""`                       |
 | `frontend.serviceAccount.annotations`                        | Additional Service Account annotations (evaluated as a template)                                                                                                                                                                      | `{}`                       |
@@ -373,11 +378,11 @@ SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier"
 | ----------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------- |
 | `orborus.image.registry`                                    | orborus image registry                                                                                                                                                                                                             | `ghcr.io`                 |
 | `orborus.image.repository`                                  | orborus image repository                                                                                                                                                                                                           | `shuffle/shuffle-orborus` |
+| `orborus.image.tag`                                         | orborus image tag (immutable tags are recommended, defaults to appVersion)                                                                                                                                                         | `""`                      |
 | `orborus.image.digest`                                      | orborus image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended)                                                                                 | `""`                      |
 | `orborus.image.pullPolicy`                                  | orborus image pull policy                                                                                                                                                                                                          | `IfNotPresent`            |
 | `orborus.image.pullSecrets`                                 | orborus image pull secrets                                                                                                                                                                                                         | `[]`                      |
 | `orborus.replicaCount`                                      | Number of orborus replicas to deploy                                                                                                                                                                                               | `1`                       |
-| `orborus.containerPorts.http`                               | orborus HTTP container port                                                                                                                                                                                                        | `8080`                    |
 | `orborus.extraContainerPorts`                               | Optionally specify extra list of additional ports for orborus containers                                                                                                                                                           | `[]`                      |
 | `orborus.livenessProbe.enabled`                             | Enable livenessProbe on orborus containers                                                                                                                                                                                         | `false`                   |
 | `orborus.livenessProbe.initialDelaySeconds`                 | Initial delay seconds for livenessProbe                                                                                                                                                                                            | `0`                       |
@@ -409,8 +414,8 @@ SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier"
 | `orborus.podSecurityContext.fsGroup`                        | Set fsGroup in orborus pods' Security Context                                                                                                                                                                                      | `1001`                    |
 | `orborus.containerSecurityContext.enabled`                  | Enabled orborus container' Security Context                                                                                                                                                                                        | `true`                    |
 | `orborus.containerSecurityContext.seLinuxOptions`           | Set SELinux options in orborus container                                                                                                                                                                                           | `{}`                      |
-| `orborus.containerSecurityContext.runAsUser`                | Set runAsUser in orborus container' Security Context                                                                                                                                                                               | `101`                     |
-| `orborus.containerSecurityContext.runAsGroup`               | Set runAsGroup in orborus container' Security Context                                                                                                                                                                              | `101`                     |
+| `orborus.containerSecurityContext.runAsUser`                | Set runAsUser in orborus container' Security Context                                                                                                                                                                               | `1001`                    |
+| `orborus.containerSecurityContext.runAsGroup`               | Set runAsGroup in orborus container' Security Context                                                                                                                                                                              | `1001`                    |
 | `orborus.containerSecurityContext.runAsNonRoot`             | Set runAsNonRoot in orborus container' Security Context                                                                                                                                                                            | `true`                    |
 | `orborus.containerSecurityContext.readOnlyRootFilesystem`   | Set readOnlyRootFilesystem in orborus container' Security Context                                                                                                                                                                  | `true`                    |
 | `orborus.containerSecurityContext.privileged`               | Set privileged in orborus container' Security Context                                                                                                                                                                              | `false`                   |
@@ -421,9 +426,7 @@ SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier"
 | `orborus.args`                                              | Override default orborus container args (useful when using custom images)                                                                                                                                                          | `[]`                      |
 | `orborus.automountServiceAccountToken`                      | Mount Service Account token in orborus pods                                                                                                                                                                                        | `true`                    |
 | `orborus.hostAliases`                                       | orborus pods host aliases                                                                                                                                                                                                          | `[]`                      |
-| `orborus.daemonsetAnnotations`                              | Annotations for orborus daemonset                                                                                                                                                                                                  | `{}`                      |
 | `orborus.deploymentAnnotations`                             | Annotations for orborus deployment                                                                                                                                                                                                 | `{}`                      |
-| `orborus.statefulsetAnnotations`                            | Annotations for orborus statefulset                                                                                                                                                                                                | `{}`                      |
 | `orborus.podLabels`                                         | Extra labels for orborus pods                                                                                                                                                                                                      | `{}`                      |
 | `orborus.podAnnotations`                                    | Annotations for orborus pods                                                                                                                                                                                                       | `{}`                      |
 | `orborus.podAffinityPreset`                                 | Pod affinity preset. Ignored if `orborus.affinity` is set. Allowed values: `soft` or `hard`                                                                                                                                        | `""`                      |
@@ -435,8 +438,6 @@ SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier"
 | `orborus.nodeSelector`                                      | Node labels for orborus pods assignment                                                                                                                                                                                            | `{}`                      |
 | `orborus.tolerations`                                       | Tolerations for orborus pods assignment                                                                                                                                                                                            | `[]`                      |
 | `orborus.updateStrategy.type`                               | orborus deployment strategy type                                                                                                                                                                                                   | `RollingUpdate`           |
-| `orborus.updateStrategy.type`                               | orborus statefulset strategy type                                                                                                                                                                                                  | `RollingUpdate`           |
-| `orborus.podManagementPolicy`                               | Pod management policy for orborus statefulset                                                                                                                                                                                      | `OrderedReady`            |
 | `orborus.priorityClassName`                                 | orborus pods' priorityClassName                                                                                                                                                                                                    | `""`                      |
 | `orborus.topologySpreadConstraints`                         | Topology Spread Constraints for orborus pod assignment spread across your cluster among failure-domains                                                                                                                            | `[]`                      |
 | `orborus.schedulerName`                                     | Name of the k8s scheduler (other than default) for orborus pods                                                                                                                                                                    | `""`                      |
@@ -477,22 +478,38 @@ SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier"
 
 ### worker Parameters
 
-| Name                                                 | Description                                                                                                                                       | Value                    |
-| ---------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------ |
-| `worker.image.registry`                              | worker image registry                                                                                                                             | `ghcr.io`                |
-| `worker.image.repository`                            | worker image repository                                                                                                                           | `shuffle/shuffle-worker` |
-| `worker.image.digest`                                | worker image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended) | `""`                     |
-| `worker.serviceAccount.create`                       | Specifies whether a ServiceAccount should be created                                                                                              | `true`                   |
-| `worker.serviceAccount.name`                         | The name of the ServiceAccount to use.                                                                                                            | `""`                     |
-| `worker.serviceAccount.annotations`                  | Additional Service Account annotations (evaluated as a template)                                                                                  | `{}`                     |
-| `worker.serviceAccount.automountServiceAccountToken` | Automount service account token for the worker service account                                                                                    | `true`                   |
-| `worker.serviceAccount.imagePullSecrets`             | Add image pull secrets to the worker service account                                                                                              | `[]`                     |
-| `worker.rbac.create`                                 | Specifies whether RBAC resources should be created                                                                                                | `true`                   |
-| `worker.networkPolicy.enabled`                       | Specifies whether a NetworkPolicy should be created                                                                                               | `true`                   |
-| `worker.networkPolicy.allowExternal`                 | Don't require server label for connections                                                                                                        | `true`                   |
-| `worker.networkPolicy.allowExternalEgress`           | Allow the pod to access any range of port and all destinations.                                                                                   | `true`                   |
-| `worker.networkPolicy.extraIngress`                  | Add extra ingress rules to the NetworkPolicy                                                                                                      | `[]`                     |
-| `worker.networkPolicy.extraEgress`                   | Add extra ingress rules to the NetworkPolicy (ignored if allowExternalEgress=true)                                                                | `[]`                     |
+| Name                                                       | Description                                                                                                                                       | Value                    |
+| ---------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------ |
+| `worker.image.registry`                                    | worker image registry                                                                                                                             | `ghcr.io`                |
+| `worker.image.repository`                                  | worker image repository                                                                                                                           | `shuffle/shuffle-worker` |
+| `worker.image.tag`                                         | worker image tag (immutable tags are recommended, defaults to appVersion)                                                                         | `""`                     |
+| `worker.image.digest`                                      | worker image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended) | `""`                     |
+| `worker.podSecurityContext.enabled`                        | Enable worker pods' Security Context                                                                                                              | `true`                   |
+| `worker.podSecurityContext.fsGroupChangePolicy`            | Set filesystem group change policy for worker pods                                                                                                | `Always`                 |
+| `worker.podSecurityContext.sysctls`                        | Set kernel settings using the sysctl interface for worker pods                                                                                    | `[]`                     |
+| `worker.podSecurityContext.supplementalGroups`             | Set filesystem extra groups for worker pods                                                                                                       | `[]`                     |
+| `worker.podSecurityContext.fsGroup`                        | Set fsGroup in worker pods' Security Context                                                                                                      | `1001`                   |
+| `worker.containerSecurityContext.enabled`                  | Enabled worker container' Security Context                                                                                                        | `true`                   |
+| `worker.containerSecurityContext.seLinuxOptions`           | Set SELinux options in worker container                                                                                                           | `{}`                     |
+| `worker.containerSecurityContext.runAsUser`                | Set runAsUser in worker container' Security Context                                                                                               | `1001`                   |
+| `worker.containerSecurityContext.runAsGroup`               | Set runAsGroup in worker container' Security Context                                                                                              | `1001`                   |
+| `worker.containerSecurityContext.runAsNonRoot`             | Set runAsNonRoot in worker container' Security Context                                                                                            | `true`                   |
+| `worker.containerSecurityContext.readOnlyRootFilesystem`   | Set readOnlyRootFilesystem in worker container' Security Context                                                                                  | `true`                   |
+| `worker.containerSecurityContext.privileged`               | Set privileged in worker container' Security Context                                                                                              | `false`                  |
+| `worker.containerSecurityContext.allowPrivilegeEscalation` | Set allowPrivilegeEscalation in worker container' Security Context                                                                                | `false`                  |
+| `worker.containerSecurityContext.capabilities.drop`        | List of capabilities to be dropped in worker container                                                                                            | `["ALL"]`                |
+| `worker.containerSecurityContext.seccompProfile.type`      | Set seccomp profile in worker container                                                                                                           | `RuntimeDefault`         |
+| `worker.serviceAccount.create`                             | Specifies whether a ServiceAccount should be created                                                                                              | `true`                   |
+| `worker.serviceAccount.name`                               | The name of the ServiceAccount to use.                                                                                                            | `""`                     |
+| `worker.serviceAccount.annotations`                        | Additional Service Account annotations (evaluated as a template)                                                                                  | `{}`                     |
+| `worker.serviceAccount.automountServiceAccountToken`       | Automount service account token for the worker service account                                                                                    | `true`                   |
+| `worker.serviceAccount.imagePullSecrets`                   | Add image pull secrets to the worker service account                                                                                              | `[]`                     |
+| `worker.rbac.create`                                       | Specifies whether RBAC resources should be created                                                                                                | `true`                   |
+| `worker.networkPolicy.enabled`                             | Specifies whether a NetworkPolicy should be created                                                                                               | `true`                   |
+| `worker.networkPolicy.allowExternal`                       | Don't require server label for connections                                                                                                        | `true`                   |
+| `worker.networkPolicy.allowExternalEgress`                 | Allow the pod to access any range of port and all destinations.                                                                                   | `true`                   |
+| `worker.networkPolicy.extraIngress`                        | Add extra ingress rules to the NetworkPolicy                                                                                                      | `[]`                     |
+| `worker.networkPolicy.extraEgress`                         | Add extra ingress rules to the NetworkPolicy (ignored if allowExternalEgress=true)                                                                | `[]`                     |
 
 ### app Parameters
 
@@ -509,6 +526,33 @@ SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier"
 | `app.networkPolicy.allowExternalEgress`           | Allow the pod to access any range of port and all destinations.                    | `true` |
 | `app.networkPolicy.extraIngress`                  | Add extra ingress rules to the NetworkPolicy                                       | `[]`   |
 | `app.networkPolicy.extraEgress`                   | Add extra ingress rules to the NetworkPolicy (ignored if allowExternalEgress=true) | `[]`   |
+| `app.exposedContainerPort`                        | The port that shuffle app containers will listen on for new requests.              | `80`   |
+| `app.podSecurityContext.enabled`                        | Enable app pods' Security Context                                                  | `true`           |
+| `app.podSecurityContext.fsGroupChangePolicy`            | Set filesystem group change policy for app pods                                    | `Always`         |
+| `app.podSecurityContext.sysctls`                        | Set kernel settings using the sysctl interface for app pods                        | `[]`             |
+| `app.podSecurityContext.supplementalGroups`             | Set filesystem extra groups for app pods                                           | `[]`             |
+| `app.podSecurityContext.fsGroup`                        | Set fsGroup in app pods' Security Context                                          | `1001`           |
+| `app.containerSecurityContext.enabled`                  | Enabled app container' Security Context                                            | `true`           |
+| `app.containerSecurityContext.seLinuxOptions`           | Set SELinux options in app container                                               | `{}`             |
+| `app.containerSecurityContext.runAsUser`                | Set runAsUser in app container' Security Context                                   | `1001`           |
+| `app.containerSecurityContext.runAsGroup`               | Set runAsGroup in app container' Security Context                                  | `1001`           |
+| `app.containerSecurityContext.runAsNonRoot`             | Set runAsNonRoot in app container' Security Context                                | `true`           |
+| `app.containerSecurityContext.readOnlyRootFilesystem`   | Set readOnlyRootFilesystem in app container' Security Context                      | `true`           |
+| `app.containerSecurityContext.privileged`               | Set privileged in app container' Security Context                                  | `false`          |
+| `app.containerSecurityContext.allowPrivilegeEscalation` | Set allowPrivilegeEscalation in app container' Security Context                    | `false`          |
+| `app.containerSecurityContext.capabilities.drop`        | List of capabilities to be dropped in app container                                | `["ALL"]`        |
+| `app.containerSecurityContext.seccompProfile.type`      | Set seccomp profile in app container                                               | `RuntimeDefault` |
+| `app.serviceAccount.create`                             | Specifies whether a ServiceAccount should be created                               | `true`           |
+| `app.serviceAccount.name`                               | The name of the ServiceAccount to use.                                             | `""`             |
+| `app.serviceAccount.annotations`                        | Additional Service Account annotations (evaluated as a template)                   | `{}`             |
+| `app.serviceAccount.automountServiceAccountToken`       | Automount service account token for the app service account                        | `true`           |
+| `app.serviceAccount.imagePullSecrets`                   | Add image pull secrets to the app service account                                  | `[]`             |
+| `app.rbac.create`                                       | Specifies whether RBAC resources should be created                                 | `true`           |
+| `app.networkPolicy.enabled`                             | Specifies whether a NetworkPolicy should be created                                | `true`           |
+| `app.networkPolicy.allowExternal`                       | Don't require server label for connections                                         | `true`           |
+| `app.networkPolicy.allowExternalEgress`                 | Allow the pod to access any range of port and all destinations.                    | `true`           |
+| `app.networkPolicy.extraIngress`                        | Add extra ingress rules to the NetworkPolicy                                       | `[]`             |
+| `app.networkPolicy.extraEgress`                         | Add extra ingress rules to the NetworkPolicy (ignored if allowExternalEgress=true) | `[]`             |
 
 ### Traffic Exposure Parameters
 
@@ -582,6 +626,7 @@ SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier"
 | `volumePermissions.enabled`                                 | Enable init container that changes the owner/group of the PV mount point to `runAsUser:fsGroup`                                                                                                                                                     | `false`            |
 | `volumePermissions.image.registry`                          | OS Shell + Utility image registry                                                                                                                                                                                                                   | `docker.io`        |
 | `volumePermissions.image.repository`                        | OS Shell + Utility image repository                                                                                                                                                                                                                 | `bitnami/os-shell` |
+| `volumePermissions.image.tag`                               | OS Shell + Utility image tag (immutable tags are recommended)                                                                                                                                                                                       | `12-debian-12-r30` |
 | `volumePermissions.image.pullPolicy`                        | OS Shell + Utility image pull policy                                                                                                                                                                                                                | `IfNotPresent`     |
 | `volumePermissions.image.pullSecrets`                       | OS Shell + Utility image pull secrets                                                                                                                                                                                                               | `[]`               |
 | `volumePermissions.resourcesPreset`                         | Set init container resources according to one common preset (allowed values: none, nano, small, medium, large, xlarge, 2xlarge). This is ignored if volumePermissions.resources is set (volumePermissions.resources is recommended for production). | `nano`             |
@@ -605,3 +650,4 @@ SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier"
 
 ### Other Parameters
 
+
diff --git a/functions/kubernetes/charts/shuffle/templates/_helpers.tpl b/functions/kubernetes/charts/shuffle/templates/_helpers.tpl
index 6bd29238..dc93dfc2 100644
--- a/functions/kubernetes/charts/shuffle/templates/_helpers.tpl
+++ b/functions/kubernetes/charts/shuffle/templates/_helpers.tpl
@@ -119,14 +119,14 @@ app.kubernetes.io/name: shuffle-app
 Return the proper image name (for the init container volume-permissions image)
 */}}
 {{- define "shuffle.volumePermissions.image" -}}
-{{- include "common.images.image" ( dict "imageRoot" .Values.volumePermissions.image "global" .Values.global ) -}}
+{{- include "common.images.image" ( dict "imageRoot" .Values.volumePermissions.image "global" .Values.global "chart" .Chart ) -}}
 {{- end -}}
 
 {{/*
 Return the proper Shuffle backend image name
 */}}
 {{- define "shuffle.backend.image" -}}
-{{- include "common.images.image" ( dict "imageRoot" .Values.backend.image "global" .Values.global ) -}}
+{{- include "common.images.image" ( dict "imageRoot" .Values.backend.image "global" .Values.global "chart" .Chart ) -}}
 {{- end -}}
 
 {{/*
@@ -140,7 +140,7 @@ Return the proper Docker Image Registry Secret Names for the backend pod
 Return the proper Shuffle frontend image name
 */}}
 {{- define "shuffle.frontend.image" -}}
-{{- include "common.images.image" ( dict "imageRoot" .Values.frontend.image "global" .Values.global ) -}}
+{{- include "common.images.image" ( dict "imageRoot" .Values.frontend.image "global" .Values.global "chart" .Chart ) -}}
 {{- end -}}
 
 {{/*
@@ -154,7 +154,7 @@ Return the proper Docker Image Registry Secret Names for the frontend pod
 Return the proper Shuffle orborus image name
 */}}
 {{- define "shuffle.orborus.image" -}}
-{{- include "common.images.image" ( dict "imageRoot" .Values.orborus.image "global" .Values.global ) -}}
+{{- include "common.images.image" ( dict "imageRoot" .Values.orborus.image "global" .Values.global "chart" .Chart ) -}}
 {{- end -}}
 
 {{/*
@@ -168,7 +168,7 @@ Return the proper Docker Image Registry Secret Names for the orborus pod
 Return the proper Shuffle worker image name
 */}}
 {{- define "shuffle.worker.image" -}}
-{{- include "common.images.image" ( dict "imageRoot" .Values.worker.image "global" .Values.global ) -}}
+{{- include "common.images.image" ( dict "imageRoot" .Values.worker.image "global" .Values.global "chart" .Chart ) -}}
 {{- end -}}
 
 {{/*
diff --git a/functions/kubernetes/charts/shuffle/templates/backend/backend-cm-env.yaml b/functions/kubernetes/charts/shuffle/templates/backend/backend-cm-env.yaml
index e7138dc0..dbbdff94 100644
--- a/functions/kubernetes/charts/shuffle/templates/backend/backend-cm-env.yaml
+++ b/functions/kubernetes/charts/shuffle/templates/backend/backend-cm-env.yaml
@@ -8,18 +8,20 @@ metadata:
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 data:
-  BACKEND_PORT: "5001"
+  BACKEND_PORT: "{{ .Values.backend.containerPorts.http }}"
   {{- if .Values.shuffle.baseUrl }}
   BASE_URL: "{{ .Values.shuffle.baseUrl }}"
   SSO_REDIRECT_URL: "{{ .Values.shuffle.baseUrl }}"
   {{- else }}
-  BASE_URL: "http://{{ include "shuffle.backend.name" . }}:5001"
+  BASE_URL: "http://{{ include "shuffle.backend.name" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.backend.containerPorts.http }}"
   {{- end }}
   ORG_ID: "{{ .Values.shuffle.org }}"
   SHUFFLE_APP_DOWNLOAD_LOCATION: "{{ .Values.backend.apps.downloadLocation }}"
   SHUFFLE_DOWNLOAD_AUTH_BRANCH: "{{ .Values.backend.apps.downloadBranch }}"
   SHUFFLE_APP_FORCE_UPDATE: "{{ .Values.backend.apps.forceUpdate }}"
   SHUFFLE_CHAT_DISABLED: "true"
+  # Sets backend_url parameter for workflow execution to the cluster-internal shuffle-backend address
+  SHUFFLE_CLOUDRUN_URL: "http://{{ include "shuffle.backend.name" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.backend.containerPorts.http }}"
   SHUFFLE_OPENSEARCH_URL: {{ include "common.tplvalues.render" (dict "value" .Values.backend.openSearch.url "context" $) }}
   SHUFFLE_OPENSEARCH_USERNAME: "{{ .Values.backend.openSearch.username }}"
   SHUFFLE_OPENSEARCH_CERTIFICATE_FILE: "{{ .Values.backend.openSearch.certificateFile }}"
diff --git a/functions/kubernetes/charts/shuffle/templates/backend/backend-svc.yaml b/functions/kubernetes/charts/shuffle/templates/backend/backend-svc.yaml
index 18328899..990f9410 100644
--- a/functions/kubernetes/charts/shuffle/templates/backend/backend-svc.yaml
+++ b/functions/kubernetes/charts/shuffle/templates/backend/backend-svc.yaml
@@ -3,7 +3,8 @@ kind: Service
 metadata:
   name: {{ template "shuffle.backend.name" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "shuffle.backend.labels" (dict "customLabels" .Values.commonLabels "context" $) | nindent 4 }}
+  {{- $serviceLabels := include "common.tplvalues.merge" (dict "values" (list .Values.backend.service.labels .Values.commonLabels) "context" .) }}
+  labels: {{- include "shuffle.backend.labels" (dict "customLabels" $serviceLabels "context" $) | nindent 4 }}
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" (dict "value" .Values.commonAnnotations "context" $) | nindent 4 }}
   {{- end }}
@@ -14,5 +15,6 @@ spec:
       port: {{ .Values.backend.containerPorts.http }}
       targetPort: http
       protocol: TCP
+      appProtocol: http
   {{- $podLabels := include "common.tplvalues.merge" (dict "values" (list .Values.backend.podLabels .Values.commonLabels) "context" .) }}
   selector: {{- include "shuffle.backend.matchLabels" (dict "customLabels" $podLabels "context" $) | nindent 4 }}
diff --git a/functions/kubernetes/charts/shuffle/templates/frontend/frontend-svc.yaml b/functions/kubernetes/charts/shuffle/templates/frontend/frontend-svc.yaml
index 76851c0a..de2db9fb 100644
--- a/functions/kubernetes/charts/shuffle/templates/frontend/frontend-svc.yaml
+++ b/functions/kubernetes/charts/shuffle/templates/frontend/frontend-svc.yaml
@@ -3,7 +3,8 @@ kind: Service
 metadata:
   name: {{ template "shuffle.frontend.name" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "shuffle.frontend.labels" (dict "customLabels" .Values.commonLabels "context" $) | nindent 4 }}
+  {{- $serviceLabels := include "common.tplvalues.merge" (dict "values" (list .Values.frontend.service.labels .Values.commonLabels) "context" .) }}
+  labels: {{- include "shuffle.frontend.labels" (dict "customLabels" $serviceLabels "context" $) | nindent 4 }}
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" (dict "value" .Values.commonAnnotations "context" $) | nindent 4 }}
   {{- end }}
@@ -14,11 +15,13 @@ spec:
       port: {{ .Values.frontend.containerPorts.http }}
       targetPort: http
       protocol: TCP
+      appProtocol: http
     {{- if .Values.frontend.containerPorts.https }}
     - name: https
       port: {{ .Values.frontend.containerPorts.https }}
       targetPort: https
       protocol: TCP
+      appProtocol: https
     {{- end }}
   {{- $podLabels := include "common.tplvalues.merge" (dict "values" (list .Values.frontend.podLabels .Values.commonLabels) "context" .) }}
   selector: {{- include "shuffle.frontend.matchLabels" (dict "customLabels" $podLabels "context" $) | nindent 4 }}
diff --git a/functions/kubernetes/charts/shuffle/templates/orborus/orborus-cm-env.yaml b/functions/kubernetes/charts/shuffle/templates/orborus/orborus-cm-env.yaml
index 57b020a7..504b674d 100644
--- a/functions/kubernetes/charts/shuffle/templates/orborus/orborus-cm-env.yaml
+++ b/functions/kubernetes/charts/shuffle/templates/orborus/orborus-cm-env.yaml
@@ -11,7 +11,7 @@ data:
   ENVIRONMENT_NAME: "{{ .Values.shuffle.org }}"
   ORG_ID: "{{ .Values.shuffle.org }}"
   TZ: "{{ .Values.shuffle.timezone }}"
-  BASE_URL: "http://{{ include "shuffle.backend.name" . }}.{{ .Release.Namespace }}.svc.cluster.local:5001"
+  BASE_URL: "http://{{ include "shuffle.backend.name" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.backend.containerPorts.http }}"
   KUBERNETES_NAMESPACE: "{{ .Release.Namespace }}"
   KUBERNETES_SERVICE_ACCOUNT: {{ include "shuffle.orborus.serviceAccount.name" . }}
   SHUFFLE_WORKER_IMAGE: "{{ include "shuffle.worker.image" . }}"
diff --git a/functions/kubernetes/charts/shuffle/templates/orborus/orborus-dpl.yaml b/functions/kubernetes/charts/shuffle/templates/orborus/orborus-dpl.yaml
index a2d9c278..fd73dd15 100644
--- a/functions/kubernetes/charts/shuffle/templates/orborus/orborus-dpl.yaml
+++ b/functions/kubernetes/charts/shuffle/templates/orborus/orborus-dpl.yaml
@@ -88,8 +88,26 @@ spec:
               value: "true"
             - name: SHUFFLE_WORKER_SERVICE_ACCOUNT_NAME
               value: {{ include "shuffle.worker.serviceAccount.name" . }}
+            - name: SHUFFLE_APP_EXPOSED_PORT
+              value: {{ .Values.app.exposedContainerPort | quote }}
+            {{- if .Values.worker.podSecurityContext.enabled }}
+            - name: SHUFFLE_WORKER_POD_SECURITY_CONTEXT
+              value: {{ omit .Values.worker.podSecurityContext "enabled" | mustToJson | quote }}
+            {{- end }}
+            {{- if .Values.worker.containerSecurityContext.enabled }}
+            - name: SHUFFLE_WORKER_CONTAINER_SECURITY_CONTEXT
+              value: {{ include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.worker.containerSecurityContext "context" $) | fromYaml | mustToJson | quote }}
+            {{- end }}
             - name: SHUFFLE_APP_SERVICE_ACCOUNT_NAME
               value: {{ include "shuffle.app.serviceAccount.name" . }}
+            {{- if .Values.app.podSecurityContext.enabled }}
+            - name: SHUFFLE_APP_POD_SECURITY_CONTEXT
+              value: {{ omit .Values.app.podSecurityContext "enabled" | mustToJson | quote }}
+            {{- end }}
+            {{- if .Values.app.containerSecurityContext.enabled }}
+            - name: SHUFFLE_APP_CONTAINER_SECURITY_CONTEXT
+              value: {{ include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.app.containerSecurityContext "context" $) | fromYaml | mustToJson | quote }}
+            {{- end }}
             {{- if .Values.orborus.extraEnvVars }}
             {{- include "common.tplvalues.render" (dict "value" .Values.orborus.extraEnvVars "context" $) | nindent 12 }}
             {{- end }}
@@ -110,8 +128,6 @@ spec:
           resources: {{- include "common.resources.preset" (dict "type" .Values.orborus.resourcesPreset) | nindent 12 }}
           {{- end }}
           ports:
-            - name: http
-              containerPort: {{ .Values.orborus.containerPorts.http }}
             {{- if .Values.orborus.extraContainerPorts }}
             {{- include "common.tplvalues.render" (dict "value" .Values.orborus.extraContainerPorts "context" $) | nindent 12 }}
             {{- end }}
@@ -120,25 +136,16 @@ spec:
           livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.orborus.customLivenessProbe "context" $) | nindent 12 }}
           {{- else if .Values.orborus.livenessProbe.enabled }}
           livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.orborus.livenessProbe "enabled") "context" $) | nindent 12 }}
-            httpGet:
-              path: /
-              port: {{ .Values.orborus.containerPorts.http }}
           {{- end }}
           {{- if .Values.orborus.customReadinessProbe }}
           readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.orborus.customReadinessProbe "context" $) | nindent 12 }}
           {{- else if .Values.orborus.readinessProbe.enabled }}
           readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.orborus.readinessProbe "enabled") "context" $) | nindent 12 }}
-            httpGet:
-              path: /
-              port: {{ .Values.orborus.containerPorts.http }}
           {{- end }}
           {{- if .Values.orborus.customStartupProbe }}
           startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.orborus.customStartupProbe "context" $) | nindent 12 }}
           {{- else if .Values.orborus.startupProbe.enabled }}
           startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.orborus.startupProbe "enabled") "context" $) | nindent 12 }}
-            httpGet:
-              path: /
-              port: {{ .Values.orborus.containerPorts.http }}
           {{- end }}
           {{- end }}
           {{- if .Values.orborus.lifecycleHooks }}
diff --git a/functions/kubernetes/charts/shuffle/templates/orborus/orborus-network-policy.yaml b/functions/kubernetes/charts/shuffle/templates/orborus/orborus-network-policy.yaml
index f6a22339..f55bf957 100644
--- a/functions/kubernetes/charts/shuffle/templates/orborus/orborus-network-policy.yaml
+++ b/functions/kubernetes/charts/shuffle/templates/orborus/orborus-network-policy.yaml
@@ -54,18 +54,6 @@ spec:
     {{- end }}
     {{- end }}
   ingress:
-    - ports:
-        - port: {{ .Values.orborus.containerPorts.http }}
-          protocol: TCP
-      {{- if not .Values.orborus.networkPolicy.allowExternal }}
-      from:
-        # Allow traffic from workers
-        - namespaceSelector:
-            matchLabels:
-              kubernetes.io/metadata.name: {{ .Release.Namespace }}
-          podSelector:
-            matchLabels: {{ include "shuffle.worker.matchLabels" . | nindent 14 }}
-      {{- end }}
     {{- if .Values.orborus.networkPolicy.extraIngress }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.orborus.networkPolicy.extraIngress "context" $ ) | nindent 4 }}
     {{- end }}
diff --git a/functions/kubernetes/charts/shuffle/templates/shuffle-app/shuffle-app-network-policy.yaml b/functions/kubernetes/charts/shuffle/templates/shuffle-app/shuffle-app-network-policy.yaml
index d4a24fe6..a8493002 100644
--- a/functions/kubernetes/charts/shuffle/templates/shuffle-app/shuffle-app-network-policy.yaml
+++ b/functions/kubernetes/charts/shuffle/templates/shuffle-app/shuffle-app-network-policy.yaml
@@ -29,6 +29,16 @@ spec:
         - namespaceSelector:
             matchLabels:
               kubernetes.io/metadata.name: kube-system
+    # Allow access to backend
+    - ports:
+      - port: {{ .Values.backend.containerPorts.http }}
+        protocol: TCP
+      to:
+        - namespaceSelector:
+            matchLabels:
+              kubernetes.io/metadata.name: {{ .Release.Namespace }}
+          podSelector:
+            matchLabels: {{ include "shuffle.backend.matchLabels" . | nindent 14 }}
     # Allow access to workers
     - ports:
         - port: 33333
@@ -44,17 +54,18 @@ spec:
     {{- end }}
     {{- end }}
   ingress:
-    {{- if .Values.app.networkPolicy.allowExternal }}
-    - {}
-    {{- else }}
-    # Allow access from workers. Apps will typicaly use port 80/TCP, but this is not enforced.
-    - from:
+    - ports:
+        - port: {{ .Values.app.exposedContainerPort }}
+          protocol: TCP
+      {{- if not .Values.app.networkPolicy.allowExternal }}
+      # Allow traffic from workers
+      from:
         - namespaceSelector:
             matchLabels:
               kubernetes.io/metadata.name: {{ .Release.Namespace }}
           podSelector:
             matchLabels: {{ include "shuffle.worker.matchLabels" . | nindent 14 }}
-    {{- end }}
+      {{- end }}
     {{- if .Values.app.networkPolicy.extraIngress }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.app.networkPolicy.extraIngress "context" $ ) | nindent 4 }}
     {{- end }}
diff --git a/functions/kubernetes/charts/shuffle/templates/shuffle-worker/shuffle-worker-network-policy.yaml b/functions/kubernetes/charts/shuffle/templates/shuffle-worker/shuffle-worker-network-policy.yaml
index 1b07d9a9..3637d975 100644
--- a/functions/kubernetes/charts/shuffle/templates/shuffle-worker/shuffle-worker-network-policy.yaml
+++ b/functions/kubernetes/charts/shuffle/templates/shuffle-worker/shuffle-worker-network-policy.yaml
@@ -29,16 +29,6 @@ spec:
         - namespaceSelector:
             matchLabels:
               kubernetes.io/metadata.name: kube-system
-    # Allow access to orborus
-    - ports:
-        - port: {{ .Values.orborus.containerPorts.http }}
-          protocol: TCP
-      to:
-        - namespaceSelector:
-            matchLabels:
-              kubernetes.io/metadata.name: {{ .Release.Namespace }}
-          podSelector:
-            matchLabels: {{ include "shuffle.orborus.matchLabels" . | nindent 14 }}
     # Allow arbitrary connections to apps. Apps will typically use port 80/TCP, but this is not enforced.
     - to:
         - namespaceSelector:
@@ -62,6 +52,12 @@ spec:
               kubernetes.io/metadata.name: {{ .Release.Namespace }}
           podSelector:
             matchLabels: {{ include "shuffle.orborus.matchLabels" . | nindent 14 }}
+        # Allow traffic from apps
+        - namespaceSelector:
+            matchLabels:
+              kubernetes.io/metadata.name: {{ .Release.Namespace }}
+          podSelector:
+            matchLabels: {{ include "shuffle.app.matchLabels" . | nindent 14 }}
       {{- end }}
     {{- if .Values.worker.networkPolicy.extraIngress }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.worker.networkPolicy.extraIngress "context" $ ) | nindent 4 }}
diff --git a/functions/kubernetes/charts/shuffle/values.schema.json b/functions/kubernetes/charts/shuffle/values.schema.json
index 7a85b9fa..661eefc6 100644
--- a/functions/kubernetes/charts/shuffle/values.schema.json
+++ b/functions/kubernetes/charts/shuffle/values.schema.json
@@ -155,6 +155,11 @@
                             "description": "backend image repository",
                             "default": "shuffle/shuffle-backend"
                         },
+                        "tag": {
+                            "type": "string",
+                            "description": "backend image tag (immutable tags are recommended, defaults to appVersion)",
+                            "default": ""
+                        },
                         "digest": {
                             "type": "string",
                             "description": "backend image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended)",
@@ -367,12 +372,12 @@
                         "runAsUser": {
                             "type": "number",
                             "description": "Set runAsUser in backend container' Security Context",
-                            "default": 1000
+                            "default": 1001
                         },
                         "runAsGroup": {
                             "type": "number",
                             "description": "Set runAsGroup in backend container' Security Context",
-                            "default": 1000
+                            "default": 1001
                         },
                         "runAsNonRoot": {
                             "type": "boolean",
@@ -444,21 +449,11 @@
                     "default": [],
                     "items": {}
                 },
-                "daemonsetAnnotations": {
-                    "type": "object",
-                    "description": "Annotations for backend daemonset",
-                    "default": {}
-                },
                 "deploymentAnnotations": {
                     "type": "object",
                     "description": "Annotations for backend deployment",
                     "default": {}
                 },
-                "statefulsetAnnotations": {
-                    "type": "object",
-                    "description": "Annotations for backend statefulset",
-                    "default": {}
-                },
                 "podLabels": {
                     "type": "object",
                     "description": "Extra labels for backend pods",
@@ -521,16 +516,11 @@
                     "properties": {
                         "type": {
                             "type": "string",
-                            "description": "backend statefulset strategy type",
-                            "default": "RollingUpdate"
+                            "description": "backend deployment strategy type",
+                            "default": "Recreate"
                         }
                     }
                 },
-                "podManagementPolicy": {
-                    "type": "string",
-                    "description": "Pod management policy for backend statefulset",
-                    "default": "OrderedReady"
-                },
                 "priorityClassName": {
                     "type": "string",
                     "description": "backend pods' priorityClassName",
@@ -693,6 +683,16 @@
                         }
                     }
                 },
+                "service": {
+                    "type": "object",
+                    "properties": {
+                        "labels": {
+                            "type": "object",
+                            "description": "Extra labels for backend service",
+                            "default": {}
+                        }
+                    }
+                },
                 "serviceAccount": {
                     "type": "object",
                     "properties": {
@@ -839,6 +839,11 @@
                             "description": "frontend image repository",
                             "default": "shuffle/shuffle-frontend"
                         },
+                        "tag": {
+                            "type": "string",
+                            "description": "frontend image tag (immutable tags are recommended, defaults to appVersion)",
+                            "default": ""
+                        },
                         "digest": {
                             "type": "string",
                             "description": "frontend image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended)",
@@ -1056,12 +1061,12 @@
                         "runAsUser": {
                             "type": "number",
                             "description": "Set runAsUser in frontend container' Security Context",
-                            "default": 101
+                            "default": 1001
                         },
                         "runAsGroup": {
                             "type": "number",
                             "description": "Set runAsGroup in frontend container' Security Context",
-                            "default": 101
+                            "default": 1001
                         },
                         "runAsNonRoot": {
                             "type": "boolean",
@@ -1133,21 +1138,11 @@
                     "default": [],
                     "items": {}
                 },
-                "daemonsetAnnotations": {
-                    "type": "object",
-                    "description": "Annotations for frontend daemonset",
-                    "default": {}
-                },
                 "deploymentAnnotations": {
                     "type": "object",
                     "description": "Annotations for frontend deployment",
                     "default": {}
                 },
-                "statefulsetAnnotations": {
-                    "type": "object",
-                    "description": "Annotations for frontend statefulset",
-                    "default": {}
-                },
                 "podLabels": {
                     "type": "object",
                     "description": "Extra labels for frontend pods",
@@ -1210,16 +1205,11 @@
                     "properties": {
                         "type": {
                             "type": "string",
-                            "description": "frontend statefulset strategy type",
+                            "description": "frontend deployment strategy type",
                             "default": "RollingUpdate"
                         }
                     }
                 },
-                "podManagementPolicy": {
-                    "type": "string",
-                    "description": "Pod management policy for frontend statefulset",
-                    "default": "OrderedReady"
-                },
                 "priorityClassName": {
                     "type": "string",
                     "description": "frontend pods' priorityClassName",
@@ -1382,6 +1372,16 @@
                         }
                     }
                 },
+                "service": {
+                    "type": "object",
+                    "properties": {
+                        "labels": {
+                            "type": "object",
+                            "description": "Extra labels for frontend service",
+                            "default": {}
+                        }
+                    }
+                },
                 "serviceAccount": {
                     "type": "object",
                     "properties": {
@@ -1463,6 +1463,11 @@
                             "description": "orborus image repository",
                             "default": "shuffle/shuffle-orborus"
                         },
+                        "tag": {
+                            "type": "string",
+                            "description": "orborus image tag (immutable tags are recommended, defaults to appVersion)",
+                            "default": ""
+                        },
                         "digest": {
                             "type": "string",
                             "description": "orborus image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended)",
@@ -1486,16 +1491,6 @@
                     "description": "Number of orborus replicas to deploy",
                     "default": 1
                 },
-                "containerPorts": {
-                    "type": "object",
-                    "properties": {
-                        "http": {
-                            "type": "number",
-                            "description": "orborus HTTP container port",
-                            "default": 8080
-                        }
-                    }
-                },
                 "extraContainerPorts": {
                     "type": "array",
                     "description": "Optionally specify extra list of additional ports for orborus containers",
@@ -1675,12 +1670,12 @@
                         "runAsUser": {
                             "type": "number",
                             "description": "Set runAsUser in orborus container' Security Context",
-                            "default": 101
+                            "default": 1001
                         },
                         "runAsGroup": {
                             "type": "number",
                             "description": "Set runAsGroup in orborus container' Security Context",
-                            "default": 101
+                            "default": 1001
                         },
                         "runAsNonRoot": {
                             "type": "boolean",
@@ -1752,21 +1747,11 @@
                     "default": [],
                     "items": {}
                 },
-                "daemonsetAnnotations": {
-                    "type": "object",
-                    "description": "Annotations for orborus daemonset",
-                    "default": {}
-                },
                 "deploymentAnnotations": {
                     "type": "object",
                     "description": "Annotations for orborus deployment",
                     "default": {}
                 },
-                "statefulsetAnnotations": {
-                    "type": "object",
-                    "description": "Annotations for orborus statefulset",
-                    "default": {}
-                },
                 "podLabels": {
                     "type": "object",
                     "description": "Extra labels for orborus pods",
@@ -1829,16 +1814,11 @@
                     "properties": {
                         "type": {
                             "type": "string",
-                            "description": "orborus statefulset strategy type",
+                            "description": "orborus deployment strategy type",
                             "default": "RollingUpdate"
                         }
                     }
                 },
-                "podManagementPolicy": {
-                    "type": "string",
-                    "description": "Pod management policy for orborus statefulset",
-                    "default": "OrderedReady"
-                },
                 "priorityClassName": {
                     "type": "string",
                     "description": "orborus pods' priorityClassName",
@@ -2092,6 +2072,11 @@
                             "description": "worker image repository",
                             "default": "shuffle/shuffle-worker"
                         },
+                        "tag": {
+                            "type": "string",
+                            "description": "worker image tag (immutable tags are recommended, defaults to appVersion)",
+                            "default": ""
+                        },
                         "digest": {
                             "type": "string",
                             "description": "worker image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended)",
@@ -2099,6 +2084,103 @@
                         }
                     }
                 },
+                "podSecurityContext": {
+                    "type": "object",
+                    "properties": {
+                        "enabled": {
+                            "type": "boolean",
+                            "description": "Enable worker pods' Security Context",
+                            "default": true
+                        },
+                        "fsGroupChangePolicy": {
+                            "type": "string",
+                            "description": "Set filesystem group change policy for worker pods",
+                            "default": "Always"
+                        },
+                        "sysctls": {
+                            "type": "array",
+                            "description": "Set kernel settings using the sysctl interface for worker pods",
+                            "default": [],
+                            "items": {}
+                        },
+                        "supplementalGroups": {
+                            "type": "array",
+                            "description": "Set filesystem extra groups for worker pods",
+                            "default": [],
+                            "items": {}
+                        },
+                        "fsGroup": {
+                            "type": "number",
+                            "description": "Set fsGroup in worker pods' Security Context",
+                            "default": 1001
+                        }
+                    }
+                },
+                "containerSecurityContext": {
+                    "type": "object",
+                    "properties": {
+                        "enabled": {
+                            "type": "boolean",
+                            "description": "Enabled worker container' Security Context",
+                            "default": true
+                        },
+                        "runAsUser": {
+                            "type": "number",
+                            "description": "Set runAsUser in worker container' Security Context",
+                            "default": 1001
+                        },
+                        "runAsGroup": {
+                            "type": "number",
+                            "description": "Set runAsGroup in worker container' Security Context",
+                            "default": 1001
+                        },
+                        "runAsNonRoot": {
+                            "type": "boolean",
+                            "description": "Set runAsNonRoot in worker container' Security Context",
+                            "default": true
+                        },
+                        "readOnlyRootFilesystem": {
+                            "type": "boolean",
+                            "description": "Set readOnlyRootFilesystem in worker container' Security Context",
+                            "default": true
+                        },
+                        "privileged": {
+                            "type": "boolean",
+                            "description": "Set privileged in worker container' Security Context",
+                            "default": false
+                        },
+                        "allowPrivilegeEscalation": {
+                            "type": "boolean",
+                            "description": "Set allowPrivilegeEscalation in worker container' Security Context",
+                            "default": false
+                        },
+                        "capabilities": {
+                            "type": "object",
+                            "properties": {
+                                "drop": {
+                                    "type": "array",
+                                    "description": "List of capabilities to be dropped in worker container",
+                                    "default": [
+                                        "ALL"
+                                    ],
+                                    "items": {
+                                        "type": "string"
+                                    }
+                                }
+                            }
+                        },
+                        "seccompProfile": {
+                            "type": "object",
+                            "properties": {
+                                "type": {
+                                    "type": "string",
+                                    "description": "Set seccomp profile in worker container",
+                                    "default": "RuntimeDefault"
+                                }
+                            }
+                        }
+                    }
+                },
                 "serviceAccount": {
                     "type": "object",
                     "properties": {
@@ -2177,6 +2259,103 @@
         "app": {
             "type": "object",
             "properties": {
+                "podSecurityContext": {
+                    "type": "object",
+                    "properties": {
+                        "enabled": {
+                            "type": "boolean",
+                            "description": "Enable app pods' Security Context",
+                            "default": true
+                        },
+                        "fsGroupChangePolicy": {
+                            "type": "string",
+                            "description": "Set filesystem group change policy for app pods",
+                            "default": "Always"
+                        },
+                        "sysctls": {
+                            "type": "array",
+                            "description": "Set kernel settings using the sysctl interface for app pods",
+                            "default": [],
+                            "items": {}
+                        },
+                        "supplementalGroups": {
+                            "type": "array",
+                            "description": "Set filesystem extra groups for app pods",
+                            "default": [],
+                            "items": {}
+                        },
+                        "fsGroup": {
+                            "type": "number",
+                            "description": "Set fsGroup in app pods' Security Context",
+                            "default": 1001
+                        }
+                    }
+                },
+                "containerSecurityContext": {
+                    "type": "object",
+                    "properties": {
+                        "enabled": {
+                            "type": "boolean",
+                            "description": "Enabled app container' Security Context",
+                            "default": true
+                        },
+                        "runAsUser": {
+                            "type": "number",
+                            "description": "Set runAsUser in app container' Security Context",
+                            "default": 1001
+                        },
+                        "runAsGroup": {
+                            "type": "number",
+                            "description": "Set runAsGroup in app container' Security Context",
+                            "default": 1001
+                        },
+                        "runAsNonRoot": {
+                            "type": "boolean",
+                            "description": "Set runAsNonRoot in app container' Security Context",
+                            "default": true
+                        },
+                        "readOnlyRootFilesystem": {
+                            "type": "boolean",
+                            "description": "Set readOnlyRootFilesystem in app container' Security Context",
+                            "default": true
+                        },
+                        "privileged": {
+                            "type": "boolean",
+                            "description": "Set privileged in app container' Security Context",
+                            "default": false
+                        },
+                        "allowPrivilegeEscalation": {
+                            "type": "boolean",
+                            "description": "Set allowPrivilegeEscalation in app container' Security Context",
+                            "default": false
+                        },
+                        "capabilities": {
+                            "type": "object",
+                            "properties": {
+                                "drop": {
+                                    "type": "array",
+                                    "description": "List of capabilities to be dropped in app container",
+                                    "default": [
+                                        "ALL"
+                                    ],
+                                    "items": {
+                                        "type": "string"
+                                    }
+                                }
+                            }
+                        },
+                        "seccompProfile": {
+                            "type": "object",
+                            "properties": {
+                                "type": {
+                                    "type": "string",
+                                    "description": "Set seccomp profile in app container",
+                                    "default": "RuntimeDefault"
+                                }
+                            }
+                        }
+                    }
+                },
                 "serviceAccount": {
                     "type": "object",
                     "properties": {
@@ -2249,6 +2428,11 @@
                             "items": {}
                         }
                     }
+                },
+                "exposedContainerPort": {
+                    "type": "number",
+                    "description": "The port that shuffle app containers will listen on for new requests. ",
+                    "default": 80
                 }
             }
         },
@@ -2591,6 +2775,11 @@
                             "description": "OS Shell + Utility image repository",
                             "default": "bitnami/os-shell"
                         },
+                        "tag": {
+                            "type": "string",
+                            "description": "OS Shell + Utility image tag (immutable tags are recommended)",
+                            "default": "12-debian-12-r30"
+                        },
                         "pullPolicy": {
                             "type": "string",
                             "description": "OS Shell + Utility image pull policy",
diff --git a/functions/kubernetes/charts/shuffle/values.yaml b/functions/kubernetes/charts/shuffle/values.yaml
index 35492f94..08763cb6 100644
--- a/functions/kubernetes/charts/shuffle/values.yaml
+++ b/functions/kubernetes/charts/shuffle/values.yaml
@@ -96,7 +96,7 @@ backend:
   ## backend image
   ## @param backend.image.registry backend image registry
   ## @param backend.image.repository backend image repository
-  ## @skip backend.image.tag backend image tag (immutable tags are recommended)
+  ## @param backend.image.tag backend image tag (immutable tags are recommended, defaults to appVersion)
   ## @param backend.image.digest backend image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended)
   ## @param backend.image.pullPolicy backend image pull policy
   ## @param backend.image.pullSecrets backend image pull secrets
@@ -104,7 +104,7 @@ backend:
   image:
     registry: ghcr.io
     repository: shuffle/shuffle-backend
-    tag: nightly
+    tag: ""
     digest: ""
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@@ -235,8 +235,8 @@ backend:
   containerSecurityContext:
     enabled: true
     seLinuxOptions: {}
-    runAsUser: 1000
-    runAsGroup: 1000
+    runAsUser: 1001
+    runAsGroup: 1001
     runAsNonRoot: true
     readOnlyRootFilesystem: true
     privileged: false
@@ -260,18 +260,10 @@ backend:
   ## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/
   ##
   hostAliases: []
-  ## @param backend.daemonsetAnnotations Annotations for backend daemonset
-  ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
-  ##
-  daemonsetAnnotations: {}
   ## @param backend.deploymentAnnotations Annotations for backend deployment
   ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
   ##
   deploymentAnnotations: {}
-  ## @param backend.statefulsetAnnotations Annotations for backend statefulset
-  ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
-  ##
-  statefulsetAnnotations: {}
   ## @param backend.podLabels Extra labels for backend pods
   ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
   ##
@@ -318,25 +310,14 @@ backend:
   ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
   ##
   tolerations: []
-  ## ONLY FOR DEPLOYMENTS:
   ## @param backend.updateStrategy.type backend deployment strategy type
   ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
-  ## ONLY FOR STATEFULSETS:
-  ## @param backend.updateStrategy.type backend statefulset strategy type
-  ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies
   ##
   updateStrategy:
-    ## ONLY FOR DEPLOYMENTS:
     ## Can be set to RollingUpdate or Recreate
-    ## ONLY FOR STATEFULSETS:
-    ## Can be set to RollingUpdate or OnDelete
+    ## Backend uses ReadWriteOnce volumes by default, which is incompatible with RollingUpdate
     ##
-    type: RollingUpdate
-  ## ONLY FOR STATEFULSETS:
-  ## @param backend.podManagementPolicy Pod management policy for backend statefulset
-  ## Ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#pod-management-policies
-  ##
-  podManagementPolicy: OrderedReady
+    type: Recreate 
   ## @param backend.priorityClassName backend pods' priorityClassName
   ##
   priorityClassName: ""
@@ -440,6 +421,14 @@ backend:
       targetCPU: ""
       targetMemory: ""
 
+  ## Service configuration
+  ##
+  service:
+    ## @param backend.service.labels Extra labels for backend service
+    ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
+    ##
+    labels: {}
+
   ## ServiceAccount configuration
   ##
   serviceAccount:
@@ -565,7 +554,7 @@ frontend:
   ## frontend image
   ## @param frontend.image.registry frontend image registry
   ## @param frontend.image.repository frontend image repository
-  ## @skip frontend.image.tag frontend image tag (immutable tags are recommended)
+  ## @param frontend.image.tag frontend image tag (immutable tags are recommended, defaults to appVersion)
   ## @param frontend.image.digest frontend image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended)
   ## @param frontend.image.pullPolicy frontend image pull policy
   ## @param frontend.image.pullSecrets frontend image pull secrets
@@ -573,7 +562,7 @@ frontend:
   image:
     registry: ghcr.io
     repository: shuffle/shuffle-frontend
-    tag: nightly
+    tag: ""
     digest: ""
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@@ -683,11 +672,12 @@ frontend:
   ## @param frontend.podSecurityContext.fsGroup Set fsGroup in frontend pods' Security Context
   ##
   podSecurityContext:
-    enabled: false
+    enabled: false # The default shuffle frontend image does not support running as non-root, because /etc/nginx/nginx.conf is written on startup
     fsGroupChangePolicy: Always
     sysctls: []
     supplementalGroups: []
     fsGroup: 1001
+
   ## Configure Container Security Context
   ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
   ## @param frontend.containerSecurityContext.enabled Enabled frontend container' Security Context
@@ -702,10 +692,10 @@ frontend:
   ## @param frontend.containerSecurityContext.seccompProfile.type Set seccomp profile in frontend container
   ##
   containerSecurityContext:
-    enabled: false
+    enabled: false # The default shuffle frontend image does not support running as non-root, because /etc/nginx/nginx.conf is written on startup
     seLinuxOptions: {}
-    runAsUser: 101
-    runAsGroup: 101
+    runAsUser: 1001
+    runAsGroup: 1001
     runAsNonRoot: true
     readOnlyRootFilesystem: true
     privileged: false
@@ -728,18 +718,10 @@ frontend:
   ## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/
   ##
   hostAliases: []
-  ## @param frontend.daemonsetAnnotations Annotations for frontend daemonset
-  ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
-  ##
-  daemonsetAnnotations: {}
   ## @param frontend.deploymentAnnotations Annotations for frontend deployment
   ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
   ##
   deploymentAnnotations: {}
-  ## @param frontend.statefulsetAnnotations Annotations for frontend statefulset
-  ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
-  ##
-  statefulsetAnnotations: {}
   ## @param frontend.podLabels Extra labels for frontend pods
   ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
   ##
@@ -786,25 +768,13 @@ frontend:
   ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
   ##
   tolerations: []
-  ## ONLY FOR DEPLOYMENTS:
   ## @param frontend.updateStrategy.type frontend deployment strategy type
   ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
-  ## ONLY FOR STATEFULSETS:
-  ## @param frontend.updateStrategy.type frontend statefulset strategy type
-  ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies
   ##
   updateStrategy:
-    ## ONLY FOR DEPLOYMENTS:
     ## Can be set to RollingUpdate or Recreate
-    ## ONLY FOR STATEFULSETS:
-    ## Can be set to RollingUpdate or OnDelete
     ##
     type: RollingUpdate
-  ## ONLY FOR STATEFULSETS:
-  ## @param frontend.podManagementPolicy Pod management policy for frontend statefulset
-  ## Ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#pod-management-policies
-  ##
-  podManagementPolicy: OrderedReady
   ## @param frontend.priorityClassName frontend pods' priorityClassName
   ##
   priorityClassName: ""
@@ -908,6 +878,14 @@ frontend:
       targetCPU: ""
       targetMemory: ""
 
+  ## Service configuration
+  ##
+  service:
+    ## @param frontend.service.labels Extra labels for frontend service
+    ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
+    ##
+    labels: {}
+
   ## ServiceAccount configuration
   ##
   serviceAccount:
@@ -970,7 +948,7 @@ orborus:
   ## orborus image
   ## @param orborus.image.registry orborus image registry
   ## @param orborus.image.repository orborus image repository
-  ## @skip orborus.image.tag orborus image tag (immutable tags are recommended)
+  ## @param orborus.image.tag orborus image tag (immutable tags are recommended, defaults to appVersion)
   ## @param orborus.image.digest orborus image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended)
   ## @param orborus.image.pullPolicy orborus image pull policy
   ## @param orborus.image.pullSecrets orborus image pull secrets
@@ -978,7 +956,7 @@ orborus:
   image:
     registry: ghcr.io
     repository: shuffle/shuffle-orborus
-    tag: nightly
+    tag: ""
     digest: ""
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@@ -996,10 +974,6 @@ orborus:
   ## @param orborus.replicaCount Number of orborus replicas to deploy
   ##
   replicaCount: 1
-  ## @param orborus.containerPorts.http orborus HTTP container port
-  ##
-  containerPorts:
-    http: 8080
   ## @param orborus.extraContainerPorts Optionally specify extra list of additional ports for orborus containers
   ## e.g:
   ## extraContainerPorts:
@@ -1107,8 +1081,8 @@ orborus:
   containerSecurityContext:
     enabled: true
     seLinuxOptions: {}
-    runAsUser: 101
-    runAsGroup: 101
+    runAsUser: 1001
+    runAsGroup: 1001
     runAsNonRoot: true
     readOnlyRootFilesystem: true
     privileged: false
@@ -1132,18 +1106,10 @@ orborus:
   ## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/
   ##
   hostAliases: []
-  ## @param orborus.daemonsetAnnotations Annotations for orborus daemonset
-  ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
-  ##
-  daemonsetAnnotations: {}
   ## @param orborus.deploymentAnnotations Annotations for orborus deployment
   ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
   ##
   deploymentAnnotations: {}
-  ## @param orborus.statefulsetAnnotations Annotations for orborus statefulset
-  ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
-  ##
-  statefulsetAnnotations: {}
   ## @param orborus.podLabels Extra labels for orborus pods
   ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
   ##
@@ -1190,25 +1156,13 @@ orborus:
   ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
   ##
   tolerations: []
-  ## ONLY FOR DEPLOYMENTS:
   ## @param orborus.updateStrategy.type orborus deployment strategy type
   ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
-  ## ONLY FOR STATEFULSETS:
-  ## @param orborus.updateStrategy.type orborus statefulset strategy type
-  ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies
   ##
   updateStrategy:
-    ## ONLY FOR DEPLOYMENTS:
     ## Can be set to RollingUpdate or Recreate
-    ## ONLY FOR STATEFULSETS:
-    ## Can be set to RollingUpdate or OnDelete
     ##
     type: RollingUpdate
-  ## ONLY FOR STATEFULSETS:
-  ## @param orborus.podManagementPolicy Pod management policy for orborus statefulset
-  ## Ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#pod-management-policies
-  ##
-  podManagementPolicy: OrderedReady
   ## @param orborus.priorityClassName orborus pods' priorityClassName
   ##
   priorityClassName: ""
@@ -1377,15 +1331,57 @@ worker:
   ## worker image
   ## @param worker.image.registry worker image registry
   ## @param worker.image.repository worker image repository
-  ## @skip worker.image.tag worker image tag (immutable tags are recommended)
+  ## @param worker.image.tag worker image tag (immutable tags are recommended, defaults to appVersion)
   ## @param worker.image.digest worker image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended)
   ##
   image:
     registry: ghcr.io
     repository: shuffle/shuffle-worker
-    tag: nightly
+    tag: ""
     digest: ""
 
+  ## Configure Pods Security Context
+  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
+  ## @param worker.podSecurityContext.enabled Enable worker pods' Security Context
+  ## @param worker.podSecurityContext.fsGroupChangePolicy Set filesystem group change policy for worker pods
+  ## @param worker.podSecurityContext.sysctls Set kernel settings using the sysctl interface for worker pods
+  ## @param worker.podSecurityContext.supplementalGroups Set filesystem extra groups for worker pods
+  ## @param worker.podSecurityContext.fsGroup Set fsGroup in worker pods' Security Context
+  ##
+  podSecurityContext:
+    enabled: true
+    fsGroupChangePolicy: Always
+    sysctls: []
+    supplementalGroups: []
+    fsGroup: 1001
+    
+  ## Configure Container Security Context
+  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
+  ## @param worker.containerSecurityContext.enabled Enabled worker container' Security Context
+  ## @param worker.containerSecurityContext.seLinuxOptions [object,nullable] Set SELinux options in worker container
+  ## @param worker.containerSecurityContext.runAsUser Set runAsUser in worker container' Security Context
+  ## @param worker.containerSecurityContext.runAsGroup Set runAsGroup in worker container' Security Context
+  ## @param worker.containerSecurityContext.runAsNonRoot Set runAsNonRoot in worker container' Security Context
+  ## @param worker.containerSecurityContext.readOnlyRootFilesystem Set readOnlyRootFilesystem in worker container' Security Context
+  ## @param worker.containerSecurityContext.privileged Set privileged in worker container' Security Context
+  ## @param worker.containerSecurityContext.allowPrivilegeEscalation Set allowPrivilegeEscalation in worker container' Security Context
+  ## @param worker.containerSecurityContext.capabilities.drop List of capabilities to be dropped in worker container
+  ## @param worker.containerSecurityContext.seccompProfile.type Set seccomp profile in worker container
+  ##
+  containerSecurityContext:
+    enabled: true
+    seLinuxOptions: {}
+    runAsUser: 1001
+    runAsGroup: 1001
+    runAsNonRoot: true
+    readOnlyRootFilesystem: true
+    privileged: false
+    allowPrivilegeEscalation: false
+    capabilities:
+      drop: ["ALL"]
+    seccompProfile:
+      type: "RuntimeDefault"
+
   ## ServiceAccount configuration
   ##
   serviceAccount:
@@ -1448,6 +1444,48 @@ worker:
 ## @section app Parameters
 ##
 app:
+  ## Configure Pods Security Context
+  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
+  ## @param app.podSecurityContext.enabled Enable app pods' Security Context
+  ## @param app.podSecurityContext.fsGroupChangePolicy Set filesystem group change policy for app pods
+  ## @param app.podSecurityContext.sysctls Set kernel settings using the sysctl interface for app pods
+  ## @param app.podSecurityContext.supplementalGroups Set filesystem extra groups for app pods
+  ## @param app.podSecurityContext.fsGroup Set fsGroup in app pods' Security Context
+  ##
+  podSecurityContext:
+    enabled: true
+    fsGroupChangePolicy: Always
+    sysctls: []
+    supplementalGroups: []
+    fsGroup: 1001
+    
+  ## Configure Container Security Context
+  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
+  ## @param app.containerSecurityContext.enabled Enabled app container' Security Context
+  ## @param app.containerSecurityContext.seLinuxOptions [object,nullable] Set SELinux options in app container
+  ## @param app.containerSecurityContext.runAsUser Set runAsUser in app container' Security Context
+  ## @param app.containerSecurityContext.runAsGroup Set runAsGroup in app container' Security Context
+  ## @param app.containerSecurityContext.runAsNonRoot Set runAsNonRoot in app container' Security Context
+  ## @param app.containerSecurityContext.readOnlyRootFilesystem Set readOnlyRootFilesystem in app container' Security Context
+  ## @param app.containerSecurityContext.privileged Set privileged in app container' Security Context
+  ## @param app.containerSecurityContext.allowPrivilegeEscalation Set allowPrivilegeEscalation in app container' Security Context
+  ## @param app.containerSecurityContext.capabilities.drop List of capabilities to be dropped in app container
+  ## @param app.containerSecurityContext.seccompProfile.type Set seccomp profile in app container
+  ##
+  containerSecurityContext:
+    enabled: true
+    seLinuxOptions: {}
+    runAsUser: 1001
+    runAsGroup: 1001
+    runAsNonRoot: true
+    readOnlyRootFilesystem: true
+    privileged: false
+    allowPrivilegeEscalation: false
+    capabilities:
+      drop: ["ALL"]
+    seccompProfile:
+      type: "RuntimeDefault"
+      
   ## ServiceAccount configuration
   ##
   serviceAccount:
@@ -1507,6 +1545,10 @@ app:
     ##
     extraEgress: []
 
+  ## @param app.exposedContainerPort The port that shuffle app containers will listen on for new requests. 
+  ##
+  exposedContainerPort: 80
+
 ## @section Traffic Exposure Parameters
 ##
 
@@ -1748,7 +1790,7 @@ volumePermissions:
   ## ref: https://hub.docker.com/r/bitnami/os-shell/tags/
   ## @param volumePermissions.image.registry OS Shell + Utility image registry
   ## @param volumePermissions.image.repository OS Shell + Utility image repository
-  ## @skip volumePermissions.image.tag OS Shell + Utility image tag (immutable tags are recommended)
+  ## @param volumePermissions.image.tag OS Shell + Utility image tag (immutable tags are recommended)
   ## @param volumePermissions.image.pullPolicy OS Shell + Utility image pull policy
   ## @param volumePermissions.image.pullSecrets OS Shell + Utility image pull secrets
   ##
@@ -1802,9 +1844,24 @@ volumePermissions:
 ## OpenSearch chart configuration
 ## ref: https://github.com/bitnami/charts/blob/main/bitnami/opensearch/values.yaml
 ## @param opensearch.enabled Switch to enable or disable the opensearch helm chart
+## @skip opensearch.master
+## @skip opensearch.data
+## @skip opensearch.coordinating
+## @skip opensearch.ingest
+## @skip opensearch.dashboards
 ##
 opensearch:
   enabled: true
+  master:
+    replicaCount: 1
+  data:
+    replicaCount: 1
+  coordinating:
+    replicaCount: 1
+  ingest:
+    replicaCount: 1
+  dashboards:
+    enabled: true
 
 ## @section Vault Parameters
 ##
diff --git a/functions/onprem/orborus/Dockerfile b/functions/onprem/orborus/Dockerfile
index 023cdf8f..3121e93a 100644
--- a/functions/onprem/orborus/Dockerfile
+++ b/functions/onprem/orborus/Dockerfile
@@ -1,11 +1,13 @@
-FROM golang:1.22 as builder
+FROM golang:1.24 as builder
 
 WORKDIR /app
 
 COPY orborus.go /app/orborus.go
 COPY go.mod /app/go.mod
 
-RUN go get
+#RUN go get
+RUN go mod download
+RUN go mod tidy 
 #RUN go build -v
 
 # Enabled CGO January 2025 (?)
diff --git a/functions/onprem/orborus/go.mod b/functions/onprem/orborus/go.mod
index 14e73904..5d3ee295 100644
--- a/functions/onprem/orborus/go.mod
+++ b/functions/onprem/orborus/go.mod
@@ -1,129 +1,152 @@
 module orborus
 
-go 1.22.7
+go 1.24.0
 
-toolchain go1.22.11
+toolchain go1.24.4
 
 //replace github.com/shuffle/shuffle-shared => ../../../../shuffle-shared
 
 require (
-	github.com/docker/docker v27.5.0+incompatible
+	github.com/docker/docker v28.2.2+incompatible
 	github.com/docker/go-connections v0.5.0
 	github.com/satori/go.uuid v1.2.0
-	github.com/shuffle/shuffle-shared v0.8.0
-	k8s.io/api v0.30.2
-	k8s.io/apimachinery v0.30.2
+	github.com/shuffle/shuffle-shared v0.8.84
+	k8s.io/api v0.33.1
+	k8s.io/apimachinery v0.33.1
 )
 
 require (
-	cloud.google.com/go v0.110.2 // indirect
-	cloud.google.com/go/compute/metadata v0.5.0 // indirect
-	cloud.google.com/go/datastore v1.11.0 // indirect
-	cloud.google.com/go/iam v0.13.0 // indirect
-	cloud.google.com/go/scheduler v1.9.0 // indirect
-	cloud.google.com/go/storage v1.29.0 // indirect
+	cloud.google.com/go/auth v0.16.1 // indirect
+	cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
+)
+
+require (
+	cel.dev/expr v0.20.0 // indirect
+	cloud.google.com/go v0.121.1 // indirect
+	cloud.google.com/go/compute/metadata v0.7.0 // indirect
+	cloud.google.com/go/datastore v1.20.0 // indirect
+	cloud.google.com/go/iam v1.5.2 // indirect
+	cloud.google.com/go/monitoring v1.24.2 // indirect
+	cloud.google.com/go/scheduler v1.11.7 // indirect
+	cloud.google.com/go/storage v1.55.0 // indirect
 	dario.cat/mergo v1.0.0 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect
 	github.com/Masterminds/semver v1.5.0 // indirect
-	github.com/Microsoft/go-winio v0.6.1 // indirect
-	github.com/ProtonMail/go-crypto v1.1.3 // indirect
-	github.com/adrg/strutil v0.2.3 // indirect
-	github.com/algolia/algoliasearch-client-go/v3 v3.18.1 // indirect
-	github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874 // indirect
+	github.com/Microsoft/go-winio v0.6.2 // indirect
+	github.com/ProtonMail/go-crypto v1.1.6 // indirect
+	github.com/adrg/strutil v0.3.1 // indirect
+	github.com/algolia/algoliasearch-client-go/v3 v3.31.4 // indirect
+	github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf // indirect
 	github.com/bradfitz/slice v0.0.0-20180809154707-2b758aa73013 // indirect
-	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
-	github.com/cloudflare/circl v1.3.7 // indirect
-	github.com/cyphar/filepath-securejoin v0.2.5 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/cenkalti/backoff/v5 v5.0.2 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/cloudflare/circl v1.6.1 // indirect
+	github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 // indirect
+	github.com/containerd/errdefs v1.0.0 // indirect
+	github.com/containerd/errdefs/pkg v0.3.0 // indirect
+	github.com/cyphar/filepath-securejoin v0.4.1 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/distribution/reference v0.6.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
+	github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
+	github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/frikky/kin-openapi v0.41.0 // indirect
-	github.com/frikky/schemaless v0.0.13 // indirect
+	github.com/frikky/kin-openapi v0.42.0 // indirect
+	github.com/frikky/schemaless v0.0.16 // indirect
+	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
-	github.com/go-git/go-billy/v5 v5.6.0 // indirect
-	github.com/go-git/go-git/v5 v5.13.0 // indirect
+	github.com/go-git/go-billy/v5 v5.6.2 // indirect
+	github.com/go-git/go-git/v5 v5.16.1 // indirect
+	github.com/go-jose/go-jose/v4 v4.0.5 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/swag v0.22.3 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/gnostic-models v0.6.8 // indirect
+	github.com/google/gnostic-models v0.6.9 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/go-github/v28 v28.1.1 // indirect
-	github.com/google/go-querystring v1.0.0 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/s2a-go v0.1.4 // indirect
+	github.com/google/go-querystring v1.1.0 // indirect
+	github.com/google/s2a-go v0.1.9 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
-	github.com/googleapis/gax-go/v2 v2.11.0 // indirect
-	github.com/imdario/mergo v0.3.6 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
+	github.com/googleapis/gax-go/v2 v2.14.2 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
+	github.com/moby/sys/sequential v0.6.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.1.0 // indirect
+	github.com/opencontainers/image-spec v1.1.1 // indirect
 	github.com/opensearch-project/opensearch-go v1.1.0 // indirect
 	github.com/opensearch-project/opensearch-go/v2 v2.3.0 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
-	github.com/pjbgf/sha1cd v0.3.0 // indirect
+	github.com/pjbgf/sha1cd v0.3.2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/sashabaranov/go-openai v1.19.2 // indirect
+	github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
+	github.com/sashabaranov/go-openai v1.40.1 // indirect
 	github.com/sendgrid/rest v2.6.9+incompatible // indirect
-	github.com/sendgrid/sendgrid-go v3.14.0+incompatible // indirect
+	github.com/sendgrid/sendgrid-go v3.16.1+incompatible // indirect
 	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
-	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/skeema/knownhosts v1.3.0 // indirect
+	github.com/skeema/knownhosts v1.3.1 // indirect
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
+	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
-	go.opencensus.io v0.24.0 // indirect
+	github.com/zeebo/errs v1.4.0 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
-	go.opentelemetry.io/otel v1.33.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
-	go.opentelemetry.io/otel/metric v1.33.0 // indirect
-	go.opentelemetry.io/otel/trace v1.33.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.4.0 // indirect
-	go4.org v0.0.0-20201209231011-d4a079459e60 // indirect
-	golang.org/x/crypto v0.32.0 // indirect
-	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/net v0.34.0 // indirect
-	golang.org/x/oauth2 v0.23.0 // indirect
-	golang.org/x/sync v0.10.0 // indirect
-	golang.org/x/sys v0.29.0 // indirect
-	golang.org/x/term v0.28.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
-	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
-	google.golang.org/api v0.126.0 // indirect
+	go.opentelemetry.io/contrib/detectors/gcp v1.36.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
+	go.opentelemetry.io/otel v1.36.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
+	go.opentelemetry.io/otel/metric v1.36.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.36.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
+	go.opentelemetry.io/otel/trace v1.36.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.5.0 // indirect
+	go4.org v0.0.0-20230225012048-214862532bf5 // indirect
+	golang.org/x/crypto v0.38.0 // indirect
+	golang.org/x/net v0.40.0 // indirect
+	golang.org/x/oauth2 v0.30.0 // indirect
+	golang.org/x/sync v0.14.0 // indirect
+	golang.org/x/sys v0.33.0 // indirect
+	golang.org/x/term v0.32.0 // indirect
+	golang.org/x/text v0.25.0 // indirect
+	golang.org/x/time v0.11.0 // indirect
+	google.golang.org/api v0.236.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
-	google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
-	google.golang.org/grpc v1.68.1 // indirect
-	google.golang.org/protobuf v1.35.2 // indirect
+	google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
+	google.golang.org/grpc v1.72.2 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
+	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/client-go v0.30.2 // indirect
-	k8s.io/klog/v2 v2.120.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
-	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
-	sigs.k8s.io/yaml v1.3.0 // indirect
+	k8s.io/client-go v0.33.1 // indirect
+	k8s.io/klog/v2 v2.130.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
+	k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
+	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
+	sigs.k8s.io/randfill v1.0.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
 )
diff --git a/functions/onprem/orborus/go.sum b/functions/onprem/orborus/go.sum
index 98879a0b..13ae08b5 100644
--- a/functions/onprem/orborus/go.sum
+++ b/functions/onprem/orborus/go.sum
@@ -1,3 +1,5 @@
+cel.dev/expr v0.20.0 h1:OunBvVCfvpWlt4dN7zg3FM6TDkzOePe1+foGJ9AXeeI=
+cel.dev/expr v0.20.0/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
@@ -7,25 +9,37 @@ cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTj
 cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
 cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
 cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
-cloud.google.com/go v0.110.2 h1:sdFPBr6xG9/wkBbfhmUz/JmZC7X6LavQgcrVINrKiVA=
-cloud.google.com/go v0.110.2/go.mod h1:k04UEeEtb6ZBRTv3dZz4CeJC3jKGxyhl0sAiVVquxiw=
+cloud.google.com/go v0.121.1 h1:S3kTQSydxmu1JfLRLpKtxRPA7rSrYPRPEUmL/PavVUw=
+cloud.google.com/go v0.121.1/go.mod h1:nRFlrHq39MNVWu+zESP2PosMWA0ryJw8KUBZ2iZpxbw=
+cloud.google.com/go/auth v0.16.1 h1:XrXauHMd30LhQYVRHLGvJiYeczweKQXZxsTbV9TiguU=
+cloud.google.com/go/auth v0.16.1/go.mod h1:1howDHJ5IETh/LwYs3ZxvlkXF48aSqqJUM+5o02dNOI=
+cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc=
+cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
-cloud.google.com/go/compute/metadata v0.5.0 h1:Zr0eK8JbFv6+Wi4ilXAR8FJ3wyNdpxHKJNPos6LTZOY=
-cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY=
+cloud.google.com/go/compute/metadata v0.7.0 h1:PBWF+iiAerVNe8UCHxdOt6eHLVc3ydFeOCw78U8ytSU=
+cloud.google.com/go/compute/metadata v0.7.0/go.mod h1:j5MvL9PprKL39t166CoB1uVHfQMs4tFQZZcKwksXUjo=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
-cloud.google.com/go/datastore v1.11.0 h1:iF6I/HaLs3Ado8uRKMvZRvF/ZLkWaWE9i8AiHzbC774=
-cloud.google.com/go/datastore v1.11.0/go.mod h1:TvGxBIHCS50u8jzG+AW/ppf87v1of8nwzFNgEZU1D3c=
-cloud.google.com/go/iam v0.13.0 h1:+CmB+K0J/33d0zSQ9SlFWUeCCEn5XJA0ZMZ3pHE9u8k=
-cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0=
+cloud.google.com/go/datastore v1.20.0 h1:NNpXoyEqIJmZFc0ACcwBEaXnmscUpcG4NkKnbCePmiM=
+cloud.google.com/go/datastore v1.20.0/go.mod h1:uFo3e+aEpRfHgtp5pp0+6M0o147KoPaYNaPAKpfh8Ew=
+cloud.google.com/go/iam v1.5.2 h1:qgFRAGEmd8z6dJ/qyEchAuL9jpswyODjA2lS+w234g8=
+cloud.google.com/go/iam v1.5.2/go.mod h1:SE1vg0N81zQqLzQEwxL2WI6yhetBdbNQuTvIKCSkUHE=
+cloud.google.com/go/logging v1.13.0 h1:7j0HgAp0B94o1YRDqiqm26w4q1rDMH7XNRU34lJXHYc=
+cloud.google.com/go/logging v1.13.0/go.mod h1:36CoKh6KA/M0PbhPKMq6/qety2DCAErbhXT62TuXALA=
+cloud.google.com/go/longrunning v0.6.7 h1:IGtfDWHhQCgCjwQjV9iiLnUta9LBCo8R9QmAFsS/PrE=
+cloud.google.com/go/longrunning v0.6.7/go.mod h1:EAFV3IZAKmM56TyiE6VAP3VoTzhZzySwI/YI1s/nRsY=
+cloud.google.com/go/monitoring v1.24.2 h1:5OTsoJ1dXYIiMiuL+sYscLc9BumrL3CarVLL7dd7lHM=
+cloud.google.com/go/monitoring v1.24.2/go.mod h1:x7yzPWcgDRnPEv3sI+jJGBkwl5qINf+6qY4eq0I9B4U=
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
-cloud.google.com/go/scheduler v1.9.0 h1:NpQAHtx3sulByTLe2dMwWmah8PWgeoieFPpJpArwFV0=
-cloud.google.com/go/scheduler v1.9.0/go.mod h1:yexg5t+KSmqu+njTIh3b7oYPheFtBWGcbVUYF1GGMIc=
+cloud.google.com/go/scheduler v1.11.7 h1:zkMEJ0UbEJ3O7NwEUlKLIp6eXYv1L7wHjbxyxznajKM=
+cloud.google.com/go/scheduler v1.11.7/go.mod h1:gqYs8ndLx2M5D0oMJh48aGS630YYvC432tHCnVWN13s=
 cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
 cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
-cloud.google.com/go/storage v1.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI=
-cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4=
+cloud.google.com/go/storage v1.55.0 h1:NESjdAToN9u1tmhVqhXCaCwYBuvEhZLLv0gBr+2znf0=
+cloud.google.com/go/storage v1.55.0/go.mod h1:ztSmTTwzsdXe5syLVS0YsbFxXuvEmEyZj7v7zChEmuY=
+cloud.google.com/go/trace v1.11.6 h1:2O2zjPzqPYAHrn3OKl029qlqG6W8ZdYaOWRyr8NgMT4=
+cloud.google.com/go/trace v1.11.6/go.mod h1:GA855OeDEBiBMzcckLPE2kDunIpC72N+Pq8WFieFjnI=
 dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
 dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
@@ -33,22 +47,27 @@ github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEK
 github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 h1:ErKg/3iS1AKcTkf3yixlZ54f9U1rljCkQyEXWUnIUxc=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0/go.mod h1:yAZHSGnqScoU556rBOVkwLze6WP5N+U11RHuWaGVxwY=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 h1:fYE9p3esPxA/C0rQ0AHhP0drtPXDRhaWiwg1DPqO7IU=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0/go.mod h1:BnBReJLvVYx2CS/UHOgVz2BXKXD9wsQPxZug20nZhd0=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.51.0 h1:OqVGm6Ei3x5+yZmSJG1Mh2NwHvpVmZ08CB5qJhT9Nuk=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.51.0/go.mod h1:SZiPHWGOOk3bl8tkevxkoiwPgsIl6CwrWcbwjfHZpdM=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 h1:6/0iUd0xrnX7qt+mLNRwg5c0PGv8wpE8K90ryANQwMI=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0/go.mod h1:otE2jQekW/PqXk1Awf5lmfokJx4uwuqcj1ab5SpGeW0=
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
 github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
-github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
-github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
-github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 h1:kkhsdkhsCvIsutKu5zLMgWtgh9YxGCNAw8Ad8hjwfYg=
-github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0=
-github.com/ProtonMail/go-crypto v1.1.3 h1:nRBOetoydLeUb4nHajyO2bKqMLfWQ/ZPwkXqXxPxCFk=
-github.com/ProtonMail/go-crypto v1.1.3/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
-github.com/adrg/strutil v0.2.3 h1:WZVn3ItPBovFmP4wMHHVXUr8luRaHrbyIuLlHt32GZQ=
-github.com/adrg/strutil v0.2.3/go.mod h1:+SNxbiH6t+O+5SZqIj5n/9i5yUjR+S3XXVrjEcN2mxg=
-github.com/algolia/algoliasearch-client-go/v3 v3.18.1 h1:FP2Xtqqs/sefR5Qluygp+jVV+juXzEdJaPrZTCDLhDQ=
-github.com/algolia/algoliasearch-client-go/v3 v3.18.1/go.mod h1:i7tLoP7TYDmHX3Q7vkIOL4syVse/k5VJ+k0i8WqFiJk=
+github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
+github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
+github.com/ProtonMail/go-crypto v1.1.6 h1:ZcV+Ropw6Qn0AX9brlQLAUXfqLBc7Bl+f/DmNxpLfdw=
+github.com/ProtonMail/go-crypto v1.1.6/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
+github.com/adrg/strutil v0.3.1 h1:OLvSS7CSJO8lBii4YmBt8jiK9QOtB9CzCzwl4Ic/Fz4=
+github.com/adrg/strutil v0.3.1/go.mod h1:8h90y18QLrs11IBffcGX3NW/GFBXCMcNg4M7H6MspPA=
+github.com/algolia/algoliasearch-client-go/v3 v3.31.4 h1:UJhx6AhZCYf0qZygDz2c1x1+1q2q2sfzsRaQM6yswWk=
+github.com/algolia/algoliasearch-client-go/v3 v3.31.4/go.mod h1:i7tLoP7TYDmHX3Q7vkIOL4syVse/k5VJ+k0i8WqFiJk=
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
-github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/aws/aws-sdk-go v1.42.27/go.mod h1:OGr6lGMAKGlG9CVrYnWYDKIyb829c6EVBRjxqjmPepc=
@@ -65,105 +84,109 @@ github.com/aws/aws-sdk-go-v2/service/sso v1.12.10/go.mod h1:ouy2P4z6sJN70fR3ka3w
 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10/go.mod h1:AFvkxc8xfBe8XA+5St5XIHHrQQtkxqrRincx4hmMHOk=
 github.com/aws/aws-sdk-go-v2/service/sts v1.19.0/go.mod h1:BgQOMsg8av8jset59jelyPW7NoZcZXLVpDsXunGDrk8=
 github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
-github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874 h1:N7oVaKyGp8bttX0bfZGmcGkjz7DLQXhAn3DNd3T0ous=
-github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874/go.mod h1:r5xuitiExdLAJ09PR7vBVENGvp4ZuTBeWTGtxuX3K+c=
+github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf h1:TqhNAT4zKbTdLa62d2HDBFdvgSbIGB3eJE8HqhgiL9I=
+github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf/go.mod h1:r5xuitiExdLAJ09PR7vBVENGvp4ZuTBeWTGtxuX3K+c=
 github.com/bradfitz/slice v0.0.0-20180809154707-2b758aa73013 h1:/P9/RL0xgWE+ehnCUUN5h3RpG3dmoMCOONO1CCvq23Y=
 github.com/bradfitz/slice v0.0.0-20180809154707-2b758aa73013/go.mod h1:pccXHIvs3TV/TUqSNyEvF99sxjX2r4FFRIyw6TZY9+w=
-github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
-github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
-github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
+github.com/cenkalti/backoff/v5 v5.0.2 h1:rIfFVxEf1QsI7E1ZHfp/B4DF/6QBAUhmgkxc0H7Zss8=
+github.com/cenkalti/backoff/v5 v5.0.2/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
+github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
-github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
-github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
-github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
-github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
+github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
+github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 h1:Om6kYQYDUk5wWbT0t0q6pvyM49i9XZAv9dDrkDA7gjk=
+github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
+github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
+github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
+github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE=
+github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk=
 github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
 github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
-github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
-github.com/cyphar/filepath-securejoin v0.2.5 h1:6iR5tXJ/e6tJZzzdMc1km3Sa7RRIVBKAK32O2s7AYfo=
-github.com/cyphar/filepath-securejoin v0.2.5/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
+github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s=
+github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
-github.com/docker/docker v27.5.0+incompatible h1:um++2NcQtGRTz5eEgO6aJimo6/JxrTXC941hd05JO6U=
-github.com/docker/docker v27.5.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v28.2.2+incompatible h1:CjwRSksz8Yo4+RmQ339Dp/D2tGO5JxwYeqtMOEe0LDw=
+github.com/docker/docker v28.2.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
 github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcejNsXKSkQ6lcIaNec2nyfOdlTBR2lU=
-github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
+github.com/elazarl/goproxy v1.7.2 h1:Y2o6urb7Eule09PjlhQRGNsqRfPmYI3KKQLFpCAV3+o=
+github.com/elazarl/goproxy v1.7.2/go.mod h1:82vkLNir0ALaW14Rc399OTTjyNREgmdL2cVoIbS6XaE=
 github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
 github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
 github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
-github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
+github.com/envoyproxy/go-control-plane v0.13.4 h1:zEqyPVyku6IvWCFwux4x9RxkLOMUL+1vC9xUFv5l2/M=
+github.com/envoyproxy/go-control-plane v0.13.4/go.mod h1:kDfuBlDVsSj2MjrLEtRWtHlsWIFcGyB2RMO44Dc5GZA=
+github.com/envoyproxy/go-control-plane/envoy v1.32.4 h1:jb83lalDRZSpPWW2Z7Mck/8kXZ5CQAFYVjQcdVIr83A=
+github.com/envoyproxy/go-control-plane/envoy v1.32.4/go.mod h1:Gzjc5k8JcJswLjAx1Zm+wSYE20UrLtt7JZMWiWQXQEw=
+github.com/envoyproxy/go-control-plane/ratelimit v0.1.0 h1:/G9QYbddjL25KvtKTv3an9lx6VBE2cnb8wp1vEGNYGI=
+github.com/envoyproxy/go-control-plane/ratelimit v0.1.0/go.mod h1:Wk+tMFAFbCXaJPzVVHnPgRKdUdwW/KdbRt94AzgRee4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/envoyproxy/protoc-gen-validate v1.2.1 h1:DEo3O99U8j4hBFwbJfrz9VtgcDfUKS7KJ7spH3d86P8=
+github.com/envoyproxy/protoc-gen-validate v1.2.1/go.mod h1:d/C80l/jxXLdfEIhX1W2TmLfsJ31lvEjwamM4DxlWXU=
 github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/frikky/kin-openapi v0.41.0 h1:oMmjo+ekGS971lb3KLeZZOqRDZOwWi3+g/OiSWP08+s=
-github.com/frikky/kin-openapi v0.41.0/go.mod h1:ev9OZAw7Bv5p0w93j91++6a1ElPzGcCofst+kmrWsj4=
-github.com/frikky/schemaless v0.0.13 h1:ARiN9V7wr2VZXAr9JK5wvTbyPgpGrgeiL1VhR5MlgaQ=
-github.com/frikky/schemaless v0.0.13/go.mod h1:mooDxY+D6weHjhKvjy3+IE9S7P4g4cpNnidkdRv/cHQ=
+github.com/frikky/kin-openapi v0.42.0 h1:d5Z6vnuQ6RnCCPIxZaDL+TH2ODLxT8abytOt+Zh+Kd0=
+github.com/frikky/kin-openapi v0.42.0/go.mod h1:ev9OZAw7Bv5p0w93j91++6a1ElPzGcCofst+kmrWsj4=
+github.com/frikky/schemaless v0.0.16 h1:4d2ZktB9xGsAusbbKliOI8TuriSrdIMzD/6ToY3wkz8=
+github.com/frikky/schemaless v0.0.16/go.mod h1:jT48kTcmr1q3o8i+8qe7g+eCsbwaz2Q9CjOJevQQzQs=
+github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
+github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY=
-github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4=
+github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
+github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic=
-github.com/go-git/go-billy/v5 v5.5.0 h1:yEY4yhzCDuMGSv83oGxiBotRzhwhNr8VZyphhiu+mTU=
-github.com/go-git/go-billy/v5 v5.5.0/go.mod h1:hmexnoNsr2SJU1Ju67OaNz5ASJY3+sHgFRpCtpDCKow=
-github.com/go-git/go-billy/v5 v5.6.0 h1:w2hPNtoehvJIxR00Vb4xX94qHQi/ApZfX+nBE2Cjio8=
-github.com/go-git/go-billy/v5 v5.6.0/go.mod h1:sFDq7xD3fn3E0GOwUSZqHo9lrkmx8xJhA0ZrfvjBRGM=
+github.com/go-git/go-billy/v5 v5.6.2 h1:6Q86EsPXMa7c3YZ3aLAQsMA0VlWmy43r6FHqa/UNbRM=
+github.com/go-git/go-billy/v5 v5.6.2/go.mod h1:rcFC2rAsp/erv7CMz9GczHcuD0D32fWzH+MJAU+jaUU=
 github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4=
 github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII=
-github.com/go-git/go-git/v5 v5.11.0 h1:XIZc1p+8YzypNr34itUfSvYJcv+eYdTnTvOZ2vD3cA4=
-github.com/go-git/go-git/v5 v5.11.0/go.mod h1:6GFcX2P3NM7FPBfpePbpLd21XxsgdAt+lKqXmCUiUCY=
-github.com/go-git/go-git/v5 v5.13.0 h1:vLn5wlGIh/X78El6r3Jr+30W16Blk0CTcxTYcYPWi5E=
-github.com/go-git/go-git/v5 v5.13.0/go.mod h1:Wjo7/JyVKtQgUNdXYXIepzWfJQkUEIGvkvVkiXRR/zw=
+github.com/go-git/go-git/v5 v5.16.1 h1:TuxMBWNL7R05tXsUGi0kh1vi4tq0WfXNLlIrAkXG1k8=
+github.com/go-git/go-git/v5 v5.16.1/go.mod h1:4Ge4alE/5gPs30F2H1esi2gPd69R0C39lolkucHBOp8=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-jose/go-jose/v4 v4.0.5 h1:M6T8+mKZl/+fNNuFHvGIzDz7BTLQPIounk/b9dw3AaE=
+github.com/go-jose/go-jose/v4 v4.0.5/go.mod h1:s3P1lRrkT8igV8D9OjyL4WRyHvjB6a4JSllnOrmmBOA=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
 github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
+github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
+github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
 github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
 github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g=
 github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
-github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
-github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
+github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
+github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
+github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
+github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=
+github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
@@ -172,70 +195,55 @@ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
-github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
+github.com/google/gnostic-models v0.6.9 h1:MU/8wDLif2qCXZmzncUQ/BOfxWfthHi63KqpoNbWqVw=
+github.com/google/gnostic-models v0.6.9/go.mod h1:CiWsm0s6BSQd1hRn8/QmxqB6BesYcbSZxsz9b0KuDBw=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/go-github/v28 v28.1.1 h1:kORf5ekX5qwXO2mGzXXOjMe/g6ap8ahVe0sBEulhSxo=
 github.com/google/go-github/v28 v28.1.1/go.mod h1:bsqJWQX05omyWVmc00nEUql9mhQyv38lDZ8kPZcQVoM=
-github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
+github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
+github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
-github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw=
-github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
+github.com/google/martian/v3 v3.3.3 h1:DIhPTQrbPkgs2yJYdXU/eNACCG5DVQjySNRNlflZ9Fc=
+github.com/google/martian/v3 v3.3.3/go.mod h1:iEPrYcgCF7jA9OtScMFQyAlZZ4YXTKEtJ1E6RWzmBA0=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec=
-github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo=
+github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc=
-github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A=
-github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=
+github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k=
-github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
+github.com/googleapis/enterprise-certificate-proxy v0.3.6 h1:GW/XbdyBFQ8Qe+YAmFU9uHLo7OnF5tL52HFAgMmyrf4=
+github.com/googleapis/enterprise-certificate-proxy v0.3.6/go.mod h1:MkHOF77EYAE7qfSuSS9PU6g4Nt4e11cnsDUowfwewLA=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/googleapis/gax-go/v2 v2.11.0 h1:9V9PWXEsWnPpQhu/PeQIkS4eGzMlTLGgt80cUUI8Ki4=
-github.com/googleapis/gax-go/v2 v2.11.0/go.mod h1:DxmR61SGKkGLa2xigwuZIQpkCI2S5iydzRfb3peWZJI=
-github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
-github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 h1:TmHmbvxPmaegwhDubVz0lICL0J5Ka2vwTzhoePEXsGE=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0/go.mod h1:qztMSjm835F2bXf+5HKAPIS5qsmQDqZna/PgVt4rWtI=
+github.com/googleapis/gax-go/v2 v2.14.2 h1:eBLnkZ9635krYIPD+ag1USrOAI0Nr0QYF3+/3GqO0k0=
+github.com/googleapis/gax-go/v2 v2.14.2/go.mod h1:ON64QhlJkhVtSqp4v1uaK92VyZ2gmvDQsweuyLV+8+w=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 h1:VNqngBF40hVlDloBruUehVYC3ArSgIyScOAyMRqBxRg=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1/go.mod h1:RBRO7fro65R6tjKzYgLAFo0t1QEXY1Dp+i/bvpRiqiQ=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
-github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
@@ -264,6 +272,10 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
 github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
+github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw=
+github.com/moby/sys/atomicwriter v0.1.0/go.mod h1:Ul8oqv2ZMNHOceF643P6FKPXeCmYtlQMvpizfsSoaWs=
+github.com/moby/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU=
+github.com/moby/sys/sequential v0.6.0/go.mod h1:uyv8EUTrca5PnDsdMGXhZe6CCe8U/UiTWd+lL+7b/Ko=
 github.com/moby/term v0.5.2 h1:6qk3FJAFDs6i/q3W/pQ97SX192qKfZgGjCQqfCJkgzQ=
 github.com/moby/term v0.5.2/go.mod h1:d3djjFCrjnB+fl8NJux+EJzu0msscUP+f8it8hPkFLc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -275,60 +287,61 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
 github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY=
-github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM=
-github.com/onsi/gomega v1.31.0 h1:54UJxxj6cPInHS3a35wm6BK/F9nHYueZ1NVujHDrnXE=
-github.com/onsi/gomega v1.31.0/go.mod h1:DW9aCi7U6Yi40wNVAvT6kzFnEVEI5n3DloYBiKiT6zk=
+github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM=
+github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
+github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
+github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
-github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
-github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
+github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
+github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
 github.com/opensearch-project/opensearch-go v1.1.0 h1:eG5sh3843bbU1itPRjA9QXbxcg8LaZ+DjEzQH9aLN3M=
 github.com/opensearch-project/opensearch-go v1.1.0/go.mod h1:+6/XHCuTH+fwsMJikZEWsucZ4eZMma3zNSeLrTtVGbo=
 github.com/opensearch-project/opensearch-go/v2 v2.3.0 h1:nQIEMr+A92CkhHrZgUhcfsrZjibvB3APXf2a1VwCmMQ=
 github.com/opensearch-project/opensearch-go/v2 v2.3.0/go.mod h1:8LDr9FCgUTVoT+5ESjc2+iaZuldqE+23Iq0r1XeNue8=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
-github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI=
+github.com/pjbgf/sha1cd v0.3.2 h1:a9wb0bp1oC2TGwStyn0Umc/IGKQnEgF0vVaZ8QF8eo4=
+github.com/pjbgf/sha1cd v0.3.2/go.mod h1:zQWigSxVmsHEZow5qaLtPYxpcKMMQpa09ixqBxuCS6A=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo=
+github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
-github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
+github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
+github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk=
-github.com/sashabaranov/go-openai v1.19.2 h1:+dkuCADSnwXV02YVJkdphY8XD9AyHLUWwk6V7LB6EL8=
-github.com/sashabaranov/go-openai v1.19.2/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=
+github.com/sashabaranov/go-openai v1.40.1 h1:bJ08Iwct5mHBVkuvG6FEcb9MDTfsXdTYPGjYLRdeTEU=
+github.com/sashabaranov/go-openai v1.40.1/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/sendgrid/rest v2.6.9+incompatible h1:1EyIcsNdn9KIisLW50MKwmSRSK+ekueiEMJ7NEoxJo0=
 github.com/sendgrid/rest v2.6.9+incompatible/go.mod h1:kXX7q3jZtJXK5c5qK83bSGMdV6tsOE70KbHoqJls4lE=
-github.com/sendgrid/sendgrid-go v3.14.0+incompatible h1:KDSasSTktAqMJCYClHVE94Fcif2i7P7wzISv1sU6DUA=
-github.com/sendgrid/sendgrid-go v3.14.0+incompatible/go.mod h1:QRQt+LX/NmgVEvmdRw0VT/QgUn499+iza2FnDca9fg8=
-github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
-github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
+github.com/sendgrid/sendgrid-go v3.16.1+incompatible h1:zWhTmB0Y8XCDzeWIm2/BIt1GjJohAA0p6hVEaDtHWWs=
+github.com/sendgrid/sendgrid-go v3.16.1+incompatible/go.mod h1:QRQt+LX/NmgVEvmdRw0VT/QgUn499+iza2FnDca9fg8=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
-github.com/shuffle/shuffle-shared v0.8.0 h1:8ABtFz5UYOXN6mnnu/LrOwz8TxASnu1OBbj+gfqmtYk=
-github.com/shuffle/shuffle-shared v0.8.0/go.mod h1:bBXhEsPKjxln0mFnSeri7gIJ3tL/636Sh5NyTyNrvIQ=
+github.com/shuffle/shuffle-shared v0.8.84 h1:ElIMQYjKBVOiadbiGkSzt/lPU5xqaQwRxQvk9wx/xYM=
+github.com/shuffle/shuffle-shared v0.8.84/go.mod h1:RdfNxqCPI+zU4jQKy3E/p4Io2injm7LpSKQUCDHNtLk=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/skeema/knownhosts v1.2.1 h1:SHWdIUa82uGZz+F+47k8SY4QhhI291cXCpopT1lK2AQ=
-github.com/skeema/knownhosts v1.2.1/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3ThzgDxUwo=
-github.com/skeema/knownhosts v1.3.0 h1:AM+y0rI04VksttfwjkSTNQorvGqmwATnvnAHpSgc0LY=
-github.com/skeema/knownhosts v1.3.0/go.mod h1:sPINvnADmT/qYH1kfv+ePMmOBTH6Tbl7b5LvTDjFK7M=
+github.com/skeema/knownhosts v1.3.1 h1:X2osQ+RAjK76shCbvhHHHVl3ZlgDm8apHEHFqRjnBY8=
+github.com/skeema/knownhosts v1.3.1/go.mod h1:r7KTdC8l4uxWRyK2TpQZ/1o5HaSzh06ePQNxPwTcfiY=
 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0=
 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spiffe/go-spiffe/v2 v2.5.0 h1:N2I01KCUkv1FAjZXJMwh95KK1ZIQLYbPfhaxw8WS0hE=
+github.com/spiffe/go-spiffe/v2 v2.5.0/go.mod h1:P+NxobPc6wXhVtINNtFjNWGBTreew1GBUCwT2wPmb7g=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
@@ -338,54 +351,59 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
+github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
 github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/zeebo/errs v1.4.0 h1:XNdoD/RRMKP7HD0UhJnIzUy74ISdGGxURlYG8HSWSfM=
+github.com/zeebo/errs v1.4.0/go.mod h1:sgbWHsvVuTPHcqJJGQ1WhI5KbWlHYz+2+2C/LSEtCw4=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
-go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
 go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
 go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 h1:yd02MEjBdJkG3uabWP9apV+OuWRIXGDuJEUJbOHmCFU=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0/go.mod h1:umTcuxiv1n/s/S6/c2AT/g2CQ7u5C59sHDNmfSwgz7Q=
-go.opentelemetry.io/otel v1.33.0 h1:/FerN9bax5LoK51X/sI0SVYrjSE0/yUL7DpxW4K3FWw=
-go.opentelemetry.io/otel v1.33.0/go.mod h1:SUUkR6csvUQl+yjReHu5uM3EtVV7MBm5FHKRlNx4I8I=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 h1:Vh5HayB/0HHfOQA7Ctx69E/Y/DcQSMPpKANYVMQ7fBA=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0/go.mod h1:cpgtDBaqD/6ok/UG0jT15/uKjAY8mRA53diogHBg3UI=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.33.0 h1:wpMfgF8E1rkrT1Z6meFh1NDtownE9Ii3n3X2GJYjsaU=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.33.0/go.mod h1:wAy0T/dUbs468uOlkT31xjvqQgEVXv58BRFWEgn5v/0=
-go.opentelemetry.io/otel/metric v1.33.0 h1:r+JOocAyeRVXD8lZpjdQjzMadVZp2M4WmQ+5WtEnklQ=
-go.opentelemetry.io/otel/metric v1.33.0/go.mod h1:L9+Fyctbp6HFTddIxClbQkjtubW6O9QS3Ann/M82u6M=
-go.opentelemetry.io/otel/sdk v1.33.0 h1:iax7M131HuAm9QkZotNHEfstof92xM+N8sr3uHXc2IM=
-go.opentelemetry.io/otel/sdk v1.33.0/go.mod h1:A1Q5oi7/9XaMlIWzPSxLRWOI8nG3FnzHJNbiENQuihM=
-go.opentelemetry.io/otel/trace v1.33.0 h1:cCJuF7LRjUFso9LPnEAHJDB2pqzp+hbO8eu1qqW2d/s=
-go.opentelemetry.io/otel/trace v1.33.0/go.mod h1:uIcdVUZMpTAmz0tI1z04GoVSezK37CbGV4fr1f2nBck=
-go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
-go.opentelemetry.io/proto/otlp v1.4.0 h1:TA9WRvW6zMwP+Ssb6fLoUIuirti1gGbP28GcKG1jgeg=
-go.opentelemetry.io/proto/otlp v1.4.0/go.mod h1:PPBWZIP98o2ElSqI35IHfu7hIhSwvc5N38Jw8pXuGFY=
-go4.org v0.0.0-20201209231011-d4a079459e60 h1:iqAGo78tVOJXELHQFRjR6TMwItrvXH4hrGJ32I/NFF8=
-go4.org v0.0.0-20201209231011-d4a079459e60/go.mod h1:CIiUVy99QCPfoE13bO4EZaz5GZMZXMSBGhxRdsvzbkg=
+go.opentelemetry.io/contrib/detectors/gcp v1.36.0 h1:F7q2tNlCaHY9nMKHR6XH9/qkp8FktLnIcy6jJNyOCQw=
+go.opentelemetry.io/contrib/detectors/gcp v1.36.0/go.mod h1:IbBN8uAIIx734PTonTPxAxnjc2pQTxWNkwfstZ+6H2k=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 h1:x7wzEgXfnzJcHDwStJT+mxOz4etr2EcexjqhBvmoakw=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0/go.mod h1:rg+RlpR5dKwaS95IyyZqj5Wd4E13lk/msnTS0Xl9lJM=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 h1:sbiXRNDSWJOTobXh5HyQKjq6wUC5tNybqjIqDpAY4CU=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ=
+go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg=
+go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 h1:1fTNlAIJZGWLP5FVu0fikVry1IsiUnXjf7QFvoNN3Xw=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0/go.mod h1:zjPK58DtkqQFn+YUMbx0M2XV3QgKU0gS9LeGohREyK4=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.36.0 h1:nRVXXvf78e00EwY6Wp0YII8ww2JVWshZ20HfTlE11AM=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.36.0/go.mod h1:r49hO7CgrxY9Voaj3Xe8pANWtr0Oq916d0XAmOoCZAQ=
+go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.36.0 h1:rixTyDGXFxRy1xzhKrotaHy3/KXdPhlWARrCgK+eqUY=
+go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.36.0/go.mod h1:dowW6UsM9MKbJq5JTz2AMVp3/5iW5I/TStsk8S+CfHw=
+go.opentelemetry.io/otel/metric v1.36.0 h1:MoWPKVhQvJ+eeXWHFBOPoBOi20jh6Iq2CcCREuTYufE=
+go.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs=
+go.opentelemetry.io/otel/sdk v1.36.0 h1:b6SYIuLRs88ztox4EyrvRti80uXIFy+Sqzoh9kFULbs=
+go.opentelemetry.io/otel/sdk v1.36.0/go.mod h1:+lC+mTgD+MUWfjJubi2vvXWcVxyr9rmlshZni72pXeY=
+go.opentelemetry.io/otel/sdk/metric v1.36.0 h1:r0ntwwGosWGaa0CrSt8cuNuTcccMXERFwHX4dThiPis=
+go.opentelemetry.io/otel/sdk/metric v1.36.0/go.mod h1:qTNOhFDfKRwX0yXOqJYegL5WRaW376QbB7P4Pb0qva4=
+go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w=
+go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA=
+go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4=
+go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4=
+go4.org v0.0.0-20230225012048-214862532bf5 h1:nifaUDeh+rPaBCMPMQHZmvJf+QdpLFnuQPwx+LxVmtc=
+go4.org v0.0.0-20230225012048-214862532bf5/go.mod h1:F57wTi5Lrj6WLyswp5EYV1ncrEbFGHD4hhz6S1ZYeaU=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
-golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
-golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
-golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
-golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
-golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
+golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
+golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -413,9 +431,6 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -429,33 +444,23 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
-golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
-golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
-golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
-golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
-golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
+golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
+golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
-golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
-golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=
-golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
+golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -464,9 +469,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
+golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -480,8 +484,6 @@ golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -492,24 +494,15 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
+golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
-golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
-golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
-golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
-golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
+golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
+golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -520,13 +513,12 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
+golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
+golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
-golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
+golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -554,15 +546,12 @@ golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapK
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
+golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
+golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
-golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
 google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
@@ -571,8 +560,8 @@ google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsb
 google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.126.0 h1:q4GJq+cAdMAC7XP7njvQ4tvohGLiSlytuL4BQxbIZ+o=
-google.golang.org/api v0.126.0/go.mod h1:mBwVAtz+87bEN6CbA1GtZPDOqY2R5ONPqJeIlvyo4Aw=
+google.golang.org/api v0.236.0 h1:CAiEiDVtO4D/Qja2IA9VzlFrgPnK3XVMmRoJZlSWbc0=
+google.golang.org/api v0.236.0/go.mod h1:X1WF9CU2oTc+Jml1tiIxGmWFK/UZezdqEu09gcxZAj4=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -593,85 +582,72 @@ google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvx
 google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc h1:8DyZCyvI8mE1IdLy/60bS+52xfymkE72wv1asokgtao=
-google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:xZnkP7mREFX5MORlOPEzLMr+90PPZQ2QWzrVTWfAq64=
-google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 h1:CkkIfIt50+lT6NHAVoRYEyAvQGFM7xEwXUUywFvEb3Q=
-google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576/go.mod h1:1R3kvZ1dtP3+4p4d3G8uJ8rFk/fWlScl38vanWACI08=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 h1:8ZmaLZE4XWrtU3MyClkYqqtl6Oegr3235h7jxsDyqCY=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU=
+google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 h1:1tXaIXCracvtsRxSBsYDiSBN0cuJvM7QYW+MrpIRY78=
+google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2/go.mod h1:49MsLSx0oWMOZqcpB3uL8ZOkAh1+TndpJ8ONoCBWiZk=
+google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 h1:Kog3KlB4xevJlAcbbbzPfRG0+X9fdoGM+UBRKVz6Wr0=
+google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237/go.mod h1:ezi0AVyMKDWy5xAncvjLWH7UcLBB5n7y2fQ8MzjJcto=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a h1:v2PbRU4K3llS09c7zodFpNePeamkAwG3mPrAery9VeE=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
-google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
-google.golang.org/grpc v1.68.1 h1:oI5oTa11+ng8r8XMMN7jAOmWfPZWbYpCFaMUTACxkM0=
-google.golang.org/grpc v1.68.1/go.mod h1:+q1XYFJjShcqn0QZHvCyeR4CXPA+llXIeUIfIe00waw=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+google.golang.org/grpc v1.72.2 h1:TdbGzwb82ty4OusHWepvFWGLgIbNo1/SUynEN0ssqv8=
+google.golang.org/grpc v1.72.2/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
-google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4=
+gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
 gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU=
-gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=
+gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q=
+gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-k8s.io/api v0.30.2 h1:+ZhRj+28QT4UOH+BKznu4CBgPWgkXO7XAvMcMl0qKvI=
-k8s.io/api v0.30.2/go.mod h1:ULg5g9JvOev2dG0u2hig4Z7tQ2hHIuS+m8MNZ+X6EmI=
-k8s.io/apimachinery v0.30.2 h1:fEMcnBj6qkzzPGSVsAZtQThU62SmQ4ZymlXRC5yFSCg=
-k8s.io/apimachinery v0.30.2/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
-k8s.io/client-go v0.30.2 h1:sBIVJdojUNPDU/jObC+18tXWcTJVcwyqS9diGdWHk50=
-k8s.io/client-go v0.30.2/go.mod h1:JglKSWULm9xlJLx4KCkfLLQ7XwtlbflV6uFFSHTMgVs=
-k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
-k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
-k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
-k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
-k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
-k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+k8s.io/api v0.33.1 h1:tA6Cf3bHnLIrUK4IqEgb2v++/GYUtqiu9sRVk3iBXyw=
+k8s.io/api v0.33.1/go.mod h1:87esjTn9DRSRTD4fWMXamiXxJhpOIREjWOSjsW1kEHw=
+k8s.io/apimachinery v0.33.1 h1:mzqXWV8tW9Rw4VeW9rEkqvnxj59k1ezDUl20tFK/oM4=
+k8s.io/apimachinery v0.33.1/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
+k8s.io/client-go v0.33.1 h1:ZZV/Ks2g92cyxWkRRnfUDsnhNn28eFpt26aGc8KbXF4=
+k8s.io/client-go v0.33.1/go.mod h1:JAsUrl1ArO7uRVFWfcj6kOomSlCv+JpvIsp6usAGefA=
+k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
+k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
+k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=
+k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
+k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
+k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
-sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
-sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
-sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
-sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
+sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
+sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
+sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
+sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
+sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
+sigs.k8s.io/structured-merge-diff/v4 v4.6.0 h1:IUA9nvMmnKWcj5jl84xn+T5MnlZKThmUW1TdblaLVAc=
+sigs.k8s.io/structured-merge-diff/v4 v4.6.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
+sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
+sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
diff --git a/functions/onprem/orborus/orborus.go b/functions/onprem/orborus/orborus.go
index 2f6af9fe..e350082b 100755
--- a/functions/onprem/orborus/orborus.go
+++ b/functions/onprem/orborus/orborus.go
@@ -1,13 +1,8 @@
 package main
 
 /*
-	Orborus exists to listen for new jobs which are deployed as workers.
+	Orborus exists to listen for new jobs from Shuffle. This is to run workflows, pipelines, and other tasks.
 */
-
-//  Potential issues:
-// Default network could be same as on the host
-// Ingress network may not exist (default)
-
 import (
 	"archive/zip"
 	"bytes"
@@ -60,7 +55,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 )
 
-// Starts jobs in bulk, so this could be increased
+// Starts jobs in bulk, so this could be increased or decreased based on who the user is
 var sleepTime = 2
 
 // Making it work on low-end machines even during busy times :)
@@ -75,9 +70,17 @@ var workerVersion = os.Getenv("SHUFFLE_WORKER_VERSION")
 var newWorkerImage = os.Getenv("SHUFFLE_WORKER_IMAGE")
 var dockerSwarmBridgeMTU = os.Getenv("SHUFFLE_SWARM_BRIDGE_DEFAULT_MTU")
 var dockerSwarmBridgeInterface = os.Getenv("SHUFFLE_SWARM_BRIDGE_DEFAULT_INTERFACE")
+var maxCPUPercent = 90
+
+// Kubernetes settings
 var isKubernetes = os.Getenv("IS_KUBERNETES")
 var kubernetesNamespace = os.Getenv("KUBERNETES_NAMESPACE")
-var maxCPUPercent = 90
+var workerServiceAccountName = os.Getenv("SHUFFLE_WORKER_SERVICE_ACCOUNT_NAME")
+var workerPodSecurityContext = os.Getenv("SHUFFLE_WORKER_POD_SECURITY_CONTEXT")
+var workerContainerSecurityContext = os.Getenv("SHUFFLE_WORKER_CONTAINER_SECURITY_CONTEXT")
+var appServiceAccountName = os.Getenv("SHUFFLE_APP_SERVICE_ACCOUNT_NAME")
+var appPodSecurityContext = os.Getenv("SHUFFLE_APP_POD_SECURITY_CONTEXT")
+var appContainerSecurityContext = os.Getenv("SHUFFLE_APP_CONTAINER_SECURITY_CONTEXT")
 
 // var baseimagename = "docker.pkg.github.com/shuffle/shuffle"
 // var baseimagename = "ghcr.io/frikky"
@@ -120,6 +123,7 @@ var tenzirDisabled = false
 var dockercli *dockerclient.Client
 var containerId string
 var executionCount = 0
+var orborusUuid = os.Getenv("SHUFFLE_ORBORUS_UUID")
 
 var imagedownloadTimeout = time.Second * 300
 var window = shuffle.NewTimeWindow(1 * time.Minute)
@@ -217,8 +221,7 @@ func skipCheckInCleanup(name string) bool {
 func cleanupExistingNodes(ctx context.Context) error {
 
 	if isKubernetes == "true" {
-		// of course, this doesn't clean up "nodes" but
-		// rather pods, services, roles etc.
+		// Cleanup all workers created by orborus and all apps created by workers.
 
 		if kubernetesNamespace == "" {
 			kubernetesNamespace = "default"
@@ -230,62 +233,38 @@ func cleanupExistingNodes(ctx context.Context) error {
 			return err
 		}
 
-		// Delete all pods
-		pods, err := clientset.CoreV1().Pods(kubernetesNamespace).List(context.Background(), metav1.ListOptions{})
-		if err != nil {
-			log.Printf("[ERROR] Failed listing pods: %s", err)
-			return err
-		}
-
-		for _, pod := range pods.Items {
-			// check if pod.Name starts with:
-			// "backend-", "frontend-", "orborus-", "opensearch-" or "memcached-"
-			if skipCheckInCleanup(pod.Name) {
-				continue
-			}
-
-			err := clientset.CoreV1().Pods(kubernetesNamespace).Delete(context.Background(), pod.Name, metav1.DeleteOptions{})
-			if err != nil {
-				log.Printf("[ERROR] Failed deleting pod %s: %s", pod.Name, err)
-			}
-		}
-
 		// Delete all services
-		services, err := clientset.CoreV1().Services(kubernetesNamespace).List(context.Background(), metav1.ListOptions{})
+		services, err := clientset.CoreV1().Services(kubernetesNamespace).List(context.Background(), metav1.ListOptions{
+			LabelSelector: "app.kubernetes.io/name in (shuffle-worker, shuffle-app),app.kubernetes.io/managed-by in (shuffle-orborus, shuffle-worker)",
+		})
 		if err != nil {
 			log.Printf("[ERROR] Failed listing services: %s", err)
 			return err
 		}
 
 		for _, service := range services.Items {
-			if skipCheckInCleanup(service.Name) {
-				continue
-			}
-
 			err := clientset.CoreV1().Services(kubernetesNamespace).Delete(context.Background(), service.Name, metav1.DeleteOptions{})
 			if err != nil {
 				log.Printf("[ERROR] Failed deleting service %s: %s", service.Name, err)
 			}
 		}
 
-		deployments, err := clientset.AppsV1().Deployments(kubernetesNamespace).List(context.Background(), metav1.ListOptions{})
+		deployments, err := clientset.AppsV1().Deployments(kubernetesNamespace).List(context.Background(), metav1.ListOptions{
+			LabelSelector: "app.kubernetes.io/name in (shuffle-worker, shuffle-app),app.kubernetes.io/managed-by in (shuffle-orborus, shuffle-worker)",
+		})
 		if err != nil {
 			log.Printf("[ERROR] Failed listing deployments: %s", err)
 			return err
 		}
 
 		for _, deployment := range deployments.Items {
-			if skipCheckInCleanup(deployment.Name) {
-				continue
-			}
-
 			err := clientset.AppsV1().Deployments(kubernetesNamespace).Delete(context.Background(), deployment.Name, metav1.DeleteOptions{})
 			if err != nil {
 				log.Printf("[ERROR] Failed deleting deployment %s: %s", deployment.Name, err)
 			}
 		}
 
-		log.Printf("[INFO] Cleaned up all pods and services in namespace %s. Waiting 10 seconds for cleanup to reflect", kubernetesNamespace)
+		log.Printf("[INFO] Cleaned up all services and deployments in namespace %s. Waiting 10 seconds for cleanup to reflect", kubernetesNamespace)
 
 		time.Sleep(10 * time.Second)
 
@@ -394,7 +373,7 @@ func deployServiceWorkers(image string) {
 	options := make(map[string]string)
 	options["com.docker.network.driver.mtu"] = fmt.Sprintf("%d", mtu)
 
-	ingressOptions := types.NetworkCreate{
+	ingressOptions := network.CreateOptions{
 		Driver:     "overlay",
 		Attachable: false,
 		Ingress:    true,
@@ -426,7 +405,7 @@ func deployServiceWorkers(image string) {
 		networkName = swarmNetworkName
 	}
 
-	networkCreateOptions := types.NetworkCreate{
+	networkCreateOptions := network.CreateOptions{
 		Driver:     "overlay",
 		Options:    options,
 		Attachable: true,
@@ -456,18 +435,21 @@ func deployServiceWorkers(image string) {
 		}
 	}
 
-	isMemcachedRunning, err := checkMemcached(ctx, dockercli)
-	if err != nil {
-		log.Printf("[ERROR] Failed checking memcached: %s", err)
-	}
-	if isMemcachedRunning == false {
-		log.Printf("[ERROR] Memcached is not running. Will try to deploy it.")
-		deployMemcached(dockercli)
-	}
+	/*
+		isMemcachedRunning, err := checkMemcached(ctx, dockercli)
+		if err != nil {
+			log.Printf("[ERROR] Failed checking memcached: %s", err)
+		}
+		if isMemcachedRunning == false {
+			log.Printf("[ERROR] Memcached is not running. Will try to deploy it.")
+			deployMemcached(dockercli)
+		}
 
-	ip := "shuffle-cache"
-
-	os.Setenv("SHUFFLE_MEMCACHED", fmt.Sprintf("%s:11211", ip))
+		ip := "shuffle-cache"
+		if len(os.Getenv("SHUFFLE_MEMCACHED")) == 0 {
+			os.Setenv("SHUFFLE_MEMCACHED", fmt.Sprintf("%s:11211", ip))
+		}
+	*/
 
 	defaultNetworkAttach := false
 	if containerId != "" {
@@ -487,9 +469,11 @@ func deployServiceWorkers(image string) {
 
 	if len(os.Getenv("DOCKER_HOST")) > 0 {
 		log.Printf("[DEBUG] Deploying docker socket proxy to the network %s as the DOCKER_HOST variable is set", networkName)
-		containers, err := dockercli.ContainerList(ctx, container.ListOptions{
+
+		listOptions := container.ListOptions{
 			All: true,
-		})
+		}
+		containers, err := dockercli.ContainerList(ctx, listOptions)
 
 		if err == nil {
 			for _, container := range containers {
@@ -608,7 +592,7 @@ func deployServiceWorkers(image string) {
 					fmt.Sprintf("SHUFFLE_LOGS_DISABLED=%s", os.Getenv("SHUFFLE_LOGS_DISABLED")),
 					fmt.Sprintf("DEBUG_MEMORY=%s", os.Getenv("DEBUG_MEMORY")),
 					fmt.Sprintf("SHUFFLE_APP_SDK_TIMEOUT=%s", os.Getenv("SHUFFLE_APP_SDK_TIMEOUT")),
-					fmt.Sprintf("SHUFFLE_MAX_SWARM_NODES=%d", os.Getenv("SHUFFLE_MAX_SWARM_NODES")),
+					fmt.Sprintf("SHUFFLE_MAX_SWARM_NODES=%s", os.Getenv("SHUFFLE_MAX_SWARM_NODES")),
 					fmt.Sprintf("SHUFFLE_BASE_IMAGE_NAME=%s", os.Getenv("SHUFFLE_BASE_IMAGE_NAME")),
 					fmt.Sprintf("SHUFFLE_APP_REQUEST_TIMEOUT=%s", os.Getenv("SHUFFLE_APP_REQUEST_TIMEOUT")),
 				},
@@ -627,13 +611,31 @@ func deployServiceWorkers(image string) {
 
 	if defaultNetworkAttach == true || strings.ToLower(os.Getenv("SHUFFLE_DEFAULT_NETWORK_ATTACH")) == "true" {
 		targetName := "shuffle_shuffle"
-		log.Printf("[DEBUG] Adding network attach for network %s to worker in swarm", targetName)
-		serviceSpec.Networks = append(serviceSpec.Networks, swarm.NetworkAttachmentConfig{
-			Target: targetName,
-		})
+		isAttachable := false
+		networks, err := dockercli.NetworkList(ctx, network.ListOptions{})
+		if err == nil {
+			for _, net := range networks {
+				if net.Name == targetName {
+					if net.Scope == "swarm" {
+						log.Printf("[DEBUG] Found swarm-scoped network: %s", targetName)
+						isAttachable = true
+					} else {
+						log.Printf("[WARNING] Network %s exist but is not swarm scoped (scope=%s)", targetName, net.Scope)
+					}
+					break
+				}
+			}
+		}
 
-		// FIXM: Remove this if deployment fails?
-		serviceSpec.TaskTemplate.ContainerSpec.Env = append(serviceSpec.TaskTemplate.ContainerSpec.Env, fmt.Sprintf("SHUFFLE_SWARM_OTHER_NETWORK=%s", targetName))
+		if isAttachable {
+			log.Printf("[DEBUG] Adding network attach for network %s to worker in swarm", targetName)
+			serviceSpec.Networks = append(serviceSpec.Networks, swarm.NetworkAttachmentConfig{
+				Target: targetName,
+			})
+
+			// FIXM: Remove this if deployment fails?
+			serviceSpec.TaskTemplate.ContainerSpec.Env = append(serviceSpec.TaskTemplate.ContainerSpec.Env, fmt.Sprintf("SHUFFLE_SWARM_OTHER_NETWORK=%s", targetName))
+		}
 	}
 
 	if dockerApiVersion != "" {
@@ -722,11 +724,38 @@ func deployServiceWorkers(image string) {
 
 	if err == nil {
 		log.Printf("[DEBUG] Successfully deployed workers with %d replica(s) on %d node(s)", replicas, cnt)
-		//time.Sleep(time.Duration(10) * time.Second)
 		//log.Printf("[DEBUG] Servicecreate request: %#v %#v", service, err)
 	} else {
 		if !strings.Contains(fmt.Sprintf("%s", err), "Already Exists") && !strings.Contains(fmt.Sprintf("%s", err), "is already in use by service") {
 			log.Printf("[ERROR] Failed making service: %s", err)
+			if strings.Contains(fmt.Sprintf("%s", err), "networks scoped to the swarm can be used") {
+				log.Printf("[WARNING] Swarm network attachment failed, retrying without shuffle_shuffle")
+
+				var updatedNetworks []swarm.NetworkAttachmentConfig
+				for _, net := range serviceSpec.Networks {
+					if net.Target != "shuffle_shuffle" {
+					updatedNetworks = append(updatedNetworks, net)
+					}
+				}
+				serviceSpec.Networks = updatedNetworks
+
+				var updatedEnv []string
+				for _, env := range serviceSpec.TaskTemplate.ContainerSpec.Env {
+					if !strings.HasPrefix(env, "SHUFFLE_SWARM_OTHER_NETWORK=") {
+						updatedEnv = append(updatedEnv, env)
+					}
+				}
+				serviceSpec.TaskTemplate.ContainerSpec.Env = updatedEnv
+				serviceOptions := types.ServiceCreateOptions{}
+				_, err = dockercli.ServiceCreate(
+					ctx,
+					serviceSpec,
+					serviceOptions,
+				)
+				if err != nil {
+					log.Printf("[ERROR] Failed to deploy service even without shuffle_shuffle network: %s", err)
+				}
+			}
 		} else {
 			log.Printf("[WARNING] Failed deploying workers: %s", err)
 			if len(serviceSpec.Networks) > 1 {
@@ -766,45 +795,54 @@ func handleBackendImageDownload(ctx context.Context, images string) error {
 
 	// Remove the image
 	handled := []string{}
-	log.Printf("[DEBUG] Should remove existing image (s): %s. Waiting 30 seconds to ensure backend has the latest images built and ready to distribute.", images)
-	removeOptions := image.RemoveOptions{}
-
-	time.Sleep(time.Duration(30) * time.Second)
-
+	//log.Printf("[DEBUG] Removing existing image (s): %s", images)
 	newImages := []string{}
-	for _, image := range strings.Split(images, ",") {
-		image = strings.TrimSpace(image)
-		if shuffle.ArrayContains(handled, image) {
+
+	successful := []string{}
+	for _, curimage := range strings.Split(images, ",") {
+		curimage = strings.TrimSpace(curimage)
+		if shuffle.ArrayContains(handled, curimage) {
 			continue
 		}
 
-		handled = append(handled, image)
-		if !strings.Contains(image, "/") {
-			image = fmt.Sprintf("frikky/shuffle:%s", image)
+		handled = append(handled, curimage)
+		if !strings.Contains(curimage, "/") {
+			curimage = fmt.Sprintf("frikky/shuffle:%s", curimage)
 		}
 
-		newImages = append(newImages, image)
+		newImages = append(newImages, curimage)
 
-		// There is no real point in actual removal. This may however be a good idea, as Worker will force download the new one anyway
-		resp, err := dockercli.ImageRemove(ctx, image, removeOptions)
+		// Force remove the current image to avoid cached layers
+//		if swarmConfig == "run" || swarmConfig == "swarm" {
+//			_, err := dockercli.ImageRemove(ctx, curimage, image.RemoveOptions{
+//				Force:         true,
+//				PruneChildren: true,
+//			})
+//
+//			if err != nil {
+//				log.Printf("[ERROR] Failed removing image for re-download: %s", err)
+//			} else {
+//				log.Printf("[DEBUG] Removed image: %s", curimage)
+//			}
+//		} else {
+//			//log.Printf("[DEBUG] Skipping image removal for %s as swarmConfig is not set to run or swarm. Value: %#v", curimage, swarmConfig)
+//		}
+//
+		err := shuffle.DownloadDockerImageBackend(&http.Client{Timeout: imagedownloadTimeout}, curimage)
 		if err != nil {
-			log.Printf("[ERROR] Failed removing image: %s. Resp: %#v", err, resp)
-
-			// Goroutining images that don't already exist, as they are most likely not the correct one
-			go shuffle.DownloadDockerImageBackend(&http.Client{Timeout: imagedownloadTimeout}, image)
+			//log.Printf("[ERROR] Failed downloading image: %s", err)
 		} else {
-			log.Printf("[DEBUG] Removed image: %s", image)
-
-			err = shuffle.DownloadDockerImageBackend(&http.Client{Timeout: imagedownloadTimeout}, image)
-			if err != nil {
-				log.Printf("[ERROR] Failed downloading image: %s", err)
-			} else {
-				log.Printf("[DEBUG] Downloaded image: %s", image)
-				//break
-			}
+			//log.Printf("[DEBUG] Downloaded image: %s", curimage)
+			successful = append(successful, curimage)
 		}
 	}
 
+	if len(successful) == 0 {
+		log.Printf("[ERROR] Failed downloading image copies: %s. This means the app may not have been updated.", strings.Join(handled, ", "))
+	} else {
+		log.Printf("[DEBUG] Successfully downloaded image copies: %s", strings.Join(successful, ", "))
+	}
+
 	if swarmConfig == "run" || swarmConfig == "swarm" {
 		log.Printf("[DEBUG] Should update service with new image after updating(s): %s. \n\nBETA REPLACEMENT IMPLEMENTATION: Contact support@shuffler.io for support.", strings.Join(newImages, "\n"))
 
@@ -820,24 +858,23 @@ func handleBackendImageDownload(ctx context.Context, images string) error {
 		)
 
 		if err != nil {
-			log.Printf("[ERROR] Failed finding containers: %s", err)
+			log.Printf("[ERROR] Failed finding services: %s", err)
 		} else {
-			log.Printf("[DEBUG] Found %d services", len(services))
-
+			found := false
 			for _, service := range services {
-
-				log.Printf("Imagename: %s", service.Spec.TaskTemplate.ContainerSpec.Image)
+				//log.Printf("Service image: %s", service.Spec.TaskTemplate.ContainerSpec.Image)
 
 				for _, image := range newImages {
 					if !strings.Contains(service.Spec.TaskTemplate.ContainerSpec.Image, image) {
 						continue
 					}
 
-					log.Printf("[DEBUG] Found service for image %#v: %#v", service.Spec.Annotations.Name)
+					log.Printf("[DEBUG] Found service for image: %#v", service.Spec.Annotations.Name)
 
 					// Update the service to run with the new image
 					//docker service update --image username/imagename:latest servicename --force
 					serviceUpdateOptions := types.ServiceUpdateOptions{}
+					service.Spec.TaskTemplate.ForceUpdate++
 					resp, err := dockercli.ServiceUpdate(
 						ctx,
 						service.ID,
@@ -850,12 +887,24 @@ func handleBackendImageDownload(ctx context.Context, images string) error {
 						log.Printf("[ERROR] Failed updating service %s with the new image %s: %s. Resp: %#v", service.Spec.Annotations.Name, image, err, resp)
 					} else {
 						log.Printf("[DEBUG] Updated service %s with the new image %s. Resp: %#v", service.Spec.Annotations.Name, image, resp)
+							
+						found = true
 
 						if !strings.Contains(fmt.Sprintf("%s", resp), "error") {
 							break
+						} else {
+							log.Printf("[ERROR] Failed updating service %s with the new image %s: %s. Resp: %#v", service.Spec.Annotations.Name, image, err, resp)
 						}
 					}
 				}
+
+				if found {
+					break
+				}
+			}
+
+			if !found {
+				log.Printf("[DEBUG] Failed to find service to update for service %s", newImages)
 			}
 
 		}
@@ -976,8 +1025,6 @@ func fixk8sRoles() {
 	}
 }
 
-func int32Ptr(i int32) *int32 { return &i }
-
 func deployK8sWorker(image string, identifier string, env []string) error {
 	env = append(env, fmt.Sprintf("IS_KUBERNETES=true"))
 	env = append(env, fmt.Sprintf("KUBERNETES_NAMESPACE=%s", os.Getenv("KUBERNETES_NAMESPACE")))
@@ -1002,6 +1049,22 @@ func deployK8sWorker(image string, identifier string, env []string) error {
 		env = append(env, fmt.Sprintf("SHUFFLE_USE_GHCR_OVERRIDE_FOR_AUTODEPLOY=%s", os.Getenv("SHUFFLE_USE_GHCR_OVERRIDE_FOR_AUTODEPLOY")))
 	}
 
+	if len(os.Getenv("SHUFFLE_APP_EXPOSED_PORT")) > 0 {
+		env = append(env, fmt.Sprintf("SHUFFLE_APP_EXPOSED_PORT=%s", os.Getenv("SHUFFLE_APP_EXPOSED_PORT")))
+	}
+
+	if len(appServiceAccountName) > 0 {
+		env = append(env, fmt.Sprintf("SHUFFLE_APP_SERVICE_ACCOUNT_NAME=%s", appServiceAccountName))
+	}
+
+	if len(appPodSecurityContext) > 0 {
+		env = append(env, fmt.Sprintf("SHUFFLE_APP_POD_SECURITY_CONTEXT=%s", appPodSecurityContext))
+	}
+
+	if len(appContainerSecurityContext) > 0 {
+		env = append(env, fmt.Sprintf("SHUFFLE_APP_CONTAINER_SECURITY_CONTEXT=%s", appContainerSecurityContext))
+	}
+
 	clientset, _, err := shuffle.GetKubernetesClient()
 	if err != nil {
 		log.Printf("[ERROR] Error getting kubernetes client:", err)
@@ -1010,18 +1073,6 @@ func deployK8sWorker(image string, identifier string, env []string) error {
 
 	//env = append(env, fmt.Sprintf("KUBERNETES_CONFIG=%s", config.String()))
 
-	// FIXME: When a service account is used, the account is also mounted in the pod
-	// The volume mount location is:
-	// /var/run/secrets/kubernetes.io/serviceaccount
-
-	// Look for if there is a default service account in use
-	if len(os.Getenv("KUBERNETES_SERVICE_ACCOUNT")) > 0 {
-		log.Printf("[DEBUG] Using Kubernetes service account %s", os.Getenv("KUBERNETES_SERVICE_ACCOUNT"))
-		env = append(env, fmt.Sprintf("KUBERNETES_SERVICE_ACCOUNT=%s", os.Getenv("KUBERNETES_SERVICE_ACCOUNT")))
-
-		// use k8s downward API to find it if we are in a pod
-	}
-
 	// Check if namespace exist as variable. If so, make it
 	if len(os.Getenv("KUBERNETES_NAMESPACE")) > 0 && !namespacemade {
 		kubernetesNamespace = os.Getenv("KUBERNETES_NAMESPACE")
@@ -1080,14 +1131,48 @@ func deployK8sWorker(image string, identifier string, env []string) error {
 		}
 	}
 
-	containerLabels := map[string]string{
+	labels := map[string]string{
+		// Well-known Kubernetes labels
+		"app.kubernetes.io/name":       "shuffle-worker",
+		"app.kubernetes.io/instance":   identifier,
+		"app.kubernetes.io/part-of":    "shuffle",
+		"app.kubernetes.io/managed-by": "shuffle-orborus",
+		// Keep legacy labels for backward compatibility
 		"container": "shuffle-worker",
 	}
 
+	matchLabels := map[string]string{
+		"app.kubernetes.io/name":     "shuffle-worker",
+		"app.kubernetes.io/instance": identifier,
+	}
+
+	// Parse security contexts from env
+	var podSecurityContext *corev1.PodSecurityContext
+	var containerSecurityContext *corev1.SecurityContext
+
+	if len(workerPodSecurityContext) > 0 {
+		podSecurityContext = &corev1.PodSecurityContext{}
+		err = json.Unmarshal([]byte(workerPodSecurityContext), podSecurityContext)
+		if err != nil {
+			log.Printf("[ERROR] Failed to unmarshal worker pod security context: %v", err)
+			return fmt.Errorf("failed to unmarshal worker pod security context: %v", err)
+		}
+	}
+
+	if len(workerContainerSecurityContext) > 0 {
+		containerSecurityContext = &corev1.SecurityContext{}
+		err = json.Unmarshal([]byte(workerContainerSecurityContext), containerSecurityContext)
+		if err != nil {
+			log.Printf("[ERROR] Failed to unmarshal worker container security context: %v", err)
+			return fmt.Errorf("failed to unmarshal worker container security context: %v", err)
+		}
+	}
+
 	containerAttachment := corev1.Container{
-		Name:  identifier,
-		Image: kubernetesImage,
-		Env:   buildEnvVars(envMap),
+		Name:            identifier,
+		Image:           kubernetesImage,
+		Env:             buildEnvVars(envMap),
+		SecurityContext: containerSecurityContext,
 
 		//ImagePullPolicy: "Never",
 		ImagePullPolicy: corev1.PullIfNotPresent,
@@ -1186,22 +1271,25 @@ func deployK8sWorker(image string, identifier string, env []string) error {
 
 	deployment := &appsv1.Deployment{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: identifier,
+			Name:   identifier,
+			Labels: labels,
 		},
 		Spec: appsv1.DeploymentSpec{
-			Replicas: int32Ptr(replicaNumberInt32),
+			Replicas: &replicaNumberInt32,
 			Selector: &metav1.LabelSelector{
-				MatchLabels: containerLabels,
+				MatchLabels: matchLabels,
 			},
 			Template: corev1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
-					Labels: containerLabels,
+					Labels: labels,
 				},
 				Spec: corev1.PodSpec{
 					Containers: []corev1.Container{
 						containerAttachment,
 					},
-					DNSPolicy: corev1.DNSClusterFirst,
+					DNSPolicy:          corev1.DNSClusterFirst,
+					ServiceAccountName: workerServiceAccountName,
+					SecurityContext:    podSecurityContext,
 				},
 			},
 		},
@@ -1213,13 +1301,13 @@ func deployK8sWorker(image string, identifier string, env []string) error {
 		return err
 	}
 
-	// kubectl expose deployment shuffle-workers --type=NodePort --port=33333 --target-port=33333
 	service := &corev1.Service{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: identifier,
+			Name:   identifier,
+			Labels: labels,
 		},
 		Spec: corev1.ServiceSpec{
-			Selector: containerLabels,
+			Selector: matchLabels,
 			Ports: []corev1.ServicePort{
 				{
 					Protocol:   "TCP",
@@ -1227,7 +1315,7 @@ func deployK8sWorker(image string, identifier string, env []string) error {
 					TargetPort: intstr.FromInt(33333),
 				},
 			},
-			Type: corev1.ServiceTypeNodePort,
+			Type: corev1.ServiceTypeClusterIP,
 		},
 	}
 
@@ -1242,7 +1330,6 @@ func deployK8sWorker(image string, identifier string, env []string) error {
 
 func deployWorker(image string, identifier string, env []string, executionRequest shuffle.ExecutionRequest) error {
 
-
 	if len(os.Getenv("REGISTRY_URL")) > 0 && os.Getenv("REGISTRY_URL") != "" {
 		env = append(env, fmt.Sprintf("REGISTRY_URL=%s", os.Getenv("REGISTRY_URL")))
 	}
@@ -1272,18 +1359,16 @@ func deployWorker(image string, identifier string, env []string, executionReques
 		Resources: container.Resources{},
 	}
 
-	certPath := "/certs"
-
 	// This is just to test the mounting locally so
 	// I can control from what source I'm mounting
 	// the certs to. Default behaviour is:
 	// /certs:/certs.
+	certPath := "/certs"
 	if os.Getenv("SHUFFLE_CERT_PATH") != "" {
 		certPath = os.Getenv("SHUFFLE_CERT_PATH")
 	}
 
 	_, err := os.ReadDir(certPath)
-
 	if certPath != "" && err == nil {
 		certVol := mount.Mount{
 			Type:   mount.TypeBind,
@@ -1302,7 +1387,6 @@ func deployWorker(image string, identifier string, env []string, executionReques
 		}
 	}
 
-
 	//var swarmConfig = os.Getenv("SHUFFLE_SWARM_CONFIG")
 	parsedUuid := uuid.NewV4()
 
@@ -1314,7 +1398,7 @@ func deployWorker(image string, identifier string, env []string, executionReques
 	if isKubernetes != "true" {
 		hostConfig.NetworkMode = container.NetworkMode(fmt.Sprintf("container:%s", containerId))
 
-		if strings.ToLower(cleanupEnv) != "false" {
+		if strings.ToLower(cleanupEnv) == "true" {
 			hostConfig.AutoRemove = true
 		}
 	}
@@ -1343,11 +1427,11 @@ func deployWorker(image string, identifier string, env []string, executionReques
 			)
 
 			if err != nil {
-				log.Printf("[ERROR] Container create error(2): %s", err)
+				log.Printf("[ERROR][%s] Container create error(2): %s", executionRequest.ExecutionId, err)
 				return err
 			}
 		} else {
-			log.Printf("[ERROR] Container create error: %s", err)
+			log.Printf("[ERROR][%s] Container create error: %s", executionRequest.ExecutionId, err)
 			return err
 		}
 	}
@@ -1372,47 +1456,47 @@ func deployWorker(image string, identifier string, env []string, executionReques
 				identifier+"-2",
 			)
 			if err != nil {
-				log.Printf("[ERROR] Failed to CREATE container (2): %s", err)
+				log.Printf("[ERROR][%s] Failed to CREATE container (2): %s", executionRequest.ExecutionId, err)
 			}
 
 			err = dockercli.ContainerStart(context.Background(), cont.ID, containerStartOptions)
 			if err != nil {
-				log.Printf("[ERROR] Failed to start container (2): %s", err)
+				log.Printf("[ERROR][%s] Failed to start container (2): %s", executionRequest.ExecutionId, err)
 			}
 		} else {
-			log.Printf("[ERROR] Failed initial container start. Quitting as this is NOT a simple network issue. Err: %s", err)
+			log.Printf("[ERROR][%s] Failed initial container start. Quitting as this is NOT a simple network issue. Err: %s", executionRequest.ExecutionId, err)
 		}
 
 		if err != nil {
-			log.Printf("[ERROR] Failed to start worker container in environment '%s': %s", environment, err)
+			log.Printf("[ERROR][%s] Failed to start worker container in environment '%s': %s", executionRequest.ExecutionId, environment, err)
 			return err
 		} else {
-			log.Printf("[INFO][%s] Worker Container created (2). Environment %s: docker logs %s", executionRequest.ExecutionId, environment, cont.ID)
+			log.Printf("[INFO][%s] Worker Container created (2). Runtime Location '%s': docker logs -f %s", executionRequest.ExecutionId, environment, cont.ID)
 		}
 
 		stats, err := dockercli.ContainerInspect(ctx, cont.ID)
 		if err != nil {
-			log.Printf("[WARNING] Failed checking worker '%s': %s", cont.ID, err)
-			return nil 
+			log.Printf("[WARNING][%s] Failed checking worker '%s': %s", executionRequest.ExecutionId, cont.ID, err)
+			return nil
 		}
 
 		containerStatus := stats.ContainerJSONBase.State.Status
 		if containerStatus != "running" {
-			log.Printf("[ERROR] Status of %s is %s. Should be running. Contact support@shuffler.io if this persists.", cont.ID, containerStatus)
+			log.Printf("[ERROR][%s] Status of %s is %s. Should be running. Contact support@shuffler.io if this persists.", executionRequest.ExecutionId, cont.ID, containerStatus)
 		}
-			/*
-			err = stopWorker(containerName)
-			if err != nil {
-				log.Printf("Failed stopping worker %s", execution.ExecutionId)
-				return nil
-			}
+		/*
+				err = stopWorker(containerName)
+				if err != nil {
+					log.Printf("Failed stopping worker %s", execution.ExecutionId)
+					return nil
+				}
 
-			err = deployWorker(dockercli, workerImage, containerName, env)
-			if err != nil {
-				log.Printf("Failed executing worker %s in state %s", execution.ExecutionId, containerStatus)
-				return nil
+				err = deployWorker(dockercli, workerImage, containerName, env)
+				if err != nil {
+					log.Printf("Failed executing worker %s in state %s", execution.ExecutionId, containerStatus)
+					return nil
+				}
 			}
-		}
 		*/
 	} else {
 		log.Printf("[INFO][%s] New Worker created. Environment %s: docker logs %s", executionRequest.ExecutionId, environment, cont.ID)
@@ -1460,47 +1544,74 @@ func initializeImages() {
 	}
 
 	if baseimageregistry == "" {
+		//baseimageregistry = "ghcr.io"   // Github
 		baseimageregistry = "docker.io" // Dockerhub
-		baseimageregistry = "ghcr.io"   // Github
-		log.Printf("[DEBUG] Setting baseimageregistry to %#v", baseimageregistry)
+
+		if len(os.Getenv("REGISTRY_URL")) > 0 {
+			baseimageregistry = os.Getenv("REGISTRY_URL")
+		} else {
+			os.Setenv("REGISTRY_URL", baseimageregistry)
+		}
+
+		os.Setenv("SHUFFLE_BASE_IMAGE_REGISTRY", baseimageregistry)
+
+		log.Printf("[WARNING] Setting baseimageregistry to %#v", baseimageregistry)
 	}
 
 	if baseimagename == "" {
+		// FIXME: This is probably the problem for image names tbh
+		//baseimagename = "shuffle"        	// Github 		(ghcr.io)
 		baseimagename = "frikky/shuffle" // Dockerhub
-		baseimagename = "shuffle"        // Github 		(ghcr.io)
-		log.Printf("[DEBUG] Setting baseimagename to %#v", baseimagename)
+
+		os.Setenv("SHUFFLE_BASE_IMAGE_NAME", baseimagename)
+		log.Printf("[WARNING] Setting baseimagename to %#v", baseimagename)
+	}
+
+	// Old sane default overrides:
+	if baseimageregistry == "ghcr.io" && baseimagename == "shuffle" {
+		baseimageregistry = "docker.io"
+		baseimagename = "frikky/shuffle"
+
+		os.Setenv("REGISTRY_URL", baseimageregistry)
+		os.Setenv("SHUFFLE_BASE_IMAGE_REGISTRY", baseimageregistry)
+		os.Setenv("SHUFFLE_BASE_IMAGE_NAME", baseimagename)
+
+		log.Printf("[WARNING] Overriding bad defaults of ghcr.io/shuffle")
 	}
 
 	log.Printf("[DEBUG] Setting swarm config to %#v. Default is empty.", swarmConfig)
 
-	newWorker := fmt.Sprintf("%s/%s/shuffle-worker:%s", baseimageregistry, baseimagename, workerVersion)
+	// This is now always static
+	newWorker := fmt.Sprintf("ghcr.io/shuffle/shuffle-worker:%s", workerVersion)
 	if len(newWorkerImage) > 0 {
 		newWorker = newWorkerImage
 	}
 
-	// check whether they are the same first
-	images := []string{
-		fmt.Sprintf("frikky/shuffle:app_sdk"),
-		fmt.Sprintf("shuffle/shuffle:app_sdk"),
-		fmt.Sprintf("%s/%s/shuffle-app_sdk:%s", baseimageregistry, baseimagename, appSdkVersion),
-		newWorker,
-	}
+	// Check whether they are the same first
+	if os.Getenv("SHUFFLE_AUTO_IMAGE_DOWNLOAD") == "false" {
+		log.Printf("[DEBUG] Skipping image download as SHUFFLE_AUTO_IMAGE_DOWNLOAD is set to false")
+	} else {
+		images := []string{
+			fmt.Sprintf("frikky/shuffle:app_sdk"),
+			newWorker,
+		}
 
-	pullOptions := image.PullOptions{}
-	for _, image := range images {
-		if isKubernetes == "true" {
-			log.Printf("[DEBUG] Skipping image pull of '%s' because Kubernetes does it in realtime instead", image)
-		} else {
-			log.Printf("[DEBUG] Pulling image %s", image)
-			reader, err := dockercli.ImagePull(ctx, image, pullOptions)
-			if err != nil {
-				log.Printf("[ERROR] Failed getting image %s: %s", image, err)
+		pullOptions := image.PullOptions{}
+		for _, image := range images {
+			if isKubernetes == "true" {
+				log.Printf("[DEBUG] Skipping image pull of '%s' because Kubernetes does it in realtime instead", image)
+			} else {
+				log.Printf("[DEBUG] Pulling image %s", image)
+				reader, err := dockercli.ImagePull(ctx, image, pullOptions)
+				if err != nil {
+					log.Printf("[ERROR] Failed getting image %s: %s", image, err)
 
-				continue
+					continue
+				}
+
+				io.Copy(os.Stdout, reader)
+				log.Printf("[DEBUG] Successfully downloaded and built %s", image)
 			}
-
-			io.Copy(os.Stdout, reader)
-			log.Printf("[DEBUG] Successfully downloaded and built %s", image)
 		}
 	}
 }
@@ -1602,7 +1713,8 @@ func getContainerResourceUsage(ctx context.Context, cli *dockerclient.Client, co
 }
 
 func parseResourceUsage(body io.Reader) (float64, float64, error) {
-	var stats types.StatsJSON
+	//var stats types.StatsJSON
+	var stats container.Stats
 
 	// Decode the stream of stats as JSON
 	decoder := json.NewDecoder(body)
@@ -1637,6 +1749,8 @@ func getOrborusStats(ctx context.Context) shuffle.OrborusStats {
 		Environment:  environment,
 		OrborusLabel: orborusLabel,
 		Timestamp:    time.Now().Unix(),
+
+		Uuid: orborusUuid,
 	}
 
 	if (swarmConfig == "run" || swarmConfig == "swarm") && strings.Contains(newWorkerImage, "scale") {
@@ -1893,6 +2007,10 @@ func main() {
 		//baseUrl = "http://localhost:5001"
 	}
 
+	if len(orborusUuid) == 0 {
+		orborusUuid = uuid.NewV4().String()
+	}
+
 	//if orgId == "" {
 	//	log.Printf("[ERROR] Org not defined. Set variable ORG_ID based on your org")
 	//	os.Exit(3)
@@ -1918,7 +2036,7 @@ func main() {
 	}
 
 	// Handle Cleanup - made it cleanup by default
-	if strings.ToLower(os.Getenv("SHUFFLE_CONTAINER_AUTO_CLEANUP")) != "false" {
+	if strings.ToLower(os.Getenv("SHUFFLE_CONTAINER_AUTO_CLEANUP")) != "false" && os.Getenv("CLEANUP") == "" {
 		cleanupEnv = "true"
 	}
 
@@ -1995,7 +2113,7 @@ func main() {
 	log.Printf("[INFO] Setting up Docker environment. Downloading worker and App SDK!")
 
 	initializeImages()
-	workerImage := fmt.Sprintf("%s/%s/shuffle-worker:%s", baseimageregistry, baseimagename, workerVersion)
+	workerImage := fmt.Sprintf("ghcr.io/shuffle/shuffle-worker:%s", workerVersion)
 	if len(newWorkerImage) > 0 {
 		workerImage = newWorkerImage
 	}
@@ -2095,6 +2213,8 @@ func main() {
 	}
 
 	log.Printf("[INFO] Waiting for executions at %s with Environment %#v", fullUrl, environment)
+
+
 	hasStarted := false
 	for {
 		if req.Method == "POST" {
@@ -2106,6 +2226,7 @@ func main() {
 
 			// Marshal and set body
 			orborusStats := getOrborusStats(ctx)
+
 			pipelinePayload, pipelineerr := sendPipelineHealthStatus()
 
 			if pipelineerr != nil {
@@ -2164,8 +2285,12 @@ func main() {
 			continue
 		}
 
-		// FIXME - add check for StatusCode
-		if newresp.StatusCode != 200 {
+		// Controls Leader/Follower mode
+		if newresp.StatusCode == 409 {
+			log.Printf("[INFO] Another Orborus is already handling jobs. Polling every 30 seconds in case Leader stops. Resp: %s", string(body))
+			time.Sleep(time.Duration(30) * time.Second)
+			continue
+		} else if newresp.StatusCode != 200 {
 			log.Printf("[ERROR] Backend connection failed for url '%s', or is missing (%d): %s", fullUrl, newresp.StatusCode, string(body))
 		} else {
 			if !hasStarted {
@@ -2235,7 +2360,7 @@ func main() {
 				if incRequest.Type == "PIPELINE_CREATE" || incRequest.Type == "PIPELINE_START" || incRequest.Type == "PIPELINE_STOP" || incRequest.Type == "PIPELINE_DELETE" {
 
 					os.Setenv("SHUFFLE_SKIP_PIPELINES", "false")
-					tenzirDisabled = false 
+					tenzirDisabled = false
 
 					// Running NEW or editing pipelines
 					err := handlePipeline(incRequest)
@@ -2245,12 +2370,9 @@ func main() {
 
 					toBeRemoved.Data = append(toBeRemoved.Data, incRequest)
 				} else if incRequest.Type == "DOCKER_IMAGE_DOWNLOAD" {
-					log.Printf("[INFO] Should delete -> download new images: %#v", incRequest.ExecutionArgument)
+					log.Printf("[INFO] Re-downloading new image(s) due to backend request: %#v", incRequest.ExecutionArgument)
 
 					if len(incRequest.ExecutionArgument) > 0 {
-						// FIXME: Wait X seconds before running this as the image build may not be done yet. This is shitty, but may be ok to do in Orborus. Easy fix for the future: Just let it run through jobs 5-10 times before actually picking it up
-
-						// Run after 25 seconds in the goroutine instead
 						go handleBackendImageDownload(ctx, incRequest.ExecutionArgument)
 					} else {
 						log.Printf("[ERROR] No image name provided for download. Removing job from queue.")
@@ -2260,7 +2382,7 @@ func main() {
 
 				} else if incRequest.Type == "CATEGORY_UPDATE" {
 					os.Setenv("SHUFFLE_SKIP_PIPELINES", "false")
-					tenzirDisabled = false 
+					tenzirDisabled = false
 
 					err = handleFileCategoryChange()
 					if err != nil {
@@ -2305,7 +2427,7 @@ func main() {
 
 					// Manual command = overrides to allow starting of Tenzir from the frontend anyway.
 					os.Setenv("SHUFFLE_SKIP_PIPELINES", "false")
-					tenzirDisabled = false 
+					tenzirDisabled = false
 
 					// Removed either way
 					toBeRemoved.Data = append(toBeRemoved.Data, incRequest)
@@ -2315,7 +2437,7 @@ func main() {
 						if strings.Contains(fmt.Sprintf("%s", err), "node available") {
 							// Disabling until UI is updated
 							os.Setenv("SHUFFLE_SKIP_PIPELINES", "true")
-							tenzirDisabled = true 
+							tenzirDisabled = true
 
 							log.Printf("[ERROR] Failed to start tenzir, reason: %s", err)
 							err = shuffle.CreateOrgNotification(
@@ -2413,11 +2535,11 @@ func main() {
 			}
 
 			if execution.Status == "ABORT" || execution.Status == "FAILED" {
-				log.Printf("[INFO] Executionstatus issue: ", execution.Status)
+				log.Printf("[INFO][%s] Executionstatus issue: ", execution.ExecutionId, execution.Status)
 			}
 
 			if shuffle.ArrayContains(executionIds, execution.ExecutionId) {
-				log.Printf("[INFO] Execution already handled (rerun of old executions?): %s", execution.ExecutionId)
+				log.Printf("[INFO][%s] Execution already handled (rerunning old execution)", execution.ExecutionId)
 				toBeRemoved.Data = append(toBeRemoved.Data, execution)
 
 				// Should check when last this was ran, and if it's more than 10 minutes ago and it's not finished, we should run it again?
@@ -2477,7 +2599,7 @@ func main() {
 
 			// Look for volume binds
 			if len(os.Getenv("SHUFFLE_VOLUME_BINDS")) > 0 {
-				log.Printf("[DEBUG] Added volume binds: %s", os.Getenv("SHUFFLE_VOLUME_BINDS"))
+				//log.Printf("[DEBUG] Added volume binds: %s", os.Getenv("SHUFFLE_VOLUME_BINDS"))
 				env = append(env, fmt.Sprintf("SHUFFLE_VOLUME_BINDS=%s", os.Getenv("SHUFFLE_VOLUME_BINDS")))
 			}
 
@@ -2507,10 +2629,24 @@ func main() {
 				toBeRemoved.Data = append(toBeRemoved.Data, execution)
 				executionIds = append(executionIds, execution.ExecutionId)
 			} else {
-				log.Printf("[WARNING] Execution ID '%s' failed to deploy: %s", execution.ExecutionId, err)
+				log.Printf("[WARNING][%s] Failed to deploy: %s", execution.ExecutionId, err)
+
 				if strings.Contains(err.Error(), "already exists") {
 					toBeRemoved.Data = append(toBeRemoved.Data, execution)
 					executionIds = append(executionIds, execution.ExecutionId)
+				} else if strings.Contains(err.Error(), "No such image") {
+					// Download the image
+
+					if isKubernetes == "true" {
+						log.Printf("[DEBUG] Skipping image pull of '%s' because Kubernetes does it in realtime instead", workerImage)
+					} else {
+						log.Printf("[DEBUG] Re-pulling image %s as it doesn't exist, and is necessary for worker to run (autofix)", workerImage)
+						pullOptions := image.PullOptions{}
+						_, err = dockercli.ImagePull(ctx, workerImage, pullOptions)
+						if err != nil {
+							log.Printf("[ERROR] Failed to pull image %s: %s", workerImage, err)
+						}
+					}
 				}
 			}
 		}
@@ -2634,7 +2770,7 @@ func deployTenzirNode() error {
 		// return errors.New("Pipelines are disabled by user with SHUFFLE_SKIP_PIPELINES")
 		//log.Printf("[INFO] Pipelines are enabled by user")
 	} else {
-		return errors.New("Pipelines are disabled by user with SHUFFLE_SKIP_PIPELINES") 
+		return errors.New("Pipelines are disabled by user with SHUFFLE_SKIP_PIPELINES")
 	}
 
 	if isKubernetes == "true" {
@@ -2834,12 +2970,12 @@ func createAndStartTenzirNode(ctx context.Context, containerName, imageName stri
 		},
 	}
 
-	// FIXME: Is this necessary? Seems to screw up networking: 
+	// FIXME: Is this necessary? Seems to screw up networking:
 	// conflicting options: hostname and the network mode
 	/*
-	if isKubernetes != "true" && os.Getenv("SHUFFLE_SWARM_CONFIG") != "run" {
-		hostConfig.NetworkMode = container.NetworkMode(fmt.Sprintf("container:%s", containerId))
-	}
+		if isKubernetes != "true" && os.Getenv("SHUFFLE_SWARM_CONFIG") != "run" {
+			hostConfig.NetworkMode = container.NetworkMode(fmt.Sprintf("container:%s", containerId))
+		}
 	*/
 
 	resp, err := dockercli.ContainerCreate(ctx, config, hostConfig, networkingConfig, nil, containerName)
@@ -2895,7 +3031,8 @@ func createAndStartTenzirNode(ctx context.Context, containerName, imageName stri
 }
 
 func createNetworkIfNotExists(ctx context.Context, networkName, subnet, gateway string) error {
-	networks, err := dockercli.NetworkList(ctx, types.NetworkListOptions{})
+	listOptions := network.ListOptions{}
+	networks, err := dockercli.NetworkList(ctx, listOptions)
 	if err != nil {
 		return err
 	}
@@ -2916,7 +3053,7 @@ func createNetworkIfNotExists(ctx context.Context, networkName, subnet, gateway
 		},
 	}
 
-	networkCreate := types.NetworkCreate{
+	networkCreate := network.CreateOptions{
 		//CheckDuplicate: true,
 		Driver: "bridge",
 		IPAM:   ipamConfig,
@@ -3047,7 +3184,6 @@ func createPipeline(command, identifier string) (string, error) {
 		return "", err
 	}
 
-
 	body, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		log.Printf("[ERROR] Failed reading response body: %s", err)
@@ -3065,8 +3201,8 @@ func createPipeline(command, identifier string) (string, error) {
 	}
 
 	type PipelineResponse struct {
-		ID string `json:"id"`
-		Message string `json:"message"`
+		ID       string `json:"id"`
+		Message  string `json:"message"`
 		Severity string `json:"severity"`
 	}
 
@@ -3202,10 +3338,28 @@ func deletePipeline(pipelineId string) error {
 func listPipelines() ([]shuffle.PipelineInfo, error) {
 	responseData := shuffle.PipelineInfoWrapper{}
 
+	if tenzirDisabled {
+		return responseData.Pipelines, errors.New("Tenzir is disabled")
+	}
+
 	var reqBody []byte
 	url := fmt.Sprintf("%s/api/v0/pipeline/list", pipelineUrl)
-	resp, err := http.Post(url, "application/json", bytes.NewBuffer(reqBody))
+	client := http.Client{
+		Timeout: 2 * time.Second,
+	}
 
+	req, err := http.NewRequest(
+		"POST",
+		url,
+		bytes.NewBuffer(reqBody),
+	)
+
+	if err != nil {
+		return responseData.Pipelines, err
+	}
+
+	req.Header.Set("Content-Type", "application/json")
+	resp, err := client.Do(req)
 	if err != nil {
 		return responseData.Pipelines, err
 	}
@@ -3289,7 +3443,7 @@ func handleFileCategoryChange() error {
 		tenzirStorageFolder = "/tmp/"
 	}
 
-	tenzirStorageFolder = strings.TrimRight(tenzirStorageFolder, "/") 
+	tenzirStorageFolder = strings.TrimRight(tenzirStorageFolder, "/")
 	sigmaPath := fmt.Sprintf("%s/sigma_rules", tenzirStorageFolder)
 	err = extractZIP("files.zip", sigmaPath)
 	if err != nil {
@@ -3297,7 +3451,6 @@ func handleFileCategoryChange() error {
 		return err
 	}
 
-
 	log.Printf("[DEBUG] Detection files copied to '%s' successfully.", sigmaPath)
 
 	return nil
@@ -3323,6 +3476,11 @@ func extractZIP(zipFile, destDir string) error {
 	}
 
 	for _, f := range r.File {
+		// Fix path traversal
+		if strings.Contains(f.Name, "..") {
+			return fmt.Errorf("illegal file name: %s", f.Name)
+		}
+
 		err := extractFile(f, destDir)
 		if err != nil {
 			return err
@@ -3381,7 +3539,7 @@ func removeFileCategory() error {
 		tenzirStorageFolder = "/tmp/"
 	}
 
-	tenzirStorageFolder = strings.TrimRight(tenzirStorageFolder, "/") 
+	tenzirStorageFolder = strings.TrimRight(tenzirStorageFolder, "/")
 
 	//sigmaPath := "/var/lib/tenzir/sigma_rules/*"
 	sigmaPath := fmt.Sprintf("%s/sigma_rules", tenzirStorageFolder)
@@ -3428,6 +3586,10 @@ func sendPipelineHealthStatus() (shuffle.LakeConfig, error) {
 		Pipelines: []shuffle.PipelineInfoMini{},
 	}
 
+	if tenzirDisabled {
+		return pipelinePayload, nil
+	}
+
 	// To not spam down the list API too much
 	randint := rand.Intn(5)
 	if len(pipelines) == 0 || randint == 0 {
@@ -3450,10 +3612,6 @@ func sendPipelineHealthStatus() (shuffle.LakeConfig, error) {
 		pipelinePayload.Pipelines = pipelines
 	}
 
-	if tenzirDisabled {
-		return pipelinePayload, nil
-	}
-
 	err := deployTenzirNode()
 	if err != nil {
 		if (!strings.Contains(err.Error(), "SHUFFLE_SKIP_PIPELINES") && !strings.Contains(err.Error(), "Kubernetes not implemented for Tenzir node")) && !strings.Contains(err.Error(), "Tenzir Node is already running") && !strings.Contains(err.Error(), "docker daemon") {
@@ -3462,7 +3620,7 @@ func sendPipelineHealthStatus() (shuffle.LakeConfig, error) {
 
 		} else {
 			tenzirDisabled = true
-			log.Printf("[ERROR] Disabling pipelines: %s. You will need to restart the Orborus to fix this.", err)
+			log.Printf("[WARNING] Disabling pipelines: %s. You will need to restart the Orborus to fix this.", err)
 		}
 
 		return pipelinePayload, err
@@ -3546,9 +3704,8 @@ func getRunningWorkers(ctx context.Context, workerTimeout int) int {
 			return 0
 		}
 
-		labelSelector := "app=shuffle-worker"
 		pods, podErr := clientset.CoreV1().Pods(kubernetesNamespace).List(ctx, metav1.ListOptions{
-			LabelSelector: labelSelector,
+			LabelSelector: "app.kubernetes.io/name=shuffle-worker",
 		})
 		if podErr != nil {
 			log.Printf("[ERROR] Failed getting running workers: %s", podErr)
@@ -3637,15 +3794,12 @@ func zombiecheck(ctx context.Context, workerTimeout int) error {
 		All: true,
 	})
 
-	//log.Printf("Len: %d", len(containers))
-
 	if err != nil {
 		log.Printf("[ERROR] Failed creating Containerlist: %s", err)
 		return err
 	}
 
 	containerNames := map[string]string{}
-
 	stopContainers := []string{}
 	removeContainers := []string{}
 	log.Printf("[INFO] Baseimage: %s, Workertimeout: %d", baseimagename, int64(workerTimeout))
@@ -3794,8 +3948,7 @@ func sendWorkerRequest(workflowExecution shuffle.ExecutionRequest, image string,
 	if err != nil {
 		log.Printf("[ERROR] Failed creating worker request: %s", err)
 		if strings.Contains(fmt.Sprintf("%s", err), "connection refused") || strings.Contains(fmt.Sprintf("%s", err), "EOF") {
-			workerImage := fmt.Sprintf("%s/%s/shuffle-worker:%s", baseimageregistry, baseimagename, workerVersion)
-
+			workerImage := fmt.Sprintf("ghcr.io/shuffle/shuffle-worker:%s", workerVersion)
 			if len(newWorkerImage) > 0 {
 				workerImage = newWorkerImage
 			}
@@ -3819,8 +3972,7 @@ func sendWorkerRequest(workflowExecution shuffle.ExecutionRequest, image string,
 		log.Printf("[ERROR] Error running worker request to %s (1): %s", streamUrl, err)
 
 		if strings.Contains(fmt.Sprintf("%s", err), "connection refused") || strings.Contains(fmt.Sprintf("%s", err), "EOF") {
-			workerImage := fmt.Sprintf("%s/%s/shuffle-worker:%s", baseimageregistry, baseimagename, workerVersion)
-
+			workerImage := fmt.Sprintf("ghcr.io/shuffle/shuffle-worker:%s", workerVersion)
 			if len(newWorkerImage) > 0 {
 				workerImage = newWorkerImage
 			}
diff --git a/functions/onprem/worker/Dockerfile b/functions/onprem/worker/Dockerfile
index 019e0fc7..e25112d0 100755
--- a/functions/onprem/worker/Dockerfile
+++ b/functions/onprem/worker/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22 as builder
+FROM golang:1.24 as builder
 
 WORKDIR /app
 #RUN go get github.com/docker/docker/api/types github.com/docker/docker/api/types/container github.com/docker/docker/client
@@ -9,7 +9,8 @@ COPY go.mod /app/go.mod
 #COPY go.sum /app/go.sum
 #RUN go
 #COPY go.sum /app/go.sum
-RUN go get
+RUN go mod download 
+RUN go mod tidy 
 
 #RUN go mod init worker
 #RUN go get
diff --git a/functions/onprem/worker/go.mod b/functions/onprem/worker/go.mod
index d1579270..1df6cb59 100644
--- a/functions/onprem/worker/go.mod
+++ b/functions/onprem/worker/go.mod
@@ -1,130 +1,153 @@
 module worker
 
-go 1.22.7
+go 1.24.0
 
-toolchain go1.22.11
+toolchain go1.24.4
+
+//replace github.com/shuffle/shuffle-shared => ../../../../shuffle-shared
 
 require (
-	github.com/docker/docker v27.5.0+incompatible
+	github.com/docker/docker v28.2.2+incompatible
 	github.com/gorilla/mux v1.8.1
 	github.com/satori/go.uuid v1.2.0
-	github.com/shuffle/shuffle-shared v0.8.2
-	k8s.io/api v0.30.2
-	k8s.io/apimachinery v0.30.2
-	k8s.io/client-go v0.30.2
+	github.com/shuffle/shuffle-shared v0.8.84
+	k8s.io/api v0.33.1
+	k8s.io/apimachinery v0.33.1
+	k8s.io/client-go v0.33.1
 )
 
 require (
-	cloud.google.com/go v0.112.0 // indirect
-	cloud.google.com/go/compute v1.24.0 // indirect
-	cloud.google.com/go/compute/metadata v0.5.0 // indirect
-	cloud.google.com/go/datastore v1.15.0 // indirect
-	cloud.google.com/go/iam v1.1.6 // indirect
-	cloud.google.com/go/scheduler v1.10.6 // indirect
-	cloud.google.com/go/storage v1.36.0 // indirect
+	cloud.google.com/go/auth v0.16.1 // indirect
+	cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
+)
+
+require (
+	cel.dev/expr v0.20.0 // indirect
+	cloud.google.com/go v0.121.1 // indirect
+	cloud.google.com/go/compute/metadata v0.7.0 // indirect
+	cloud.google.com/go/datastore v1.20.0 // indirect
+	cloud.google.com/go/iam v1.5.2 // indirect
+	cloud.google.com/go/monitoring v1.24.2 // indirect
+	cloud.google.com/go/scheduler v1.11.7 // indirect
+	cloud.google.com/go/storage v1.55.0 // indirect
 	dario.cat/mergo v1.0.0 // indirect
+	github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect
 	github.com/Masterminds/semver v1.5.0 // indirect
-	github.com/Microsoft/go-winio v0.6.1 // indirect
-	github.com/ProtonMail/go-crypto v1.1.3 // indirect
-	github.com/adrg/strutil v0.2.3 // indirect
-	github.com/algolia/algoliasearch-client-go/v3 v3.18.1 // indirect
-	github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874 // indirect
+	github.com/Microsoft/go-winio v0.6.2 // indirect
+	github.com/ProtonMail/go-crypto v1.1.6 // indirect
+	github.com/adrg/strutil v0.3.1 // indirect
+	github.com/algolia/algoliasearch-client-go/v3 v3.31.4 // indirect
+	github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf // indirect
 	github.com/bradfitz/slice v0.0.0-20180809154707-2b758aa73013 // indirect
-	github.com/cloudflare/circl v1.3.7 // indirect
-	github.com/containerd/log v0.1.0 // indirect
-	github.com/cyphar/filepath-securejoin v0.2.5 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/cenkalti/backoff/v5 v5.0.2 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/cloudflare/circl v1.6.1 // indirect
+	github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 // indirect
+	github.com/containerd/errdefs v1.0.0 // indirect
+	github.com/containerd/errdefs/pkg v0.3.0 // indirect
+	github.com/cyphar/filepath-securejoin v0.4.1 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/distribution/reference v0.6.0 // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
+	github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
+	github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/frikky/kin-openapi v0.41.0 // indirect
-	github.com/frikky/schemaless v0.0.13 // indirect
+	github.com/frikky/kin-openapi v0.42.0 // indirect
+	github.com/frikky/schemaless v0.0.16 // indirect
+	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
-	github.com/go-git/go-billy/v5 v5.6.0 // indirect
-	github.com/go-git/go-git/v5 v5.13.0 // indirect
+	github.com/go-git/go-billy/v5 v5.6.2 // indirect
+	github.com/go-git/go-git/v5 v5.16.1 // indirect
+	github.com/go-jose/go-jose/v4 v4.0.5 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/swag v0.22.3 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/gnostic-models v0.6.8 // indirect
+	github.com/google/gnostic-models v0.6.9 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/go-github/v28 v28.1.1 // indirect
-	github.com/google/go-querystring v1.0.0 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/s2a-go v0.1.7 // indirect
+	github.com/google/go-querystring v1.1.0 // indirect
+	github.com/google/s2a-go v0.1.9 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
-	github.com/googleapis/gax-go/v2 v2.12.0 // indirect
-	github.com/imdario/mergo v0.3.6 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
+	github.com/googleapis/gax-go/v2 v2.14.2 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
-	github.com/moby/term v0.5.2 // indirect
+	github.com/moby/sys/sequential v0.6.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.1.0 // indirect
+	github.com/opencontainers/image-spec v1.1.1 // indirect
 	github.com/opensearch-project/opensearch-go v1.1.0 // indirect
 	github.com/opensearch-project/opensearch-go/v2 v2.3.0 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
-	github.com/pjbgf/sha1cd v0.3.0 // indirect
+	github.com/pjbgf/sha1cd v0.3.2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/sashabaranov/go-openai v1.19.2 // indirect
+	github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
+	github.com/sashabaranov/go-openai v1.40.1 // indirect
 	github.com/sendgrid/rest v2.6.9+incompatible // indirect
-	github.com/sendgrid/sendgrid-go v3.14.0+incompatible // indirect
+	github.com/sendgrid/sendgrid-go v3.16.1+incompatible // indirect
 	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
-	github.com/skeema/knownhosts v1.3.0 // indirect
+	github.com/skeema/knownhosts v1.3.1 // indirect
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
+	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
-	go.opencensus.io v0.24.0 // indirect
+	github.com/zeebo/errs v1.4.0 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
-	go.opentelemetry.io/otel v1.33.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.33.0 // indirect
-	go.opentelemetry.io/otel/metric v1.33.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.33.0 // indirect
-	go.opentelemetry.io/otel/trace v1.33.0 // indirect
-	go4.org v0.0.0-20201209231011-d4a079459e60 // indirect
-	golang.org/x/crypto v0.32.0 // indirect
-	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/net v0.34.0 // indirect
-	golang.org/x/oauth2 v0.23.0 // indirect
-	golang.org/x/sync v0.10.0 // indirect
-	golang.org/x/sys v0.29.0 // indirect
-	golang.org/x/term v0.28.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
-	google.golang.org/api v0.162.0 // indirect
+	go.opentelemetry.io/contrib/detectors/gcp v1.36.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
+	go.opentelemetry.io/otel v1.36.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
+	go.opentelemetry.io/otel/metric v1.36.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.36.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
+	go.opentelemetry.io/otel/trace v1.36.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.5.0 // indirect
+	go4.org v0.0.0-20230225012048-214862532bf5 // indirect
+	golang.org/x/crypto v0.38.0 // indirect
+	golang.org/x/net v0.40.0 // indirect
+	golang.org/x/oauth2 v0.30.0 // indirect
+	golang.org/x/sync v0.14.0 // indirect
+	golang.org/x/sys v0.33.0 // indirect
+	golang.org/x/term v0.32.0 // indirect
+	golang.org/x/text v0.25.0 // indirect
+	golang.org/x/time v0.11.0 // indirect
+	google.golang.org/api v0.236.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
-	google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
-	google.golang.org/grpc v1.68.1 // indirect
-	google.golang.org/protobuf v1.35.2 // indirect
+	google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
+	google.golang.org/grpc v1.72.2 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
+	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	gotest.tools/v3 v3.5.1 // indirect
-	k8s.io/klog/v2 v2.120.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
-	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
-	sigs.k8s.io/yaml v1.3.0 // indirect
+	k8s.io/klog/v2 v2.130.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
+	k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
+	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
+	sigs.k8s.io/randfill v1.0.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
 )
diff --git a/functions/onprem/worker/go.sum b/functions/onprem/worker/go.sum
index fd10cb6c..0ef2d3a6 100644
--- a/functions/onprem/worker/go.sum
+++ b/functions/onprem/worker/go.sum
@@ -1,3 +1,5 @@
+cel.dev/expr v0.20.0 h1:OunBvVCfvpWlt4dN7zg3FM6TDkzOePe1+foGJ9AXeeI=
+cel.dev/expr v0.20.0/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
@@ -7,49 +9,63 @@ cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTj
 cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
 cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
 cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
-cloud.google.com/go v0.112.0 h1:tpFCD7hpHFlQ8yPwT3x+QeXqc2T6+n6T+hmABHfDUSM=
-cloud.google.com/go v0.112.0/go.mod h1:3jEEVwZ/MHU4djK5t5RHuKOA/GbLddgTdVubX1qnPD4=
+cloud.google.com/go v0.121.1 h1:S3kTQSydxmu1JfLRLpKtxRPA7rSrYPRPEUmL/PavVUw=
+cloud.google.com/go v0.121.1/go.mod h1:nRFlrHq39MNVWu+zESP2PosMWA0ryJw8KUBZ2iZpxbw=
+cloud.google.com/go/auth v0.16.1 h1:XrXauHMd30LhQYVRHLGvJiYeczweKQXZxsTbV9TiguU=
+cloud.google.com/go/auth v0.16.1/go.mod h1:1howDHJ5IETh/LwYs3ZxvlkXF48aSqqJUM+5o02dNOI=
+cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc=
+cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
-cloud.google.com/go/compute v1.24.0 h1:phWcR2eWzRJaL/kOiJwfFsPs4BaKq1j6vnpZrc1YlVg=
-cloud.google.com/go/compute v1.24.0/go.mod h1:kw1/T+h/+tK2LJK0wiPPx1intgdAM3j/g3hFDlscY40=
-cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
-cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
-cloud.google.com/go/compute/metadata v0.5.0 h1:Zr0eK8JbFv6+Wi4ilXAR8FJ3wyNdpxHKJNPos6LTZOY=
-cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY=
+cloud.google.com/go/compute/metadata v0.7.0 h1:PBWF+iiAerVNe8UCHxdOt6eHLVc3ydFeOCw78U8ytSU=
+cloud.google.com/go/compute/metadata v0.7.0/go.mod h1:j5MvL9PprKL39t166CoB1uVHfQMs4tFQZZcKwksXUjo=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
-cloud.google.com/go/datastore v1.15.0 h1:0P9WcsQeTWjuD1H14JIY7XQscIPQ4Laje8ti96IC5vg=
-cloud.google.com/go/datastore v1.15.0/go.mod h1:GAeStMBIt9bPS7jMJA85kgkpsMkvseWWXiaHya9Jes8=
-cloud.google.com/go/iam v1.1.6 h1:bEa06k05IO4f4uJonbB5iAgKTPpABy1ayxaIZV/GHVc=
-cloud.google.com/go/iam v1.1.6/go.mod h1:O0zxdPeGBoFdWW3HWmBxJsk0pfvNM/p/qa82rWOGTwI=
+cloud.google.com/go/datastore v1.20.0 h1:NNpXoyEqIJmZFc0ACcwBEaXnmscUpcG4NkKnbCePmiM=
+cloud.google.com/go/datastore v1.20.0/go.mod h1:uFo3e+aEpRfHgtp5pp0+6M0o147KoPaYNaPAKpfh8Ew=
+cloud.google.com/go/iam v1.5.2 h1:qgFRAGEmd8z6dJ/qyEchAuL9jpswyODjA2lS+w234g8=
+cloud.google.com/go/iam v1.5.2/go.mod h1:SE1vg0N81zQqLzQEwxL2WI6yhetBdbNQuTvIKCSkUHE=
+cloud.google.com/go/logging v1.13.0 h1:7j0HgAp0B94o1YRDqiqm26w4q1rDMH7XNRU34lJXHYc=
+cloud.google.com/go/logging v1.13.0/go.mod h1:36CoKh6KA/M0PbhPKMq6/qety2DCAErbhXT62TuXALA=
+cloud.google.com/go/longrunning v0.6.7 h1:IGtfDWHhQCgCjwQjV9iiLnUta9LBCo8R9QmAFsS/PrE=
+cloud.google.com/go/longrunning v0.6.7/go.mod h1:EAFV3IZAKmM56TyiE6VAP3VoTzhZzySwI/YI1s/nRsY=
+cloud.google.com/go/monitoring v1.24.2 h1:5OTsoJ1dXYIiMiuL+sYscLc9BumrL3CarVLL7dd7lHM=
+cloud.google.com/go/monitoring v1.24.2/go.mod h1:x7yzPWcgDRnPEv3sI+jJGBkwl5qINf+6qY4eq0I9B4U=
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
-cloud.google.com/go/scheduler v1.10.6 h1:5U8iXLoQ03qOB+ZXlAecU7fiE33+u3QiM9nh4cd0eTE=
-cloud.google.com/go/scheduler v1.10.6/go.mod h1:pe2pNCtJ+R01E06XCDOJs1XvAMbv28ZsQEbqknxGOuE=
+cloud.google.com/go/scheduler v1.11.7 h1:zkMEJ0UbEJ3O7NwEUlKLIp6eXYv1L7wHjbxyxznajKM=
+cloud.google.com/go/scheduler v1.11.7/go.mod h1:gqYs8ndLx2M5D0oMJh48aGS630YYvC432tHCnVWN13s=
 cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
 cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
-cloud.google.com/go/storage v1.36.0 h1:P0mOkAcaJxhCTvAkMhxMfrTKiNcub4YmmPBtlhAyTr8=
-cloud.google.com/go/storage v1.36.0/go.mod h1:M6M/3V/D3KpzMTJyPOR/HU6n2Si5QdaXYEsng2xgOs8=
+cloud.google.com/go/storage v1.55.0 h1:NESjdAToN9u1tmhVqhXCaCwYBuvEhZLLv0gBr+2znf0=
+cloud.google.com/go/storage v1.55.0/go.mod h1:ztSmTTwzsdXe5syLVS0YsbFxXuvEmEyZj7v7zChEmuY=
+cloud.google.com/go/trace v1.11.6 h1:2O2zjPzqPYAHrn3OKl029qlqG6W8ZdYaOWRyr8NgMT4=
+cloud.google.com/go/trace v1.11.6/go.mod h1:GA855OeDEBiBMzcckLPE2kDunIpC72N+Pq8WFieFjnI=
 dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
 dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
-github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
+github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEKWjV8V+WSxDXJ4NFATAsZjh8iIbsQIg=
+github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 h1:ErKg/3iS1AKcTkf3yixlZ54f9U1rljCkQyEXWUnIUxc=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0/go.mod h1:yAZHSGnqScoU556rBOVkwLze6WP5N+U11RHuWaGVxwY=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 h1:fYE9p3esPxA/C0rQ0AHhP0drtPXDRhaWiwg1DPqO7IU=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0/go.mod h1:BnBReJLvVYx2CS/UHOgVz2BXKXD9wsQPxZug20nZhd0=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.51.0 h1:OqVGm6Ei3x5+yZmSJG1Mh2NwHvpVmZ08CB5qJhT9Nuk=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.51.0/go.mod h1:SZiPHWGOOk3bl8tkevxkoiwPgsIl6CwrWcbwjfHZpdM=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 h1:6/0iUd0xrnX7qt+mLNRwg5c0PGv8wpE8K90ryANQwMI=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0/go.mod h1:otE2jQekW/PqXk1Awf5lmfokJx4uwuqcj1ab5SpGeW0=
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
 github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
-github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
-github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
-github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 h1:kkhsdkhsCvIsutKu5zLMgWtgh9YxGCNAw8Ad8hjwfYg=
-github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0=
-github.com/ProtonMail/go-crypto v1.1.3 h1:nRBOetoydLeUb4nHajyO2bKqMLfWQ/ZPwkXqXxPxCFk=
-github.com/ProtonMail/go-crypto v1.1.3/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
-github.com/adrg/strutil v0.2.3 h1:WZVn3ItPBovFmP4wMHHVXUr8luRaHrbyIuLlHt32GZQ=
-github.com/adrg/strutil v0.2.3/go.mod h1:+SNxbiH6t+O+5SZqIj5n/9i5yUjR+S3XXVrjEcN2mxg=
-github.com/algolia/algoliasearch-client-go/v3 v3.18.1 h1:FP2Xtqqs/sefR5Qluygp+jVV+juXzEdJaPrZTCDLhDQ=
-github.com/algolia/algoliasearch-client-go/v3 v3.18.1/go.mod h1:i7tLoP7TYDmHX3Q7vkIOL4syVse/k5VJ+k0i8WqFiJk=
+github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
+github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
+github.com/ProtonMail/go-crypto v1.1.6 h1:ZcV+Ropw6Qn0AX9brlQLAUXfqLBc7Bl+f/DmNxpLfdw=
+github.com/ProtonMail/go-crypto v1.1.6/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
+github.com/adrg/strutil v0.3.1 h1:OLvSS7CSJO8lBii4YmBt8jiK9QOtB9CzCzwl4Ic/Fz4=
+github.com/adrg/strutil v0.3.1/go.mod h1:8h90y18QLrs11IBffcGX3NW/GFBXCMcNg4M7H6MspPA=
+github.com/algolia/algoliasearch-client-go/v3 v3.31.4 h1:UJhx6AhZCYf0qZygDz2c1x1+1q2q2sfzsRaQM6yswWk=
+github.com/algolia/algoliasearch-client-go/v3 v3.31.4/go.mod h1:i7tLoP7TYDmHX3Q7vkIOL4syVse/k5VJ+k0i8WqFiJk=
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
@@ -68,105 +84,109 @@ github.com/aws/aws-sdk-go-v2/service/sso v1.12.10/go.mod h1:ouy2P4z6sJN70fR3ka3w
 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10/go.mod h1:AFvkxc8xfBe8XA+5St5XIHHrQQtkxqrRincx4hmMHOk=
 github.com/aws/aws-sdk-go-v2/service/sts v1.19.0/go.mod h1:BgQOMsg8av8jset59jelyPW7NoZcZXLVpDsXunGDrk8=
 github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
-github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874 h1:N7oVaKyGp8bttX0bfZGmcGkjz7DLQXhAn3DNd3T0ous=
-github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874/go.mod h1:r5xuitiExdLAJ09PR7vBVENGvp4ZuTBeWTGtxuX3K+c=
+github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf h1:TqhNAT4zKbTdLa62d2HDBFdvgSbIGB3eJE8HqhgiL9I=
+github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf/go.mod h1:r5xuitiExdLAJ09PR7vBVENGvp4ZuTBeWTGtxuX3K+c=
 github.com/bradfitz/slice v0.0.0-20180809154707-2b758aa73013 h1:/P9/RL0xgWE+ehnCUUN5h3RpG3dmoMCOONO1CCvq23Y=
 github.com/bradfitz/slice v0.0.0-20180809154707-2b758aa73013/go.mod h1:pccXHIvs3TV/TUqSNyEvF99sxjX2r4FFRIyw6TZY9+w=
-github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
-github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
-github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
+github.com/cenkalti/backoff/v5 v5.0.2 h1:rIfFVxEf1QsI7E1ZHfp/B4DF/6QBAUhmgkxc0H7Zss8=
+github.com/cenkalti/backoff/v5 v5.0.2/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
+github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
-github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
-github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
-github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ=
-github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM=
+github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
+github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
+github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 h1:Om6kYQYDUk5wWbT0t0q6pvyM49i9XZAv9dDrkDA7gjk=
+github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
+github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
+github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
+github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE=
+github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk=
 github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
 github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
-github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
-github.com/cyphar/filepath-securejoin v0.2.5 h1:6iR5tXJ/e6tJZzzdMc1km3Sa7RRIVBKAK32O2s7AYfo=
-github.com/cyphar/filepath-securejoin v0.2.5/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
+github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s=
+github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
-github.com/docker/docker v26.1.5+incompatible h1:NEAxTwEjxV6VbBMBoGG3zPqbiJosIApZjxlbrG9q3/g=
-github.com/docker/docker v26.1.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-github.com/docker/docker v27.5.0+incompatible h1:um++2NcQtGRTz5eEgO6aJimo6/JxrTXC941hd05JO6U=
-github.com/docker/docker v27.5.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v28.2.2+incompatible h1:CjwRSksz8Yo4+RmQ339Dp/D2tGO5JxwYeqtMOEe0LDw=
+github.com/docker/docker v28.2.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
 github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcejNsXKSkQ6lcIaNec2nyfOdlTBR2lU=
-github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
+github.com/elazarl/goproxy v1.7.2 h1:Y2o6urb7Eule09PjlhQRGNsqRfPmYI3KKQLFpCAV3+o=
+github.com/elazarl/goproxy v1.7.2/go.mod h1:82vkLNir0ALaW14Rc399OTTjyNREgmdL2cVoIbS6XaE=
 github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
 github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
 github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
-github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/go-control-plane v0.13.4 h1:zEqyPVyku6IvWCFwux4x9RxkLOMUL+1vC9xUFv5l2/M=
+github.com/envoyproxy/go-control-plane v0.13.4/go.mod h1:kDfuBlDVsSj2MjrLEtRWtHlsWIFcGyB2RMO44Dc5GZA=
+github.com/envoyproxy/go-control-plane/envoy v1.32.4 h1:jb83lalDRZSpPWW2Z7Mck/8kXZ5CQAFYVjQcdVIr83A=
+github.com/envoyproxy/go-control-plane/envoy v1.32.4/go.mod h1:Gzjc5k8JcJswLjAx1Zm+wSYE20UrLtt7JZMWiWQXQEw=
+github.com/envoyproxy/go-control-plane/ratelimit v0.1.0 h1:/G9QYbddjL25KvtKTv3an9lx6VBE2cnb8wp1vEGNYGI=
+github.com/envoyproxy/go-control-plane/ratelimit v0.1.0/go.mod h1:Wk+tMFAFbCXaJPzVVHnPgRKdUdwW/KdbRt94AzgRee4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A=
-github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew=
+github.com/envoyproxy/protoc-gen-validate v1.2.1 h1:DEo3O99U8j4hBFwbJfrz9VtgcDfUKS7KJ7spH3d86P8=
+github.com/envoyproxy/protoc-gen-validate v1.2.1/go.mod h1:d/C80l/jxXLdfEIhX1W2TmLfsJ31lvEjwamM4DxlWXU=
 github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/frikky/kin-openapi v0.41.0 h1:oMmjo+ekGS971lb3KLeZZOqRDZOwWi3+g/OiSWP08+s=
-github.com/frikky/kin-openapi v0.41.0/go.mod h1:ev9OZAw7Bv5p0w93j91++6a1ElPzGcCofst+kmrWsj4=
-github.com/frikky/schemaless v0.0.13 h1:ARiN9V7wr2VZXAr9JK5wvTbyPgpGrgeiL1VhR5MlgaQ=
-github.com/frikky/schemaless v0.0.13/go.mod h1:mooDxY+D6weHjhKvjy3+IE9S7P4g4cpNnidkdRv/cHQ=
+github.com/frikky/kin-openapi v0.42.0 h1:d5Z6vnuQ6RnCCPIxZaDL+TH2ODLxT8abytOt+Zh+Kd0=
+github.com/frikky/kin-openapi v0.42.0/go.mod h1:ev9OZAw7Bv5p0w93j91++6a1ElPzGcCofst+kmrWsj4=
+github.com/frikky/schemaless v0.0.16 h1:4d2ZktB9xGsAusbbKliOI8TuriSrdIMzD/6ToY3wkz8=
+github.com/frikky/schemaless v0.0.16/go.mod h1:jT48kTcmr1q3o8i+8qe7g+eCsbwaz2Q9CjOJevQQzQs=
+github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
+github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY=
-github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4=
+github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
+github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic=
-github.com/go-git/go-billy/v5 v5.5.0 h1:yEY4yhzCDuMGSv83oGxiBotRzhwhNr8VZyphhiu+mTU=
-github.com/go-git/go-billy/v5 v5.5.0/go.mod h1:hmexnoNsr2SJU1Ju67OaNz5ASJY3+sHgFRpCtpDCKow=
-github.com/go-git/go-billy/v5 v5.6.0 h1:w2hPNtoehvJIxR00Vb4xX94qHQi/ApZfX+nBE2Cjio8=
-github.com/go-git/go-billy/v5 v5.6.0/go.mod h1:sFDq7xD3fn3E0GOwUSZqHo9lrkmx8xJhA0ZrfvjBRGM=
+github.com/go-git/go-billy/v5 v5.6.2 h1:6Q86EsPXMa7c3YZ3aLAQsMA0VlWmy43r6FHqa/UNbRM=
+github.com/go-git/go-billy/v5 v5.6.2/go.mod h1:rcFC2rAsp/erv7CMz9GczHcuD0D32fWzH+MJAU+jaUU=
 github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4=
 github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII=
-github.com/go-git/go-git/v5 v5.11.0 h1:XIZc1p+8YzypNr34itUfSvYJcv+eYdTnTvOZ2vD3cA4=
-github.com/go-git/go-git/v5 v5.11.0/go.mod h1:6GFcX2P3NM7FPBfpePbpLd21XxsgdAt+lKqXmCUiUCY=
-github.com/go-git/go-git/v5 v5.13.0 h1:vLn5wlGIh/X78El6r3Jr+30W16Blk0CTcxTYcYPWi5E=
-github.com/go-git/go-git/v5 v5.13.0/go.mod h1:Wjo7/JyVKtQgUNdXYXIepzWfJQkUEIGvkvVkiXRR/zw=
+github.com/go-git/go-git/v5 v5.16.1 h1:TuxMBWNL7R05tXsUGi0kh1vi4tq0WfXNLlIrAkXG1k8=
+github.com/go-git/go-git/v5 v5.16.1/go.mod h1:4Ge4alE/5gPs30F2H1esi2gPd69R0C39lolkucHBOp8=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-jose/go-jose/v4 v4.0.5 h1:M6T8+mKZl/+fNNuFHvGIzDz7BTLQPIounk/b9dw3AaE=
+github.com/go-jose/go-jose/v4 v4.0.5/go.mod h1:s3P1lRrkT8igV8D9OjyL4WRyHvjB6a4JSllnOrmmBOA=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
-github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
 github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
+github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
+github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
 github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
 github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g=
 github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
-github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
-github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
+github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
+github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
+github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
+github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=
+github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
@@ -175,69 +195,57 @@ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
-github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
+github.com/google/gnostic-models v0.6.9 h1:MU/8wDLif2qCXZmzncUQ/BOfxWfthHi63KqpoNbWqVw=
+github.com/google/gnostic-models v0.6.9/go.mod h1:CiWsm0s6BSQd1hRn8/QmxqB6BesYcbSZxsz9b0KuDBw=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/go-github/v28 v28.1.1 h1:kORf5ekX5qwXO2mGzXXOjMe/g6ap8ahVe0sBEulhSxo=
 github.com/google/go-github/v28 v28.1.1/go.mod h1:bsqJWQX05omyWVmc00nEUql9mhQyv38lDZ8kPZcQVoM=
-github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
+github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
+github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
-github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw=
-github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
+github.com/google/martian/v3 v3.3.3 h1:DIhPTQrbPkgs2yJYdXU/eNACCG5DVQjySNRNlflZ9Fc=
+github.com/google/martian/v3 v3.3.3/go.mod h1:iEPrYcgCF7jA9OtScMFQyAlZZ4YXTKEtJ1E6RWzmBA0=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec=
-github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo=
+github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o=
-github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw=
-github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=
+github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs=
-github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0=
+github.com/googleapis/enterprise-certificate-proxy v0.3.6 h1:GW/XbdyBFQ8Qe+YAmFU9uHLo7OnF5tL52HFAgMmyrf4=
+github.com/googleapis/enterprise-certificate-proxy v0.3.6/go.mod h1:MkHOF77EYAE7qfSuSS9PU6g4Nt4e11cnsDUowfwewLA=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas=
-github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=
+github.com/googleapis/gax-go/v2 v2.14.2 h1:eBLnkZ9635krYIPD+ag1USrOAI0Nr0QYF3+/3GqO0k0=
+github.com/googleapis/gax-go/v2 v2.14.2/go.mod h1:ON64QhlJkhVtSqp4v1uaK92VyZ2gmvDQsweuyLV+8+w=
 github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
 github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 h1:Wqo399gCIufwto+VfwCSvsnfGpF/w5E9CNxSwbpD6No=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0/go.mod h1:qmOFXW2epJhM0qSnUUYpldc7gVz2KMQwJ/QYCDIa7XU=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 h1:VNqngBF40hVlDloBruUehVYC3ArSgIyScOAyMRqBxRg=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1/go.mod h1:RBRO7fro65R6tjKzYgLAFo0t1QEXY1Dp+i/bvpRiqiQ=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
-github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
@@ -266,8 +274,11 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
 github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
-github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
-github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
+github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw=
+github.com/moby/sys/atomicwriter v0.1.0/go.mod h1:Ul8oqv2ZMNHOceF643P6FKPXeCmYtlQMvpizfsSoaWs=
+github.com/moby/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU=
+github.com/moby/sys/sequential v0.6.0/go.mod h1:uyv8EUTrca5PnDsdMGXhZe6CCe8U/UiTWd+lL+7b/Ko=
+github.com/moby/term v0.5.2 h1:6qk3FJAFDs6i/q3W/pQ97SX192qKfZgGjCQqfCJkgzQ=
 github.com/moby/term v0.5.2/go.mod h1:d3djjFCrjnB+fl8NJux+EJzu0msscUP+f8it8hPkFLc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
@@ -278,69 +289,61 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
 github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY=
-github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM=
-github.com/onsi/gomega v1.31.0 h1:54UJxxj6cPInHS3a35wm6BK/F9nHYueZ1NVujHDrnXE=
-github.com/onsi/gomega v1.31.0/go.mod h1:DW9aCi7U6Yi40wNVAvT6kzFnEVEI5n3DloYBiKiT6zk=
+github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM=
+github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
+github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
+github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
-github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
-github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
+github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
+github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
 github.com/opensearch-project/opensearch-go v1.1.0 h1:eG5sh3843bbU1itPRjA9QXbxcg8LaZ+DjEzQH9aLN3M=
 github.com/opensearch-project/opensearch-go v1.1.0/go.mod h1:+6/XHCuTH+fwsMJikZEWsucZ4eZMma3zNSeLrTtVGbo=
 github.com/opensearch-project/opensearch-go/v2 v2.3.0 h1:nQIEMr+A92CkhHrZgUhcfsrZjibvB3APXf2a1VwCmMQ=
 github.com/opensearch-project/opensearch-go/v2 v2.3.0/go.mod h1:8LDr9FCgUTVoT+5ESjc2+iaZuldqE+23Iq0r1XeNue8=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
-github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI=
+github.com/pjbgf/sha1cd v0.3.2 h1:a9wb0bp1oC2TGwStyn0Umc/IGKQnEgF0vVaZ8QF8eo4=
+github.com/pjbgf/sha1cd v0.3.2/go.mod h1:zQWigSxVmsHEZow5qaLtPYxpcKMMQpa09ixqBxuCS6A=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo=
+github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
-github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
+github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
+github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk=
-github.com/sashabaranov/go-openai v1.19.2 h1:+dkuCADSnwXV02YVJkdphY8XD9AyHLUWwk6V7LB6EL8=
-github.com/sashabaranov/go-openai v1.19.2/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=
+github.com/sashabaranov/go-openai v1.40.1 h1:bJ08Iwct5mHBVkuvG6FEcb9MDTfsXdTYPGjYLRdeTEU=
+github.com/sashabaranov/go-openai v1.40.1/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/sendgrid/rest v2.6.9+incompatible h1:1EyIcsNdn9KIisLW50MKwmSRSK+ekueiEMJ7NEoxJo0=
 github.com/sendgrid/rest v2.6.9+incompatible/go.mod h1:kXX7q3jZtJXK5c5qK83bSGMdV6tsOE70KbHoqJls4lE=
-github.com/sendgrid/sendgrid-go v3.14.0+incompatible h1:KDSasSTktAqMJCYClHVE94Fcif2i7P7wzISv1sU6DUA=
-github.com/sendgrid/sendgrid-go v3.14.0+incompatible/go.mod h1:QRQt+LX/NmgVEvmdRw0VT/QgUn499+iza2FnDca9fg8=
-github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
-github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
+github.com/sendgrid/sendgrid-go v3.16.1+incompatible h1:zWhTmB0Y8XCDzeWIm2/BIt1GjJohAA0p6hVEaDtHWWs=
+github.com/sendgrid/sendgrid-go v3.16.1+incompatible/go.mod h1:QRQt+LX/NmgVEvmdRw0VT/QgUn499+iza2FnDca9fg8=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
-github.com/shuffle/shuffle-shared v0.6.74 h1:os3BDSFZnl4U8ZgsTAY8IsTDADcMXhbc1rS9UMa0BIY=
-github.com/shuffle/shuffle-shared v0.6.74/go.mod h1:RAJiSFjmuKmijKTbbEf9A6Ojb+3/te7g71lED7JjPus=
-github.com/shuffle/shuffle-shared v0.6.90 h1:FzIYtEt44eWgEsW/9tj2ki7qq8FEm/HWXUok+THp72M=
-github.com/shuffle/shuffle-shared v0.6.90/go.mod h1:RAJiSFjmuKmijKTbbEf9A6Ojb+3/te7g71lED7JjPus=
-github.com/shuffle/shuffle-shared v0.7.0 h1:T7nbC5An/K9ePx1pwvYqSnnNZuafwK3GVy6wPDuog18=
-github.com/shuffle/shuffle-shared v0.7.0/go.mod h1:bBXhEsPKjxln0mFnSeri7gIJ3tL/636Sh5NyTyNrvIQ=
-github.com/shuffle/shuffle-shared v0.7.82 h1:La11F5jp9bNtM3VuR9PawyWo90/vZ+1Txo4NIc4YdPg=
-github.com/shuffle/shuffle-shared v0.7.82/go.mod h1:bBXhEsPKjxln0mFnSeri7gIJ3tL/636Sh5NyTyNrvIQ=
-github.com/shuffle/shuffle-shared v0.7.83 h1:OyyDo0ii8rOYHN5wGbcM94JuDKLmbZ9jhMQ0+/KMb0A=
-github.com/shuffle/shuffle-shared v0.7.83/go.mod h1:bBXhEsPKjxln0mFnSeri7gIJ3tL/636Sh5NyTyNrvIQ=
-github.com/shuffle/shuffle-shared v0.8.0 h1:8ABtFz5UYOXN6mnnu/LrOwz8TxASnu1OBbj+gfqmtYk=
-github.com/shuffle/shuffle-shared v0.8.0/go.mod h1:bBXhEsPKjxln0mFnSeri7gIJ3tL/636Sh5NyTyNrvIQ=
+github.com/shuffle/shuffle-shared v0.8.84 h1:ElIMQYjKBVOiadbiGkSzt/lPU5xqaQwRxQvk9wx/xYM=
+github.com/shuffle/shuffle-shared v0.8.84/go.mod h1:RdfNxqCPI+zU4jQKy3E/p4Io2injm7LpSKQUCDHNtLk=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/skeema/knownhosts v1.2.1 h1:SHWdIUa82uGZz+F+47k8SY4QhhI291cXCpopT1lK2AQ=
-github.com/skeema/knownhosts v1.2.1/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3ThzgDxUwo=
-github.com/skeema/knownhosts v1.3.0 h1:AM+y0rI04VksttfwjkSTNQorvGqmwATnvnAHpSgc0LY=
-github.com/skeema/knownhosts v1.3.0/go.mod h1:sPINvnADmT/qYH1kfv+ePMmOBTH6Tbl7b5LvTDjFK7M=
+github.com/skeema/knownhosts v1.3.1 h1:X2osQ+RAjK76shCbvhHHHVl3ZlgDm8apHEHFqRjnBY8=
+github.com/skeema/knownhosts v1.3.1/go.mod h1:r7KTdC8l4uxWRyK2TpQZ/1o5HaSzh06ePQNxPwTcfiY=
 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0=
 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spiffe/go-spiffe/v2 v2.5.0 h1:N2I01KCUkv1FAjZXJMwh95KK1ZIQLYbPfhaxw8WS0hE=
+github.com/spiffe/go-spiffe/v2 v2.5.0/go.mod h1:P+NxobPc6wXhVtINNtFjNWGBTreew1GBUCwT2wPmb7g=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
@@ -350,51 +353,50 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
+github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
 github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/zeebo/errs v1.4.0 h1:XNdoD/RRMKP7HD0UhJnIzUy74ISdGGxURlYG8HSWSfM=
+github.com/zeebo/errs v1.4.0/go.mod h1:sgbWHsvVuTPHcqJJGQ1WhI5KbWlHYz+2+2C/LSEtCw4=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
-go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
 go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
 go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.50.0 h1:cEPbyTSEHlQR89XVlyo78gqluF8Y3oMeBkXGWzQsfXY=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.50.0/go.mod h1:DKdbWcT4GH1D0Y3Sqt/PFXt2naRKDWtU+eE6oLdFNA8=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 h1:yd02MEjBdJkG3uabWP9apV+OuWRIXGDuJEUJbOHmCFU=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0/go.mod h1:umTcuxiv1n/s/S6/c2AT/g2CQ7u5C59sHDNmfSwgz7Q=
-go.opentelemetry.io/otel v1.25.0 h1:gldB5FfhRl7OJQbUHt/8s0a7cE8fbsPAtdpRaApKy4k=
-go.opentelemetry.io/otel v1.25.0/go.mod h1:Wa2ds5NOXEMkCmUou1WA7ZBfLTHWIsp034OVD7AO+Vg=
-go.opentelemetry.io/otel v1.33.0 h1:/FerN9bax5LoK51X/sI0SVYrjSE0/yUL7DpxW4K3FWw=
-go.opentelemetry.io/otel v1.33.0/go.mod h1:SUUkR6csvUQl+yjReHu5uM3EtVV7MBm5FHKRlNx4I8I=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.25.0 h1:dT33yIHtmsqpixFsSQPwNeY5drM9wTcoL8h0FWF4oGM=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.25.0/go.mod h1:h95q0LBGh7hlAC08X2DhSeyIG02YQ0UyioTCVAqRPmc=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.25.0 h1:Mbi5PKN7u322woPa85d7ebZ+SOvEoPvoiBu+ryHWgfA=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.25.0/go.mod h1:e7ciERRhZaOZXVjx5MiL8TK5+Xv7G5Gv5PA2ZDEJdL8=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.33.0/go.mod h1:wAy0T/dUbs468uOlkT31xjvqQgEVXv58BRFWEgn5v/0=
-go.opentelemetry.io/otel/metric v1.25.0 h1:LUKbS7ArpFL/I2jJHdJcqMGxkRdxpPHE0VU/D4NuEwA=
-go.opentelemetry.io/otel/metric v1.25.0/go.mod h1:rkDLUSd2lC5lq2dFNrX9LGAbINP5B7WBkC78RXCpH5s=
-go.opentelemetry.io/otel/metric v1.33.0 h1:r+JOocAyeRVXD8lZpjdQjzMadVZp2M4WmQ+5WtEnklQ=
-go.opentelemetry.io/otel/metric v1.33.0/go.mod h1:L9+Fyctbp6HFTddIxClbQkjtubW6O9QS3Ann/M82u6M=
-go.opentelemetry.io/otel/sdk v1.25.0 h1:PDryEJPC8YJZQSyLY5eqLeafHtG+X7FWnf3aXMtxbqo=
-go.opentelemetry.io/otel/sdk v1.25.0/go.mod h1:oFgzCM2zdsxKzz6zwpTZYLLQsFwc+K0daArPdIhuxkw=
-go.opentelemetry.io/otel/sdk v1.33.0/go.mod h1:A1Q5oi7/9XaMlIWzPSxLRWOI8nG3FnzHJNbiENQuihM=
-go.opentelemetry.io/otel/trace v1.25.0 h1:tqukZGLwQYRIFtSQM2u2+yfMVTgGVeqRLPUYx1Dq6RM=
-go.opentelemetry.io/otel/trace v1.25.0/go.mod h1:hCCs70XM/ljO+BeQkyFnbK28SBIJ/Emuha+ccrCRT7I=
-go.opentelemetry.io/otel/trace v1.33.0 h1:cCJuF7LRjUFso9LPnEAHJDB2pqzp+hbO8eu1qqW2d/s=
-go.opentelemetry.io/otel/trace v1.33.0/go.mod h1:uIcdVUZMpTAmz0tI1z04GoVSezK37CbGV4fr1f2nBck=
-go.opentelemetry.io/proto/otlp v1.1.0 h1:2Di21piLrCqJ3U3eXGCTPHE9R8Nh+0uglSnOyxikMeI=
-go.opentelemetry.io/proto/otlp v1.1.0/go.mod h1:GpBHCBWiqvVLDqmHZsoMM3C5ySeKTC7ej/RNTae6MdY=
-go4.org v0.0.0-20201209231011-d4a079459e60 h1:iqAGo78tVOJXELHQFRjR6TMwItrvXH4hrGJ32I/NFF8=
-go4.org v0.0.0-20201209231011-d4a079459e60/go.mod h1:CIiUVy99QCPfoE13bO4EZaz5GZMZXMSBGhxRdsvzbkg=
+go.opentelemetry.io/contrib/detectors/gcp v1.36.0 h1:F7q2tNlCaHY9nMKHR6XH9/qkp8FktLnIcy6jJNyOCQw=
+go.opentelemetry.io/contrib/detectors/gcp v1.36.0/go.mod h1:IbBN8uAIIx734PTonTPxAxnjc2pQTxWNkwfstZ+6H2k=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 h1:x7wzEgXfnzJcHDwStJT+mxOz4etr2EcexjqhBvmoakw=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0/go.mod h1:rg+RlpR5dKwaS95IyyZqj5Wd4E13lk/msnTS0Xl9lJM=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 h1:sbiXRNDSWJOTobXh5HyQKjq6wUC5tNybqjIqDpAY4CU=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ=
+go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg=
+go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 h1:1fTNlAIJZGWLP5FVu0fikVry1IsiUnXjf7QFvoNN3Xw=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0/go.mod h1:zjPK58DtkqQFn+YUMbx0M2XV3QgKU0gS9LeGohREyK4=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.36.0 h1:nRVXXvf78e00EwY6Wp0YII8ww2JVWshZ20HfTlE11AM=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.36.0/go.mod h1:r49hO7CgrxY9Voaj3Xe8pANWtr0Oq916d0XAmOoCZAQ=
+go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.36.0 h1:rixTyDGXFxRy1xzhKrotaHy3/KXdPhlWARrCgK+eqUY=
+go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.36.0/go.mod h1:dowW6UsM9MKbJq5JTz2AMVp3/5iW5I/TStsk8S+CfHw=
+go.opentelemetry.io/otel/metric v1.36.0 h1:MoWPKVhQvJ+eeXWHFBOPoBOi20jh6Iq2CcCREuTYufE=
+go.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs=
+go.opentelemetry.io/otel/sdk v1.36.0 h1:b6SYIuLRs88ztox4EyrvRti80uXIFy+Sqzoh9kFULbs=
+go.opentelemetry.io/otel/sdk v1.36.0/go.mod h1:+lC+mTgD+MUWfjJubi2vvXWcVxyr9rmlshZni72pXeY=
+go.opentelemetry.io/otel/sdk/metric v1.36.0 h1:r0ntwwGosWGaa0CrSt8cuNuTcccMXERFwHX4dThiPis=
+go.opentelemetry.io/otel/sdk/metric v1.36.0/go.mod h1:qTNOhFDfKRwX0yXOqJYegL5WRaW376QbB7P4Pb0qva4=
+go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w=
+go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA=
+go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4=
+go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4=
+go4.org v0.0.0-20230225012048-214862532bf5 h1:nifaUDeh+rPaBCMPMQHZmvJf+QdpLFnuQPwx+LxVmtc=
+go4.org v0.0.0-20230225012048-214862532bf5/go.mod h1:F57wTi5Lrj6WLyswp5EYV1ncrEbFGHD4hhz6S1ZYeaU=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -402,12 +404,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
-golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
-golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
-golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
-golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
-golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
+golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
+golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -435,11 +433,6 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=
-golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -453,32 +446,23 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
-golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
-golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
-golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
-golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
-golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
+golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
+golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ=
-golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA=
-golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
-golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
+golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -487,11 +471,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
+golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -505,34 +486,25 @@ golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
-golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
+golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
-golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
-golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
-golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
-golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
+golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
+golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -543,15 +515,12 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
+golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
+golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
-golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
+golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -579,17 +548,12 @@ golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapK
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ=
-golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
+golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
+golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
-golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
 google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
@@ -598,8 +562,8 @@ google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsb
 google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.162.0 h1:Vhs54HkaEpkMBdgGdOT2P6F0csGG/vxDS0hWHJzmmps=
-google.golang.org/api v0.162.0/go.mod h1:6SulDkfoBIg4NFmCuZ39XeeAgSHCPecfSUuDyYlAHs0=
+google.golang.org/api v0.236.0 h1:CAiEiDVtO4D/Qja2IA9VzlFrgPnK3XVMmRoJZlSWbc0=
+google.golang.org/api v0.236.0/go.mod h1:X1WF9CU2oTc+Jml1tiIxGmWFK/UZezdqEu09gcxZAj4=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -620,88 +584,72 @@ google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvx
 google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de h1:F6qOa9AZTYJXOUEr4jDysRDLrm4PHePlge4v4TGAlxY=
-google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:VUhTRKeHn9wwcdrk73nvdC9gF178Tzhmt/qyaFcPLSo=
-google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de h1:jFNzHPIeuzhdRwVhbZdiym9q0ory/xY3sA+v2wPg8I0=
-google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:5iCWqnniDlqZHrd3neWVTOwvh/v6s3232omMecelax8=
-google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 h1:CkkIfIt50+lT6NHAVoRYEyAvQGFM7xEwXUUywFvEb3Q=
-google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576/go.mod h1:1R3kvZ1dtP3+4p4d3G8uJ8rFk/fWlScl38vanWACI08=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda h1:LI5DOvAxUPMv/50agcLLoo+AdWc1irS9Rzz4vPuD1V4=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 h1:8ZmaLZE4XWrtU3MyClkYqqtl6Oegr3235h7jxsDyqCY=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU=
+google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 h1:1tXaIXCracvtsRxSBsYDiSBN0cuJvM7QYW+MrpIRY78=
+google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2/go.mod h1:49MsLSx0oWMOZqcpB3uL8ZOkAh1+TndpJ8ONoCBWiZk=
+google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 h1:Kog3KlB4xevJlAcbbbzPfRG0+X9fdoGM+UBRKVz6Wr0=
+google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237/go.mod h1:ezi0AVyMKDWy5xAncvjLWH7UcLBB5n7y2fQ8MzjJcto=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a h1:v2PbRU4K3llS09c7zodFpNePeamkAwG3mPrAery9VeE=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.63.0 h1:WjKe+dnvABXyPJMD7KDNLxtoGk5tgk+YFWN6cBWjZE8=
-google.golang.org/grpc v1.63.0/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
-google.golang.org/grpc v1.68.1 h1:oI5oTa11+ng8r8XMMN7jAOmWfPZWbYpCFaMUTACxkM0=
-google.golang.org/grpc v1.68.1/go.mod h1:+q1XYFJjShcqn0QZHvCyeR4CXPA+llXIeUIfIe00waw=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+google.golang.org/grpc v1.72.2 h1:TdbGzwb82ty4OusHWepvFWGLgIbNo1/SUynEN0ssqv8=
+google.golang.org/grpc v1.72.2/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
-google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
-google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
-google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4=
+gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
 gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU=
-gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=
+gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q=
+gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-k8s.io/api v0.30.2 h1:+ZhRj+28QT4UOH+BKznu4CBgPWgkXO7XAvMcMl0qKvI=
-k8s.io/api v0.30.2/go.mod h1:ULg5g9JvOev2dG0u2hig4Z7tQ2hHIuS+m8MNZ+X6EmI=
-k8s.io/apimachinery v0.30.2 h1:fEMcnBj6qkzzPGSVsAZtQThU62SmQ4ZymlXRC5yFSCg=
-k8s.io/apimachinery v0.30.2/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
-k8s.io/client-go v0.30.2 h1:sBIVJdojUNPDU/jObC+18tXWcTJVcwyqS9diGdWHk50=
-k8s.io/client-go v0.30.2/go.mod h1:JglKSWULm9xlJLx4KCkfLLQ7XwtlbflV6uFFSHTMgVs=
-k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
-k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
-k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
-k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
-k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
-k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+k8s.io/api v0.33.1 h1:tA6Cf3bHnLIrUK4IqEgb2v++/GYUtqiu9sRVk3iBXyw=
+k8s.io/api v0.33.1/go.mod h1:87esjTn9DRSRTD4fWMXamiXxJhpOIREjWOSjsW1kEHw=
+k8s.io/apimachinery v0.33.1 h1:mzqXWV8tW9Rw4VeW9rEkqvnxj59k1ezDUl20tFK/oM4=
+k8s.io/apimachinery v0.33.1/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
+k8s.io/client-go v0.33.1 h1:ZZV/Ks2g92cyxWkRRnfUDsnhNn28eFpt26aGc8KbXF4=
+k8s.io/client-go v0.33.1/go.mod h1:JAsUrl1ArO7uRVFWfcj6kOomSlCv+JpvIsp6usAGefA=
+k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
+k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
+k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=
+k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
+k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
+k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
-sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
-sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
-sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
-sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
+sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
+sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
+sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
+sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
+sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
+sigs.k8s.io/structured-merge-diff/v4 v4.6.0 h1:IUA9nvMmnKWcj5jl84xn+T5MnlZKThmUW1TdblaLVAc=
+sigs.k8s.io/structured-merge-diff/v4 v4.6.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
+sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
+sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
diff --git a/functions/onprem/worker/worker.go b/functions/onprem/worker/worker.go
index 7595572b..2fbf51e3 100644
--- a/functions/onprem/worker/worker.go
+++ b/functions/onprem/worker/worker.go
@@ -23,8 +23,9 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/mount"
 	"github.com/docker/docker/api/types/image"
+	"github.com/docker/docker/api/types/mount"
+	"github.com/docker/docker/api/types/network"
 	dockerclient "github.com/docker/docker/client"
 
 	// This is for automatic removal of certain code :)
@@ -57,11 +58,15 @@ var cleanupEnv = strings.ToLower(os.Getenv("CLEANUP"))
 var swarmNetworkName = os.Getenv("SHUFFLE_SWARM_NETWORK_NAME")
 var dockerApiVersion = strings.ToLower(os.Getenv("DOCKER_API_VERSION"))
 
-var baseimagename = "frikky/shuffle"
+// Kubernetes settings
+var appServiceAccountName = os.Getenv("SHUFFLE_APP_SERVICE_ACCOUNT_NAME")
+var appPodSecurityContext = os.Getenv("SHUFFLE_APP_POD_SECURITY_CONTEXT")
+var appContainerSecurityContext = os.Getenv("SHUFFLE_APP_CONTAINER_SECURITY_CONTEXT")
 var kubernetesNamespace = os.Getenv("KUBERNETES_NAMESPACE")
+
 var executionCount int64
 
-// var baseimagename = os.Getenv("SHUFFLE_BASE_IMAGE_NAME")
+var baseimagename = os.Getenv("SHUFFLE_BASE_IMAGE_NAME")
 
 // var baseimagename = "registry.hub.docker.com/frikky/shuffle"
 var registryName = "registry.hub.docker.com"
@@ -73,6 +78,7 @@ var appsInitialized = false
 
 var hostname string
 var maxReplicas = uint64(12)
+var debug bool
 
 /*
 var environments []string
@@ -105,11 +111,9 @@ var window = shuffle.NewTimeWindow(10 * time.Second)
 
 // Images to be autodeployed in the latest version of Shuffle.
 var autoDeploy = map[string]string{
-	"http:1.4.0":               "frikky/shuffle:http_1.4.0",
-	"http:1.3.0":               "frikky/shuffle:http_1.3.0",
-	"shuffle-tools:1.2.0":      "frikky/shuffle:shuffle-tools_1.2.0",
-	"shuffle-subflow:1.0.0":    "frikky/shuffle:shuffle-subflow_1.0.0",
-	"shuffle-subflow:1.1.0":    "frikky/shuffle:shuffle-subflow_1.1.0",
+	"http:1.4.0":            "frikky/shuffle:http_1.4.0",
+	"shuffle-tools:1.2.0":   "frikky/shuffle:shuffle-tools_1.2.0",
+	"shuffle-subflow:1.1.0": "frikky/shuffle:shuffle-subflow_1.1.0",
 	// "shuffle-tools-fork:1.0.0": "frikky/shuffle:shuffle-tools-fork_1.0.0",
 }
 
@@ -158,7 +162,7 @@ func setWorkflowExecution(ctx context.Context, workflowExecution shuffle.Workflo
 			log.Printf("[ERROR] Failed marshalling shutdowndata during set: %s", err)
 		}
 
-		log.Printf("[DEBUG][%s] Sending result (set)", workflowExecution.ExecutionId)
+		log.Printf("[DEBUG][%s] Sending result (set). Status: %s, Actions: %d, Results: %d", workflowExecution.ExecutionId, workflowExecution.Status, len(workflowExecution.Workflow.Actions), len(workflowExecution.Results))
 		sendResult(workflowExecution, shutdownData)
 		return nil
 	}
@@ -301,7 +305,7 @@ func shutdown(workflowExecution shuffle.WorkflowExecution, nodeId string, reason
 	}
 
 	// Might not be necessary because of cleanupEnv hostconfig autoremoval
-	if cleanupEnv == "true" && (os.Getenv("SHUFFLE_SWARM_CONFIG") != "run" && os.Getenv("SHUFFLE_SWARM_CONFIG") != "swarm") {
+	if strings.ToLower(cleanupEnv) == "true" && (os.Getenv("SHUFFLE_SWARM_CONFIG") != "run" && os.Getenv("SHUFFLE_SWARM_CONFIG") != "swarm") {
 		/*
 			ctx := context.Background()
 			dockercli, err := dockerclient.NewEnvClient()
@@ -392,8 +396,6 @@ func shutdown(workflowExecution shuffle.WorkflowExecution, nodeId string, reason
 	}
 }
 
-func int32Ptr(i int32) *int32 { return &i }
-
 // ** STARTREMOVE ***/
 func deployk8sApp(image string, identifier string, env []string) error {
 	if len(os.Getenv("KUBERNETES_NAMESPACE")) > 0 {
@@ -402,6 +404,11 @@ func deployk8sApp(image string, identifier string, env []string) error {
 		kubernetesNamespace = "default"
 	}
 
+	deployport, err := strconv.Atoi(os.Getenv("SHUFFLE_APP_EXPOSED_PORT"))
+	if err != nil {
+		deployport = 80
+	}
+
 	envMap := make(map[string]string)
 	for _, envStr := range env {
 		parts := strings.SplitN(envStr, "=", 2)
@@ -411,9 +418,7 @@ func deployk8sApp(image string, identifier string, env []string) error {
 	}
 
 	// add to env
-	// fmt.Sprintf("SHUFFLE_APP_EXPOSED_PORT=%d", deployport),
-	// fmt.Sprintf("SHUFFLE_SWARM_CONFIG=%s", os.Getenv("SHUFFLE_SWARM_CONFIG")),
-	envMap["SHUFFLE_APP_EXPOSED_PORT"] = "80"
+	envMap["SHUFFLE_APP_EXPOSED_PORT"] = strconv.Itoa(deployport)
 	envMap["SHUFFLE_SWARM_CONFIG"] = os.Getenv("SHUFFLE_SWARM_CONFIG")
 	envMap["BASE_URL"] = "http://shuffle-workers:33333"
 
@@ -487,9 +492,49 @@ func deployk8sApp(image string, identifier string, env []string) error {
 
 	//fix naming convention
 	// podUuid := uuid.NewV4().String()
-	// podName := fmt.Sprintf("%s-%s", value, podUuid)
+	// name := fmt.Sprintf("%s-%s", value, podUuid)
 	// replace identifier "_" with "-"
-	podName := strings.ReplaceAll(identifier, "_", "-")
+	name := strings.ReplaceAll(identifier, "_", "-")
+
+	labels := map[string]string{
+		// Well-known Kubernetes labels
+		"app.kubernetes.io/name":       "shuffle-app",
+		"app.kubernetes.io/instance":   name,
+		"app.kubernetes.io/part-of":    "shuffle",
+		"app.kubernetes.io/managed-by": "shuffle-worker",
+		// Keep legacy labels for backward compatibility
+		"app": name,
+		// TODO: Add Shuffle specific labels
+		// "app.shuffler.io/name":    "APP_NAME",
+		// "app.shuffler.io/version": "APP_VERSION",
+	}
+
+	matchLabels := map[string]string{
+		"app.kubernetes.io/name":     "shuffle-app",
+		"app.kubernetes.io/instance": name,
+	}
+
+	// Parse security contexts from env
+	var podSecurityContext *corev1.PodSecurityContext
+	var containerSecurityContext *corev1.SecurityContext
+
+	if len(appPodSecurityContext) > 0 {
+		podSecurityContext = &corev1.PodSecurityContext{}
+		err = json.Unmarshal([]byte(appPodSecurityContext), podSecurityContext)
+		if err != nil {
+			log.Printf("[ERROR] Failed to unmarshal app pod security context: %v", err)
+			return fmt.Errorf("failed to unmarshal app pod security context: %v", err)
+		}
+	}
+
+	if len(appContainerSecurityContext) > 0 {
+		containerSecurityContext = &corev1.SecurityContext{}
+		err = json.Unmarshal([]byte(appContainerSecurityContext), containerSecurityContext)
+		if err != nil {
+			log.Printf("[ERROR] Failed to unmarshal app container security context: %v", err)
+			return fmt.Errorf("failed to unmarshal app container security context: %v", err)
+		}
+	}
 
 	// pod := &corev1.Pod{
 	// 	ObjectMeta: metav1.ObjectMeta{
@@ -569,20 +614,17 @@ func deployk8sApp(image string, identifier string, env []string) error {
 
 	deployment := &appsv1.Deployment{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: podName,
+			Name:   name,
+			Labels: labels,
 		},
 		Spec: appsv1.DeploymentSpec{
-			Replicas: int32Ptr(replicaNumberInt32),
+			Replicas: &replicaNumberInt32,
 			Selector: &metav1.LabelSelector{
-				MatchLabels: map[string]string{
-					"app": podName,
-				},
+				MatchLabels: matchLabels,
 			},
 			Template: corev1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
-					Labels: map[string]string{
-						"app": podName,
-					},
+					Labels: labels,
 				},
 				Spec: corev1.PodSpec{
 					Containers: []corev1.Container{
@@ -590,8 +632,18 @@ func deployk8sApp(image string, identifier string, env []string) error {
 							Name:  value,
 							Image: image,
 							Env:   buildEnvVars(envMap),
+							Ports: []corev1.ContainerPort{
+								{
+									Protocol:      "TCP",
+									ContainerPort: int32(deployport),
+								},
+							},
+							SecurityContext: containerSecurityContext,
 						},
 					},
+					DNSPolicy:          corev1.DNSClusterFirst,
+					ServiceAccountName: appServiceAccountName,
+					SecurityContext:    podSecurityContext,
 				},
 			},
 		},
@@ -603,23 +655,21 @@ func deployk8sApp(image string, identifier string, env []string) error {
 		return err
 	}
 
-	// kubectl expose deployment {podName} --type=NodePort --port=80 --target-port=80
 	service := &corev1.Service{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: podName,
+			Name:   name,
+			Labels: labels,
 		},
 		Spec: corev1.ServiceSpec{
-			Selector: map[string]string{
-				"app": podName,
-			},
+			Selector: matchLabels,
 			Ports: []corev1.ServicePort{
 				{
 					Protocol:   "TCP",
 					Port:       80,
-					TargetPort: intstr.FromInt(80),
+					TargetPort: intstr.FromInt(deployport),
 				},
 			},
-			Type: corev1.ServiceTypeNodePort,
+			Type: corev1.ServiceTypeClusterIP,
 		},
 	}
 
@@ -875,7 +925,7 @@ func deployApp(cli *dockerclient.Client, image string, identifier string, env []
 	}
 
 	// Removing because log extraction should happen first
-	if cleanupEnv == "true" {
+	if strings.ToLower(cleanupEnv) == "true" {
 		hostConfig.AutoRemove = true
 	}
 
@@ -885,19 +935,30 @@ func deployApp(cli *dockerclient.Client, image string, identifier string, env []
 	if len(volumeBindString) > 0 {
 		volumeBindSplit := strings.Split(volumeBindString, ",")
 		for _, volumeBind := range volumeBindSplit {
-			if strings.Contains(volumeBind, ":") {
-				volumeBinds = append(volumeBinds, volumeBind)
-			} else {
-				log.Printf("[ERROR] Volume bind '%s' is invalid.", volumeBind)
+			if volumeBind == "srcfolder=dstfolder" || volumeBind == "srcfolder:dstfolder" || volumeBind == "/srcfolder:/dstfolder" {
+				log.Printf("[DEBUG] Volume bind '%s' is invalid.", volumeBind)
+				continue
 			}
+
+			if !strings.HasPrefix(volumeBind, "/") {
+				log.Printf("[ERROR] Volume bind '%s' is invalid. Use absolute paths.", volumeBind)
+				continue
+			}
+
+			if !strings.Contains(volumeBind, ":") {
+				log.Printf("[ERROR] Volume bind '%s' is invalid. Use absolute paths with colon inbetween them (/srcpath:dstpath/", volumeBind)
+				continue
+			}
+
+			volumeBinds = append(volumeBinds, volumeBind)
 		}
 	}
 
 	// Add more volume binds if possible
 	if len(volumeBinds) > 0 {
-		log.Printf("[DEBUG] Setting up binds for container. Got %d volume binds.", len(volumeBinds))
 
-		hostConfig.Binds = volumeBinds
+		// Only use mounts, not direct binds
+		hostConfig.Binds = []string{}
 		hostConfig.Mounts = []mount.Mount{}
 		for _, bind := range volumeBinds {
 			if !strings.Contains(bind, ":") || strings.Contains(bind, "..") || strings.HasPrefix(bind, "~") {
@@ -905,15 +966,27 @@ func deployApp(cli *dockerclient.Client, image string, identifier string, env []
 				continue
 			}
 
-			log.Printf("[DEBUG] Appending bind %s to app container", bind)
+			log.Printf("[DEBUG] Appending bind %s to App container", bind)
 			bindSplit := strings.Split(bind, ":")
 			sourceFolder := bindSplit[0]
 			destinationFolder := bindSplit[1]
-			hostConfig.Mounts = append(hostConfig.Mounts, mount.Mount{
-				Type:   mount.TypeBind,
-				Source: sourceFolder,
-				Target: destinationFolder,
-			})
+
+			readOnly := false
+			if len(bindSplit) > 2 {
+				mode := bindSplit[2]
+				if mode == "ro" {
+					readOnly = true
+				}
+			}
+
+			builtMount := mount.Mount{
+				Type:     mount.TypeBind,
+				Source:   sourceFolder,
+				Target:   destinationFolder,
+				ReadOnly: readOnly,
+			}
+
+			hostConfig.Mounts = append(hostConfig.Mounts, builtMount)
 		}
 	}
 
@@ -922,6 +995,8 @@ func deployApp(cli *dockerclient.Client, image string, identifier string, env []
 		Env:   env,
 	}
 
+	//log.Printf("[DEBUG] Deploying image with env: %#v", env)
+
 	// Checking as late as possible, just in case.
 	newExecId := fmt.Sprintf("%s_%s", workflowExecution.ExecutionId, action.ID)
 	_, err := shuffle.GetCache(ctx, newExecId)
@@ -957,7 +1032,8 @@ func deployApp(cli *dockerclient.Client, image string, identifier string, env []
 
 func cleanupKubernetesExecution(clientset *kubernetes.Clientset, workflowExecution shuffle.WorkflowExecution, namespace string) error {
 	// workerName := fmt.Sprintf("worker-%s", workflowExecution.ExecutionId)
-	labelSelector := fmt.Sprintf("app=shuffle-app,executionId=%s", workflowExecution.ExecutionId)
+	// FIXME: The executionId label is currently not set
+	labelSelector := fmt.Sprintf("app.kubernetes.io/name=shuffle-app,executionId=%s", workflowExecution.ExecutionId)
 
 	podList, err := clientset.CoreV1().Pods(namespace).List(context.TODO(), metav1.ListOptions{
 		LabelSelector: labelSelector,
@@ -1038,17 +1114,21 @@ func DeployContainer(ctx context.Context, cli *dockerclient.Client, config *cont
 	err = cli.ContainerStart(ctx, cont.ID, container.StartOptions{})
 	if err != nil {
 		if strings.Contains(fmt.Sprintf("%s", err), "cannot join network") || strings.Contains(fmt.Sprintf("%s", err), "No such container") {
+			// Remove the "CREATED" one from the previous if possible
+			go cli.ContainerRemove(ctx, cont.ID, container.RemoveOptions{})
+
+			log.Printf("[WARNING] Failed deploying App on first attempt: %s. Removing some HostConfig configs.", err)
 			parsedUuid := uuid.NewV4()
 			identifier = fmt.Sprintf("%s-%s-nonetwork", identifier, parsedUuid)
-			hostConfig = &container.HostConfig{
-				LogConfig: container.LogConfig{
-					Type: "json-file",
-					Config: map[string]string{
-						"max-size": "10m",
-					},
+
+			hostConfig.NetworkMode = container.NetworkMode("")
+			hostConfig.LogConfig = container.LogConfig{
+				Type: "json-file",
+				Config: map[string]string{
+					"max-size": "10m",
 				},
-				Resources: container.Resources{},
 			}
+			hostConfig.Resources = container.Resources{}
 
 			cont, err = cli.ContainerCreate(
 				context.Background(),
@@ -1070,12 +1150,12 @@ func DeployContainer(ctx context.Context, cli *dockerclient.Client, config *cont
 				return err
 			}
 
-			log.Printf("[DEBUG] Running secondary check without network with worker")
+			//log.Printf("[DEBUG] Running secondary check without network with worker")
 			err = cli.ContainerStart(ctx, cont.ID, container.StartOptions{})
 		}
 
 		if err != nil {
-			log.Printf("[ERROR] Failed to start container in environment %s: %s", environment, err)
+			log.Printf("[ERROR] Failed to start container (2) in runtime location %s: %s", environment, err)
 
 			cacheErr := shuffle.DeleteCache(ctx, actionExecId)
 			if cacheErr != nil {
@@ -1235,6 +1315,7 @@ func getWorkerURLs() ([]string, error) {
 }
 
 func askOtherWorkersToDownloadImage(image string) {
+	// Why wouldn't it happen on swarm? Hmm
 	if os.Getenv("SHUFFLE_SWARM_CONFIG") != "run" && os.Getenv("SHUFFLE_SWARM_CONFIG") != "swarm" {
 		return
 	}
@@ -1477,10 +1558,6 @@ func handleExecutionResult(workflowExecution shuffle.WorkflowExecution) {
 			env = append(env, fmt.Sprintf("SHUFFLE_APP_SDK_TIMEOUT=%s", os.Getenv("SHUFFLE_APP_SDK_TIMEOUT")))
 		}
 
-		// Fixes issue:
-		// standard_go init_linux.go:185: exec user process caused "argument list too long"
-		// https://devblogs.microsoft.com/oldnewthing/20100203-00/?p=15083
-
 		// FIXME: Ensure to NEVER do this anymore
 		// This potentially breaks too much stuff. Better to have the app poll the data.
 		_ = executionData
@@ -1504,9 +1581,11 @@ func handleExecutionResult(workflowExecution shuffle.WorkflowExecution) {
 			fmt.Sprintf("%s:%s_%s", baseimagename, parsedAppname, action.AppVersion),
 		}
 
-		// If cleanup is set, it should run for efficiency
+		// This is the weirdest shit ever looking back at
+		// Needs optimization lol
+
 		pullOptions := image.PullOptions{}
-		if cleanupEnv == "true" {
+		if strings.ToLower(cleanupEnv) == "true" {
 			err = deployApp(dockercli, images[0], identifier, env, workflowExecution, action)
 			if err != nil && !strings.Contains(err.Error(), "Conflict. The container name") {
 				if strings.Contains(err.Error(), "exited prematurely") {
@@ -1792,6 +1871,8 @@ func handleExecutionResult(workflowExecution shuffle.WorkflowExecution) {
 }
 
 func executionInit(workflowExecution shuffle.WorkflowExecution) error {
+	ctx := context.Background()
+
 	parents := map[string][]string{}
 	children := map[string][]string{}
 	nextActions := []string{}
@@ -1812,6 +1893,20 @@ func executionInit(workflowExecution shuffle.WorkflowExecution) error {
 		}
 	}
 
+	// Validates RERUN of single actions
+	// Identified by:
+	// 1. Predefined result from previous exec
+	// 2. Only ONE action
+	// 3. Every predefined result having result.Action.Category == "rerun"
+	/*
+		if len(workflowExecution.Workflow.Actions) == 1 && len(workflowExecution.Results) > 0 {
+			finished := shuffle.ValidateFinished(ctx, extra, workflowExecution)
+			if finished {
+				return nil
+			}
+		}
+	*/
+
 	nextActions = append(nextActions, startAction)
 	for _, branch := range workflowExecution.Workflow.Branches {
 		// Check what the parent is first. If it's trigger - skip
@@ -1899,8 +1994,6 @@ func executionInit(workflowExecution shuffle.WorkflowExecution) error {
 		//log.Printf("Successfully downloaded and built %s", image)
 	}
 
-	ctx := context.Background()
-
 	visited := []string{}
 	executed := []string{}
 	environments := []string{}
@@ -2282,6 +2375,54 @@ func buildEnvVars(envMap map[string]string) []corev1.EnvVar {
 	}
 	return envVars
 }
+func getWorkerBackendExecution(auth string, executionId string) (*shuffle.WorkflowExecution, error) {
+	backendUrl := os.Getenv("BASE_URL")
+	if len(backendUrl) == 0 {
+		backendUrl = "http://shuffle-backend:5001"
+	}
+
+	var workflowExecution *shuffle.WorkflowExecution
+
+	streamResultUrl := fmt.Sprintf("%s/api/v1/streams/results", backendUrl)
+	topClient := shuffle.GetExternalClient(backendUrl)
+	requestData := shuffle.ActionResult {
+		Authorization: auth,
+		ExecutionId: executionId,
+	}
+
+	data, err := json.Marshal(requestData)
+	if err != nil {
+		return workflowExecution, err
+	}
+
+	req, err := http.NewRequest(
+		"POST",
+		streamResultUrl,
+		bytes.NewBuffer([]byte(data)),
+	)
+
+	newresp, err := topClient.Do(req)
+	if err != nil {
+		return workflowExecution, err
+	}
+
+	defer newresp.Body.Close()
+	if newresp.StatusCode != 200 {
+		return workflowExecution, errors.New(fmt.Sprintf("Got bad status code from backend %d", newresp.StatusCode))
+	}
+
+	body, err := ioutil.ReadAll(newresp.Body)
+	if err != nil {
+		return workflowExecution, err
+	}
+
+	err = json.Unmarshal(body, &workflowExecution)
+	if err != nil {
+		return workflowExecution, err
+	}
+
+	return workflowExecution, nil
+}
 
 func handleWorkflowQueue(resp http.ResponseWriter, request *http.Request) {
 	if request.Body == nil {
@@ -2326,10 +2467,14 @@ func handleWorkflowQueue(resp http.ResponseWriter, request *http.Request) {
 
 	workflowExecution, err := shuffle.GetWorkflowExecution(ctx, actionResult.ExecutionId)
 	if err != nil {
-		log.Printf("[ERROR][%s] Failed getting execution (workflowqueue) %s: %s", actionResult.ExecutionId, actionResult.ExecutionId, err)
-		resp.WriteHeader(500)
-		resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Failed getting execution ID %s because it doesn't exist locally."}`, actionResult.ExecutionId)))
-		return
+		log.Printf("[WARNING][%s] Failed to find execution in cache requesting backend (1): %s", actionResult.ExecutionId, err)
+		workflowExecution, err = getWorkerBackendExecution(actionResult.Authorization, actionResult.ExecutionId)
+		if err != nil {
+			log.Printf("[ERROR][%s] Failed getting execution (workflowqueue) %s: %s", actionResult.ExecutionId, actionResult.ExecutionId, err)
+			resp.WriteHeader(500)
+			resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Failed getting execution ID %s because it doesn't exist locally."}`, actionResult.ExecutionId)))
+			return
+		}
 	}
 
 	if workflowExecution.Authorization != actionResult.Authorization {
@@ -2375,10 +2520,14 @@ func runWorkflowExecutionTransaction(ctx context.Context, attempts int64, workfl
 	//log.Printf("[DEBUG][%s] IN WORKFLOWEXECUTION SUB!", actionResult.ExecutionId)
 	workflowExecution, err := shuffle.GetWorkflowExecution(ctx, workflowExecutionId)
 	if err != nil {
-		log.Printf("[ERROR] Failed getting execution cache: %s", err)
-		resp.WriteHeader(400)
-		resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Failed getting execution"}`)))
-		return
+		log.Printf("[WARNING][%s] Failed to find execution in cache requesting backend (2): %s", actionResult.ExecutionId, err)
+		workflowExecution, err = getWorkerBackendExecution(actionResult.Authorization, actionResult.ExecutionId)
+		if err != nil {
+			log.Printf("[ERROR] Failed getting execution cache: %s", err)
+			resp.WriteHeader(400)
+			resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Failed getting execution"}`)))
+			return
+		}
 	}
 
 	resultLength := len(workflowExecution.Results)
@@ -2429,10 +2578,14 @@ func runWorkflowExecutionTransaction(ctx context.Context, attempts int64, workfl
 		if strings.Contains(fmt.Sprintf("%s", err), "Rerun this transaction") {
 			workflowExecution, err := shuffle.GetWorkflowExecution(ctx, workflowExecutionId)
 			if err != nil {
-				log.Printf("[ERROR][%s] Failed getting execution cache (2): %s", workflowExecution.ExecutionId, err)
-				resp.WriteHeader(400)
-				resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Failed getting execution (2)"}`)))
-				return
+				log.Printf("[WARNING][%s] Failed to find execution in cache requesting backend (3): %s", actionResult.ExecutionId, err)
+				workflowExecution, err = getWorkerBackendExecution(actionResult.Authorization, actionResult.ExecutionId)
+				if err != nil {
+					log.Printf("[ERROR][%s] Failed getting execution cache (2): %s", workflowExecution.ExecutionId, err)
+					resp.WriteHeader(400)
+					resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Failed getting execution (2)"}`)))
+					return
+				}
 			}
 
 			resultLength = len(workflowExecution.Results)
@@ -2494,11 +2647,16 @@ func runWorkflowExecutionTransaction(ctx context.Context, attempts int64, workfl
 	}
 
 	if setExecution || workflowExecution.Status == "FINISHED" || workflowExecution.Status == "ABORTED" || workflowExecution.Status == "FAILURE" {
-		log.Printf("[DEBUG][%s] Running setexec with status %s and %d/%d results", workflowExecution.ExecutionId, workflowExecution.Status, len(workflowExecution.Results), len(workflowExecution.Workflow.Actions))
+		if debug { 
+			log.Printf("[DEBUG][%s] Running setexec with status %s and %d/%d results", workflowExecution.ExecutionId, workflowExecution.Status, len(workflowExecution.Results), len(workflowExecution.Workflow.Actions))
+		}
+
 		//result(s)", workflowExecution.ExecutionId, workflowExecution.Status, len(workflowExecution.Results))
 		err = setWorkflowExecution(ctx, *workflowExecution, dbSave)
 		if err != nil {
-			resp.WriteHeader(401)
+			log.Printf("[ERROR][%s] Failed setting execution: %s", workflowExecution.ExecutionId, err)
+
+			resp.WriteHeader(400)
 			resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Failed setting workflowexecution actionresult: %s"}`, err)))
 			return
 		}
@@ -2507,7 +2665,10 @@ func runWorkflowExecutionTransaction(ctx context.Context, attempts int64, workfl
 		if os.Getenv("SHUFFLE_SWARM_CONFIG") == "run" || os.Getenv("SHUFFLE_SWARM_CONFIG") == "swarm" {
 			finished := shuffle.ValidateFinished(ctx, -1, *workflowExecution)
 			if !finished {
-				log.Printf("[DEBUG][%s] Handling next node since it's not finished!", workflowExecution.ExecutionId)
+				if debug { 
+					log.Printf("[DEBUG][%s] Handling next node since it's not finished!", workflowExecution.ExecutionId)
+				}
+
 				handleExecutionResult(*workflowExecution)
 			} else {
 				shutdownData, err := json.Marshal(workflowExecution)
@@ -2589,7 +2750,7 @@ func sendSelfRequest(actionResult shuffle.ActionResult) {
 		if err != nil {
 			log.Printf("[ERROR][%s] Failed reading body: %s", actionResult.ExecutionId, err)
 		} else {
-			log.Printf("[DEBUG][%s] NEWRESP (from backend): %s", actionResult.ExecutionId, string(body))
+			log.Printf("[DEBUG][%s] NEWRESP (from backend - 2): %s", actionResult.ExecutionId, string(body))
 		}
 	}
 }
@@ -2742,10 +2903,14 @@ func handleGetStreamResults(resp http.ResponseWriter, request *http.Request) {
 	ctx := context.Background()
 	workflowExecution, err := shuffle.GetWorkflowExecution(ctx, actionResult.ExecutionId)
 	if err != nil {
-		log.Printf("[INFO] Failed getting execution (streamresult) %s: %s", actionResult.ExecutionId, err)
-		resp.WriteHeader(400)
-		resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Bad authorization key or execution_id might not exist."}`)))
-		return
+		log.Printf("[WARNING][%s] Failed to find execution in cache requesting backend (4): %s", actionResult.ExecutionId, err)
+		workflowExecution, err = getWorkerBackendExecution(actionResult.Authorization, actionResult.ExecutionId)
+		if err != nil {
+			log.Printf("[ERROR] Failed getting execution (streamresult) %s: %s", actionResult.ExecutionId, err)
+			resp.WriteHeader(400)
+			resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Bad authorization key or execution_id might not exist."}`)))
+			return
+		}
 	}
 
 	// Authorization is done here
@@ -3465,7 +3630,9 @@ func sendAppRequest(ctx context.Context, incomingUrl, appName string, port int,
 		log.Printf("[ERROR] Failed reading app request body body: %s", err)
 		return err
 	} else {
-		log.Printf("[DEBUG][%s] NEWRESP (from app): %s", workflowExecution.ExecutionId, string(body))
+		if debug { 
+			log.Printf("[DEBUG][%s] NEWRESP (from app): %s", workflowExecution.ExecutionId, string(body))
+		}
 	}
 
 	return nil
@@ -3611,7 +3778,7 @@ func getStreamResultsWrapper(client *http.Client, req *http.Request, workflowExe
 
 		// Checks if a subflow is child of the startnode, as sub-subflows aren't working properly yet
 		childNodes := shuffle.FindChildNodes(workflowExecution.Workflow, workflowExecution.Start, []string{}, []string{})
-		log.Printf("[DEBUG] Looking for subflow in %#v to check execution pattern as child of %s", childNodes, workflowExecution.Start)
+		//log.Printf("[DEBUG] Looking for subflow in %#v to check execution pattern as child of %s", childNodes, workflowExecution.Start)
 		subflowFound := false
 		for _, childNode := range childNodes {
 			for _, trigger := range workflowExecution.Workflow.Triggers {
@@ -3693,8 +3860,174 @@ func getStreamResultsWrapper(client *http.Client, req *http.Request, workflowExe
 	return environments, nil
 }
 
+func checkStandaloneRun() {
+	// Check if the required argc/argv is set
+	//log.Printf("ARGS: %#v", os.Args)
+	if len(os.Args) < 4 {
+		return
+	}
+
+	if os.Args[1] != "standalone" {
+		log.Printf("[ERROR] First argument should be 'standalone' to run worker standalone")
+		return
+	}
+
+	if os.Args[2] == "" || len(os.Args[2]) != 36 {
+		log.Printf("[ERROR] Second argument should be the execution ID, with next being authorization")
+		return
+	}
+
+	if os.Args[3] == "" || len(os.Args[3]) < 10 {
+		log.Printf("[ERROR] Third argument should be the authorization key")
+		return
+	}
+
+	backendUrl := "https://shuffler.io"
+	if len(os.Args) > 4 {
+		backendUrl = os.Args[4]
+	}
+
+	if !strings.Contains(backendUrl, "http") {
+		log.Printf("[ERROR] Backend URL should start with http:// or https://")
+		return
+
+	}
+
+	// Format:
+	// go run worker.go standalone <executionid> <authorization> <optional:url>
+	executionId := os.Args[2]
+	authorization := os.Args[3]
+
+	os.Setenv("EXECUTIONID", executionId)
+	os.Setenv("AUTHORIZATION", authorization)
+	os.Setenv("BASE_URL", backendUrl)
+
+	os.Setenv("STANDALONE_EXECUTION", "true")
+
+	log.Printf("\n\n\n[DEBUG] Running worker in standalone mode with execution ID %s and authorization %s. Backend URL (default): %s\nThis means we will first RESET the execution results, then rerun it\n\n", executionId, authorization, backendUrl)
+
+	// 1. Reset the execution after getting it
+	data = fmt.Sprintf(`{"execution_id": "%s", "authorization": "%s"}`, executionId, authorization)
+	streamResultUrl := fmt.Sprintf("%s/api/v1/streams/results", backendUrl)
+	client := shuffle.GetExternalClient(streamResultUrl)
+	req, err := http.NewRequest(
+		"POST",
+		streamResultUrl,
+		bytes.NewBuffer([]byte(data)),
+	)
+
+	if err != nil {
+		log.Printf("[ERROR] Failed making request builder for backend: %s", err)
+		os.Exit(1)
+	}
+
+	// Read the data and unmarshal it
+	newresp, err := client.Do(req)
+	if err != nil {
+		log.Printf("[ERROR] Failed standalone request in setup: %s", err)
+		os.Exit(1)
+	}
+
+	defer newresp.Body.Close()
+	body, err := ioutil.ReadAll(newresp.Body)
+	if err != nil {
+		log.Printf("[ERROR] Failed reading body: %s", err)
+		os.Exit(1)
+	}
+
+	if newresp.StatusCode != 200 {
+		log.Printf("[ERROR] Failed resetting execution: %s. Body: %s", newresp.Status, string(body))
+		os.Exit(1)
+	}
+
+	// Map to shuffle.Workflowexecution struct
+	workflowExecution := shuffle.WorkflowExecution{}
+	err = json.Unmarshal(body, &workflowExecution)
+	if err != nil {
+		log.Printf("[ERROR] Failed unmarshalling body: %s", err)
+		os.Exit(1)
+	}
+
+	log.Printf("[DEBUG][%s] Got %d results with status %s. Running full reset IF status is not executing.", workflowExecution.ExecutionId, len(workflowExecution.Results), workflowExecution.Status)
+
+	// Just continue as per usual?
+	//if workflowExecution.Status == "EXECUTING" {
+	//	return
+	//}
+
+	workflowExecution.Status = "EXECUTING"
+
+	newResults := []shuffle.ActionResult{}
+	for _, result := range workflowExecution.Results {
+		if result.Status == "SKIPPED" {
+			newResults = append(newResults, result)
+			continue
+		}
+
+		// This is to handle reruns of SINGLE actions
+		if result.Action.Category == "rerun" {
+			newResults = append(newResults, result)
+			continue
+		}
+
+		// Anything else here.
+	}
+
+	workflowExecution.Results = newResults
+	workflowExecution.Status = "EXECUTING"
+	workflowExecution.CompletedAt = 0
+
+	marshalledResult, err := json.Marshal(workflowExecution)
+	if err != nil {
+		log.Printf("[ERROR] Failed marshalling body: %s", err)
+		os.Exit(1)
+	}
+
+	// Send a /api/v1/streams result back
+	// 1. Reset the execution after getting it
+	streamUrl := fmt.Sprintf("%s/api/v1/streams?reset=true", backendUrl)
+	req, err = http.NewRequest(
+		"POST",
+		streamUrl,
+		bytes.NewBuffer([]byte(marshalledResult)),
+	)
+
+	if err != nil {
+		log.Printf("[ERROR] Failed making request builder (2) for backend: %s", err)
+		os.Exit(1)
+	}
+
+	// Read the data and unmarshal it
+	newresp, err = client.Do(req)
+	if err != nil {
+		log.Printf("[ERROR] Failed standalone request in setup: %s", err)
+		os.Exit(1)
+	}
+
+	defer newresp.Body.Close()
+	body, err = ioutil.ReadAll(newresp.Body)
+	if err != nil {
+		log.Printf("[ERROR] Failed reading body (2): %s", err)
+		os.Exit(1)
+	}
+
+	if newresp.StatusCode != 200 {
+		log.Printf("[ERROR] Failed resetting execution (2): %s. Body: %s", newresp.Status, string(body))
+		os.Exit(1)
+	}
+
+	log.Printf("\n\n\n[DEBUG] Finished resetting execution %s. Body: %s. Starting execution.\n\n\n", newresp.Status, string(body))
+
+}
+
 // Initial loop etc
 func main() {
+	checkStandaloneRun()
+
+	if os.Getenv("DEBUG") == "true" {
+		debug = true
+	}
+
 	/*** STARTREMOVE ***/
 	if os.Getenv("SHUFFLE_SWARM_CONFIG") == "run" || os.Getenv("SHUFFLE_SWARM_CONFIG") == "swarm" {
 		logsDisabled = "true"
@@ -3715,7 +4048,7 @@ func main() {
 		}
 	}
 
-	log.Printf("[INFO] Setting up worker environment")
+	//log.Printf("[INFO] Setting up worker environment")
 	sleepTime = 5
 	client := shuffle.GetExternalClient(baseUrl)
 
@@ -3724,7 +4057,7 @@ func main() {
 	}
 
 	if baseimagename == "" {
-		log.Printf("[DEBUG] Setting baseimagename")
+		log.Printf("[DEBUG] Setting baseimagename to frikky/shuffle as it's empty (docker.io)")
 		baseimagename = "frikky/shuffle" // Dockerhub
 		//baseimagename = "shuffle"        // Github 		(ghcr.io)
 	}
@@ -4250,9 +4583,10 @@ func getNetworkId(ctx context.Context, dockercli *dockerclient.Client) (string,
 	networkFilter := filters.NewArgs()
 	networkFilter.Add("name", swarmNetworkName)
 
-	networks, err := dockercli.NetworkList(ctx, types.NetworkListOptions{
+	listOptions := network.ListOptions{
 		Filters: networkFilter,
-	})
+	}
+	networks, err := dockercli.NetworkList(ctx, listOptions)
 
 	if err != nil || len(networks) == 0 {
 		return "", err
@@ -4281,9 +4615,10 @@ func numberOfApps(ctx context.Context, dockercli *dockerclient.Client) int {
 	networkFilter := filters.NewArgs()
 	networkFilter.Add("name", swarmNetworkName)
 
-	networks, err := dockercli.NetworkList(ctx, types.NetworkListOptions{
+	listOptions := network.ListOptions{
 		Filters: networkFilter,
-	})
+	}
+	networks, err := dockercli.NetworkList(ctx, listOptions)
 
 	if err != nil || len(networks) == 0 {
 		return 0
diff --git a/functions/usecases/README.md b/functions/usecases/README.md
deleted file mode 100644
index 553034c2..00000000
--- a/functions/usecases/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Mindmap exporter
-Shuffle has a mindmap for Workflow use-cases. These can be changed and exported, with the most important piece being that they're explorable and editable. This has and will come in handy for us as we build it into the product.
-
-https://www.mindmeister.com/map/2172644474
-
-## Editing the Mindmap
-There are a few categories. To edit them, click the small plus next to the branch you want to change.
-
-## Exporting the Mindmap
-Click "Export as RTF" in the top left corner of the URL. Download it there.
-
-## Generating the Shuffle-comaptible mindmap
-1. Move the rtf file here
-2. Rename it categories.rtf
-3. Run the read_categories.py file (python3 read_categories.py)
-4. You now have a file called categories.json locally with all the categories in JSON format, ready to be used in graphs.
diff --git a/functions/usecases/categories.json b/functions/usecases/categories.json
deleted file mode 100644
index e438a380..00000000
--- a/functions/usecases/categories.json
+++ /dev/null
@@ -1,260 +0,0 @@
-[
-    {
-        "name": "1. Collect & Distribute",
-        "color": "#c51152",
-        "list": [
-            {
-                "name": "2-way Ticket synchronization",
-                "items": {}
-            },
-            {
-                "name": "Email management",
-                "items": {
-                    "name": "Release a quarantined message",
-                    "items": {}
-                }
-            },
-            {
-                "name": "EDR to ticket",
-                "items": {
-                    "name": "Get host information",
-                    "items": {}
-                }
-            },
-            {
-                "name": "SIEM to ticket",
-                "items": {}
-            },
-            {
-                "name": "ChatOps",
-                "items": {}
-            },
-            {
-                "name": "Threat Intel received",
-                "items": {}
-            },
-            {
-                "name": "Domain investigation with LetsEncrypt",
-                "items": {}
-            },
-            {
-                "name": "Botnet tracker",
-                "items": {}
-            },
-            {
-                "name": "Get running containers",
-                "items": {}
-            },
-            {
-                "name": "Assign tickets",
-                "items": {}
-            },
-            {
-                "name": "Firewall alerts",
-                "items": {
-                    "name": "URL filtering",
-                    "items": {}
-                }
-            },
-            {
-                "name": "IDS/IPS alerts",
-                "items": {
-                    "name": "Manage policies",
-                    "items": {}
-                }
-            },
-            {
-                "name": "Deduplicate information",
-                "items": {}
-            },
-            {
-                "name": "Correlate information",
-                "items": {}
-            }
-        ]
-    },
-    {
-        "name": "2. Enrich",
-        "color": "#f4c20d",
-        "list": [
-            {
-                "name": "Internal Enrichment",
-                "items": {
-                    "name": "...",
-                    "items": {}
-                }
-            },
-            {
-                "name": "External historical Enrichment",
-                "items": {
-                    "name": "...",
-                    "items": {}
-                }
-            },
-            {
-                "name": "Realtime",
-                "items": {
-                    "name": "Analyze screenshots",
-                    "items": {}
-                }
-            },
-            {
-                "name": "Ticketing webhook verification",
-                "items": {}
-            }
-        ]
-    },
-    {
-        "name": "3. Detect",
-        "color": "#3cba54",
-        "list": [
-            {
-                "name": "Search SIEM (Sigma)",
-                "items": {
-                    "name": "Endpoint",
-                    "items": {}
-                }
-            },
-            {
-                "name": "Search EDR (OSQuery)",
-                "items": {}
-            },
-            {
-                "name": "Search emails (Phish)",
-                "items": {
-                    "name": "Check headers and IOCs",
-                    "items": {}
-                }
-            },
-            {
-                "name": "Search IOCs (ioc-finder)",
-                "items": {}
-            },
-            {
-                "name": "Search files (Yara)",
-                "items": {}
-            },
-            {
-                "name": "Correlate tickets",
-                "items": {}
-            },
-            {
-                "name": "Honeypot access",
-                "items": {
-                    "name": "...",
-                    "items": {}
-                }
-            }
-        ]
-    },
-    {
-        "name": "4. Respond",
-        "color": "#4a148c",
-        "list": [
-            {
-                "name": "Eradicate malware",
-                "items": {}
-            },
-            {
-                "name": "Quarantine host(s)",
-                "items": {}
-            },
-            {
-                "name": "Trigger scans",
-                "items": {}
-            },
-            {
-                "name": "Update indicators (FW, EDR, SIEM...)",
-                "items": {}
-            },
-            {
-                "name": "Autoblock activity when threat intel is received",
-                "items": {}
-            },
-            {
-                "name": "Lock/Delete/Reset account",
-                "items": {}
-            },
-            {
-                "name": "Lock vault",
-                "items": {}
-            },
-            {
-                "name": "Increase authentication",
-                "items": {}
-            },
-            {
-                "name": "Get policies from assets",
-                "items": {}
-            }
-        ]
-    },
-    {
-        "name": "5. Verify",
-        "color": "#4885ed",
-        "list": [
-            {
-                "name": "Discover vulnerabilities",
-                "items": {}
-            },
-            {
-                "name": "Discover assets",
-                "items": {}
-            },
-            {
-                "name": "Ensure policies are followed",
-                "items": {}
-            },
-            {
-                "name": "Find Inactive users",
-                "items": {}
-            },
-            {
-                "name": "Ensure access rights match HR systems",
-                "items": {}
-            },
-            {
-                "name": "Ensure onboarding is followed",
-                "items": {}
-            },
-            {
-                "name": "Third party apps in SaaS",
-                "items": {}
-            },
-            {
-                "name": "Devices used for your cloud account",
-                "items": {}
-            },
-            {
-                "name": "Too much access in GCP/Azure/AWS/ other clouds",
-                "items": {}
-            },
-            {
-                "name": "Certificate validation",
-                "items": {}
-            },
-            {
-                "name": "Monitor new DNS entries for domain with passive DNS",
-                "items": {}
-            },
-            {
-                "name": "Monitor and track password dumps",
-                "items": {}
-            },
-            {
-                "name": "Monitor for mentions of domain on darknet sites",
-                "items": {}
-            },
-            {
-                "name": "Reporting",
-                "items": {
-                    "name": "Monthly reports",
-                    "items": {
-                        "name": "...",
-                        "items": {}
-                    }
-                }
-            }
-        ]
-    }
-]
\ No newline at end of file
diff --git a/functions/usecases/categories.rtf b/functions/usecases/categories.rtf
deleted file mode 100644
index e19cf26a..00000000
--- a/functions/usecases/categories.rtf
+++ /dev/null
@@ -1,555 +0,0 @@
-{\rtf1\ansi\deff0\deflang2057\plain\fs24\fet1
-{\fonttbl
-{\f0\froman Arial;}
-}
-{\info
-{\createim\yr2022\mo2\dy20\hr1\min15}
-}
-
-\paperw11907\paperh16840\margl1800\margr1800\margt1440\margb1440
-\slmult0\ltrpar\li0
-{\b\fs28
-Shuffle categories
-}
-\par\pard\plain
-\slmult0\ltrpar\li200
-{\fs24
-1. Collect & Distribute
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-2-way Ticket synchronization
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Email management
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Attachments
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Manage senders
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Manage URLs
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Encode & Decode URLs
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Release a quarantined message
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-EDR to ticket
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Fetch incidents & events
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Quarantine files
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Quarantine host (respond)
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Get host information
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-SIEM to ticket
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-ChatOps
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Threat Intel received
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Domain investigation with LetsEncrypt
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Botnet tracker
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Get running containers
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Assign tickets
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Firewall alerts
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Block/accept policies
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Add addresses and ports to groups
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Support custom URL categories
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Fetch logs for specific address
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-URL filtering
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-IDS/IPS alerts
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Get/Fetch alerts
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Receive alerts real-time
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Get PCAP files
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Get network logs
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Manage policies
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Deduplicate information
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Correlate information
-}
-\par\pard\plain
-\slmult0\ltrpar\li200
-{\fs24
-3. Detect
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Search SIEM (Sigma)
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Network
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Endpoint
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Search EDR (OSQuery)
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Search emails (Phish)
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Check malware
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Check targeted
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Check headers and IOCs
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Search IOCs (ioc-finder)
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Search files (Yara)
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Correlate tickets
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Honeypot access
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-S3 Honeypot
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-SSH Honeypot
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-FTP honeypot
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Network honeypot
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-...
-}
-\par\pard\plain
-\slmult0\ltrpar\li200
-{\fs24
-rich
-}
-\par\pard\plain
-\slmult0\ltrpar\li200
-{\fs24
-5. Verify
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Discover vulnerabilities
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Discover assets
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Ensure policies are followed
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Find Inactive users
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Ensure access rights match HR systems
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Ensure onboarding is followed
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Third party apps in SaaS
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Devices used for your cloud account
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Too much access in GCP/Azure/AWS/ other clouds
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Certificate validation
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Monitor new DNS entries for domain with passive DNS
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Monitor and track password dumps
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Monitor for mentions of domain on darknet sites
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Reporting
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Automation time saved
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Automation money saved
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Incident response report
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Department cost
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Monthly reports
-}
-\par\pard\plain
-\slmult0\ltrpar\li800
-{\fs24
-EDR alerts
-}
-\par\pard\plain
-\slmult0\ltrpar\li800
-{\fs24
-SIEM alerts
-}
-\par\pard\plain
-\slmult0\ltrpar\li800
-{\fs24
-Emails quarantined
-}
-\par\pard\plain
-\slmult0\ltrpar\li800
-{\fs24
-...
-}
-\par\pard\plain
-\slmult0\ltrpar\li200
-{\fs24
-4. Respond
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Eradicate malware
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Quarantine host(s)
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Trigger scans
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Update indicators (FW, EDR, SIEM...)
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Autoblock activity when threat intel is received
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Lock/Delete/Reset account
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Lock vault
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Increase authentication
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Get policies from assets
-}
-\par\pard\plain
-\slmult0\ltrpar\li200
-{\fs24
-2. Enrich
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Internal Enrichment
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Users
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Hostnames
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-IPs
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Departments
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Role
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Software
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-...
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-External historical Enrichment
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-IPs
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-URLs
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Hashes
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Files
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-...
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Realtime
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-File detonation
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-URL detonation
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-PCAP analysis
-}
-\par\pard\plain
-\slmult0\ltrpar\li600
-{\fs24
-Analyze screenshots
-}
-\par\pard\plain
-\slmult0\ltrpar\li400
-{\fs24
-Ticketing webhook verification
-}
-\par\pard\plain
-}
\ No newline at end of file
diff --git a/functions/usecases/read_categories.py b/functions/usecases/read_categories.py
deleted file mode 100644
index 65df43c9..00000000
--- a/functions/usecases/read_categories.py
+++ /dev/null
@@ -1,66 +0,0 @@
-data = ""
-with open("categories.rtf", "r") as tmp:
-    data = tmp.read()
-
-fixed_json = []
-linearity = 0
-heading = ""
-subheading = ""
-subsubheading = ""
-
-cnt = -1
-subcnt = -1
-
-colors = ["#c51152", "#3cba54", "#4885ed", "#4a148c", "#f4c20d"]
-for line in data.split("\n"):
-    if line == "rich":
-        continue
-
-    if "li" in line:
-        lisplit = line.split("\\")
-        try:
-            linearity = int(lisplit[-1][2])
-        except:
-            pass
-
-        #print("Linearity: %s" % linearity)
-
-    if line.startswith("{") or line.startswith("}"):
-        continue
-
-    if line.startswith("\\"):
-        continue
-
-    if linearity == 0:
-        continue
-
-    if linearity == 2:
-        #if cnt >= 0:
-        #    for key, value in fixed_json[cnt].items():
-        #        print(key, value)
-
-
-        cnt += 1 
-        subcnt = -1
-        fixed_json.append({"name": line, "color": colors[cnt], "list": []})
-        heading = line 
-    elif linearity == 4:
-        subheading = line
-        fixed_json[cnt]["list"].append({"name": line, "items": {}})
-        subcnt += 1
-    elif linearity == 6:
-        fixed_json[cnt]["list"][subcnt]["items"] = {"name": line, "items": {}}
-    elif linearity == 8:
-        fixed_json[cnt]["list"][subcnt]["items"]["items"] = {"name": line, "items": {}}
-    else:
-        print("No handler for %s" % line)
-
-#print(line)
-#print(data)
-import json
-filename = "categories.json"
-fixed_json.sort(key=lambda x: x["name"])
-with open(filename, "w+") as tmp:
-    tmp.write(json.dumps(fixed_json, indent=4))
-
-print("Wrote to file %s" % filename)