Release 2024.4.1 (#28 )

Add num launches to notification call
Fix window clicking on Linux
2026-02-14 22:57:47 +01:00 · 2024-05-14 15:01:55 -07:00 · 2024-05-14 14:25:10 -07:00 · 2024-05-14 12:19:19 -07:00 · 2024-05-14 08:44:15 -07:00 · 2024-05-14 08:28:20 -07:00
258 changed files with 9682 additions and 15790 deletions
--- a/.github/workflows/ci-js.yml
+++ b/.github/workflows/ci-js.yml
@@ -1,18 +0,0 @@
-on:
-  pull_request:
-    branches: [develop]
-
-name: CI (JS)
-
-jobs:
-  test:
-    name: Lint/Test
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: lts/*
-      - run: npm ci
-      - run: npm run lint
-      - run: npm test
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -1,36 +0,0 @@
-on:
-  pull_request:
-    branches: [develop]
-    paths:
-      - src-tauri/**
-      - .github/workflows/**
-
-name: CI (Rust)
-
-defaults:
-  run:
-    working-directory: src-tauri
-
-jobs:
-  test:
-    name: Check/Test
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - run: |
-          sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.1-dev
-      - uses: dtolnay/rust-toolchain@stable
-      - uses: actions/cache@v3
-        continue-on-error: false
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: ${{ runner.os }}-cargo-
-      - run: cargo check --all
-      - run: cargo test --all
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,8 +1,8 @@
 name: Generate Artifacts
 on:
  push:
-    tags: [ v* ]
-
+    branches:
+      - release
 jobs:
  build-artifacts:
    permissions:
@@ -32,26 +32,15 @@ jobs:
        with:
          # Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds.
          targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
-      - uses: actions/cache@v3
-        continue-on-error: false
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: ${{ runner.os }}-cargo-
      - name: install dependencies (ubuntu only)
        if: matrix.platform == 'ubuntu-22.04' # This must match the platform value defined above.
        run: |
          sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
+          sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
+        # webkitgtk 4.0 is for Tauri v1 - webkitgtk 4.1 is for Tauri v2.
+        # You can remove the one that doesn't apply to your app to speed up the workflow a bit.
      - name: Install dependencies
        run: npm ci
-      - name: Run lint
-        run: npm run lint
      - name: Run tests
        run: npm test
      - uses: tauri-apps/tauri-action@v0
--- a/.gitignore
+++ b/.gitignore
@@ -27,5 +27,4 @@ dist-ssr
 *.sqlite
 *.sqlite-*

-.cargo
-plugins/**/build
+.cargo
--- a/Desktop.run.xml
+++ b/Desktop.run.xml
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Build Desktop" type="ShConfigurationType">
+    <option name="SCRIPT_TEXT" value="npm run tauri build" />
+    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
+    <option name="SCRIPT_PATH" value="" />
+    <option name="SCRIPT_OPTIONS" value="" />
+    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
+    <option name="INTERPRETER_PATH" value="/bin/zsh" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="EXECUTE_IN_TERMINAL" value="false" />
+    <option name="EXECUTE_SCRIPT_FILE" value="false" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.tauriignore
+++ b/.tauriignore
@@ -0,0 +1 @@
+plugins
--- a/index.html
+++ b/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-  <meta charset="UTF-8"/>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
  <title>Yaak App</title>
  <!-- <script src="http://localhost:8097"></script>-->

@@ -15,13 +15,13 @@

      @media (prefers-color-scheme: dark) {
          html, body {
-              background-color: #1b1a29;
+              background-color: black;
          }
      }
  </style>
 </head>

-<body class="text-base">
+<body>
 <div id="root"></div>
 <div id="cm-portal" class="cm-portal"></div>
 <div id="react-portal"></div>
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -4,9 +4,9 @@
  "version": "0.0.0",
  "type": "module",
  "scripts": {
-    "start": "npm run tauri-dev:desktop",
+    "start": "npm run build:plugins && npm run tauri-dev:desktop",
    "tauri-dev:desktop": "tauri dev --no-watch --config ./src-tauri/tauri-dev.conf.json",
-    "tauri-dev:ios": "tauri ios dev --force-ip-prompt --config ./src-tauri/tauri-dev.conf.json",
+    "tauri-dev:ios": "tauri ios dev --no-watch --config ./src-tauri/tauri-dev.conf.json",
    "tauri-build": "tauri build",
    "tauri": "tauri",
    "build": "npm run build:frontend",
@@ -29,7 +29,7 @@
  },
  "dependencies": {
    "@codemirror/commands": "^6.2.1",
-    "@codemirror/lang-javascript": "^6.2.2",
+    "@codemirror/lang-javascript": "^6.1.4",
    "@codemirror/lang-json": "^6.0.1",
    "@codemirror/lang-xml": "^6.0.2",
    "@codemirror/language": "^6.6.0",
@@ -52,7 +52,6 @@
    "codemirror": "^6.0.1",
    "codemirror-json-schema": "^0.6.1",
    "date-fns": "^3.3.1",
-    "fast-fuzzy": "^1.12.0",
    "focus-trap-react": "^10.1.1",
    "format-graphql": "^1.4.0",
    "framer-motion": "^9.0.4",
@@ -65,7 +64,6 @@
    "react-dnd-html5-backend": "^16.0.1",
    "react-dom": "^18.2.0",
    "react-helmet-async": "^1.3.0",
-    "react-pdf": "^9.0.0",
    "react-router-dom": "^6.8.1",
    "react-use": "^17.4.0",
    "slugify": "^1.6.6",
@@ -103,9 +101,8 @@
    "prettier": "^2.8.4",
    "react-devtools": "^4.27.2",
    "tailwindcss": "^3.2.7",
-    "typescript": "^5.4.5",
+    "typescript": "^5.3.3",
    "vite": "^5.0.0",
-    "vite-plugin-static-copy": "^1.0.5",
    "vite-plugin-svgr": "^4.2.0",
    "vite-plugin-top-level-await": "^1.4.1",
    "vitest": "^1.3.0"
--- a/plugins/exporter-curl/src/index.ts
+++ b/plugins/exporter-curl/src/index.ts
@@ -2,7 +2,7 @@ import { HttpRequest } from '../../../src-web/lib/models';

 const NEWLINE = '\\\n ';

-export function pluginHookExport(_: any, request: Partial<HttpRequest>) {
+export function pluginHookExport(request: Partial<HttpRequest>) {
  const xs = ['curl'];

  // Add method and URL all on first line
--- a/plugins/exporter-curl/tests/index.test.ts
+++ b/plugins/exporter-curl/tests/index.test.ts
@@ -1,12 +1,10 @@
 import { describe, expect, test } from 'vitest';
 import { pluginHookExport } from '../src';

-const ctx = {};
-
 describe('exporter-curl', () => {
  test('Exports GET with params', () => {
    expect(
-      pluginHookExport(ctx, {
+      pluginHookExport({
        url: 'https://yaak.app',
        urlParameters: [
          { name: 'a', value: 'aaa' },
@@ -20,7 +18,7 @@ describe('exporter-curl', () => {
  });
  test('Exports POST with url form data', () => {
    expect(
-      pluginHookExport(ctx, {
+      pluginHookExport({
        url: 'https://yaak.app',
        method: 'POST',
        bodyType: 'application/x-www-form-urlencoded',
@@ -39,7 +37,7 @@ describe('exporter-curl', () => {

  test('Exports PUT with multipart form', () => {
    expect(
-      pluginHookExport(ctx, {
+      pluginHookExport({
        url: 'https://yaak.app',
        method: 'PUT',
        bodyType: 'multipart/form-data',
@@ -64,7 +62,7 @@ describe('exporter-curl', () => {

  test('Exports JSON body', () => {
    expect(
-      pluginHookExport(ctx, {
+      pluginHookExport({
        url: 'https://yaak.app',
        method: 'POST',
        bodyType: 'application/json',
@@ -84,7 +82,7 @@ describe('exporter-curl', () => {

  test('Exports multi-line JSON body', () => {
    expect(
-      pluginHookExport(ctx, {
+      pluginHookExport({
        url: 'https://yaak.app',
        method: 'POST',
        bodyType: 'application/json',
@@ -104,7 +102,7 @@ describe('exporter-curl', () => {

  test('Exports headers', () => {
    expect(
-      pluginHookExport(ctx, {
+      pluginHookExport({
        headers: [
          { name: 'a', value: 'aaa' },
          { name: 'b', value: 'bbb', enabled: true },
@@ -116,7 +114,7 @@ describe('exporter-curl', () => {

  test('Basic auth', () => {
    expect(
-      pluginHookExport(ctx, {
+      pluginHookExport({
        url: 'https://yaak.app',
        authenticationType: 'basic',
        authentication: {
@@ -129,7 +127,7 @@ describe('exporter-curl', () => {

  test('Broken basic auth', () => {
    expect(
-      pluginHookExport(ctx, {
+      pluginHookExport({
        url: 'https://yaak.app',
        authenticationType: 'basic',
        authentication: {},
@@ -139,7 +137,7 @@ describe('exporter-curl', () => {

  test('Digest auth', () => {
    expect(
-      pluginHookExport(ctx, {
+      pluginHookExport({
        url: 'https://yaak.app',
        authenticationType: 'digest',
        authentication: {
@@ -152,7 +150,7 @@ describe('exporter-curl', () => {

  test('Bearer auth', () => {
    expect(
-      pluginHookExport(ctx, {
+      pluginHookExport({
        url: 'https://yaak.app',
        authenticationType: 'bearer',
        authentication: {
@@ -164,7 +162,7 @@ describe('exporter-curl', () => {

  test('Broken bearer auth', () => {
    expect(
-      pluginHookExport(ctx, {
+      pluginHookExport({
        url: 'https://yaak.app',
        authenticationType: 'bearer',
        authentication: {
--- a/plugins/exporter-curl/vite.config.js
+++ b/plugins/exporter-curl/vite.config.js
@@ -8,8 +8,6 @@ export default defineConfig({
      fileName: 'index',
      formats: ['es'],
    },
-    emptyOutDir: true,
-    sourcemap: true,
-    outDir: resolve(__dirname, 'build'),
+    outDir: resolve(__dirname, '../../src-tauri/plugins/exporter-curl'),
  },
 });
--- a/plugins/filter-jsonpath/src/index.js
+++ b/plugins/filter-jsonpath/src/index.js
@@ -1,6 +1,6 @@
 import jp from 'jsonpath';

-export function pluginHookResponseFilter(ctx, filter, text) {
+export function pluginHookResponseFilter(filter, text) {
  let parsed;
  try {
    parsed = JSON.parse(text);
--- a/plugins/filter-jsonpath/vite.config.js
+++ b/plugins/filter-jsonpath/vite.config.js
@@ -8,8 +8,6 @@ export default defineConfig({
      fileName: 'index',
      formats: ['es'],
    },
-    emptyOutDir: true,
-    sourcemap: true,
-    outDir: resolve(__dirname, 'build'),
+    outDir: resolve(__dirname, '../../src-tauri/plugins/filter-jsonpath'),
  },
 });
--- a/plugins/filter-xpath/src/index.js
+++ b/plugins/filter-xpath/src/index.js
@@ -1,7 +1,7 @@
 import xpath from 'xpath';
 import { DOMParser } from '@xmldom/xmldom';

-export function pluginHookResponseFilter(ctx, filter, text) {
+export function pluginHookResponseFilter(filter, text) {
  const doc = new DOMParser().parseFromString(text, 'text/xml');
  const filtered = `${xpath.select(filter, doc)}`;
  return { filtered };
--- a/plugins/filter-xpath/vite.config.js
+++ b/plugins/filter-xpath/vite.config.js
@@ -8,8 +8,6 @@ export default defineConfig({
      fileName: 'index',
      formats: ['es'],
    },
-    emptyOutDir: true,
-    sourcemap: true,
-    outDir: resolve(__dirname, 'build'),
+    outDir: resolve(__dirname, '../../src-tauri/plugins/filter-xpath'),
  },
 });
--- a/plugins/importer-curl/src/index.ts
+++ b/plugins/importer-curl/src/index.ts
@@ -43,7 +43,7 @@ type Pair = string | boolean;

 type PairsByName = Record<string, Pair[]>;

-export function pluginHookImport(_: any, rawData: string) {
+export function pluginHookImport(rawData: string) {
  if (!rawData.match(/^\s*curl /)) {
    return null;
  }
--- a/plugins/importer-curl/tests/index.test.ts
+++ b/plugins/importer-curl/tests/index.test.ts
@@ -2,11 +2,9 @@ import { describe, expect, test } from 'vitest';
 import { HttpRequest, Model, Workspace } from '../../../src-web/lib/models';
 import { pluginHookImport } from '../src';

-const ctx = {};
-
 describe('importer-curl', () => {
  test('Imports basic GET', () => {
-    expect(pluginHookImport(ctx, 'curl https://yaak.app')).toEqual({
+    expect(pluginHookImport('curl https://yaak.app')).toEqual({
      resources: {
        workspaces: [baseWorkspace()],
        httpRequests: [
@@ -19,7 +17,7 @@ describe('importer-curl', () => {
  });

  test('Explicit URL', () => {
-    expect(pluginHookImport(ctx, 'curl --url https://yaak.app')).toEqual({
+    expect(pluginHookImport('curl --url https://yaak.app')).toEqual({
      resources: {
        workspaces: [baseWorkspace()],
        httpRequests: [
@@ -32,7 +30,7 @@ describe('importer-curl', () => {
  });

  test('Missing URL', () => {
-    expect(pluginHookImport(ctx, 'curl -X POST')).toEqual({
+    expect(pluginHookImport('curl -X POST')).toEqual({
      resources: {
        workspaces: [baseWorkspace()],
        httpRequests: [
@@ -45,7 +43,7 @@ describe('importer-curl', () => {
  });

  test('URL between', () => {
-    expect(pluginHookImport(ctx, 'curl -v https://yaak.app -X POST')).toEqual({
+    expect(pluginHookImport('curl -v https://yaak.app -X POST')).toEqual({
      resources: {
        workspaces: [baseWorkspace()],
        httpRequests: [
@@ -59,7 +57,7 @@ describe('importer-curl', () => {
  });

  test('Random flags', () => {
-    expect(pluginHookImport(ctx, 'curl --random -Z -Y -S --foo https://yaak.app')).toEqual({
+    expect(pluginHookImport('curl --random -Z -Y -S --foo https://yaak.app')).toEqual({
      resources: {
        workspaces: [baseWorkspace()],
        httpRequests: [
@@ -72,7 +70,7 @@ describe('importer-curl', () => {
  });

  test('Imports --request method', () => {
-    expect(pluginHookImport(ctx, 'curl --request POST https://yaak.app')).toEqual({
+    expect(pluginHookImport('curl --request POST https://yaak.app')).toEqual({
      resources: {
        workspaces: [baseWorkspace()],
        httpRequests: [
@@ -86,7 +84,7 @@ describe('importer-curl', () => {
  });

  test('Imports -XPOST method', () => {
-    expect(pluginHookImport(ctx, 'curl -XPOST --request POST https://yaak.app')).toEqual({
+    expect(pluginHookImport('curl -XPOST --request POST https://yaak.app')).toEqual({
      resources: {
        workspaces: [baseWorkspace()],
        httpRequests: [
@@ -101,10 +99,7 @@ describe('importer-curl', () => {

  test('Imports multiple requests', () => {
    expect(
-      pluginHookImport(
-        ctx,
-        'curl \\\n  https://yaak.app\necho "foo"\ncurl example.com;curl foo.com',
-      ),
+      pluginHookImport('curl \\\n  https://yaak.app\necho "foo"\ncurl example.com;curl foo.com'),
    ).toEqual({
      resources: {
        workspaces: [baseWorkspace()],
@@ -119,7 +114,7 @@ describe('importer-curl', () => {

  test('Imports form data', () => {
    expect(
-      pluginHookImport(ctx, 'curl -X POST -F "a=aaa" -F b=bbb" -F f=@filepath https://yaak.app'),
+      pluginHookImport('curl -X POST -F "a=aaa" -F b=bbb" -F f=@filepath https://yaak.app'),
    ).toEqual({
      resources: {
        workspaces: [baseWorkspace()],
@@ -149,7 +144,7 @@ describe('importer-curl', () => {
  });

  test('Imports data params as form url-encoded', () => {
-    expect(pluginHookImport(ctx, 'curl -d a -d b -d c=ccc https://yaak.app')).toEqual({
+    expect(pluginHookImport('curl -d a -d b -d c=ccc https://yaak.app')).toEqual({
      resources: {
        workspaces: [baseWorkspace()],
        httpRequests: [
@@ -179,7 +174,7 @@ describe('importer-curl', () => {

  test('Imports data params as text', () => {
    expect(
-      pluginHookImport(ctx, 'curl -H Content-Type:text/plain -d a -d b -d c=ccc https://yaak.app'),
+      pluginHookImport('curl -H Content-Type:text/plain -d a -d b -d c=ccc https://yaak.app'),
    ).toEqual({
      resources: {
        workspaces: [baseWorkspace()],
@@ -199,7 +194,6 @@ describe('importer-curl', () => {
  test('Imports multi-line JSON', () => {
    expect(
      pluginHookImport(
-        ctx,
        `curl -H Content-Type:application/json -d $'{\n  "foo":"bar"\n}' https://yaak.app`,
      ),
    ).toEqual({
@@ -220,7 +214,7 @@ describe('importer-curl', () => {

  test('Imports multiple headers', () => {
    expect(
-      pluginHookImport(ctx, 'curl -H Foo:bar --header Name -H AAA:bbb -H :ccc https://yaak.app'),
+      pluginHookImport('curl -H Foo:bar --header Name -H AAA:bbb -H :ccc https://yaak.app'),
    ).toEqual({
      resources: {
        workspaces: [baseWorkspace()],
@@ -240,7 +234,7 @@ describe('importer-curl', () => {
  });

  test('Imports basic auth', () => {
-    expect(pluginHookImport(ctx, 'curl --user user:pass https://yaak.app')).toEqual({
+    expect(pluginHookImport('curl --user user:pass https://yaak.app')).toEqual({
      resources: {
        workspaces: [baseWorkspace()],
        httpRequests: [
@@ -258,7 +252,7 @@ describe('importer-curl', () => {
  });

  test('Imports digest auth', () => {
-    expect(pluginHookImport(ctx, 'curl --digest --user user:pass https://yaak.app')).toEqual({
+    expect(pluginHookImport('curl --digest --user user:pass https://yaak.app')).toEqual({
      resources: {
        workspaces: [baseWorkspace()],
        httpRequests: [
@@ -276,7 +270,7 @@ describe('importer-curl', () => {
  });

  test('Imports cookie as header', () => {
-    expect(pluginHookImport(ctx, 'curl --cookie "foo=bar" https://yaak.app')).toEqual({
+    expect(pluginHookImport('curl --cookie "foo=bar" https://yaak.app')).toEqual({
      resources: {
        workspaces: [baseWorkspace()],
        httpRequests: [
@@ -290,7 +284,7 @@ describe('importer-curl', () => {
  });

  test('Imports query params from the URL', () => {
-    expect(pluginHookImport(ctx, 'curl "https://yaak.app?foo=bar&baz=a%20a"')).toEqual({
+    expect(pluginHookImport('curl "https://yaak.app?foo=bar&baz=a%20a"')).toEqual({
      resources: {
        workspaces: [baseWorkspace()],
        httpRequests: [
--- a/plugins/importer-curl/vite.config.js
+++ b/plugins/importer-curl/vite.config.js
@@ -8,8 +8,6 @@ export default defineConfig({
      fileName: 'index',
      formats: ['es'],
    },
-    emptyOutDir: true,
-    sourcemap: true,
-    outDir: resolve(__dirname, 'build'),
+    outDir: resolve(__dirname, '../../src-tauri/plugins/importer-curl'),
  },
 });
--- a/plugins/importer-insomnia/src/index.ts
+++ b/plugins/importer-insomnia/src/index.ts
@@ -5,7 +5,7 @@ import {
  HttpRequest,
  Workspace,
 } from '../../../src-web/lib/models';
-import '../../../src-web/plugin/runtime.d.ts';
+import { parse as parseYaml } from 'yaml';

 type AtLeast<T, K extends keyof T> = Partial<T> & Pick<T, K>;

@@ -17,7 +17,7 @@ export interface ExportResources {
  folders: AtLeast<Folder, 'name' | 'id' | 'model' | 'workspaceId'>[];
 }

-export function pluginHookImport(ctx: YaakContext, contents: string) {
+export function pluginHookImport(contents: string) {
  let parsed: any;

  try {
@@ -25,10 +25,8 @@ export function pluginHookImport(ctx: YaakContext, contents: string) {
  } catch (e) {}

  try {
-    parsed = parsed ?? YAML.parse(contents);
-  } catch (e) {
-    console.log('FAILED', e);
-  }
+    parsed = parseYaml(contents);
+  } catch (e) {}

  if (!isJSObject(parsed)) return;
  if (!Array.isArray(parsed.resources)) return;
--- a/plugins/importer-insomnia/vite.config.js
+++ b/plugins/importer-insomnia/vite.config.js
@@ -8,8 +8,6 @@ export default defineConfig({
      fileName: 'index',
      formats: ['es'],
    },
-    emptyOutDir: true,
-    sourcemap: true,
-    outDir: resolve(__dirname, 'build'),
+    outDir: resolve(__dirname, '../../src-tauri/plugins/importer-insomnia'),
  },
 });
--- a/plugins/importer-postman/src/index.ts
+++ b/plugins/importer-postman/src/index.ts
@@ -13,11 +13,7 @@ interface ExportResources {
  folders: AtLeast<Folder, 'name' | 'id' | 'model' | 'workspaceId'>[];
 }

-export function pluginHookImport(
-  ctx: any,
-  contents: string,
-): { resources: ExportResources } | undefined {
-  console.log('CTX', ctx);
+export function pluginHookImport(contents: string): { resources: ExportResources } | undefined {
  const root = parseJSONToRecord(contents);
  if (root == null) return;

@@ -184,7 +180,6 @@ function importBody(rawBody: any): Pick<HttpRequest, 'body' | 'bodyType' | 'head
          f.src != null
            ? {
                enabled: !f.disabled,
-                contentType: f.contentType ?? null,
                name: f.key ?? '',
                file: f.src ?? '',
              }
@@ -249,7 +244,6 @@ function convertTemplateSyntax<T>(obj: T): T {
 }

 const idCount: Partial<Record<Model['model'], number>> = {};
-
 function generateId(model: Model['model']): string {
  idCount[model] = (idCount[model] ?? -1) + 1;
  return `GENERATE_ID::${model.toUpperCase()}_${idCount[model]}`;
--- a/plugins/importer-postman/tests/index.test.ts
+++ b/plugins/importer-postman/tests/index.test.ts
@@ -23,7 +23,7 @@ describe('importer-postman', () => {
  for (const fixture of fixtures) {
    test('Imports ' + fixture, () => {
      const contents = fs.readFileSync(path.join(p, fixture), 'utf-8');
-      const imported = pluginHookImport({}, contents);
+      const imported = pluginHookImport(contents);
      const folder0 = newId('folder');
      const folder1 = newId('folder');
      expect(imported).toEqual({
--- a/plugins/importer-postman/vite.config.js
+++ b/plugins/importer-postman/vite.config.js
@@ -8,8 +8,6 @@ export default defineConfig({
      fileName: 'index',
      formats: ['es'],
    },
-    emptyOutDir: true,
-    sourcemap: true,
-    outDir: resolve(__dirname, 'build'),
+    outDir: resolve(__dirname, '../../src-tauri/plugins/importer-postman'),
  },
 });
--- a/plugins/importer-yaak/src/index.ts
+++ b/plugins/importer-yaak/src/index.ts
@@ -1,4 +1,4 @@
-export function pluginHookImport(ctx: any, contents: string) {
+export function pluginHookImport(contents: string) {
  let parsed;
  try {
    parsed = JSON.parse(contents);
@@ -18,7 +18,7 @@ export function pluginHookImport(ctx: any, contents: string) {
  // Migrate v1 to v2 -- changes requests to httpRequests
  if ('requests' in parsed.resources) {
    parsed.resources.httpRequests = parsed.resources.requests;
-    delete parsed.resources['requests'];
+    delete parsed.resources.requests;
  }

  return { resources: parsed.resources }; // Should already be in the correct format
--- a/plugins/importer-yaak/tests/index.test.ts
+++ b/plugins/importer-yaak/tests/index.test.ts
@@ -1,18 +1,15 @@
 import { describe, expect, test } from 'vitest';
 import { pluginHookImport } from '../src';

-const ctx = {};
-
 describe('importer-yaak', () => {
  test('Skips invalid imports', () => {
-    expect(pluginHookImport(ctx, 'not JSON')).toBeUndefined();
-    expect(pluginHookImport(ctx, '[]')).toBeUndefined();
-    expect(pluginHookImport(ctx, JSON.stringify({ resources: {} }))).toBeUndefined();
+    expect(pluginHookImport('not JSON')).toBeUndefined();
+    expect(pluginHookImport('[]')).toBeUndefined();
+    expect(pluginHookImport(JSON.stringify({ resources: {} }))).toBeUndefined();
  });

  test('converts schema 1 to 2', () => {
    const imported = pluginHookImport(
-      ctx,
      JSON.stringify({
        yaakSchema: 1,
        resources: {
--- a/plugins/importer-yaak/vite.config.js
+++ b/plugins/importer-yaak/vite.config.js
@@ -8,8 +8,6 @@ export default defineConfig({
      fileName: 'index',
      formats: ['es'],
    },
-    emptyOutDir: true,
-    sourcemap: true,
-    outDir: resolve(__dirname, 'build'),
+    outDir: resolve(__dirname, '../../src-tauri/plugins/importer-yaak'),
  },
 });
--- a/src-tauri/.sqlx/query-05dca7fe15ab1bf03952e94498ef3130e16f752da72782783696eb2cca4736d5.json
+++ b/src-tauri/.sqlx/query-05dca7fe15ab1bf03952e94498ef3130e16f752da72782783696eb2cca4736d5.json
@@ -1,98 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n            SELECT\n                id, model, created_at, updated_at, theme, appearance,\n                theme_dark, theme_light, update_channel,\n                interface_font_size, interface_scale, editor_font_size, editor_soft_wrap, \n                open_workspace_new_window\n            FROM settings\n            WHERE id = 'default'\n        ",
-  "describe": {
-    "columns": [
-      {
-        "name": "id",
-        "ordinal": 0,
-        "type_info": "Text"
-      },
-      {
-        "name": "model",
-        "ordinal": 1,
-        "type_info": "Text"
-      },
-      {
-        "name": "created_at",
-        "ordinal": 2,
-        "type_info": "Datetime"
-      },
-      {
-        "name": "updated_at",
-        "ordinal": 3,
-        "type_info": "Datetime"
-      },
-      {
-        "name": "theme",
-        "ordinal": 4,
-        "type_info": "Text"
-      },
-      {
-        "name": "appearance",
-        "ordinal": 5,
-        "type_info": "Text"
-      },
-      {
-        "name": "theme_dark",
-        "ordinal": 6,
-        "type_info": "Text"
-      },
-      {
-        "name": "theme_light",
-        "ordinal": 7,
-        "type_info": "Text"
-      },
-      {
-        "name": "update_channel",
-        "ordinal": 8,
-        "type_info": "Text"
-      },
-      {
-        "name": "interface_font_size",
-        "ordinal": 9,
-        "type_info": "Int64"
-      },
-      {
-        "name": "interface_scale",
-        "ordinal": 10,
-        "type_info": "Int64"
-      },
-      {
-        "name": "editor_font_size",
-        "ordinal": 11,
-        "type_info": "Int64"
-      },
-      {
-        "name": "editor_soft_wrap",
-        "ordinal": 12,
-        "type_info": "Bool"
-      },
-      {
-        "name": "open_workspace_new_window",
-        "ordinal": 13,
-        "type_info": "Bool"
-      }
-    ],
-    "parameters": {
-      "Right": 0
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      true
-    ]
-  },
-  "hash": "05dca7fe15ab1bf03952e94498ef3130e16f752da72782783696eb2cca4736d5"
-}
--- a/src-tauri/.sqlx/query-48ec5fdf20f34add763c540061caa25054545503704e19f149987f99b1a0e4f0.json
+++ b/src-tauri/.sqlx/query-48ec5fdf20f34add763c540061caa25054545503704e19f149987f99b1a0e4f0.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            UPDATE settings SET (\n                theme, appearance, update_channel\n            ) = (?, ?, ?) WHERE id = 'default';\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 3
+    },
+    "nullable": []
+  },
+  "hash": "48ec5fdf20f34add763c540061caa25054545503704e19f149987f99b1a0e4f0"
+}
--- a/src-tauri/.sqlx/query-6b5edf45a6799cd7f87c23a3c7f818ad110d58c601f694a619d9345ae9e8e11d.json
+++ b/src-tauri/.sqlx/query-6b5edf45a6799cd7f87c23a3c7f818ad110d58c601f694a619d9345ae9e8e11d.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n            UPDATE settings SET (\n                theme, appearance, theme_dark, theme_light, update_channel,\n                interface_font_size, interface_scale, editor_font_size, editor_soft_wrap,\n                open_workspace_new_window\n            ) = (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) WHERE id = 'default';\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 10
-    },
-    "nullable": []
-  },
-  "hash": "6b5edf45a6799cd7f87c23a3c7f818ad110d58c601f694a619d9345ae9e8e11d"
-}
--- a/src-tauri/.sqlx/query-b32994b09ae7a06eb0f031069d327e55127a5bce60cbb499b83d1701386a23cb.json
+++ b/src-tauri/.sqlx/query-b32994b09ae7a06eb0f031069d327e55127a5bce60cbb499b83d1701386a23cb.json
@@ -0,0 +1,56 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            SELECT\n                id, model, created_at, updated_at, theme, appearance, update_channel\n            FROM settings\n            WHERE id = 'default'\n        ",
+  "describe": {
+    "columns": [
+      {
+        "name": "id",
+        "ordinal": 0,
+        "type_info": "Text"
+      },
+      {
+        "name": "model",
+        "ordinal": 1,
+        "type_info": "Text"
+      },
+      {
+        "name": "created_at",
+        "ordinal": 2,
+        "type_info": "Datetime"
+      },
+      {
+        "name": "updated_at",
+        "ordinal": 3,
+        "type_info": "Datetime"
+      },
+      {
+        "name": "theme",
+        "ordinal": 4,
+        "type_info": "Text"
+      },
+      {
+        "name": "appearance",
+        "ordinal": 5,
+        "type_info": "Text"
+      },
+      {
+        "name": "update_channel",
+        "ordinal": 6,
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Right": 0
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "b32994b09ae7a06eb0f031069d327e55127a5bce60cbb499b83d1701386a23cb"
+}
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,4 +1,4 @@
-workspace = { members = ["grpc", "templates"] }
+workspace = { members = ["grpc"] }

 [package]
 name = "yaak-app"
@@ -8,7 +8,7 @@ edition = "2021"
 # Produce a library for mobile support
 [lib]
 name = "tauri_app_lib"
-crate-type = ["staticlib", "cdylib", "lib"]
+crate-type = ["staticlib", "cdylib", "rlib"]

 [profile.release]
 strip = true  # Automatically strip symbols from the binary.
@@ -24,35 +24,30 @@ cocoa = "0.25.0"
 openssl-sys = { version = "0.9", features = ["vendored"] } # For Ubuntu installation to work

 [dependencies]
-grpc = { path = "./grpc" }
-templates = { path = "./templates" }
-anyhow = "1.0.86"
 base64 = "0.22.0"
+boa_engine = { version = "0.18.0", features = ["annex-b"] }
+boa_runtime = { version = "0.18.0" }
 chrono = { version = "0.4.31", features = ["serde"] }
-datetime = "0.5.2"
-deno_ast = { version = "0.39.0", features = ["transpiling"] }
-deno_console = "0.155.0"
-deno_core = { version = "0.284.0" }
-hex_color = "3.0.0"
-http = "1"
-log = "0.4.21"
+http = "0.2.10"
 rand = "0.8.5"
-regex = "1.10.2"
-reqwest = { version = "0.12.4", features = ["multipart", "cookies", "gzip", "brotli", "deflate", "json", "native-tls-alpn"] }
-reqwest_cookie_store = "0.8.0"
+reqwest = { version = "0.11.23", features = ["multipart", "cookies", "gzip", "brotli", "deflate", "json"] }
 serde = { version = "1.0.198", features = ["derive"] }
 serde_json = { version = "1.0.116", features = ["raw_value"] }
-serde_yaml = "0.9.34"
 sqlx = { version = "0.7.4", features = ["sqlite", "runtime-tokio-rustls", "json", "chrono", "time"] }
-tauri = { version = "2.0.0-beta", features = ["devtools", "protocol-asset"] }
-tauri-plugin-clipboard-manager = "2.1.0-beta"
-tauri-plugin-dialog = "2.0.0-beta"
-tauri-plugin-fs = "2.0.0-beta"
-tauri-plugin-log = { version = "2.0.0-beta", features = ["colored"] }
-tauri-plugin-os = "2.0.0-beta"
-tauri-plugin-shell = "2.0.0-beta"
-tauri-plugin-updater = "2.0.0-beta"
-tauri-plugin-window-state = "2.0.0-beta"
+tauri = { version = "2.0.0-beta.19", features = ["config-toml", "devtools", "protocol-asset"] }
+tauri-plugin-clipboard-manager = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-dialog = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-log = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2", features = ["colored"] }
+tauri-plugin-shell = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-os = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-updater = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-fs = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 tokio = { version = "1.36.0", features = ["sync"] }
-tokio-stream = "0.1.15"
 uuid = "1.7.0"
+log = "0.4.21"
+datetime = "0.5.2"
+reqwest_cookie_store = "0.6.0"
+grpc = { path = "./grpc" }
+tokio-stream = "0.1.15"
+regex = "1.10.2"
--- a/src-tauri/capabilities/capabilities.json
+++ b/src-tauri/capabilities/capabilities.json
@@ -39,7 +39,6 @@
        }
      ]
    },
-    "webview:allow-set-webview-zoom",
    "window:allow-close",
    "window:allow-is-fullscreen",
    "window:allow-maximize",
@@ -49,7 +48,6 @@
    "window:allow-set-title",
    "window:allow-start-dragging",
    "window:allow-unmaximize",
-    "window:allow-theme",
    "clipboard-manager:allow-read-text",
    "clipboard-manager:allow-write-text"
  ]
--- a/src-tauri/gen/apple/.gitignore
+++ b/src-tauri/gen/apple/.gitignore
@@ -0,0 +1,3 @@
+xcuserdata/
+build/
+Externals/
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@1x.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@1x.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@2x-1.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@2x-1.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@2x.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@2x.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@3x.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@3x.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@1x.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@1x.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@2x-1.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@2x-1.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@2x.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@2x.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@3x.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@3x.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@1x.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@1x.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@2x-1.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@2x-1.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@2x.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@2x.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@3x.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@3x.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-512x512@2x.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-512x512@2x.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-60x60@2x.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-60x60@2x.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-60x60@3x.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-60x60@3x.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-76x76@1x.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-76x76@1x.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-76x76@2x.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-76x76@2x.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-83.5x83.5@2x.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-83.5x83.5@2x.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,116 @@
+{
+  "images" : [
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-20x20@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-20x20@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-29x29@2x-1.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-29x29@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-40x40@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-40x40@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-60x60@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-60x60@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-20x20@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-20x20@2x-1.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-29x29@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-29x29@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-40x40@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-40x40@2x-1.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-76x76@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-76x76@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-83.5x83.5@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "AppIcon-512@2x.png",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
--- a/src-tauri/gen/apple/Assets.xcassets/Contents.json
+++ b/src-tauri/gen/apple/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
--- a/src-tauri/gen/apple/ExportOptions.plist
+++ b/src-tauri/gen/apple/ExportOptions.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>method</key>
+    <string>development</string>
+</dict>
+</plist>
--- a/src-tauri/gen/apple/Podfile
+++ b/src-tauri/gen/apple/Podfile
@@ -0,0 +1,21 @@
+# Uncomment the next line to define a global platform for your project
+
+target 'yaak-app_iOS' do
+platform :ios, '13.0'
+  # Pods for yaak-app_iOS
+end
+
+target 'yaak-app_macOS' do
+platform :osx, '11.0'
+  # Pods for yaak-app_macOS
+end
+
+# Delete the deployment target for iOS and macOS, causing it to be inherited from the Podfile
+post_install do |installer|
+ installer.pods_project.targets.each do |target|
+  target.build_configurations.each do |config|
+   config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'
+   config.build_settings.delete 'MACOSX_DEPLOYMENT_TARGET'
+  end
+ end
+end
--- a/src-tauri/gen/apple/Sources/yaak-app/bindings/bindings.h
+++ b/src-tauri/gen/apple/Sources/yaak-app/bindings/bindings.h
@@ -0,0 +1,8 @@
+#pragma once
+
+namespace ffi {
+    extern "C" {
+        void start_app();
+    }
+}
+
--- a/src-tauri/gen/apple/Sources/yaak-app/main.mm
+++ b/src-tauri/gen/apple/Sources/yaak-app/main.mm
@@ -0,0 +1,6 @@
+#include "bindings/bindings.h"
+
+int main(int argc, char * argv[]) {
+	ffi::start_app();
+	return 0;
+}
--- a/src-tauri/gen/apple/project.yml
+++ b/src-tauri/gen/apple/project.yml
@@ -0,0 +1,90 @@
+name: yaak-app
+options:
+  bundleIdPrefix: app.yaak
+  deploymentTarget:
+    iOS: 13.0
+fileGroups: [../../src]
+configs:
+  debug: debug
+  release: release
+settingGroups:
+  app:
+    base:
+      PRODUCT_NAME: Yaak
+      PRODUCT_BUNDLE_IDENTIFIER: app.yaak.yaak-app
+      DEVELOPMENT_TEAM: 7PU3P6ELJ8
+targetTemplates:
+  app:
+    type: application
+    sources:
+      - path: Sources
+    scheme:
+      environmentVariables:
+        RUST_BACKTRACE: full
+        RUST_LOG: info
+    settings:
+      groups: [app]
+targets:
+  yaak-app_iOS:
+    type: application
+    platform: iOS
+    sources:
+      - path: Sources
+      - path: Assets.xcassets
+      - path: Externals
+      - path: yaak-app_iOS
+      - path: assets
+        buildPhase: resources
+        type: folder
+    info:
+      path: yaak-app_iOS/Info.plist
+      properties:
+        LSRequiresIPhoneOS: true
+        UILaunchStoryboardName: LaunchScreen
+        UIRequiredDeviceCapabilities: [arm64, metal]
+        UISupportedInterfaceOrientations:
+          - UIInterfaceOrientationPortrait
+          - UIInterfaceOrientationLandscapeLeft
+          - UIInterfaceOrientationLandscapeRight
+        UISupportedInterfaceOrientations~ipad:
+          - UIInterfaceOrientationPortrait
+          - UIInterfaceOrientationPortraitUpsideDown
+          - UIInterfaceOrientationLandscapeLeft
+          - UIInterfaceOrientationLandscapeRight
+        CFBundleShortVersionString: 2024.3.10
+        CFBundleVersion: 2024.3.10
+    entitlements:
+      path: yaak-app_iOS/yaak-app_iOS.entitlements
+    scheme:
+      environmentVariables:
+        RUST_BACKTRACE: full
+        RUST_LOG: info
+    settings:
+      base:
+        ENABLE_BITCODE: false
+        ARCHS: [arm64, arm64-sim]
+        VALID_ARCHS: arm64  arm64-sim 
+        LIBRARY_SEARCH_PATHS[arch=x86_64]: $(inherited) $(PROJECT_DIR)/Externals/x86_64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)
+        LIBRARY_SEARCH_PATHS[arch=arm64]: $(inherited) $(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)
+        LIBRARY_SEARCH_PATHS[arch=arm64-sim]: $(inherited) $(PROJECT_DIR)/Externals/arm64-sim/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)
+        ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: true
+        EXCLUDED_ARCHS[sdk=iphonesimulator*]: arm64
+        EXCLUDED_ARCHS[sdk=iphoneos*]: arm64-sim x86_64
+      groups: [app]
+    dependencies:
+      - framework: libapp_lib.a
+        embed: false
+      - sdk: CoreGraphics.framework
+      - sdk: Metal.framework
+      - sdk: MetalKit.framework
+      - sdk: QuartzCore.framework
+      - sdk: Security.framework
+      - sdk: UIKit.framework
+      - sdk: WebKit.framework
+    preBuildScripts:
+      - script: node tauri ios xcode-script -v --platform ${PLATFORM_DISPLAY_NAME:?} --sdk-root ${SDKROOT:?} --framework-search-paths "${FRAMEWORK_SEARCH_PATHS:?}" --header-search-paths "${HEADER_SEARCH_PATHS:?}" --gcc-preprocessor-definitions "${GCC_PREPROCESSOR_DEFINITIONS:-}" --configuration ${CONFIGURATION:?} ${FORCE_COLOR} ${ARCHS:?}
+        name: Build Rust Code
+        basedOnDependencyAnalysis: false
+        outputFiles:
+          - $(SRCROOT)/target/aarch64-apple-ios/${CONFIGURATION}/deps/libapp_lib.a
+          - $(SRCROOT)/target/x86_64-apple-ios/${CONFIGURATION}/deps/libapp_lib.a
--- a/src-tauri/gen/apple/yaak-app.xcodeproj/project.pbxproj
+++ b/src-tauri/gen/apple/yaak-app.xcodeproj/project.pbxproj
@@ -0,0 +1,481 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 54;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		0AC23E163631EF3775908406 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EDEF0D2E01608E7F464F71B6 /* WebKit.framework */; };
+		1B1BFDF8BC345D0D980E4427 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EF0B8CF73BE8166011E2CEAB /* QuartzCore.framework */; };
+		36588BE1A75B386BB2FEDAC5 /* MetalKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A93A95F6B2F31FA92AA099E0 /* MetalKit.framework */; };
+		38E2C1B0E9FCC9A5FDE8876D /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF2908761467DF191C2A8939 /* Metal.framework */; };
+		8D518C1A67069BD7D339D055 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F34A96C5084EFDF1802A634 /* CoreGraphics.framework */; };
+		8DF67739DC49E577EB0FAE3F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 396F45DCFBE2C71866817528 /* Assets.xcassets */; };
+		A1D932F0E7399066AD07DC6D /* libapp_lib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 75D938BE0FA8770BA965AE1E /* libapp_lib.a */; };
+		AF0EEC868306E1D1C85994D0 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B5BF2E39256494269E65F8E /* Security.framework */; };
+		BE9FFDF51EB7DEBF707BB39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5415A3F2D217A47DD3BA40B3 /* UIKit.framework */; };
+		F0627C04787F4E187EF416F4 /* assets in Resources */ = {isa = PBXBuildFile; fileRef = 2A615609009B3AE2728043E4 /* assets */; };
+		FEE5934F5FFB0FBE10883AF2 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = C754460F1DAF2D414038A7EA /* main.mm */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		106BE62BE01A35403424018C /* main.rs */ = {isa = PBXFileReference; path = main.rs; sourceTree = "<group>"; };
+		14F240DAC31C5C52D7B4BB96 /* window_ext.rs */ = {isa = PBXFileReference; path = window_ext.rs; sourceTree = "<group>"; };
+		1B5226A88D8B805E878524C8 /* updates.rs */ = {isa = PBXFileReference; path = updates.rs; sourceTree = "<group>"; };
+		1F34A96C5084EFDF1802A634 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
+		1F5A647F82A24722F3C830BB /* plugin.rs */ = {isa = PBXFileReference; path = plugin.rs; sourceTree = "<group>"; };
+		2A615609009B3AE2728043E4 /* assets */ = {isa = PBXFileReference; lastKnownFileType = folder; path = assets; sourceTree = SOURCE_ROOT; };
+		396F45DCFBE2C71866817528 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		53872C1120171EDC4A6DFEDD /* analytics.rs */ = {isa = PBXFileReference; path = analytics.rs; sourceTree = "<group>"; };
+		5415A3F2D217A47DD3BA40B3 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
+		5C1B6610F62B56E1947BEBBD /* http.rs */ = {isa = PBXFileReference; path = http.rs; sourceTree = "<group>"; };
+		6286C385ABAD2E04237679D7 /* yaak-app_iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "yaak-app_iOS.entitlements"; sourceTree = "<group>"; };
+		75D938BE0FA8770BA965AE1E /* libapp_lib.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libapp_lib.a; sourceTree = "<group>"; };
+		7B5BF2E39256494269E65F8E /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
+		A2CC02313D71CECB68031D53 /* grpc.rs */ = {isa = PBXFileReference; path = grpc.rs; sourceTree = "<group>"; };
+		A6DA9B210723CA84891876F8 /* bindings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = bindings.h; sourceTree = "<group>"; };
+		A93A95F6B2F31FA92AA099E0 /* MetalKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MetalKit.framework; path = System/Library/Frameworks/MetalKit.framework; sourceTree = SDKROOT; };
+		C754460F1DAF2D414038A7EA /* main.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
+		D69BFB768591FDEEF65198EE /* yaak-app_iOS.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = "yaak-app_iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		DDDE197D9C6BC5680EEEEA00 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
+		DF2908761467DF191C2A8939 /* Metal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Metal.framework; path = System/Library/Frameworks/Metal.framework; sourceTree = SDKROOT; };
+		DF45D08D97DE587CABF9537E /* window_menu.rs */ = {isa = PBXFileReference; path = window_menu.rs; sourceTree = "<group>"; };
+		E1E84E267D81D6437901B1C6 /* render.rs */ = {isa = PBXFileReference; path = render.rs; sourceTree = "<group>"; };
+		E964D3637BAED49E34B91739 /* models.rs */ = {isa = PBXFileReference; path = models.rs; sourceTree = "<group>"; };
+		EDEF0D2E01608E7F464F71B6 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
+		EF0B8CF73BE8166011E2CEAB /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
+		FB34CB48BB9F25D49F80D513 /* lib.rs */ = {isa = PBXFileReference; path = lib.rs; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		D8E8888B0F3E4411B98AE8EE /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A1D932F0E7399066AD07DC6D /* libapp_lib.a in Frameworks */,
+				8D518C1A67069BD7D339D055 /* CoreGraphics.framework in Frameworks */,
+				38E2C1B0E9FCC9A5FDE8876D /* Metal.framework in Frameworks */,
+				36588BE1A75B386BB2FEDAC5 /* MetalKit.framework in Frameworks */,
+				1B1BFDF8BC345D0D980E4427 /* QuartzCore.framework in Frameworks */,
+				AF0EEC868306E1D1C85994D0 /* Security.framework in Frameworks */,
+				BE9FFDF51EB7DEBF707BB39A /* UIKit.framework in Frameworks */,
+				0AC23E163631EF3775908406 /* WebKit.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		0844ACEFE550685042AC6029 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				D69BFB768591FDEEF65198EE /* yaak-app_iOS.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		6D0B6FF641B88DAF74C78B00 /* Externals */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Externals;
+			sourceTree = "<group>";
+		};
+		8A07575CB8654BB9107F9A32 /* bindings */ = {
+			isa = PBXGroup;
+			children = (
+				A6DA9B210723CA84891876F8 /* bindings.h */,
+			);
+			path = bindings;
+			sourceTree = "<group>";
+		};
+		8F0B46911FBEF2B246BE3385 /* yaak-app */ = {
+			isa = PBXGroup;
+			children = (
+				C754460F1DAF2D414038A7EA /* main.mm */,
+				8A07575CB8654BB9107F9A32 /* bindings */,
+			);
+			path = "yaak-app";
+			sourceTree = "<group>";
+		};
+		90E982C0E9B45CBAAE66E16D /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				1F34A96C5084EFDF1802A634 /* CoreGraphics.framework */,
+				75D938BE0FA8770BA965AE1E /* libapp_lib.a */,
+				DF2908761467DF191C2A8939 /* Metal.framework */,
+				A93A95F6B2F31FA92AA099E0 /* MetalKit.framework */,
+				EF0B8CF73BE8166011E2CEAB /* QuartzCore.framework */,
+				7B5BF2E39256494269E65F8E /* Security.framework */,
+				5415A3F2D217A47DD3BA40B3 /* UIKit.framework */,
+				EDEF0D2E01608E7F464F71B6 /* WebKit.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		C88F9D29DC52F052255C35A3 = {
+			isa = PBXGroup;
+			children = (
+				2A615609009B3AE2728043E4 /* assets */,
+				396F45DCFBE2C71866817528 /* Assets.xcassets */,
+				6D0B6FF641B88DAF74C78B00 /* Externals */,
+				EBC83899FBFA4A3D0A92837F /* Sources */,
+				F3A6B45E25E23922AB1BDB34 /* src */,
+				D49CF68C9105CE84E2084C14 /* yaak-app_iOS */,
+				90E982C0E9B45CBAAE66E16D /* Frameworks */,
+				0844ACEFE550685042AC6029 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		D49CF68C9105CE84E2084C14 /* yaak-app_iOS */ = {
+			isa = PBXGroup;
+			children = (
+				DDDE197D9C6BC5680EEEEA00 /* Info.plist */,
+				6286C385ABAD2E04237679D7 /* yaak-app_iOS.entitlements */,
+			);
+			path = "yaak-app_iOS";
+			sourceTree = "<group>";
+		};
+		EBC83899FBFA4A3D0A92837F /* Sources */ = {
+			isa = PBXGroup;
+			children = (
+				8F0B46911FBEF2B246BE3385 /* yaak-app */,
+			);
+			path = Sources;
+			sourceTree = "<group>";
+		};
+		F3A6B45E25E23922AB1BDB34 /* src */ = {
+			isa = PBXGroup;
+			children = (
+				53872C1120171EDC4A6DFEDD /* analytics.rs */,
+				A2CC02313D71CECB68031D53 /* grpc.rs */,
+				5C1B6610F62B56E1947BEBBD /* http.rs */,
+				FB34CB48BB9F25D49F80D513 /* lib.rs */,
+				106BE62BE01A35403424018C /* main.rs */,
+				E964D3637BAED49E34B91739 /* models.rs */,
+				1F5A647F82A24722F3C830BB /* plugin.rs */,
+				E1E84E267D81D6437901B1C6 /* render.rs */,
+				1B5226A88D8B805E878524C8 /* updates.rs */,
+				14F240DAC31C5C52D7B4BB96 /* window_ext.rs */,
+				DF45D08D97DE587CABF9537E /* window_menu.rs */,
+			);
+			name = src;
+			path = ../../src;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		7C3E2AC18A0A227C2DF356E2 /* yaak-app_iOS */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = C05E07AE7C7B25CACFADCDD4 /* Build configuration list for PBXNativeTarget "yaak-app_iOS" */;
+			buildPhases = (
+				5454ED506FC51D41C81A0318 /* Build Rust Code */,
+				C3495A2849227C6276D3876E /* Sources */,
+				E148188313FB67F061AB4E59 /* Resources */,
+				D8E8888B0F3E4411B98AE8EE /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "yaak-app_iOS";
+			productName = "yaak-app_iOS";
+			productReference = D69BFB768591FDEEF65198EE /* yaak-app_iOS.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		A8F6206BC76F061F1FEFD439 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				BuildIndependentTargetsInParallel = YES;
+				LastUpgradeCheck = 1430;
+				TargetAttributes = {
+					7C3E2AC18A0A227C2DF356E2 = {
+						DevelopmentTeam = 7PU3P6ELJ8;
+					};
+				};
+			};
+			buildConfigurationList = 24EF8D1B948FFF6B275FB0F4 /* Build configuration list for PBXProject "yaak-app" */;
+			compatibilityVersion = "Xcode 14.0";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				Base,
+				en,
+			);
+			mainGroup = C88F9D29DC52F052255C35A3;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				7C3E2AC18A0A227C2DF356E2 /* yaak-app_iOS */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		E148188313FB67F061AB4E59 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				8DF67739DC49E577EB0FAE3F /* Assets.xcassets in Resources */,
+				F0627C04787F4E187EF416F4 /* assets in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		5454ED506FC51D41C81A0318 /* Build Rust Code */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Build Rust Code";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(SRCROOT)/target/aarch64-apple-ios/${CONFIGURATION}/deps/libapp_lib.a",
+				"$(SRCROOT)/target/x86_64-apple-ios/${CONFIGURATION}/deps/libapp_lib.a",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "node tauri ios xcode-script -v --platform ${PLATFORM_DISPLAY_NAME:?} --sdk-root ${SDKROOT:?} --framework-search-paths \"${FRAMEWORK_SEARCH_PATHS:?}\" --header-search-paths \"${HEADER_SEARCH_PATHS:?}\" --gcc-preprocessor-definitions \"${GCC_PREPROCESSOR_DEFINITIONS:-}\" --configuration ${CONFIGURATION:?} ${FORCE_COLOR} ${ARCHS:?}";
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		C3495A2849227C6276D3876E /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				FEE5934F5FFB0FBE10883AF2 /* main.mm in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		35D1DB294FFD067C835186C7 /* debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					"DEBUG=1",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = iphoneos;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+			};
+			name = debug;
+		};
+		368BB1E364597E7675463634 /* release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				ARCHS = (
+					arm64,
+					"arm64-sim",
+				);
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_ENTITLEMENTS = "yaak-app_iOS/yaak-app_iOS.entitlements";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				DEVELOPMENT_TEAM = 7PU3P6ELJ8;
+				ENABLE_BITCODE = NO;
+				"EXCLUDED_ARCHS[sdk=iphoneos*]" = "arm64-sim x86_64";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"\".\"",
+				);
+				INFOPLIST_FILE = "yaak-app_iOS/Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				"LIBRARY_SEARCH_PATHS[arch=arm64-sim]" = "$(inherited) $(PROJECT_DIR)/Externals/arm64-sim/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)";
+				"LIBRARY_SEARCH_PATHS[arch=arm64]" = "$(inherited) $(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)";
+				"LIBRARY_SEARCH_PATHS[arch=x86_64]" = "$(inherited) $(PROJECT_DIR)/Externals/x86_64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)";
+				PRODUCT_BUNDLE_IDENTIFIER = "app.yaak.yaak-app";
+				PRODUCT_NAME = Yaak;
+				SDKROOT = iphoneos;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALID_ARCHS = "arm64  arm64-sim";
+			};
+			name = release;
+		};
+		45382E89556BF93E8D1F1C2D /* debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				ARCHS = (
+					arm64,
+					"arm64-sim",
+				);
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_ENTITLEMENTS = "yaak-app_iOS/yaak-app_iOS.entitlements";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				DEVELOPMENT_TEAM = 7PU3P6ELJ8;
+				ENABLE_BITCODE = NO;
+				"EXCLUDED_ARCHS[sdk=iphoneos*]" = "arm64-sim x86_64";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"\".\"",
+				);
+				INFOPLIST_FILE = "yaak-app_iOS/Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				"LIBRARY_SEARCH_PATHS[arch=arm64-sim]" = "$(inherited) $(PROJECT_DIR)/Externals/arm64-sim/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)";
+				"LIBRARY_SEARCH_PATHS[arch=arm64]" = "$(inherited) $(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)";
+				"LIBRARY_SEARCH_PATHS[arch=x86_64]" = "$(inherited) $(PROJECT_DIR)/Externals/x86_64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)";
+				PRODUCT_BUNDLE_IDENTIFIER = "app.yaak.yaak-app";
+				PRODUCT_NAME = Yaak;
+				SDKROOT = iphoneos;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALID_ARCHS = "arm64  arm64-sim";
+			};
+			name = debug;
+		};
+		ABD0A3DD3D5C66C839496F44 /* release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_FAST_MATH = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = iphoneos;
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_VERSION = 5.0;
+			};
+			name = release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		24EF8D1B948FFF6B275FB0F4 /* Build configuration list for PBXProject "yaak-app" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				35D1DB294FFD067C835186C7 /* debug */,
+				ABD0A3DD3D5C66C839496F44 /* release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = debug;
+		};
+		C05E07AE7C7B25CACFADCDD4 /* Build configuration list for PBXNativeTarget "yaak-app_iOS" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				45382E89556BF93E8D1F1C2D /* debug */,
+				368BB1E364597E7675463634 /* release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = debug;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = A8F6206BC76F061F1FEFD439 /* Project object */;
+}
--- a/src-tauri/gen/apple/yaak-app.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/src-tauri/gen/apple/yaak-app.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>
--- a/src-tauri/gen/apple/yaak-app.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ b/src-tauri/gen/apple/yaak-app.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
--- a/src-tauri/gen/apple/yaak-app.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+++ b/src-tauri/gen/apple/yaak-app.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildSystemType</key>
+	<string>Original</string>
+	<key>DisableBuildSystemDeprecationDiagnostic</key>
+	<true/>
+</dict>
+</plist>
--- a/src-tauri/gen/apple/yaak-app.xcodeproj/xcshareddata/xcschemes/yaak-app_iOS.xcscheme
+++ b/src-tauri/gen/apple/yaak-app.xcodeproj/xcshareddata/xcschemes/yaak-app_iOS.xcscheme
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1430"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "7C3E2AC18A0A227C2DF356E2"
+               BuildableName = "Yaak.app"
+               BlueprintName = "yaak-app_iOS"
+               ReferencedContainer = "container:yaak-app.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "NO">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7C3E2AC18A0A227C2DF356E2"
+            BuildableName = "Yaak.app"
+            BlueprintName = "yaak-app_iOS"
+            ReferencedContainer = "container:yaak-app.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "RUST_BACKTRACE"
+            value = "full"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "RUST_LOG"
+            value = "info"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7C3E2AC18A0A227C2DF356E2"
+            BuildableName = "Yaak.app"
+            BlueprintName = "yaak-app_iOS"
+            ReferencedContainer = "container:yaak-app.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "RUST_BACKTRACE"
+            value = "full"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "RUST_LOG"
+            value = "info"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "release"
+      shouldUseLaunchSchemeArgsEnv = "NO"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7C3E2AC18A0A227C2DF356E2"
+            BuildableName = "Yaak.app"
+            BlueprintName = "yaak-app_iOS"
+            ReferencedContainer = "container:yaak-app.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "RUST_BACKTRACE"
+            value = "full"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "RUST_LOG"
+            value = "info"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
--- a/src-tauri/gen/apple/yaak-app_iOS/Info.plist
+++ b/src-tauri/gen/apple/yaak-app_iOS/Info.plist
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>2024.3.10</string>
+	<key>CFBundleVersion</key>
+	<string>2024.3.10</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>arm64</string>
+		<string>metal</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>
--- a/src-tauri/gen/apple/yaak-app_iOS/yaak-app_iOS.entitlements
+++ b/src-tauri/gen/apple/yaak-app_iOS/yaak-app_iOS.entitlements
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>
--- a/src-tauri/gen/schemas/acl-manifests.json
+++ b/src-tauri/gen/schemas/acl-manifests.json
--- a/src-tauri/gen/schemas/capabilities.json
+++ b/src-tauri/gen/schemas/capabilities.json
@@ -1 +1 @@
-{"main":{"identifier":"main","description":"Main permissions","local":true,"windows":["*"],"permissions":["os:allow-os-type","event:allow-emit","clipboard-manager:allow-write-text","clipboard-manager:allow-read-text","dialog:allow-open","dialog:allow-save","event:allow-listen","event:allow-unlisten","fs:allow-read-file","fs:allow-read-text-file",{"identifier":"fs:scope","allow":[{"path":"$APPDATA"},{"path":"$APPDATA/**"}]},"shell:allow-open",{"identifier":"shell:allow-execute","allow":[{"args":true,"name":"protoc","sidecar":true}]},"webview:allow-set-webview-zoom","window:allow-close","window:allow-is-fullscreen","window:allow-maximize","window:allow-minimize","window:allow-toggle-maximize","window:allow-set-decorations","window:allow-set-title","window:allow-start-dragging","window:allow-unmaximize","window:allow-theme","clipboard-manager:allow-read-text","clipboard-manager:allow-write-text"]}}
+{"main":{"identifier":"main","description":"Main permissions","local":true,"windows":["*"],"permissions":["os:allow-os-type","event:allow-emit","clipboard-manager:allow-write-text","clipboard-manager:allow-read-text","dialog:allow-open","dialog:allow-save","event:allow-listen","event:allow-unlisten","fs:allow-read-file","fs:allow-read-text-file",{"identifier":"fs:scope","allow":[{"path":"$APPDATA"},{"path":"$APPDATA/**"}]},"shell:allow-open",{"identifier":"shell:allow-execute","allow":[{"args":true,"name":"protoc","sidecar":true}]},"window:allow-close","window:allow-is-fullscreen","window:allow-maximize","window:allow-minimize","window:allow-toggle-maximize","window:allow-set-decorations","window:allow-set-title","window:allow-start-dragging","window:allow-unmaximize","clipboard-manager:allow-read-text","clipboard-manager:allow-write-text"]}}
--- a/src-tauri/gen/schemas/desktop-schema.json
+++ b/src-tauri/gen/schemas/desktop-schema.json
@@ -2216,13 +2216,6 @@
                        "shell:allow-open"
                      ]
                    },
-                    {
-                      "description": "shell:allow-spawn -> Enables the spawn command without any pre-configured scope.",
-                      "type": "string",
-                      "enum": [
-                        "shell:allow-spawn"
-                      ]
-                    },
                    {
                      "description": "shell:allow-stdin-write -> Enables the stdin_write command without any pre-configured scope.",
                      "type": "string",
@@ -2251,13 +2244,6 @@
                        "shell:deny-open"
                      ]
                    },
-                    {
-                      "description": "shell:deny-spawn -> Denies the spawn command without any pre-configured scope.",
-                      "type": "string",
-                      "enum": [
-                        "shell:deny-spawn"
-                      ]
-                    },
                    {
                      "description": "shell:deny-stdin-write -> Denies the stdin_write command without any pre-configured scope.",
                      "type": "string",
@@ -5337,13 +5323,6 @@
            "shell:allow-open"
          ]
        },
-        {
-          "description": "shell:allow-spawn -> Enables the spawn command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "shell:allow-spawn"
-          ]
-        },
        {
          "description": "shell:allow-stdin-write -> Enables the stdin_write command without any pre-configured scope.",
          "type": "string",
@@ -5372,13 +5351,6 @@
            "shell:deny-open"
          ]
        },
-        {
-          "description": "shell:deny-spawn -> Denies the spawn command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "shell:deny-spawn"
-          ]
-        },
        {
          "description": "shell:deny-stdin-write -> Denies the stdin_write command without any pre-configured scope.",
          "type": "string",
@@ -5561,13 +5533,6 @@
            "updater:allow-check"
          ]
        },
-        {
-          "description": "updater:allow-download -> Enables the download command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "updater:allow-download"
-          ]
-        },
        {
          "description": "updater:allow-download-and-install -> Enables the download_and_install command without any pre-configured scope.",
          "type": "string",
@@ -5575,13 +5540,6 @@
            "updater:allow-download-and-install"
          ]
        },
-        {
-          "description": "updater:allow-install -> Enables the install command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "updater:allow-install"
-          ]
-        },
        {
          "description": "updater:deny-check -> Denies the check command without any pre-configured scope.",
          "type": "string",
@@ -5589,13 +5547,6 @@
            "updater:deny-check"
          ]
        },
-        {
-          "description": "updater:deny-download -> Denies the download command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "updater:deny-download"
-          ]
-        },
        {
          "description": "updater:deny-download-and-install -> Denies the download_and_install command without any pre-configured scope.",
          "type": "string",
@@ -5603,13 +5554,6 @@
            "updater:deny-download-and-install"
          ]
        },
-        {
-          "description": "updater:deny-install -> Denies the install command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "updater:deny-install"
-          ]
-        },
        {
          "description": "webview:default -> Default permissions for the plugin.",
          "type": "string",
@@ -5953,13 +5897,6 @@
            "window:allow-minimize"
          ]
        },
-        {
-          "description": "window:allow-monitor-from-point -> Enables the monitor_from_point command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "window:allow-monitor-from-point"
-          ]
-        },
        {
          "description": "window:allow-outer-position -> Enables the outer_position command without any pre-configured scope.",
          "type": "string",
@@ -6394,13 +6331,6 @@
            "window:deny-minimize"
          ]
        },
-        {
-          "description": "window:deny-monitor-from-point -> Denies the monitor_from_point command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "window:deny-monitor-from-point"
-          ]
-        },
        {
          "description": "window:deny-outer-position -> Denies the outer_position command without any pre-configured scope.",
          "type": "string",
--- a/src-tauri/gen/schemas/linux-schema.json
+++ b/src-tauri/gen/schemas/linux-schema.json
@@ -2216,13 +2216,6 @@
                        "shell:allow-open"
                      ]
                    },
-                    {
-                      "description": "shell:allow-spawn -> Enables the spawn command without any pre-configured scope.",
-                      "type": "string",
-                      "enum": [
-                        "shell:allow-spawn"
-                      ]
-                    },
                    {
                      "description": "shell:allow-stdin-write -> Enables the stdin_write command without any pre-configured scope.",
                      "type": "string",
@@ -2251,13 +2244,6 @@
                        "shell:deny-open"
                      ]
                    },
-                    {
-                      "description": "shell:deny-spawn -> Denies the spawn command without any pre-configured scope.",
-                      "type": "string",
-                      "enum": [
-                        "shell:deny-spawn"
-                      ]
-                    },
                    {
                      "description": "shell:deny-stdin-write -> Denies the stdin_write command without any pre-configured scope.",
                      "type": "string",
@@ -2512,69 +2498,6 @@
            "clipboard-manager:deny-write-text"
          ]
        },
-        {
-          "description": "deep-link:default -> Allows reading the opened deep link via the get_current command",
-          "type": "string",
-          "enum": [
-            "deep-link:default"
-          ]
-        },
-        {
-          "description": "deep-link:allow-get-current -> Enables the get_current command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "deep-link:allow-get-current"
-          ]
-        },
-        {
-          "description": "deep-link:allow-is-registered -> Enables the is_registered command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "deep-link:allow-is-registered"
-          ]
-        },
-        {
-          "description": "deep-link:allow-register -> Enables the register command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "deep-link:allow-register"
-          ]
-        },
-        {
-          "description": "deep-link:allow-unregister -> Enables the unregister command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "deep-link:allow-unregister"
-          ]
-        },
-        {
-          "description": "deep-link:deny-get-current -> Denies the get_current command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "deep-link:deny-get-current"
-          ]
-        },
-        {
-          "description": "deep-link:deny-is-registered -> Denies the is_registered command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "deep-link:deny-is-registered"
-          ]
-        },
-        {
-          "description": "deep-link:deny-register -> Denies the register command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "deep-link:deny-register"
-          ]
-        },
-        {
-          "description": "deep-link:deny-unregister -> Denies the unregister command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "deep-link:deny-unregister"
-          ]
-        },
        {
          "type": "string",
          "enum": [
@@ -5400,13 +5323,6 @@
            "shell:allow-open"
          ]
        },
-        {
-          "description": "shell:allow-spawn -> Enables the spawn command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "shell:allow-spawn"
-          ]
-        },
        {
          "description": "shell:allow-stdin-write -> Enables the stdin_write command without any pre-configured scope.",
          "type": "string",
@@ -5435,13 +5351,6 @@
            "shell:deny-open"
          ]
        },
-        {
-          "description": "shell:deny-spawn -> Denies the spawn command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "shell:deny-spawn"
-          ]
-        },
        {
          "description": "shell:deny-stdin-write -> Denies the stdin_write command without any pre-configured scope.",
          "type": "string",
@@ -5624,13 +5533,6 @@
            "updater:allow-check"
          ]
        },
-        {
-          "description": "updater:allow-download -> Enables the download command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "updater:allow-download"
-          ]
-        },
        {
          "description": "updater:allow-download-and-install -> Enables the download_and_install command without any pre-configured scope.",
          "type": "string",
@@ -5638,13 +5540,6 @@
            "updater:allow-download-and-install"
          ]
        },
-        {
-          "description": "updater:allow-install -> Enables the install command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "updater:allow-install"
-          ]
-        },
        {
          "description": "updater:deny-check -> Denies the check command without any pre-configured scope.",
          "type": "string",
@@ -5652,13 +5547,6 @@
            "updater:deny-check"
          ]
        },
-        {
-          "description": "updater:deny-download -> Denies the download command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "updater:deny-download"
-          ]
-        },
        {
          "description": "updater:deny-download-and-install -> Denies the download_and_install command without any pre-configured scope.",
          "type": "string",
@@ -5666,13 +5554,6 @@
            "updater:deny-download-and-install"
          ]
        },
-        {
-          "description": "updater:deny-install -> Denies the install command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "updater:deny-install"
-          ]
-        },
        {
          "description": "webview:default -> Default permissions for the plugin.",
          "type": "string",
@@ -6016,13 +5897,6 @@
            "window:allow-minimize"
          ]
        },
-        {
-          "description": "window:allow-monitor-from-point -> Enables the monitor_from_point command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "window:allow-monitor-from-point"
-          ]
-        },
        {
          "description": "window:allow-outer-position -> Enables the outer_position command without any pre-configured scope.",
          "type": "string",
@@ -6457,13 +6331,6 @@
            "window:deny-minimize"
          ]
        },
-        {
-          "description": "window:deny-monitor-from-point -> Denies the monitor_from_point command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "window:deny-monitor-from-point"
-          ]
-        },
        {
          "description": "window:deny-outer-position -> Denies the outer_position command without any pre-configured scope.",
          "type": "string",
--- a/src-tauri/gen/schemas/macOS-schema.json
+++ b/src-tauri/gen/schemas/macOS-schema.json
@@ -2216,13 +2216,6 @@
                        "shell:allow-open"
                      ]
                    },
-                    {
-                      "description": "shell:allow-spawn -> Enables the spawn command without any pre-configured scope.",
-                      "type": "string",
-                      "enum": [
-                        "shell:allow-spawn"
-                      ]
-                    },
                    {
                      "description": "shell:allow-stdin-write -> Enables the stdin_write command without any pre-configured scope.",
                      "type": "string",
@@ -2251,13 +2244,6 @@
                        "shell:deny-open"
                      ]
                    },
-                    {
-                      "description": "shell:deny-spawn -> Denies the spawn command without any pre-configured scope.",
-                      "type": "string",
-                      "enum": [
-                        "shell:deny-spawn"
-                      ]
-                    },
                    {
                      "description": "shell:deny-stdin-write -> Denies the stdin_write command without any pre-configured scope.",
                      "type": "string",
@@ -5337,13 +5323,6 @@
            "shell:allow-open"
          ]
        },
-        {
-          "description": "shell:allow-spawn -> Enables the spawn command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "shell:allow-spawn"
-          ]
-        },
        {
          "description": "shell:allow-stdin-write -> Enables the stdin_write command without any pre-configured scope.",
          "type": "string",
@@ -5372,13 +5351,6 @@
            "shell:deny-open"
          ]
        },
-        {
-          "description": "shell:deny-spawn -> Denies the spawn command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "shell:deny-spawn"
-          ]
-        },
        {
          "description": "shell:deny-stdin-write -> Denies the stdin_write command without any pre-configured scope.",
          "type": "string",
@@ -5561,13 +5533,6 @@
            "updater:allow-check"
          ]
        },
-        {
-          "description": "updater:allow-download -> Enables the download command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "updater:allow-download"
-          ]
-        },
        {
          "description": "updater:allow-download-and-install -> Enables the download_and_install command without any pre-configured scope.",
          "type": "string",
@@ -5575,13 +5540,6 @@
            "updater:allow-download-and-install"
          ]
        },
-        {
-          "description": "updater:allow-install -> Enables the install command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "updater:allow-install"
-          ]
-        },
        {
          "description": "updater:deny-check -> Denies the check command without any pre-configured scope.",
          "type": "string",
@@ -5589,13 +5547,6 @@
            "updater:deny-check"
          ]
        },
-        {
-          "description": "updater:deny-download -> Denies the download command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "updater:deny-download"
-          ]
-        },
        {
          "description": "updater:deny-download-and-install -> Denies the download_and_install command without any pre-configured scope.",
          "type": "string",
@@ -5603,13 +5554,6 @@
            "updater:deny-download-and-install"
          ]
        },
-        {
-          "description": "updater:deny-install -> Denies the install command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "updater:deny-install"
-          ]
-        },
        {
          "description": "webview:default -> Default permissions for the plugin.",
          "type": "string",
@@ -5953,13 +5897,6 @@
            "window:allow-minimize"
          ]
        },
-        {
-          "description": "window:allow-monitor-from-point -> Enables the monitor_from_point command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "window:allow-monitor-from-point"
-          ]
-        },
        {
          "description": "window:allow-outer-position -> Enables the outer_position command without any pre-configured scope.",
          "type": "string",
@@ -6394,13 +6331,6 @@
            "window:deny-minimize"
          ]
        },
-        {
-          "description": "window:deny-monitor-from-point -> Denies the monitor_from_point command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "window:deny-monitor-from-point"
-          ]
-        },
        {
          "description": "window:deny-outer-position -> Denies the outer_position command without any pre-configured scope.",
          "type": "string",
--- a/src-tauri/gen/schemas/windows-schema.json
+++ b/src-tauri/gen/schemas/windows-schema.json
--- a/src-tauri/grpc/Cargo.toml
+++ b/src-tauri/grpc/Cargo.toml
@@ -18,5 +18,5 @@ anyhow = "1.0.79"
 hyper = { version = "0.14" }
 hyper-rustls = { version = "0.24.0", features = ["http2"] }
 uuid = { version = "1.7.0", features = ["v4"] }
-tauri = { version = "2.0.0-beta" }
-tauri-plugin-shell = "2.0.0-beta"
+tauri = { version = "2.0.0-beta.16" }
+tauri-plugin-shell = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
--- a/src-tauri/grpc/src/manager.rs
+++ b/src-tauri/grpc/src/manager.rs
@@ -185,22 +185,20 @@ impl GrpcHandle {
    pub async fn services_from_files(
        &mut self,
        id: &str,
-        uri: &str,
+        uri: &Uri,
        paths: Vec<PathBuf>,
    ) -> Result<Vec<ServiceDefinition>, String> {
        let pool = fill_pool_from_files(&self.app_handle, paths).await?;
-        let uri = Uri::from_str(uri).map_err(|e| e.to_string())?;
-        self.pools.insert(self.get_pool_key(id, &uri), pool.clone());
+        self.pools.insert(self.get_pool_key(id, uri), pool.clone());
        Ok(self.services_from_pool(&pool))
    }
    pub async fn services_from_reflection(
        &mut self,
        id: &str,
-        uri: &str,
+        uri: &Uri,
    ) -> Result<Vec<ServiceDefinition>, String> {
-        let uri = Uri::from_str(uri).map_err(|e| e.to_string())?;
-        let pool = fill_pool(&uri).await?;
-        self.pools.insert(self.get_pool_key(id, &uri), pool.clone());
+        let pool = fill_pool(uri).await?;
+        self.pools.insert(self.get_pool_key(id, uri), pool.clone());
        Ok(self.services_from_pool(&pool))
    }

@@ -236,10 +234,9 @@ impl GrpcHandle {
    pub async fn connect(
        &mut self,
        id: &str,
-        uri: &str,
+        uri: Uri,
        proto_files: Vec<PathBuf>,
    ) -> Result<GrpcConnection, String> {
-        let uri = Uri::from_str(uri).map_err(|e| e.to_string())?;
        let pool = match self.pools.get(id) {
            Some(p) => p.clone(),
            None => match proto_files.len() {
--- a/src-tauri/migrations/20240522031045_theme-settings.sql
+++ b/src-tauri/migrations/20240522031045_theme-settings.sql
@@ -1,4 +0,0 @@
-ALTER TABLE settings
-    ADD COLUMN theme_dark TEXT DEFAULT 'yaak-dark' NOT NULL;
-ALTER TABLE settings
-    ADD COLUMN theme_light TEXT DEFAULT 'yaak-light' NOT NULL;
--- a/src-tauri/migrations/20240529143147_more-settings.sql
+++ b/src-tauri/migrations/20240529143147_more-settings.sql
@@ -1,4 +0,0 @@
-ALTER TABLE settings ADD COLUMN interface_font_size INTEGER DEFAULT 15 NOT NULL;
-ALTER TABLE settings ADD COLUMN interface_scale INTEGER DEFAULT 1 NOT NULL;
-ALTER TABLE settings ADD COLUMN editor_font_size INTEGER DEFAULT 13 NOT NULL;
-ALTER TABLE settings ADD COLUMN editor_soft_wrap BOOLEAN DEFAULT 1 NOT NULL;
--- a/src-tauri/migrations/20240607151115_open-workspace-setting.sql
+++ b/src-tauri/migrations/20240607151115_open-workspace-setting.sql
@@ -1 +0,0 @@
-ALTER TABLE settings ADD COLUMN open_workspace_new_window BOOLEAN NULL DEFAULT NULL;
--- a/src-tauri/plugins/importer-curl/index.mjs
+++ b/src-tauri/plugins/importer-curl/index.mjs
@@ -0,0 +1,297 @@
+var j = "(?:" + [
+  "\\|\\|",
+  "\\&\\&",
+  ";;",
+  "\\|\\&",
+  "\\<\\(",
+  "\\<\\<\\<",
+  ">>",
+  ">\\&",
+  "<\\&",
+  "[&;()|<>]"
+].join("|") + ")", D = new RegExp("^" + j + "$"), q = "|&;()<> \\t", M = '"((\\\\"|[^"])*?)"', Q = "'((\\\\'|[^'])*?)'", V = /^#$/, _ = "'", G = '"', U = "$", $ = "", z = 4294967296;
+for (var L = 0; L < 4; L++)
+  $ += (z * Math.random()).toString(16);
+var J = new RegExp("^" + $);
+function X(n, s) {
+  for (var e = s.lastIndex, t = [], c; c = s.exec(n); )
+    t.push(c), s.lastIndex === c.index && (s.lastIndex += 1);
+  return s.lastIndex = e, t;
+}
+function F(n, s, e) {
+  var t = typeof n == "function" ? n(e) : n[e];
+  return typeof t > "u" && e != "" ? t = "" : typeof t > "u" && (t = "$"), typeof t == "object" ? s + $ + JSON.stringify(t) + $ : s + t;
+}
+function K(n, s, e) {
+  e || (e = {});
+  var t = e.escape || "\\", c = "(\\" + t + `['"` + q + `]|[^\\s'"` + q + "])+", m = new RegExp([
+    "(" + j + ")",
+    // control chars
+    "(" + c + "|" + M + "|" + Q + ")+"
+  ].join("|"), "g"), f = X(n, m);
+  if (f.length === 0)
+    return [];
+  s || (s = {});
+  var w = !1;
+  return f.map(function(r) {
+    var a = r[0];
+    if (!a || w)
+      return;
+    if (D.test(a))
+      return { op: a };
+    var x = !1, C = !1, d = "", O = !1, i;
+    function T() {
+      i += 1;
+      var v, p, R = a.charAt(i);
+      if (R === "{") {
+        if (i += 1, a.charAt(i) === "}")
+          throw new Error("Bad substitution: " + a.slice(i - 2, i + 1));
+        if (v = a.indexOf("}", i), v < 0)
+          throw new Error("Bad substitution: " + a.slice(i));
+        p = a.slice(i, v), i = v;
+      } else if (/[*@#?$!_-]/.test(R))
+        p = R, i += 1;
+      else {
+        var g = a.slice(i);
+        v = g.match(/[^\w\d_]/), v ? (p = g.slice(0, v.index), i += v.index - 1) : (p = g, i = a.length);
+      }
+      return F(s, "", p);
+    }
+    for (i = 0; i < a.length; i++) {
+      var u = a.charAt(i);
+      if (O = O || !x && (u === "*" || u === "?"), C)
+        d += u, C = !1;
+      else if (x)
+        u === x ? x = !1 : x == _ ? d += u : u === t ? (i += 1, u = a.charAt(i), u === G || u === t || u === U ? d += u : d += t + u) : u === U ? d += T() : d += u;
+      else if (u === G || u === _)
+        x = u;
+      else {
+        if (D.test(u))
+          return { op: a };
+        if (V.test(u)) {
+          w = !0;
+          var b = { comment: n.slice(r.index + i + 1) };
+          return d.length ? [d, b] : [b];
+        } else
+          u === t ? C = !0 : u === U ? d += T() : d += u;
+      }
+    }
+    return O ? { op: "glob", pattern: d } : d;
+  }).reduce(function(r, a) {
+    return typeof a > "u" ? r : r.concat(a);
+  }, []);
+}
+var Y = function(s, e, t) {
+  var c = K(s, e, t);
+  return typeof e != "function" ? c : c.reduce(function(m, f) {
+    if (typeof f == "object")
+      return m.concat(f);
+    var w = f.split(RegExp("(" + $ + ".*?" + $ + ")", "g"));
+    return w.length === 1 ? m.concat(w[0]) : m.concat(w.filter(Boolean).map(function(r) {
+      return J.test(r) ? JSON.parse(r.split($)[1]) : r;
+    }));
+  }, []);
+}, Z = Y;
+const ae = "curl", se = "cURL", ie = "cURL command line tool", H = ["d", "data", "data-raw", "data-urlencode", "data-binary", "data-ascii"], ee = [
+  ["url"],
+  // Specify the URL explicitly
+  ["user", "u"],
+  // Authentication
+  ["digest"],
+  // Apply auth as digest
+  ["header", "H"],
+  ["cookie", "b"],
+  ["get", "G"],
+  // Put the post data in the URL
+  ["d", "data"],
+  // Add url encoded data
+  ["data-raw"],
+  ["data-urlencode"],
+  ["data-binary"],
+  ["data-ascii"],
+  ["form", "F"],
+  // Add multipart data
+  ["request", "X"],
+  // Request method
+  H
+].flatMap((n) => n);
+function oe(n) {
+  if (!n.match(/^\s*curl /))
+    return null;
+  const s = [], e = n.replace(/\ncurl/g, "; curl");
+  let t = [];
+  const m = Z(e).flatMap((r) => typeof r == "string" && r.startsWith("-") && !r.startsWith("--") && r.length > 2 ? [r.slice(0, 2), r.slice(2)] : r);
+  for (const r of m) {
+    if (typeof r == "string") {
+      r.startsWith("$") ? t.push(r.slice(1)) : t.push(r);
+      continue;
+    }
+    if ("comment" in r)
+      continue;
+    const { op: a } = r;
+    if (a === ";") {
+      s.push(t), t = [];
+      continue;
+    }
+    if (a != null && a.startsWith("$")) {
+      const x = a.slice(2, a.length - 1).replace(/\\'/g, "'");
+      t.push(x);
+      continue;
+    }
+    a === "glob" && t.push(r.pattern);
+  }
+  s.push(t);
+  const f = {
+    model: "workspace",
+    id: N("workspace"),
+    name: "Curl Import"
+  };
+  return {
+    resources: {
+      httpRequests: s.filter((r) => r[0] === "curl").map((r) => te(r, f.id)),
+      workspaces: [f]
+    }
+  };
+}
+function te(n, s) {
+  const e = {}, t = [];
+  for (let o = 1; o < n.length; o++) {
+    let l = n[o];
+    if (typeof l == "string" && (l = l.trim()), typeof l == "string" && l.match(/^-{1,2}[\w-]+/)) {
+      const E = l[0] === "-" && l[1] !== "-";
+      let h = l.replace(/^-{1,2}/, "");
+      if (!ee.includes(h))
+        continue;
+      let y;
+      const S = n[o + 1];
+      E && h.length > 1 ? (y = h.slice(1), h = h.slice(0, 1)) : typeof S == "string" && !S.startsWith("-") ? (y = S, o++) : y = !0, e[h] = e[h] || [], e[h].push(y);
+    } else
+      l && t.push(l);
+  }
+  let c, m;
+  const f = A(e, t[0] || "", ["url"]), [w, r] = W(f, "?");
+  c = (r == null ? void 0 : r.split("&").map((o) => {
+    const l = W(o, "=");
+    return { name: l[0] ?? "", value: l[1] ?? "", enabled: !0 };
+  })) ?? [], m = w ?? f;
+  const [a, x] = A(e, "", ["u", "user"]).split(/:(.*)$/), C = A(e, !1, ["digest"]), d = a ? C ? "digest" : "basic" : null, O = a ? {
+    username: a.trim(),
+    password: (x ?? "").trim()
+  } : {}, i = [
+    ...e.header || [],
+    ...e.H || []
+  ].map((o) => {
+    const [l, E] = o.split(/:(.*)$/);
+    return E ? {
+      name: (l ?? "").trim(),
+      value: E.trim(),
+      enabled: !0
+    } : {
+      name: (l ?? "").trim().replace(/;$/, ""),
+      value: "",
+      enabled: !0
+    };
+  }), T = [
+    ...e.cookie || [],
+    ...e.b || []
+  ].map((o) => {
+    const l = o.split("=", 1)[0], E = o.replace(`${l}=`, "");
+    return `${l}=${E}`;
+  }).join("; "), u = i.find((o) => o.name.toLowerCase() === "cookie");
+  T && u ? u.value += `; ${T}` : T && i.push({
+    name: "Cookie",
+    value: T,
+    enabled: !0
+  });
+  const b = ne(e), v = i.find((o) => o.name.toLowerCase() === "content-type"), p = v ? v.value.split(";")[0] : null, R = [
+    ...e.form || [],
+    ...e.F || []
+  ].map((o) => {
+    const l = o.split("="), E = l[0] ?? "", h = l[1] ?? "", y = {
+      name: E,
+      enabled: !0
+    };
+    return h.indexOf("@") === 0 ? y.file = h.slice(1) : y.value = h, y;
+  });
+  let g = {}, I = null;
+  const B = A(e, !1, ["G", "get"]);
+  b.length > 0 && B ? c.push(...b) : b.length > 0 && (p == null || p === "application/x-www-form-urlencoded") ? (I = p ?? "application/x-www-form-urlencoded", g = {
+    form: b.map((o) => ({
+      ...o,
+      name: decodeURIComponent(o.name || ""),
+      value: decodeURIComponent(o.value || "")
+    }))
+  }, i.push({
+    name: "Content-Type",
+    value: "application/x-www-form-urlencoded",
+    enabled: !0
+  })) : b.length > 0 ? (I = p === "application/json" || p === "text/xml" || p === "text/plain" ? p : "other", g = {
+    text: b.map(({ name: o, value: l }) => o && l ? `${o}=${l}` : o || l).join("&")
+  }) : R.length && (I = p ?? "multipart/form-data", g = {
+    form: R
+  }, p == null && i.push({
+    name: "Content-Type",
+    value: "multipart/form-data",
+    enabled: !0
+  }));
+  let P = A(e, "", ["X", "request"]).toUpperCase();
+  return P === "" && g && (P = "text" in g || "form" in g ? "POST" : "GET"), {
+    id: N("http_request"),
+    model: "http_request",
+    workspaceId: s,
+    name: "",
+    urlParameters: c,
+    url: m,
+    method: P,
+    headers: i,
+    authentication: O,
+    authenticationType: d,
+    body: g,
+    bodyType: I,
+    folderId: null,
+    sortPriority: 0
+  };
+}
+const ne = (n) => {
+  let s = [];
+  for (const e of H) {
+    const t = n[e];
+    if (!(!t || t.length === 0))
+      for (const c of t) {
+        if (typeof c != "string")
+          continue;
+        const [m, f] = c.split("=");
+        c.startsWith("@") ? s.push({
+          name: m ?? "",
+          value: "",
+          filePath: c.slice(1),
+          enabled: !0
+        }) : s.push({
+          name: m ?? "",
+          value: e === "data-urlencode" ? encodeURIComponent(f ?? "") : f ?? "",
+          enabled: !0
+        });
+      }
+  }
+  return s;
+}, A = (n, s, e) => {
+  for (const t of e)
+    if (n[t] && n[t].length)
+      return n[t][0];
+  return s;
+};
+function W(n, s) {
+  const e = n.indexOf(s);
+  return e > -1 ? [n.slice(0, e), n.slice(e + 1)] : [n];
+}
+const k = {};
+function N(n) {
+  return k[n] = (k[n] ?? -1) + 1, `GENERATE_ID::${n.toUpperCase()}_${k[n]}`;
+}
+export {
+  ie as description,
+  ae as id,
+  te as importCommand,
+  se as name,
+  oe as pluginHookImport
+};
--- a/src-tauri/plugins/importer-insomnia/index.mjs
+++ b/src-tauri/plugins/importer-insomnia/index.mjs
--- a/src-tauri/plugins/importer-postman/index.mjs
+++ b/src-tauri/plugins/importer-postman/index.mjs
@@ -0,0 +1,181 @@
+const S = "https://schema.getpostman.com/json/collection/v2.1.0/collection.json", _ = "https://schema.getpostman.com/json/collection/v2.0.0/collection.json", O = [_, S];
+function v(e) {
+  var g;
+  const t = k(e);
+  if (t == null)
+    return;
+  const o = i(t.info);
+  if (!O.includes(o.schema) || !Array.isArray(t.item))
+    return;
+  const u = A(t.auth), s = {
+    workspaces: [],
+    environments: [],
+    httpRequests: [],
+    folders: []
+  }, n = {
+    model: "workspace",
+    id: h("workspace"),
+    name: o.name || "Postman Import",
+    description: o.description || "",
+    variables: ((g = t.variable) == null ? void 0 : g.map((r) => ({
+      name: r.key,
+      value: r.value
+    }))) ?? []
+  };
+  s.workspaces.push(n);
+  const T = (r, p = null) => {
+    if (typeof r.name == "string" && Array.isArray(r.item)) {
+      const a = {
+        model: "folder",
+        workspaceId: n.id,
+        id: h("folder"),
+        name: r.name,
+        folderId: p
+      };
+      s.folders.push(a);
+      for (const l of r.item)
+        T(l, a.id);
+    } else if (typeof r.name == "string" && "request" in r) {
+      const a = i(r.request), l = j(a.body), w = A(a.auth), d = w.authenticationType == null ? u : w, q = {
+        model: "http_request",
+        id: h("http_request"),
+        workspaceId: n.id,
+        folderId: p,
+        name: r.name,
+        method: a.method || "GET",
+        url: typeof a.url == "string" ? a.url : i(a.url).raw,
+        body: l.body,
+        bodyType: l.bodyType,
+        authentication: d.authentication,
+        authenticationType: d.authenticationType,
+        headers: [
+          ...l.headers,
+          ...d.headers,
+          ...b(a.header).map((m) => ({
+            name: m.key,
+            value: m.value,
+            enabled: !m.disabled
+          }))
+        ]
+      };
+      s.httpRequests.push(q);
+    } else
+      console.log("Unknown item", r, p);
+  };
+  for (const r of t.item)
+    T(r);
+  return { resources: f(s) };
+}
+function A(e) {
+  const t = i(e);
+  return "basic" in t ? {
+    headers: [],
+    authenticationType: "basic",
+    authentication: {
+      username: t.basic.username || "",
+      password: t.basic.password || ""
+    }
+  } : "bearer" in t ? {
+    headers: [],
+    authenticationType: "bearer",
+    authentication: {
+      token: t.bearer.token || ""
+    }
+  } : { headers: [], authenticationType: null, authentication: {} };
+}
+function j(e) {
+  var o, c, u, s;
+  const t = i(e);
+  return "graphql" in t ? {
+    headers: [
+      {
+        name: "Content-Type",
+        value: "application/json",
+        enabled: !0
+      }
+    ],
+    bodyType: "graphql",
+    body: {
+      text: JSON.stringify(
+        { query: t.graphql.query, variables: k(t.graphql.variables) },
+        null,
+        2
+      )
+    }
+  } : "urlencoded" in t ? {
+    headers: [
+      {
+        name: "Content-Type",
+        value: "application/x-www-form-urlencoded",
+        enabled: !0
+      }
+    ],
+    bodyType: "application/x-www-form-urlencoded",
+    body: {
+      form: b(t.urlencoded).map((n) => ({
+        enabled: !n.disabled,
+        name: n.key ?? "",
+        value: n.value ?? ""
+      }))
+    }
+  } : "formdata" in t ? {
+    headers: [
+      {
+        name: "Content-Type",
+        value: "multipart/form-data",
+        enabled: !0
+      }
+    ],
+    bodyType: "multipart/form-data",
+    body: {
+      form: b(t.formdata).map(
+        (n) => n.src != null ? {
+          enabled: !n.disabled,
+          name: n.key ?? "",
+          file: n.src ?? ""
+        } : {
+          enabled: !n.disabled,
+          name: n.key ?? "",
+          value: n.value ?? ""
+        }
+      )
+    }
+  } : "raw" in t ? {
+    headers: [
+      {
+        name: "Content-Type",
+        value: ((c = (o = t.options) == null ? void 0 : o.raw) == null ? void 0 : c.language) === "json" ? "application/json" : "",
+        enabled: !0
+      }
+    ],
+    bodyType: ((s = (u = t.options) == null ? void 0 : u.raw) == null ? void 0 : s.language) === "json" ? "application/json" : "other",
+    body: {
+      text: t.raw ?? ""
+    }
+  } : { headers: [], bodyType: null, body: {} };
+}
+function k(e) {
+  try {
+    return i(JSON.parse(e));
+  } catch {
+  }
+  return null;
+}
+function i(e) {
+  return Object.prototype.toString.call(e) === "[object Object]" ? e : {};
+}
+function b(e) {
+  return Object.prototype.toString.call(e) === "[object Array]" ? e : [];
+}
+function f(e) {
+  return typeof e == "string" ? e.replace(/{{\s*(_\.)?([^}]+)\s*}}/g, "${[$2]}") : Array.isArray(e) && e != null ? e.map(f) : typeof e == "object" && e != null ? Object.fromEntries(
+    Object.entries(e).map(([t, o]) => [t, f(o)])
+  ) : e;
+}
+const y = {};
+function h(e) {
+  return y[e] = (y[e] ?? -1) + 1, `GENERATE_ID::${e.toUpperCase()}_${y[e]}`;
+}
+export {
+  v as pluginHookImport
+};
--- a/src-tauri/plugins/importer-yaak/index.mjs
+++ b/src-tauri/plugins/importer-yaak/index.mjs
@@ -0,0 +1,17 @@
+function u(r) {
+  let e;
+  try {
+    e = JSON.parse(r);
+  } catch {
+    return;
+  }
+  if (!(!t(e) || !("yaakSchema" in e)))
+    return "requests" in e.resources && (e.resources.httpRequests = e.resources.requests, delete e.resources.requests), { resources: e.resources };
+}
+function t(r) {
+  return Object.prototype.toString.call(r) === "[object Object]";
+}
+export {
+  t as isJSObject,
+  u as pluginHookImport
+};
--- a/src-tauri/src/analytics.rs
+++ b/src-tauri/src/analytics.rs
@@ -1,6 +1,6 @@
 use std::fmt::Display;

-use log::{debug, info};
+use log::warn;
 use serde::{Deserialize, Serialize};
 use serde_json::json;
 use sqlx::types::JsonValue;
@@ -19,7 +19,6 @@ const NUM_LAUNCHES_KEY: &str = "num_launches";
 #[serde(rename_all = "snake_case")]
 pub enum AnalyticsResource {
    App,
-    Appearance,
    CookieJar,
    Dialog,
    Environment,
@@ -30,10 +29,9 @@ pub enum AnalyticsResource {
    HttpRequest,
    HttpResponse,
    KeyValue,
-    Setting,
    Sidebar,
-    Theme,
    Workspace,
+    Setting,
 }

 impl AnalyticsResource {
@@ -189,12 +187,15 @@ pub async fn track_event(

    // Disable analytics actual sending in dev
    if is_dev() {
-        debug!("track: {}", event);
+        // debug!("track: {} {} {:?}", event, attributes_json, params);
        return;
    }

    if let Err(e) = req.send().await {
-        info!("Error sending analytics event: {}", e);
+        warn!(
+            "Error sending analytics event: {} {} {} {:?}",
+            e, event, attributes_json, params,
+        );
    }
 }

@@ -246,4 +247,4 @@ async fn get_id(app_handle: &AppHandle) -> String {

 pub async fn get_num_launches(app: &AppHandle) -> i32 {
    get_key_value_int(app, NAMESPACE, NUM_LAUNCHES_KEY, 0).await
-}
+}
--- a/src-tauri/src/deno.rs
+++ b/src-tauri/src/deno.rs
@@ -1,237 +0,0 @@
-// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
-//! This example shows how to use swc to transpile TypeScript and JSX/TSX
-//! modules.
-//!
-//! It will only transpile, not typecheck (like Deno's `--no-check` flag).
-
-use std::cell::RefCell;
-use std::collections::HashMap;
-use std::rc::Rc;
-use std::sync::Arc;
-
-use crate::deno_ops::op_yaml_parse;
-use anyhow::anyhow;
-use anyhow::bail;
-use anyhow::Context;
-use anyhow::Error;
-use deno_ast::ParseParams;
-use deno_ast::{EmitOptions, MediaType, SourceMapOption, TranspileOptions};
-use deno_core::error::{AnyError, JsError};
-use deno_core::resolve_path;
-use deno_core::JsRuntime;
-use deno_core::ModuleLoadResponse;
-use deno_core::ModuleLoader;
-use deno_core::ModuleSource;
-use deno_core::ModuleSourceCode;
-use deno_core::ModuleSpecifier;
-use deno_core::ModuleType;
-use deno_core::RequestedModuleType;
-use deno_core::ResolutionKind;
-use deno_core::RuntimeOptions;
-use deno_core::SourceMapGetter;
-use deno_core::{resolve_import, v8};
-use tokio::task::block_in_place;
-
-#[derive(Clone)]
-struct SourceMapStore(Rc<RefCell<HashMap<String, Vec<u8>>>>);
-
-impl SourceMapGetter for SourceMapStore {
-    fn get_source_map(&self, specifier: &str) -> Option<Vec<u8>> {
-        self.0.borrow().get(specifier).cloned()
-    }
-
-    fn get_source_line(&self, _file_name: &str, _line_number: usize) -> Option<String> {
-        None
-    }
-}
-
-struct TypescriptModuleLoader {
-    source_maps: SourceMapStore,
-}
-
-impl ModuleLoader for TypescriptModuleLoader {
-    fn resolve(
-        &self,
-        specifier: &str,
-        referrer: &str,
-        _kind: ResolutionKind,
-    ) -> Result<ModuleSpecifier, Error> {
-        Ok(resolve_import(specifier, referrer)?)
-    }
-
-    fn load(
-        &self,
-        module_specifier: &ModuleSpecifier,
-        _maybe_referrer: Option<&ModuleSpecifier>,
-        _is_dyn_import: bool,
-        _requested_module_type: RequestedModuleType,
-    ) -> ModuleLoadResponse {
-        let source_maps = self.source_maps.clone();
-        fn load(
-            source_maps: SourceMapStore,
-            module_specifier: &ModuleSpecifier,
-        ) -> Result<ModuleSource, AnyError> {
-            let path = module_specifier
-                .to_file_path()
-                .map_err(|_| anyhow!("Only file:// URLs are supported."))?;
-
-            let media_type = MediaType::from_path(&path);
-            let (module_type, should_transpile) = match MediaType::from_path(&path) {
-                MediaType::JavaScript | MediaType::Mjs | MediaType::Cjs => {
-                    (ModuleType::JavaScript, false)
-                }
-                MediaType::Jsx => (ModuleType::JavaScript, true),
-                MediaType::TypeScript
-                | MediaType::Mts
-                | MediaType::Cts
-                | MediaType::Dts
-                | MediaType::Dmts
-                | MediaType::Dcts
-                | MediaType::Tsx => (ModuleType::JavaScript, true),
-                MediaType::Json => (ModuleType::Json, false),
-                _ => bail!("Unknown extension {:?}", path.extension()),
-            };
-
-            let code = std::fs::read_to_string(&path)?;
-            let code = if should_transpile {
-                let parsed = deno_ast::parse_module(ParseParams {
-                    specifier: module_specifier.clone(),
-                    text: Arc::from(code),
-                    media_type,
-                    capture_tokens: false,
-                    scope_analysis: false,
-                    maybe_syntax: None,
-                })?;
-                let res = parsed.transpile(
-                    &TranspileOptions::default(),
-                    &EmitOptions {
-                        source_map: SourceMapOption::Separate,
-                        inline_sources: true,
-                        ..Default::default()
-                    },
-                )?;
-                let src = res.into_source();
-                let source_map = src.source_map.unwrap();
-                let source = src.source;
-                source_maps
-                    .0
-                    .borrow_mut()
-                    .insert(module_specifier.to_string(), source_map);
-                String::from_utf8(source).unwrap()
-            } else {
-                code
-            };
-
-            Ok(ModuleSource::new(
-                module_type,
-                ModuleSourceCode::String(code.into()),
-                module_specifier,
-                None,
-            ))
-        }
-
-        ModuleLoadResponse::Sync(load(source_maps, module_specifier))
-    }
-}
-
-pub fn run_plugin_deno_block(
-    plugin_index_file: &str,
-    fn_name: &str,
-    fn_args: Vec<serde_json::Value>,
-) -> Result<serde_json::Value, Error> {
-    block_in_place(|| {
-        tauri::async_runtime::block_on(run_plugin_deno_2(plugin_index_file, fn_name, fn_args))
-    })
-}
-
-deno_core::extension!(
-    yaak_runtime,
-    ops = [ op_yaml_parse ],
-    esm_entry_point = "ext:yaak_runtime/yaml.js",
-    esm = [dir "src/plugin-runtime", "yaml.js"]
-);
-
-async fn run_plugin_deno_2(
-    plugin_index_file: &str,
-    fn_name: &str,
-    fn_args: Vec<serde_json::Value>,
-) -> Result<serde_json::Value, Error> {
-    let source_map_store = SourceMapStore(Rc::new(RefCell::new(HashMap::new())));
-
-    let mut ext_console = deno_console::deno_console::init_ops_and_esm();
-    ext_console.esm_entry_point = Some("ext:deno_console/01_console.js");
-
-    let ext_yaak = yaak_runtime::init_ops_and_esm();
-
-    let mut js_runtime = JsRuntime::new(RuntimeOptions {
-        module_loader: Some(Rc::new(TypescriptModuleLoader {
-            source_maps: source_map_store.clone(),
-        })),
-        source_map_getter: Some(Rc::new(source_map_store)),
-        extensions: vec![ext_console, ext_yaak],
-        ..Default::default()
-    });
-
-    let main_module = resolve_path(
-        plugin_index_file,
-        &std::env::current_dir().context("Unable to get CWD")?,
-    )?;
-
-    // Load the main module so we can do stuff with it
-    let mod_id = js_runtime.load_main_es_module(&main_module).await?;
-    let result = js_runtime.mod_evaluate(mod_id);
-    js_runtime.run_event_loop(Default::default()).await?;
-    result.await?;
-
-    let module_namespace = js_runtime.get_module_namespace(mod_id).unwrap();
-    let scope = &mut js_runtime.handle_scope();
-    let module_namespace = v8::Local::<v8::Object>::new(scope, module_namespace);
-
-    // Get the exported function we're calling
-    let func_key = v8::String::new(scope, fn_name).unwrap();
-    let func = module_namespace.get(scope, func_key.into()).unwrap();
-    let func = v8::Local::<v8::Function>::try_from(func).unwrap();
-    let tc_scope = &mut v8::TryCatch::new(scope);
-
-    // Create Yaak context object
-    let null = v8::null(tc_scope).into();
-    let name = v8::String::new(tc_scope, "foo").unwrap().into();
-    let value = v8::String::new(tc_scope, "bar").unwrap().into();
-    let yaak_ctx: v8::Local<v8::Value> =
-        v8::Object::with_prototype_and_properties(tc_scope, null, &[name], &[value]).into();
-
-    // Create the function arguments
-    let passed_args = &mut fn_args
-        .iter()
-        .map(|a| {
-            let v: v8::Local<v8::Value> = deno_core::serde_v8::to_v8(tc_scope, a).unwrap();
-            v
-        })
-        .collect::<Vec<v8::Local<v8::Value>>>();
-
-    let all_args = &mut vec![yaak_ctx];
-    all_args.append(passed_args);
-
-    // Call the function
-    let func_res = func.call(tc_scope, module_namespace.into(), all_args);
-
-    // Catch and return any thrown errors
-    if tc_scope.has_caught() {
-        let e = tc_scope.exception().unwrap();
-        let js_error = JsError::from_v8_exception(tc_scope, e);
-        return Err(Error::msg(js_error.stack.unwrap_or_default()));
-    }
-
-    // Handle the result
-    match func_res {
-        None => Ok(serde_json::Value::Null),
-        Some(res) => {
-            if res.is_null() || res.is_undefined() {
-                Ok(serde_json::Value::Null)
-            } else {
-                let value: serde_json::Value = deno_core::serde_v8::from_v8(tc_scope, res).unwrap();
-                Ok(value)
-            }
-        }
-    }
-}
--- a/src-tauri/src/deno_ops.rs
+++ b/src-tauri/src/deno_ops.rs
@@ -1,16 +0,0 @@
-use deno_core::error::AnyError;
-use deno_core::op2;
-
-#[op2]
-#[serde]
-pub fn op_yaml_parse(#[string] text: String) -> Result<serde_json::Value, AnyError> {
-    let value = serde_yaml::from_str(&text)?;
-    Ok(value)
-}
-
-#[op2]
-#[string]
-pub fn op_yaml_stringify(#[serde] value: serde_json::Value) -> Result<String, AnyError> {
-    let value = serde_yaml::to_string(&value)?;
-    Ok(value)
-}
--- a/src-tauri/src/http_request.rs
+++ b/src-tauri/src/http_request.rs
@@ -7,12 +7,11 @@ use std::sync::Arc;
 use std::time::Duration;

 use base64::Engine;
+use http::{HeaderMap, HeaderName, HeaderValue, Method};
 use http::header::{ACCEPT, USER_AGENT};
-use http::{HeaderMap, HeaderName, HeaderValue};
 use log::{error, info, warn};
-use reqwest::redirect::Policy;
-use reqwest::Method;
 use reqwest::{multipart, Url};
+use reqwest::redirect::Policy;
 use sqlx::types::{Json, JsonValue};
 use tauri::{Manager, WebviewWindow};
 use tokio::sync::oneshot;
@@ -46,7 +45,6 @@ pub async fn send_http_request(
            true => Policy::limited(10), // TODO: Handle redirects natively
            false => Policy::none(),
        })
-        .connection_verbose(true)
        .gzip(true)
        .brotli(true)
        .deflate(true)
@@ -91,24 +89,14 @@ pub async fn send_http_request(
    let uri = match http::Uri::from_str(url_string.as_str()) {
        Ok(u) => u,
        Err(e) => {
-            return response_err(
-                response,
-                format!("Failed to parse URL \"{}\": {}", url_string, e.to_string()),
-                window,
-            )
-            .await;
+            return response_err(response, e.to_string(), window).await;
        }
    };
    // Yes, we're parsing both URI and URL because they could return different errors
    let url = match Url::from_str(uri.to_string().as_str()) {
        Ok(u) => u,
        Err(e) => {
-            return response_err(
-                response,
-                format!("Failed to parse URL \"{}\": {}", url_string, e.to_string()),
-                window,
-            )
-            .await;
+            return response_err(response, e.to_string(), window).await;
        }
    };

@@ -302,7 +290,7 @@ pub async fn send_http_request(
                        .unwrap_or_default();

                    let name = render::render(name_raw, &workspace, environment_ref);
-                    let mut part = if file_path.is_empty() {
+                    let part = if file_path.is_empty() {
                        multipart::Part::text(render::render(
                            value_raw,
                            &workspace,
@@ -323,24 +311,23 @@ pub async fn send_http_request(
                        .as_str()
                        .unwrap_or_default();

-                    if !ct_raw.is_empty() {
-                        let content_type = render::render(ct_raw, &workspace, environment_ref);
-                        part = part
-                            .mime_str(content_type.as_str())
-                            .map_err(|e| e.to_string())?;
-                    }
-
-                    if !file_path.is_empty() {
-                        let filename = PathBuf::from(file_path)
-                            .file_name()
-                            .unwrap_or_default()
-                            .to_str()
-                            .unwrap_or_default()
-                            .to_string();
-                        part = part.file_name(filename);
-                    }
-
-                    multipart_form = multipart_form.part(name, part);
+                    multipart_form = multipart_form.part(
+                        name,
+                        if ct_raw.is_empty() {
+                            part
+                        } else {
+                            let content_type = render::render(ct_raw, &workspace, environment_ref);
+                            let filename = PathBuf::from(file_path)
+                                .file_name()
+                                .unwrap_or_default()
+                                .to_str()
+                                .unwrap_or_default()
+                                .to_string();
+                            part.file_name(filename)
+                                .mime_str(content_type.as_str())
+                                .map_err(|e| e.to_string())?
+                        },
+                    );
                }
            }
            headers.remove("Content-Type"); // reqwest will add this automatically
@@ -394,11 +381,11 @@ pub async fn send_http_request(
            response.url = v.url().to_string();
            response.remote_addr = v.remote_addr().map(|a| a.to_string());
            response.version = match v.version() {
-                reqwest::Version::HTTP_09 => Some("HTTP/0.9".to_string()),
-                reqwest::Version::HTTP_10 => Some("HTTP/1.0".to_string()),
-                reqwest::Version::HTTP_11 => Some("HTTP/1.1".to_string()),
-                reqwest::Version::HTTP_2 => Some("HTTP/2".to_string()),
-                reqwest::Version::HTTP_3 => Some("HTTP/3".to_string()),
+                http::Version::HTTP_09 => Some("HTTP/0.9".to_string()),
+                http::Version::HTTP_10 => Some("HTTP/1.0".to_string()),
+                http::Version::HTTP_11 => Some("HTTP/1.1".to_string()),
+                http::Version::HTTP_2 => Some("HTTP/2".to_string()),
+                http::Version::HTTP_3 => Some("HTTP/3".to_string()),
                _ => None,
            };

--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -6,75 +6,72 @@ extern crate objc;
 use std::collections::HashMap;
 use std::env::current_dir;
 use std::fs;
-use std::fs::{create_dir_all, read_to_string, File};
+use std::fs::{create_dir_all, File, read_to_string};
 use std::path::PathBuf;
 use std::process::exit;
 use std::str::FromStr;
 use std::time::Duration;

+use ::http::Uri;
+use ::http::uri::InvalidUri;
 use base64::Engine;
 use fern::colors::ColoredLevelConfig;
 use log::{debug, error, info, warn};
 use rand::random;
 use serde_json::{json, Value};
+use sqlx::{Pool, Sqlite, SqlitePool};
 use sqlx::migrate::Migrator;
 use sqlx::sqlite::SqliteConnectOptions;
 use sqlx::types::Json;
-use sqlx::{Pool, Sqlite, SqlitePool};
+use tauri::{AppHandle, RunEvent, State, WebviewUrl, WebviewWindow};
+use tauri::{Manager, WindowEvent};
 use tauri::path::BaseDirectory;
 #[cfg(target_os = "macos")]
 use tauri::TitleBarStyle;
-use tauri::{AppHandle, LogicalSize, RunEvent, State, WebviewUrl, WebviewWindow};
-use tauri::{Manager, WindowEvent};
 use tauri_plugin_log::{fern, Target, TargetKind};
 use tauri_plugin_shell::ShellExt;
 use tokio::sync::Mutex;

+use ::grpc::{Code, deserialize_message, serialize_message, ServiceDefinition};
 use ::grpc::manager::{DynamicMessage, GrpcHandle};
-use ::grpc::{deserialize_message, serialize_message, Code, ServiceDefinition};
+use window_ext::TrafficLightWindowExt;

 use crate::analytics::{AnalyticsAction, AnalyticsResource};
 use crate::grpc::metadata_to_map;
-use crate::http_request::send_http_request;
+use crate::http::send_http_request;
 use crate::models::{
-    cancel_pending_grpc_connections, cancel_pending_responses, create_http_response,
-    delete_all_grpc_connections, delete_all_http_responses, delete_cookie_jar, delete_environment,
-    delete_folder, delete_grpc_connection, delete_grpc_request, delete_http_request,
-    delete_http_response, delete_workspace, duplicate_grpc_request, duplicate_http_request,
-    generate_model_id, get_cookie_jar, get_environment, get_folder, get_grpc_connection,
+    cancel_pending_grpc_connections, cancel_pending_responses, CookieJar,
+    create_http_response, delete_all_grpc_connections, delete_all_http_responses, delete_cookie_jar,
+    delete_environment, delete_folder, delete_grpc_connection, delete_grpc_request,
+    delete_http_request, delete_http_response, delete_workspace, duplicate_grpc_request,
+    duplicate_http_request, Environment, EnvironmentVariable, Folder, generate_model_id,
+    get_cookie_jar, get_environment, get_folder, get_grpc_connection,
    get_grpc_request, get_http_request, get_http_response, get_key_value_raw,
-    get_or_create_settings, get_workspace, get_workspace_export_resources, list_cookie_jars,
-    list_environments, list_folders, list_grpc_connections, list_grpc_events, list_grpc_requests,
-    list_http_requests, list_responses, list_workspaces, set_key_value_raw, update_response_if_id,
-    update_settings, upsert_cookie_jar, upsert_environment, upsert_folder, upsert_grpc_connection,
-    upsert_grpc_event, upsert_grpc_request, upsert_http_request, upsert_workspace, CookieJar,
-    Environment, EnvironmentVariable, Folder, GrpcConnection, GrpcEvent, GrpcEventType,
-    GrpcRequest, HttpRequest, HttpResponse, KeyValue, ModelType, Settings, Workspace,
-    WorkspaceExportResources,
+    get_or_create_settings, get_workspace, get_workspace_export_resources, GrpcConnection, GrpcEvent,
+    GrpcEventType, GrpcRequest, HttpRequest, HttpResponse,
+    KeyValue, list_cookie_jars, list_environments, list_folders, list_grpc_connections,
+    list_grpc_events, list_grpc_requests, list_http_requests, list_responses, list_workspaces,
+    ModelType, set_key_value_raw, Settings, update_response_if_id, update_settings, upsert_cookie_jar,
+    upsert_environment, upsert_folder, upsert_grpc_connection, upsert_grpc_event, upsert_grpc_request, upsert_http_request, upsert_workspace,
+    Workspace, WorkspaceExportResources,
 };
 use crate::notifications::YaakNotifier;
-use crate::plugin::{run_plugin_export_curl, run_plugin_import, ImportResult};
+use crate::plugin::{ImportResult, run_plugin_export_curl, run_plugin_import};
 use crate::render::render_request;
 use crate::updates::{UpdateMode, YaakUpdater};
 use crate::window_menu::app_menu;

 mod analytics;
-mod deno;
-mod deno_ops;
 mod grpc;
-mod http_request;
+mod http;
 mod models;
 mod notifications;
 mod plugin;
 mod render;
-#[cfg(target_os = "macos")]
-mod tauri_plugin_mac_window;
 mod updates;
+mod window_ext;
 mod window_menu;

-const DEFAULT_WINDOW_WIDTH: f64 = 1100.0;
-const DEFAULT_WINDOW_HEIGHT: f64 = 600.0;
-
 async fn migrate_db(app_handle: &AppHandle, db: &Mutex<Pool<Sqlite>>) -> Result<(), String> {
    let pool = &*db.lock().await;
    let p = app_handle
@@ -118,6 +115,7 @@ async fn cmd_dismiss_notification(
    notification_id: &str,
    yaak_notifier: State<'_, Mutex<YaakNotifier>>,
 ) -> Result<(), String> {
+    info!("SEEN? {notification_id}");
    yaak_notifier.lock().await.seen(&app, notification_id).await
 }

@@ -131,14 +129,14 @@ async fn cmd_grpc_reflect(
    let req = get_grpc_request(&window, request_id)
        .await
        .map_err(|e| e.to_string())?;
-    let uri = safe_uri(req.url.as_str());
+    let uri = safe_uri(&req.url).map_err(|e| e.to_string())?;
    if proto_files.len() > 0 {
        grpc_handle
            .lock()
            .await
            .services_from_files(
                &req.id,
-                uri.as_str(),
+                &uri,
                proto_files
                    .iter()
                    .map(|p| PathBuf::from_str(p).unwrap())
@@ -149,7 +147,7 @@ async fn cmd_grpc_reflect(
        grpc_handle
            .lock()
            .await
-            .services_from_reflection(&req.id, uri.as_str())
+            .services_from_reflection(&req.id, &uri)
            .await
    }
 }
@@ -248,7 +246,7 @@ async fn cmd_grpc_go(
    let maybe_in_msg_tx = std::sync::Mutex::new(Some(in_msg_tx.clone()));
    let (cancelled_tx, mut cancelled_rx) = tokio::sync::watch::channel(false);

-    let uri = safe_uri(&req.url);
+    let uri = safe_uri(&req.url).map_err(|e| e.to_string())?;

    let in_msg_stream = tokio_stream::wrappers::ReceiverStream::new(in_msg_rx);

@@ -266,7 +264,7 @@ async fn cmd_grpc_go(
        .await
        .connect(
            &req.clone().id,
-            uri.as_str(),
+            uri,
            proto_files
                .iter()
                .map(|p| PathBuf::from_str(p).unwrap())
@@ -735,7 +733,7 @@ async fn cmd_filter_response(
    };

    let body = read_to_string(response.body_path.unwrap()).unwrap();
-    let filter_result = plugin::run_plugin_filter(plugin_name, filter, &body)
+    let filter_result = plugin::run_plugin_filter(&w.app_handle(), plugin_name, filter, &body)
        .await
        .expect("Failed to run filter");
    Ok(filter_result.filtered)
@@ -749,16 +747,16 @@ async fn cmd_import_data(
 ) -> Result<WorkspaceExportResources, String> {
    let mut result: Option<ImportResult> = None;
    let plugins = vec![
-        "importer-postman",
-        "importer-insomnia",
        "importer-yaak",
+        "importer-insomnia",
+        "importer-postman",
        "importer-curl",
    ];
-    let file =
-        read_to_string(file_path).unwrap_or_else(|_| panic!("Unable to read file {}", file_path));
+    let file = fs::read_to_string(file_path)
+        .unwrap_or_else(|_| panic!("Unable to read file {}", file_path));
    let file_contents = file.as_str();
    for plugin_name in plugins {
-        let v = run_plugin_import(plugin_name, file_contents)
+        let v = plugin::run_plugin_import(&w.app_handle(), plugin_name, file_contents)
            .await
            .map_err(|e| e.to_string())?;
        if let Some(r) = v {
@@ -807,15 +805,13 @@ async fn cmd_import_data(
                }
            };

+            info!("Importing resources");
            for mut v in r.resources.workspaces {
                v.id = maybe_gen_id(v.id.as_str(), ModelType::TypeWorkspace, &mut id_map);
                let x = upsert_workspace(&w, v).await.map_err(|e| e.to_string())?;
                imported_resources.workspaces.push(x.clone());
+                info!("Imported workspace: {}", x.name);
            }
-            info!(
-                "Imported {} workspaces",
-                imported_resources.workspaces.len()
-            );

            for mut v in r.resources.environments {
                v.id = maybe_gen_id(v.id.as_str(), ModelType::TypeEnvironment, &mut id_map);
@@ -826,11 +822,8 @@ async fn cmd_import_data(
                );
                let x = upsert_environment(&w, v).await.map_err(|e| e.to_string())?;
                imported_resources.environments.push(x.clone());
+                info!("Imported environment: {}", x.name);
            }
-            info!(
-                "Imported {} environments",
-                imported_resources.environments.len()
-            );

            for mut v in r.resources.folders {
                v.id = maybe_gen_id(v.id.as_str(), ModelType::TypeFolder, &mut id_map);
@@ -842,8 +835,8 @@ async fn cmd_import_data(
                v.folder_id = maybe_gen_id_opt(v.folder_id, ModelType::TypeFolder, &mut id_map);
                let x = upsert_folder(&w, v).await.map_err(|e| e.to_string())?;
                imported_resources.folders.push(x.clone());
+                info!("Imported folder: {}", x.name);
            }
-            info!("Imported {} folders", imported_resources.folders.len());

            for mut v in r.resources.http_requests {
                v.id = maybe_gen_id(v.id.as_str(), ModelType::TypeHttpRequest, &mut id_map);
@@ -857,11 +850,8 @@ async fn cmd_import_data(
                    .await
                    .map_err(|e| e.to_string())?;
                imported_resources.http_requests.push(x.clone());
+                info!("Imported request: {}", x.name);
            }
-            info!(
-                "Imported {} http_requests",
-                imported_resources.http_requests.len()
-            );

            for mut v in r.resources.grpc_requests {
                v.id = maybe_gen_id(v.id.as_str(), ModelType::TypeGrpcRequest, &mut id_map);
@@ -875,11 +865,8 @@ async fn cmd_import_data(
                    .await
                    .map_err(|e| e.to_string())?;
                imported_resources.grpc_requests.push(x.clone());
+                info!("Imported request: {}", x.name);
            }
-            info!(
-                "Imported {} grpc_requests",
-                imported_resources.grpc_requests.len()
-            );

            Ok(imported_resources)
        }
@@ -903,12 +890,16 @@ async fn cmd_request_to_curl(
        .await
        .map_err(|e| e.to_string())?;
    let rendered = render_request(&request, &workspace, environment.as_ref());
-    Ok(run_plugin_export_curl(&rendered)?)
+    Ok(run_plugin_export_curl(&app, &rendered)?)
 }

 #[tauri::command]
-async fn cmd_curl_to_request(command: &str, workspace_id: &str) -> Result<HttpRequest, String> {
-    let v = run_plugin_import("importer-curl", command)
+async fn cmd_curl_to_request(
+    app: AppHandle,
+    command: &str,
+    workspace_id: &str,
+) -> Result<HttpRequest, String> {
+    let v = run_plugin_import(&app, "importer-curl", command)
        .await
        .map_err(|e| e.to_string());
    match v {
@@ -958,28 +949,6 @@ async fn cmd_export_data(
    Ok(())
 }

-#[tauri::command]
-async fn cmd_save_response(
-    window: WebviewWindow,
-    response_id: &str,
-    filepath: &str,
-) -> Result<(), String> {
-    let response = get_http_response(&window, response_id)
-        .await
-        .map_err(|e| e.to_string())?;
-
-    let body_path = match response.body_path {
-        None => {
-            return Err("Response does not have a body".to_string());
-        }
-        Some(p) => p,
-    };
-
-    fs::copy(body_path, filepath).map_err(|e| e.to_string())?;
-
-    Ok(())
-}
-
 #[tauri::command]
 async fn cmd_send_http_request(
    window: WebviewWindow,
@@ -1060,7 +1029,6 @@ async fn response_err(
    error: String,
    w: &WebviewWindow,
 ) -> Result<HttpResponse, String> {
-    warn!("Failed to send request: {}", error);
    let mut response = response.clone();
    response.elapsed = -1;
    response.error = Some(error.clone());
@@ -1322,15 +1290,6 @@ async fn cmd_update_folder(folder: Folder, w: WebviewWindow) -> Result<Folder, S
    upsert_folder(&w, folder).await.map_err(|e| e.to_string())
 }

-#[tauri::command]
-async fn cmd_write_file_dev(pathname: &str, contents: &str) -> Result<(), String> {
-    if !is_dev() {
-        panic!("Cannot write arbitrary files when not in dev mode");
-    }
-
-    fs::write(pathname, contents).map_err(|e| e.to_string())
-}
-
 #[tauri::command]
 async fn cmd_delete_folder(w: WebviewWindow, folder_id: &str) -> Result<Folder, String> {
    delete_folder(&w, folder_id)
@@ -1520,8 +1479,6 @@ async fn cmd_list_workspaces(w: WebviewWindow) -> Result<Vec<Workspace>, String>
            &w,
            Workspace {
                name: "Yaak".to_string(),
-                setting_follow_redirects: true,
-                setting_validate_certificates: true,
                ..Default::default()
            },
        )
@@ -1534,19 +1491,8 @@ async fn cmd_list_workspaces(w: WebviewWindow) -> Result<Vec<Workspace>, String>
 }

 #[tauri::command]
-async fn cmd_new_window(app_handle: AppHandle, url: &str) -> Result<(), String> {
-    create_window(&app_handle, url);
-    Ok(())
-}
-
-#[tauri::command]
-async fn cmd_new_nested_window(
-    window: WebviewWindow,
-    url: &str,
-    label: &str,
-    title: &str,
-) -> Result<(), String> {
-    create_nested_window(&window, label, url, title);
+async fn cmd_new_window(window: WebviewWindow, url: &str) -> Result<(), String> {
+    create_window(&window.app_handle(), Some(url));
    Ok(())
 }

@@ -1573,26 +1519,14 @@ async fn cmd_check_for_updates(

 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
-    let mut builder = tauri::Builder::default()
+    tauri::Builder::default()
        .plugin(tauri_plugin_clipboard_manager::init())
        .plugin(tauri_plugin_window_state::Builder::default().build())
        .plugin(tauri_plugin_shell::init())
        .plugin(tauri_plugin_updater::Builder::new().build())
        .plugin(tauri_plugin_dialog::init())
        .plugin(tauri_plugin_os::init())
-        .plugin(tauri_plugin_fs::init());
-
-    #[cfg(target_os = "macos")]
-    {
-        builder = builder.plugin(tauri_plugin_mac_window::init());
-    }
-
-    #[cfg(target_os = "linux")]
-    {
-        builder = builder; // Don't complain about not being mut
-    }
-
-    builder
+        .plugin(tauri_plugin_fs::init())
        .plugin(
            tauri_plugin_log::Builder::default()
                .targets([
@@ -1610,9 +1544,7 @@ pub fn run() {
                .level_for("tokio_util", log::LevelFilter::Info)
                .level_for("tonic", log::LevelFilter::Info)
                .level_for("tower", log::LevelFilter::Info)
-                .level_for("tracing", log::LevelFilter::Warn)
-                .level_for("swc_ecma_codegen", log::LevelFilter::Off)
-                .level_for("swc_ecma_transforms_base", log::LevelFilter::Off)
+                .level_for("tracing", log::LevelFilter::Info)
                .with_colors(ColoredLevelConfig::default())
                .level(if is_dev() {
                    log::LevelFilter::Trace
@@ -1720,11 +1652,9 @@ pub fn run() {
            cmd_list_http_responses,
            cmd_list_workspaces,
            cmd_metadata,
-            cmd_new_nested_window,
            cmd_new_window,
            cmd_request_to_curl,
            cmd_dismiss_notification,
-            cmd_save_response,
            cmd_send_ephemeral_request,
            cmd_send_http_request,
            cmd_set_key_value,
@@ -1737,20 +1667,13 @@ pub fn run() {
            cmd_update_http_request,
            cmd_update_settings,
            cmd_update_workspace,
-            cmd_write_file_dev,
        ])
-        .register_uri_scheme_protocol("yaak", |_app, _req| {
-            debug!("Testing yaak protocol");
-            tauri::http::Response::builder()
-                .body("Success".as_bytes().to_vec())
-                .unwrap()
-        })
        .build(tauri::generate_context!())
        .expect("error while running tauri application")
        .run(|app_handle, event| {
            match event {
                RunEvent::Ready => {
-                    create_window(app_handle, "/");
+                    create_window(app_handle, None);
                    let h = app_handle.clone();
                    tauri::async_runtime::spawn(async move {
                        let info = analytics::track_launch_event(&h).await;
@@ -1796,47 +1719,7 @@ fn is_dev() -> bool {
    }
 }

-fn create_nested_window(
-    window: &WebviewWindow,
-    label: &str,
-    url: &str,
-    title: &str,
-) -> WebviewWindow {
-    info!("Create new nested window label={label}");
-    let mut win_builder = tauri::WebviewWindowBuilder::new(
-        window,
-        format!("nested_{}_{}", window.label(), label),
-        WebviewUrl::App(url.into()),
-    )
-    .resizable(true)
-    .fullscreen(false)
-    .disable_drag_drop_handler() // Required for frontend Dnd on windows
-    .title(title)
-    .parent(&window)
-    .unwrap()
-    .inner_size(DEFAULT_WINDOW_WIDTH * 0.7, DEFAULT_WINDOW_HEIGHT * 0.9);
-
-    // Add macOS-only things
-    #[cfg(target_os = "macos")]
-    {
-        win_builder = win_builder
-            .hidden_title(true)
-            .title_bar_style(TitleBarStyle::Overlay);
-    }
-
-    // Add non-MacOS things
-    #[cfg(not(target_os = "macos"))]
-    {
-        win_builder = win_builder.decorations(false);
-    }
-
-    let win = win_builder.build().expect("failed to build window");
-
-    win
-}
-
-fn create_window(handle: &AppHandle, url: &str) -> WebviewWindow {
-    #[allow(unused_variables)]
+fn create_window(handle: &AppHandle, url: Option<&str>) -> WebviewWindow {
    let menu = app_menu(handle).unwrap();

    // This causes the window to not be clickable (in AppImage), so disable on Linux
@@ -1844,25 +1727,28 @@ fn create_window(handle: &AppHandle, url: &str) -> WebviewWindow {
    handle.set_menu(menu).expect("Failed to set app menu");

    let window_num = handle.webview_windows().len();
-    let label = format!("main_{}", window_num);
-    info!("Create new window label={label}");
-    let mut win_builder =
-        tauri::WebviewWindowBuilder::new(handle, label, WebviewUrl::App(url.into()))
-            .resizable(true)
-            .fullscreen(false)
-            .disable_drag_drop_handler() // Required for frontend Dnd on windows
-            .inner_size(DEFAULT_WINDOW_WIDTH, DEFAULT_WINDOW_HEIGHT)
-            .position(
-                // Randomly offset so windows don't stack exactly
-                100.0 + random::<f64>() * 30.0,
-                100.0 + random::<f64>() * 30.0,
-            )
-            .title(handle.package_info().name.to_string());
+    let window_id = format!("wnd_{}", window_num);
+    let mut win_builder = tauri::WebviewWindowBuilder::new(
+        handle,
+        window_id,
+        WebviewUrl::App(url.unwrap_or_default().into()),
+    )
+    .resizable(true)
+    .fullscreen(false)
+    .disable_drag_drop_handler() // Required for frontend Dnd on windows
+    .inner_size(1100.0, 600.0)
+    .position(
+        // Randomly offset so windows don't stack exactly
+        100.0 + random::<f64>() * 30.0,
+        100.0 + random::<f64>() * 30.0,
+    )
+    .title(handle.package_info().name.to_string());

    // Add macOS-only things
    #[cfg(target_os = "macos")]
    {
        win_builder = win_builder
+            // .menu(app_menu)
            .hidden_title(true)
            .title_bar_style(TitleBarStyle::Overlay);
    }
@@ -1870,13 +1756,17 @@ fn create_window(handle: &AppHandle, url: &str) -> WebviewWindow {
    // Add non-MacOS things
    #[cfg(not(target_os = "macos"))]
    {
-        // Doesn't seem to work from Rust, here, so we do it in main.tsx
+        // Doesn't seem to work from Rust, here, so we do it in JS
        win_builder = win_builder.decorations(false);
    }

    let win = win_builder.build().expect("failed to build window");

-    let webview_window = win.clone();
+    // Tauri doesn't support shadows when hiding decorations, so we add our own
+    // #[cfg(any(windows, target_os = "macos"))]
+    // set_shadow(&win, true).unwrap();
+
+    let win2 = win.clone();
    win.on_menu_event(move |w, event| {
        if !w.is_focused().unwrap() {
            return;
@@ -1885,39 +1775,48 @@ fn create_window(handle: &AppHandle, url: &str) -> WebviewWindow {
        match event.id().0.as_str() {
            "quit" => exit(0),
            "close" => w.close().unwrap(),
-            "zoom_reset" => w.emit("zoom_reset", true).unwrap(),
-            "zoom_in" => w.emit("zoom_in", true).unwrap(),
-            "zoom_out" => w.emit("zoom_out", true).unwrap(),
+            "zoom_reset" => w.emit("zoom", 0).unwrap(),
+            "zoom_in" => w.emit("zoom", 1).unwrap(),
+            "zoom_out" => w.emit("zoom", -1).unwrap(),
            "settings" => w.emit("settings", true).unwrap(),
+            "duplicate_request" => w.emit("duplicate_request", true).unwrap(),
+            "refresh" => win2.eval("location.reload()").unwrap(),
            "open_feedback" => {
-                _ = webview_window
+                _ = win2
                    .app_handle()
                    .shell()
                    .open("https://yaak.canny.io", None)
            }
-
-            // Commands for development
-            "dev.reset_size" => webview_window
-                .set_size(LogicalSize::new(
-                    DEFAULT_WINDOW_WIDTH,
-                    DEFAULT_WINDOW_HEIGHT,
-                ))
-                .unwrap(),
-            "dev.refresh" => webview_window.eval("location.reload()").unwrap(),
-            "dev.generate_theme_css" => {
-                w.emit("generate_theme_css", true).unwrap();
-            }
-            "dev.toggle_devtools" => {
-                if webview_window.is_devtools_open() {
-                    webview_window.close_devtools();
+            "toggle_devtools" => {
+                if win2.is_devtools_open() {
+                    win2.close_devtools();
                } else {
-                    webview_window.open_devtools();
+                    win2.open_devtools();
                }
            }
            _ => {}
        }
    });

+    let win3 = win.clone();
+    win.on_window_event(move |e| {
+        let apply_offset = || {
+            win3.position_traffic_lights();
+        };
+
+        match e {
+            WindowEvent::Resized(..) => apply_offset(),
+            WindowEvent::ThemeChanged(..) => apply_offset(),
+            WindowEvent::Focused(..) => apply_offset(),
+            WindowEvent::ScaleFactorChanged { .. } => apply_offset(),
+            WindowEvent::CloseRequested { .. } => {
+                // api.prevent_close();
+            }
+            _ => {}
+        }
+    });
+
+    win.position_traffic_lights();
    win
 }

@@ -1926,10 +1825,11 @@ async fn get_update_mode(h: &AppHandle) -> UpdateMode {
    UpdateMode::new(settings.update_channel.as_str())
 }

-fn safe_uri(endpoint: &str) -> String {
-    if endpoint.starts_with("http://") || endpoint.starts_with("https://") {
-        endpoint.into()
+fn safe_uri(endpoint: &str) -> Result<Uri, InvalidUri> {
+    let uri = if endpoint.starts_with("http://") || endpoint.starts_with("https://") {
+        Uri::from_str(endpoint)?
    } else {
-        format!("http://{}", endpoint)
-    }
+        Uri::from_str(&format!("http://{}", endpoint))?
+    };
+    Ok(uri)
 }
--- a/src-tauri/src/models.rs
+++ b/src-tauri/src/models.rs
@@ -52,14 +52,7 @@ pub struct Settings {
    pub updated_at: NaiveDateTime,
    pub theme: String,
    pub appearance: String,
-    pub theme_dark: String,
-    pub theme_light: String,
    pub update_channel: String,
-    pub interface_font_size: i64,
-    pub interface_scale: i64,
-    pub editor_font_size: i64,
-    pub editor_soft_wrap: bool,
-    pub open_workspace_new_window: Option<bool>,
 }

 #[derive(sqlx::FromRow, Debug, Clone, Serialize, Deserialize, Default)]
@@ -890,10 +883,7 @@ async fn get_settings(mgr: &impl Manager<Wry>) -> Result<Settings, sqlx::Error>
        Settings,
        r#"
            SELECT
-                id, model, created_at, updated_at, theme, appearance,
-                theme_dark, theme_light, update_channel,
-                interface_font_size, interface_scale, editor_font_size, editor_soft_wrap, 
-                open_workspace_new_window
+                id, model, created_at, updated_at, theme, appearance, update_channel
            FROM settings
            WHERE id = 'default'
        "#,
@@ -929,21 +919,12 @@ pub async fn update_settings(
    sqlx::query!(
        r#"
            UPDATE settings SET (
-                theme, appearance, theme_dark, theme_light, update_channel,
-                interface_font_size, interface_scale, editor_font_size, editor_soft_wrap,
-                open_workspace_new_window
-            ) = (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) WHERE id = 'default';
+                theme, appearance, update_channel
+            ) = (?, ?, ?) WHERE id = 'default';
        "#,
        settings.theme,
        settings.appearance,
-        settings.theme_dark,
-        settings.theme_light,
-        settings.update_channel,
-        settings.interface_font_size,
-        settings.interface_scale,
-        settings.editor_font_size,
-        settings.editor_soft_wrap,
-        settings.open_workspace_new_window,
+        settings.update_channel
    )
    .execute(&db)
    .await?;
--- a/src-tauri/src/notifications.rs
+++ b/src-tauri/src/notifications.rs
@@ -1,8 +1,8 @@
 use std::time::SystemTime;

 use chrono::{Duration, NaiveDateTime, Utc};
+use http::Method;
 use log::debug;
-use reqwest::Method;
 use serde::{Deserialize, Serialize};
 use tauri::{AppHandle, Manager};

--- a/src-tauri/src/plugin-runtime/yaml.js
+++ b/src-tauri/src/plugin-runtime/yaml.js
@@ -1,7 +0,0 @@
-((globalThis) => {
-  const core = Deno.core;
-  globalThis.YAML = {
-    parse: core.ops.op_yaml_parse,
-    stringify: core.ops.op_yaml_stringify,
-  };
-})(globalThis);
--- a/src-tauri/src/plugin.rs
+++ b/src-tauri/src/plugin.rs
@@ -1,9 +1,17 @@
-use std::path;
+use std::rc::Rc;

-use log::error;
+use boa_engine::{
+    Context, js_string, JsNativeError, JsValue, Module, module::SimpleModuleLoader,
+    property::Attribute, Source,
+};
+use boa_engine::builtins::promise::PromiseState;
+use boa_runtime::Console;
+use log::{debug, error};
 use serde::{Deserialize, Serialize};
+use serde_json::json;
+use tauri::{AppHandle, Manager};
+use tauri::path::BaseDirectory;

-use crate::deno::run_plugin_deno_block;
 use crate::models::{HttpRequest, WorkspaceExportResources};

 #[derive(Default, Debug, Deserialize, Serialize)]
@@ -17,68 +25,140 @@ pub struct ImportResult {
 }

 pub async fn run_plugin_filter(
+    app_handle: &AppHandle,
    plugin_name: &str,
    response_body: &str,
    filter: &str,
 ) -> Option<FilterResult> {
-    let plugin_dir = path::Path::new("/Users/gschier/Workspace/yaak/plugins");
-    let plugin_index_file = plugin_dir.join(plugin_name).join("build/index.mjs");
-
-    let result = run_plugin_deno_block(
-        plugin_index_file.to_str().unwrap(),
+    let result_json = run_plugin(
+        app_handle,
+        plugin_name,
        "pluginHookResponseFilter",
-        vec![
-            serde_json::to_value(response_body).unwrap(),
-            serde_json::to_value(filter).unwrap(),
-        ],
-    )
-    .map_err(|e| e.to_string())
-    .expect("Failed to run plugin");
+        &[js_string!(response_body).into(), js_string!(filter).into()],
+    );

-    if result.is_null() {
+    if result_json.is_null() {
        error!("Plugin {} failed to run", plugin_name);
        return None;
    }

    let resources: FilterResult =
-        serde_json::from_value(result).expect("failed to parse filter plugin result json");
+        serde_json::from_value(result_json).expect("failed to parse filter plugin result json");
    Some(resources)
 }

-pub fn run_plugin_export_curl(request: &HttpRequest) -> Result<String, String> {
-    let plugin_dir = path::Path::new("/Users/gschier/Workspace/yaak/plugins");
-    let plugin_index_file = plugin_dir.join("exporter-curl").join("build/index.mjs");
-
+pub fn run_plugin_export_curl(
+    app_handle: &AppHandle,
+    request: &HttpRequest,
+) -> Result<String, String> {
+    let mut context = Context::default();
    let request_json = serde_json::to_value(request).map_err(|e| e.to_string())?;
-    let result = run_plugin_deno_block(
-        plugin_index_file.to_str().unwrap(),
+    let result_json = run_plugin(
+        app_handle,
+        "exporter-curl",
        "pluginHookExport",
-        vec![request_json],
-    )
-    .map_err(|e| e.to_string())?;
+        &[JsValue::from_json(&request_json, &mut context).map_err(|e| e.to_string())?],
+    );

-    let export_str: String = serde_json::from_value(result).map_err(|e| e.to_string())?;
-    Ok(export_str)
+    let resources: String = serde_json::from_value(result_json).map_err(|e| e.to_string())?;
+    Ok(resources)
 }

 pub async fn run_plugin_import(
+    app_handle: &AppHandle,
    plugin_name: &str,
    file_contents: &str,
 ) -> Result<Option<ImportResult>, String> {
-    let plugin_dir = path::Path::new("/Users/gschier/Workspace/yaak/plugins");
-    let plugin_index_file = plugin_dir.join(plugin_name).join("build/index.mjs");
-
-    let result = run_plugin_deno_block(
-        plugin_index_file.to_str().unwrap(),
+    let result_json = run_plugin(
+        app_handle,
+        plugin_name,
        "pluginHookImport",
-        vec![serde_json::to_value(file_contents).map_err(|e| e.to_string())?],
-    )
-    .map_err(|e| e.to_string())?;
+        &[js_string!(file_contents).into()],
+    );

-    if result.is_null() {
+    if result_json.is_null() {
        return Ok(None);
    }

-    let resources: ImportResult = serde_json::from_value(result).map_err(|e| e.to_string())?;
+    let resources: ImportResult = serde_json::from_value(result_json).map_err(|e| e.to_string())?;
    Ok(Some(resources))
 }
+
+fn run_plugin(
+    app_handle: &AppHandle,
+    plugin_name: &str,
+    entrypoint: &str,
+    js_args: &[JsValue],
+) -> serde_json::Value {
+    let plugin_dir = app_handle
+        .path()
+        .resolve("plugins", BaseDirectory::Resource)
+        .expect("failed to resolve plugin directory resource")
+        .join(plugin_name);
+    let plugin_index_file = plugin_dir.join("index.mjs");
+
+    debug!(
+        "Running plugin dir={:?} file={:?}",
+        plugin_dir, plugin_index_file
+    );
+
+    let loader = Rc::new(SimpleModuleLoader::new(plugin_dir).unwrap());
+    let context = &mut Context::builder()
+        .module_loader(loader.clone())
+        .build()
+        .expect("failed to create context");
+
+    add_runtime(context);
+
+    let source = Source::from_filepath(&plugin_index_file).expect("Error opening file");
+
+    // Can also pass a `Some(realm)` if you need to execute the module in another realm.
+    let module = Module::parse(source, None, context).expect("failed to parse module");
+
+    // Insert parsed entrypoint into the module loader
+    loader.insert(plugin_index_file, module.clone());
+
+    let promise_result = module.load_link_evaluate(context);
+
+    // Very important to push forward the job queue after queueing promises.
+    context.run_jobs();
+
+    // Checking if the final promise didn't return an error.
+    match promise_result.state() {
+        PromiseState::Pending => {
+            panic!("Promise was pending");
+        }
+        PromiseState::Fulfilled(v) => {
+            assert_eq!(v, JsValue::undefined())
+        }
+        PromiseState::Rejected(err) => {
+            panic!("Failed to link: {}", err.display());
+        }
+    }
+
+    let namespace = module.namespace(context);
+
+    let result = namespace
+        .get(js_string!(entrypoint), context)
+        .expect("failed to get entrypoint")
+        .as_callable()
+        .cloned()
+        .ok_or_else(|| JsNativeError::typ().with_message("export wasn't a function!"))
+        .expect("Failed to get entrypoint")
+        .call(&JsValue::undefined(), js_args, context)
+        .expect("Failed to call entrypoint");
+
+    match result.is_undefined() {
+        true => json!(null), // to_json doesn't work with undefined (yet)
+        false => result
+            .to_json(context)
+            .expect("failed to convert result to json"),
+    }
+}
+
+fn add_runtime(context: &mut Context) {
+    let console = Console::init(context);
+    context
+        .register_global_property(js_string!(Console::NAME), console, Attribute::all())
+        .expect("the console builtin shouldn't exist");
+}
--- a/src-tauri/src/render.rs
+++ b/src-tauri/src/render.rs
@@ -1,11 +1,9 @@
 use std::collections::HashMap;

+use regex::Regex;
 use sqlx::types::{Json, JsonValue};

-use crate::models::{
-    Environment, EnvironmentVariable, HttpRequest, HttpRequestHeader, HttpUrlParameter, Workspace,
-};
-use templates::parse_and_render;
+use crate::models::{Environment, HttpRequest, HttpRequestHeader, HttpUrlParameter, Workspace};

 pub fn render_request(r: &HttpRequest, w: &Workspace, e: Option<&Environment>) -> HttpRequest {
    let r = r.clone();
@@ -66,29 +64,30 @@ pub fn render_request(r: &HttpRequest, w: &Workspace, e: Option<&Environment>) -
 }

 pub fn render(template: &str, workspace: &Workspace, environment: Option<&Environment>) -> String {
-    let mut variables = HashMap::new();
-    variables = add_variable_to_map(variables, &workspace.variables.0);
-
-    if let Some(e) = environment {
-        variables = add_variable_to_map(variables, &e.variables.0);
-    }
-
-    parse_and_render(template, variables, None)
-}
-
-fn add_variable_to_map<'a>(
-    m: HashMap<&'a str, &'a str>,
-    variables: &'a Vec<EnvironmentVariable>,
-) -> HashMap<&'a str, &'a str> {
-    let mut map = m.clone();
-    for variable in variables {
+    let mut map = HashMap::new();
+    let workspace_variables = &workspace.variables.0;
+    for variable in workspace_variables {
        if !variable.enabled || variable.value.is_empty() {
            continue;
        }
-        let name = variable.name.as_str();
-        let value = variable.value.as_str();
-        map.insert(name, value);
+        map.insert(variable.name.as_str(), variable.value.as_str());
    }

-    map
+    if let Some(e) = environment {
+        let environment_variables = &e.variables.0;
+        for variable in environment_variables {
+            if !variable.enabled || variable.value.is_empty() {
+                continue;
+            }
+            map.insert(variable.name.as_str(), variable.value.as_str());
+        }
+    }
+
+    Regex::new(r"\$\{\[\s*([^]\s]+)\s*]}")
+        .expect("Failed to create regex")
+        .replace_all(template, |caps: &regex::Captures| {
+            let key = caps.get(1).unwrap().as_str();
+            map.get(key).unwrap_or(&"")
+        })
+        .to_string()
 }
--- a/src-tauri/src/tauri_plugin_mac_window.rs
+++ b/src-tauri/src/tauri_plugin_mac_window.rs
@@ -1,450 +0,0 @@
-use hex_color::HexColor;
-use objc::{msg_send, sel, sel_impl};
-use rand::{distributions::Alphanumeric, Rng};
-use tauri::{
-    plugin::{Builder, TauriPlugin},
-    Manager, Runtime, Window, WindowEvent,
-};
-
-const WINDOW_CONTROL_PAD_X: f64 = 13.0;
-const WINDOW_CONTROL_PAD_Y: f64 = 18.0;
-
-struct UnsafeWindowHandle(*mut std::ffi::c_void);
-
-unsafe impl Send for UnsafeWindowHandle {}
-
-unsafe impl Sync for UnsafeWindowHandle {}
-
-pub fn init<R: Runtime>() -> TauriPlugin<R> {
-    Builder::new("mac_window")
-        .on_window_ready(|window| {
-            #[cfg(target_os = "macos")]
-            {
-                setup_traffic_light_positioner(&window);
-                let h = window.app_handle();
-
-                let window_for_theme = window.clone();
-                let id1 = h.listen("yaak_bg_changed", move |ev| {
-                    let payload = serde_json::from_str::<&str>(ev.payload()).unwrap().trim();
-                    let color = HexColor::parse_rgb(payload).unwrap();
-                    update_window_theme(window_for_theme.clone(), color);
-                });
-
-                let window_for_title = window.clone();
-                let id2 = h.listen("yaak_title_changed", move |ev| {
-                    let payload = serde_json::from_str::<&str>(ev.payload()).unwrap().trim();
-                    update_window_title(window_for_title.clone(), payload.to_string());
-                });
-
-                let h = h.clone();
-                window.on_window_event(move |e| {
-                    match e {
-                        WindowEvent::Destroyed => {
-                            h.unlisten(id1);
-                            h.unlisten(id2);
-                        }
-                        _ => {}
-                    };
-                });
-            }
-            return;
-        })
-        .build()
-}
-
-#[cfg(target_os = "macos")]
-fn update_window_title<R: Runtime>(window: Window<R>, title: String) {
-    use cocoa::{appkit::NSWindow, base::nil, foundation::NSString};
-
-    unsafe {
-        let window_handle = UnsafeWindowHandle(window.ns_window().unwrap());
-
-        let window2 = window.clone();
-        let label = window.label().to_string();
-        let _ = window.run_on_main_thread(move || {
-            let win_title = NSString::alloc(nil).init_str(&title);
-            let handle = window_handle;
-            NSWindow::setTitle_(handle.0 as cocoa::base::id, win_title);
-            position_traffic_lights(
-                UnsafeWindowHandle(window2.ns_window().expect("Failed to create window handle")),
-                WINDOW_CONTROL_PAD_X,
-                WINDOW_CONTROL_PAD_Y,
-                label,
-            );
-        });
-    }
-}
-
-#[cfg(target_os = "macos")]
-fn update_window_theme<R: Runtime>(window: Window<R>, color: HexColor) {
-    use cocoa::appkit::{
-        NSAppearance, NSAppearanceNameVibrantDark, NSAppearanceNameVibrantLight, NSWindow,
-    };
-
-    let brightness = (color.r as u64 + color.g as u64 + color.b as u64) / 3;
-    let label = window.label().to_string();
-
-    unsafe {
-        let window_handle = UnsafeWindowHandle(window.ns_window().unwrap());
-        let window2 = window.clone();
-        let _ = window.run_on_main_thread(move || {
-            let handle = window_handle;
-
-            let selected_appearance = if brightness >= 128 {
-                NSAppearance(NSAppearanceNameVibrantLight)
-            } else {
-                NSAppearance(NSAppearanceNameVibrantDark)
-            };
-
-            NSWindow::setAppearance(handle.0 as cocoa::base::id, selected_appearance);
-            position_traffic_lights(
-                UnsafeWindowHandle(window2.ns_window().expect("Failed to create window handle")),
-                WINDOW_CONTROL_PAD_X,
-                WINDOW_CONTROL_PAD_Y,
-                label,
-            );
-        });
-    }
-}
-
-#[cfg(target_os = "macos")]
-fn position_traffic_lights(ns_window_handle: UnsafeWindowHandle, x: f64, y: f64, label: String) {
-    if label.starts_with("nested_") {
-        return;
-    }
-
-    use cocoa::appkit::{NSView, NSWindow, NSWindowButton};
-    use cocoa::foundation::NSRect;
-
-    let ns_window = ns_window_handle.0 as cocoa::base::id;
-    unsafe {
-        let close = ns_window.standardWindowButton_(NSWindowButton::NSWindowCloseButton);
-        let miniaturize =
-            ns_window.standardWindowButton_(NSWindowButton::NSWindowMiniaturizeButton);
-        let zoom = ns_window.standardWindowButton_(NSWindowButton::NSWindowZoomButton);
-
-        let title_bar_container_view = close.superview().superview();
-
-        let close_rect: NSRect = msg_send![close, frame];
-        let button_height = close_rect.size.height;
-
-        let title_bar_frame_height = button_height + y;
-        let mut title_bar_rect = NSView::frame(title_bar_container_view);
-        title_bar_rect.size.height = title_bar_frame_height;
-        title_bar_rect.origin.y = NSView::frame(ns_window).size.height - title_bar_frame_height;
-        let _: () = msg_send![title_bar_container_view, setFrame: title_bar_rect];
-
-        let window_buttons = vec![close, miniaturize, zoom];
-        let space_between = NSView::frame(miniaturize).origin.x - NSView::frame(close).origin.x;
-
-        for (i, button) in window_buttons.into_iter().enumerate() {
-            let mut rect: NSRect = NSView::frame(button);
-            rect.origin.x = x + (i as f64 * space_between);
-            button.setFrameOrigin(rect.origin);
-        }
-    }
-}
-
-#[cfg(target_os = "macos")]
-#[derive(Debug)]
-struct WindowState<R: Runtime> {
-    window: Window<R>,
-}
-
-#[cfg(target_os = "macos")]
-pub fn setup_traffic_light_positioner<R: Runtime>(window: &Window<R>) {
-    use cocoa::appkit::NSWindow;
-    use cocoa::base::{id, BOOL};
-    use cocoa::delegate;
-    use cocoa::foundation::NSUInteger;
-    use objc::runtime::{Object, Sel};
-    use std::ffi::c_void;
-
-    position_traffic_lights(
-        UnsafeWindowHandle(window.ns_window().expect("Failed to create window handle")),
-        WINDOW_CONTROL_PAD_X,
-        WINDOW_CONTROL_PAD_Y,
-        window.label().to_string(),
-    );
-
-    // Ensure they stay in place while resizing the window.
-    fn with_window_state<R: Runtime, F: FnOnce(&mut WindowState<R>) -> T, T>(
-        this: &Object,
-        func: F,
-    ) {
-        let ptr = unsafe {
-            let x: *mut c_void = *this.get_ivar("app_box");
-            &mut *(x as *mut WindowState<R>)
-        };
-        func(ptr);
-    }
-
-    unsafe {
-        let ns_win = window
-            .ns_window()
-            .expect("NS Window should exist to mount traffic light delegate.")
-            as id;
-
-        let current_delegate: id = ns_win.delegate();
-
-        extern "C" fn on_window_should_close(this: &Object, _cmd: Sel, sender: id) -> BOOL {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                msg_send![super_del, windowShouldClose: sender]
-            }
-        }
-        extern "C" fn on_window_will_close(this: &Object, _cmd: Sel, notification: id) {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, windowWillClose: notification];
-            }
-        }
-        extern "C" fn on_window_did_resize<R: Runtime>(this: &Object, _cmd: Sel, notification: id) {
-            unsafe {
-                with_window_state(&*this, |state: &mut WindowState<R>| {
-                    let id = state
-                        .window
-                        .ns_window()
-                        .expect("NS window should exist on state to handle resize")
-                        as id;
-
-                    position_traffic_lights(
-                        UnsafeWindowHandle(id as *mut c_void),
-                        WINDOW_CONTROL_PAD_X,
-                        WINDOW_CONTROL_PAD_Y,
-                        state.window.label().to_string(),
-                    );
-                });
-
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, windowDidResize: notification];
-            }
-        }
-        extern "C" fn on_window_did_move(this: &Object, _cmd: Sel, notification: id) {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, windowDidMove: notification];
-            }
-        }
-        extern "C" fn on_window_did_change_backing_properties(
-            this: &Object,
-            _cmd: Sel,
-            notification: id,
-        ) {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, windowDidChangeBackingProperties: notification];
-            }
-        }
-        extern "C" fn on_window_did_become_key(this: &Object, _cmd: Sel, notification: id) {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, windowDidBecomeKey: notification];
-            }
-        }
-        extern "C" fn on_window_did_resign_key(this: &Object, _cmd: Sel, notification: id) {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, windowDidResignKey: notification];
-            }
-        }
-        extern "C" fn on_dragging_entered(this: &Object, _cmd: Sel, notification: id) -> BOOL {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                msg_send![super_del, draggingEntered: notification]
-            }
-        }
-        extern "C" fn on_prepare_for_drag_operation(
-            this: &Object,
-            _cmd: Sel,
-            notification: id,
-        ) -> BOOL {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                msg_send![super_del, prepareForDragOperation: notification]
-            }
-        }
-        extern "C" fn on_perform_drag_operation(this: &Object, _cmd: Sel, sender: id) -> BOOL {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                msg_send![super_del, performDragOperation: sender]
-            }
-        }
-        extern "C" fn on_conclude_drag_operation(this: &Object, _cmd: Sel, notification: id) {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, concludeDragOperation: notification];
-            }
-        }
-        extern "C" fn on_dragging_exited(this: &Object, _cmd: Sel, notification: id) {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, draggingExited: notification];
-            }
-        }
-        extern "C" fn on_window_will_use_full_screen_presentation_options(
-            this: &Object,
-            _cmd: Sel,
-            window: id,
-            proposed_options: NSUInteger,
-        ) -> NSUInteger {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                msg_send![super_del, window: window willUseFullScreenPresentationOptions: proposed_options]
-            }
-        }
-        extern "C" fn on_window_did_enter_full_screen<R: Runtime>(
-            this: &Object,
-            _cmd: Sel,
-            notification: id,
-        ) {
-            unsafe {
-                with_window_state(&*this, |state: &mut WindowState<R>| {
-                    state
-                        .window
-                        .emit("did-enter-fullscreen", ())
-                        .expect("Failed to emit event");
-                });
-
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, windowDidEnterFullScreen: notification];
-            }
-        }
-        extern "C" fn on_window_will_enter_full_screen<R: Runtime>(
-            this: &Object,
-            _cmd: Sel,
-            notification: id,
-        ) {
-            unsafe {
-                with_window_state(&*this, |state: &mut WindowState<R>| {
-                    state
-                        .window
-                        .emit("will-enter-fullscreen", ())
-                        .expect("Failed to emit event");
-                });
-
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, windowWillEnterFullScreen: notification];
-            }
-        }
-        extern "C" fn on_window_did_exit_full_screen<R: Runtime>(
-            this: &Object,
-            _cmd: Sel,
-            notification: id,
-        ) {
-            unsafe {
-                with_window_state(&*this, |state: &mut WindowState<R>| {
-                    state
-                        .window
-                        .emit("did-exit-fullscreen", ())
-                        .expect("Failed to emit event");
-
-                    let id = state.window.ns_window().expect("Failed to emit event") as id;
-                    position_traffic_lights(
-                        UnsafeWindowHandle(id as *mut c_void),
-                        WINDOW_CONTROL_PAD_X,
-                        WINDOW_CONTROL_PAD_Y,
-                        state.window.label().to_string(),
-                    );
-                });
-
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, windowDidExitFullScreen: notification];
-            }
-        }
-        extern "C" fn on_window_will_exit_full_screen<R: Runtime>(
-            this: &Object,
-            _cmd: Sel,
-            notification: id,
-        ) {
-            unsafe {
-                with_window_state(&*this, |state: &mut WindowState<R>| {
-                    state
-                        .window
-                        .emit("will-exit-fullscreen", ())
-                        .expect("Failed to emit event");
-                });
-
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, windowWillExitFullScreen: notification];
-            }
-        }
-        extern "C" fn on_window_did_fail_to_enter_full_screen(
-            this: &Object,
-            _cmd: Sel,
-            window: id,
-        ) {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, windowDidFailToEnterFullScreen: window];
-            }
-        }
-        extern "C" fn on_effective_appearance_did_change(
-            this: &Object,
-            _cmd: Sel,
-            notification: id,
-        ) {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, effectiveAppearanceDidChange: notification];
-            }
-        }
-        extern "C" fn on_effective_appearance_did_changed_on_main_thread(
-            this: &Object,
-            _cmd: Sel,
-            notification: id,
-        ) {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![
-                    super_del,
-                    effectiveAppearanceDidChangedOnMainThread: notification
-                ];
-            }
-        }
-
-        // Are we de-allocing this properly ? (I miss safe Rust :(  )
-        let window_label = window.label().to_string();
-
-        let app_state = WindowState {
-            window: window.clone(),
-        };
-        let app_box = Box::into_raw(Box::new(app_state)) as *mut c_void;
-        let random_str: String = rand::thread_rng()
-            .sample_iter(&Alphanumeric)
-            .take(20)
-            .map(char::from)
-            .collect();
-
-        // We need to ensure we have a unique delegate name, otherwise we will panic while trying to create a duplicate
-        // delegate with the same name.
-        let delegate_name = format!("windowDelegate_{}_{}", window_label, random_str);
-
-        ns_win.setDelegate_(delegate!(&delegate_name, {
-            window: id = ns_win,
-            app_box: *mut c_void = app_box,
-            toolbar: id = cocoa::base::nil,
-            super_delegate: id = current_delegate,
-            (windowShouldClose:) => on_window_should_close as extern fn(&Object, Sel, id) -> BOOL,
-            (windowWillClose:) => on_window_will_close as extern fn(&Object, Sel, id),
-            (windowDidResize:) => on_window_did_resize::<R> as extern fn(&Object, Sel, id),
-            (windowDidMove:) => on_window_did_move as extern fn(&Object, Sel, id),
-            (windowDidChangeBackingProperties:) => on_window_did_change_backing_properties as extern fn(&Object, Sel, id),
-            (windowDidBecomeKey:) => on_window_did_become_key as extern fn(&Object, Sel, id),
-            (windowDidResignKey:) => on_window_did_resign_key as extern fn(&Object, Sel, id),
-            (draggingEntered:) => on_dragging_entered as extern fn(&Object, Sel, id) -> BOOL,
-            (prepareForDragOperation:) => on_prepare_for_drag_operation as extern fn(&Object, Sel, id) -> BOOL,
-            (performDragOperation:) => on_perform_drag_operation as extern fn(&Object, Sel, id) -> BOOL,
-            (concludeDragOperation:) => on_conclude_drag_operation as extern fn(&Object, Sel, id),
-            (draggingExited:) => on_dragging_exited as extern fn(&Object, Sel, id),
-            (window:willUseFullScreenPresentationOptions:) => on_window_will_use_full_screen_presentation_options as extern fn(&Object, Sel, id, NSUInteger) -> NSUInteger,
-            (windowDidEnterFullScreen:) => on_window_did_enter_full_screen::<R> as extern fn(&Object, Sel, id),
-            (windowWillEnterFullScreen:) => on_window_will_enter_full_screen::<R> as extern fn(&Object, Sel, id),
-            (windowDidExitFullScreen:) => on_window_did_exit_full_screen::<R> as extern fn(&Object, Sel, id),
-            (windowWillExitFullScreen:) => on_window_will_exit_full_screen::<R> as extern fn(&Object, Sel, id),
-            (windowDidFailToEnterFullScreen:) => on_window_did_fail_to_enter_full_screen as extern fn(&Object, Sel, id),
-            (effectiveAppearanceDidChange:) => on_effective_appearance_did_change as extern fn(&Object, Sel, id),
-            (effectiveAppearanceDidChangedOnMainThread:) => on_effective_appearance_did_changed_on_main_thread as extern fn(&Object, Sel, id)
-        }))
-    }
-}
--- a/src-tauri/src/updates.rs
+++ b/src-tauri/src/updates.rs
@@ -19,7 +19,6 @@ pub struct YaakUpdater {
 pub enum UpdateMode {
    Stable,
    Beta,
-    Alpha,
 }

 impl Display for UpdateMode {
@@ -27,7 +26,6 @@ impl Display for UpdateMode {
        let s = match self {
            UpdateMode::Stable => "stable",
            UpdateMode::Beta => "beta",
-            UpdateMode::Alpha => "alpha",
        };
        write!(f, "{}", s)
    }
@@ -37,7 +35,6 @@ impl UpdateMode {
    pub fn new(mode: &str) -> UpdateMode {
        match mode {
            "beta" => UpdateMode::Beta,
-            "alpha" => UpdateMode::Alpha,
            _ => UpdateMode::Stable,
        }
    }
@@ -56,8 +53,13 @@ impl YaakUpdater {
    ) -> Result<bool, tauri_plugin_updater::Error> {
        self.last_update_check = SystemTime::now();

-        info!("Checking for updates mode={}", mode);
+        let enabled = is_dev();
+        info!("Checking for updates mode={} enabled={}", mode, enabled);

+        if !enabled {
+            return Ok(false);
+        }
+        
        let update_check_result = app_handle
            .updater_builder()
            .header("X-Update-Mode", mode.to_string())?
@@ -65,7 +67,8 @@ impl YaakUpdater {
            .check()
            .await;

-        match update_check_result {
+        match update_check_result
+        {
            Ok(Some(update)) => {
                let h = app_handle.clone();
                app_handle
@@ -118,11 +121,6 @@ impl YaakUpdater {
            return Ok(false);
        }

-        // Don't check if dev
-        if is_dev() {
-            return Ok(false);
-        }
-
        self.force_check(app_handle, mode).await
    }
 }
--- a/src-tauri/src/window_ext.rs
+++ b/src-tauri/src/window_ext.rs
@@ -0,0 +1,53 @@
+use tauri::WebviewWindow;
+
+const TRAFFIC_LIGHT_OFFSET_X: f64 = 13.0;
+const TRAFFIC_LIGHT_OFFSET_Y: f64 = 18.0;
+
+pub trait TrafficLightWindowExt {
+    fn position_traffic_lights(&self);
+}
+
+impl TrafficLightWindowExt for WebviewWindow {
+    #[cfg(not(target_os = "macos"))]
+    fn position_traffic_lights(&self) {
+        // No-op on other platforms
+    }
+
+    #[cfg(target_os = "macos")]
+    fn position_traffic_lights(&self) {
+        use cocoa::appkit::{NSView, NSWindow, NSWindowButton};
+        use cocoa::foundation::NSRect;
+
+        let window = self.ns_window().unwrap() as cocoa::base::id;
+
+        let x = TRAFFIC_LIGHT_OFFSET_X;
+        let y = TRAFFIC_LIGHT_OFFSET_Y;
+
+        unsafe {
+            let close = window.standardWindowButton_(NSWindowButton::NSWindowCloseButton);
+            let miniaturize =
+                window.standardWindowButton_(NSWindowButton::NSWindowMiniaturizeButton);
+            let zoom = window.standardWindowButton_(NSWindowButton::NSWindowZoomButton);
+
+            let title_bar_container_view = close.superview().superview();
+
+            let close_rect: NSRect = msg_send![close, frame];
+            let button_height = close_rect.size.height;
+
+            let title_bar_frame_height = button_height + y;
+            let mut title_bar_rect = NSView::frame(title_bar_container_view);
+            title_bar_rect.size.height = title_bar_frame_height;
+            title_bar_rect.origin.y = NSView::frame(window).size.height - title_bar_frame_height;
+            let _: () = msg_send![title_bar_container_view, setFrame: title_bar_rect];
+
+            let window_buttons = vec![close, miniaturize, zoom];
+            let space_between = NSView::frame(miniaturize).origin.x - NSView::frame(close).origin.x;
+
+            for (i, button) in window_buttons.into_iter().enumerate() {
+                let mut rect: NSRect = NSView::frame(button);
+                rect.origin.x = x + (i as f64 * space_between);
+                button.setFrameOrigin(rect.origin);
+            }
+        }
+    }
+}
--- a/src-tauri/src/window_menu.rs
+++ b/src-tauri/src/window_menu.rs
@@ -126,19 +126,12 @@ pub fn app_menu(app_handle: &AppHandle) -> tauri::Result<Menu<Wry>> {
                "Develop",
                true,
                &[
-                    &MenuItemBuilder::with_id("dev.refresh".to_string(), "Refresh")
+                    &MenuItemBuilder::with_id("refresh".to_string(), "Refresh")
                        .accelerator("CmdOrCtrl+Shift+r")
                        .build(app_handle)?,
-                    &MenuItemBuilder::with_id("dev.toggle_devtools".to_string(), "Open Devtools")
+                    &MenuItemBuilder::with_id("toggle_devtools".to_string(), "Open Devtools")
                        .accelerator("CmdOrCtrl+Option+i")
                        .build(app_handle)?,
-                    &MenuItemBuilder::with_id("dev.reset_size".to_string(), "Reset Size")
-                        .build(app_handle)?,
-                    &MenuItemBuilder::with_id(
-                        "dev.generate_theme_css".to_string(),
-                        "Generate Theme CSS",
-                    )
-                    .build(app_handle)?,
                ],
            )?,
        ],
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -1,13 +1,13 @@
 {
-  "productName": "yaak",
-  "version": "2024.6.1",
-  "identifier": "app.yaak.desktop",
  "build": {
    "beforeBuildCommand": "npm run build",
    "beforeDevCommand": "npm run dev",
    "devUrl": "http://localhost:1420",
    "frontendDist": "../dist"
  },
+  "productName": "Yaak",
+  "version": "2024.4.1",
+  "identifier": "app.yaak.desktop",
  "app": {
    "withGlobalTauri": false,
    "security": {
@@ -22,14 +22,6 @@
    }
  },
  "plugins": {
-    "deep-link": {
-      "mobile": [],
-      "desktop": {
-        "schemes": [
-          "yaak"
-        ]
-      }
-    },
    "updater": {
      "endpoints": [
        "https://update.yaak.app/check/{{target}}/{{arch}}/{{current_version}}"
@@ -50,13 +42,13 @@
      "icons/release/icon.icns",
      "icons/release/icon.ico"
    ],
-    "longDescription": "A cross-platform desktop app for interacting with REST, GraphQL, and gRPC",
+    "longDescription": "The best cross-platform visual API client",
    "resources": [
      "migrations/*",
      "plugins/*",
      "protoc-vendored/include/*"
    ],
-    "shortDescription": "Desktop API client",
+    "shortDescription": "The best API client",
    "targets": [
      "deb",
      "appimage",
@@ -65,9 +57,6 @@
      "dmg",
      "updater"
    ],
-    "iOS": {
-      "developmentTeam": "7PU3P6ELJ8"
-    },
    "macOS": {
      "exceptionDomain": "",
      "entitlements": "macos/entitlements.plist",
--- a/src-tauri/templates/Cargo.toml
+++ b/src-tauri/templates/Cargo.toml
@@ -1,6 +0,0 @@
-[package]
-name = "templates"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
--- a/src-tauri/templates/src/lib.rs
+++ b/src-tauri/templates/src/lib.rs
@@ -1,7 +0,0 @@
-pub mod parser;
-pub mod renderer;
-
-pub use parser::*;
-pub use renderer::*;
-
-pub fn template_foo() {}
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`ALTER TABLE settings ADD COLUMN open_workspace_new_window BOOLEAN NULL DEFAULT NULL;`