Fix analytics again

Fix dialog close button
Fix URLBar expanded state inner buttons
2026-01-19 15:37:08 +01:00 · 2024-01-18 22:28:25 -08:00 · 2024-01-18 20:57:42 -08:00 · 2024-01-18 20:40:56 -08:00 · 2024-01-18 20:23:02 -08:00 · 2024-01-18 14:42:02 -08:00
148 changed files with 14466 additions and 1533 deletions
--- a/Desktop.run.xml
+++ b/Desktop.run.xml
@@ -6,7 +6,8 @@
      <script value="start" />
    </scripts>
    <node-interpreter value="project" />
-    <envs />
+    <envs>
+    </envs>
    <method v="2" />
  </configuration>
-</component>
+</component>
--- a/index.html
+++ b/index.html
@@ -5,17 +5,6 @@
  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
  <title>Yaak App</title>
 <!--  <script src="http://localhost:8097"></script>-->
-  <style>
-      body {
-          background-color: white;
-      }
-
-      @media (prefers-color-scheme: dark) {
-          body {
-              background-color: black;
-          }
-      }
-  </style>
 </head>

 <body>
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -5,19 +5,21 @@
  "type": "module",
  "scripts": {
    "start": "npm run build:plugins && npm run tauri-dev",
-    "tauri-dev": "YAAK_ENV=development tauri dev --no-watch --config src-tauri/tauri-dev.conf.json",
+    "tauri-dev": "tauri dev --no-watch --config ./src-tauri/tauri-dev.conf.json",
    "tauri-build": "tauri build",
    "tauri": "tauri",
    "build": "npm run build:frontend",
    "dev": "vite dev",
    "lint": "tsc && eslint . --ext .ts,.tsx",
-    "build:icon:release": "tauri icon design/icon.png --output src-tauri/icons/release",
-    "build:icon:dev": "tauri icon design/icon-dev.png --output src-tauri/icons/dev",
+    "build:icon:release": "tauri icon design/icon.png --output ./src-tauri/icons/release",
+    "build:icon:dev": "tauri icon design/icon-dev.png --output ./src-tauri/icons/dev",
    "build:frontend": "vite build",
-    "build:plugins": "run-p build:plugin:importer-insomnia build:plugin:importer-postman build:plugin:importer-yaak",
-    "build:plugin:importer-insomnia": "cd src-tauri/plugins/importer-insomnia && vite build",
-    "build:plugin:importer-postman": "cd src-tauri/plugins/importer-postman && vite build",
-    "build:plugin:importer-yaak": "cd src-tauri/plugins/importer-yaak && vite build",
+    "build:plugins": "run-p build:plugin:*",
+    "build:plugin:importer-insomnia": "cd plugins/importer-insomnia && vite build --emptyOutDir",
+    "build:plugin:importer-postman": "cd plugins/importer-postman && vite build --emptyOutDir",
+    "build:plugin:importer-yaak": "cd plugins/importer-yaak && vite build --emptyOutDir",
+    "build:plugin:filter-jsonpath": "cd plugins/filter-jsonpath && vite build --emptyOutDir",
+    "build:plugin:filter-xpath": "cd plugins/filter-xpath && vite build --emptyOutDir",
    "test": "vitest",
    "coverage": "vitest run --coverage",
    "prepare": "husky install"
@@ -32,14 +34,13 @@
    "@lezer/generator": "^1.2.2",
    "@lezer/highlight": "^1.1.3",
    "@lezer/lr": "^1.3.3",
-    "@radix-ui/react-icons": "^1.2.0",
    "@react-hook/resize-observer": "^1.2.6",
    "@tailwindcss/container-queries": "^0.1.0",
    "@tanstack/query-sync-storage-persister": "^4.27.1",
    "@tanstack/react-query": "^4.28.0",
    "@tanstack/react-query-devtools": "^4.28.0",
    "@tanstack/react-query-persist-client": "^4.28.0",
-    "@tauri-apps/api": "^1.5.1",
+    "@tauri-apps/api": "^1.5.3",
    "buffer": "^6.0.3",
    "classnames": "^2.3.2",
    "cm6-graphql": "^0.0.9",
@@ -47,6 +48,7 @@
    "focus-trap-react": "^10.1.1",
    "format-graphql": "^1.4.0",
    "framer-motion": "^9.0.4",
+    "lucide-react": "^0.309.0",
    "papaparse": "^5.4.1",
    "parse-color": "^1.0.0",
    "react": "^18.2.0",
@@ -62,7 +64,7 @@
  },
  "devDependencies": {
    "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e",
-    "@tauri-apps/cli": "^1.5.4",
+    "@tauri-apps/cli": "^1.5.6",
    "@types/node": "^18.7.10",
    "@types/papaparse": "^5.3.7",
    "@types/parse-color": "^1.0.1",
@@ -86,6 +88,7 @@
    "postcss": "^8.4.21",
    "postcss-nesting": "^11.2.1",
    "prettier": "^2.8.4",
+    "react-devtools": "^4.28.5",
    "tailwindcss": "^3.2.7",
    "typescript": "^5.0.2",
    "vite": "^4.0.0",
--- a/plugins/filter-jsonpath/package-lock.json
+++ b/plugins/filter-jsonpath/package-lock.json
@@ -0,0 +1,173 @@
+{
+  "name": "filter-jsonpath",
+  "version": "0.0.1",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "filter-jsonpath",
+      "version": "0.0.1",
+      "dependencies": {
+        "jsonpath": "^1.1.1"
+      }
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
+    },
+    "node_modules/escodegen": {
+      "version": "1.14.3",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
+      "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^4.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=4.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/escodegen/node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.2.tgz",
+      "integrity": "sha512-+JpPZam9w5DuJ3Q67SqsMGtiHKENSMRVoxvArfJZK01/BfLEObtZ6orJa/MtoGNR/rfMgp5837T41PAmTwAv/A==",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
+    },
+    "node_modules/jsonpath": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/jsonpath/-/jsonpath-1.1.1.tgz",
+      "integrity": "sha512-l6Cg7jRpixfbgoWgkrl77dgEj8RPvND0wMH6TwQmi9Qs4TFfS9u5cUFnbeKTwj5ga5Y3BTGGNI28k117LJ009w==",
+      "dependencies": {
+        "esprima": "1.2.2",
+        "static-eval": "2.0.2",
+        "underscore": "1.12.1"
+      }
+    },
+    "node_modules/levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
+      "dependencies": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/optionator": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "dependencies": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-eval": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/static-eval/-/static-eval-2.0.2.tgz",
+      "integrity": "sha512-N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg==",
+      "dependencies": {
+        "escodegen": "^1.8.1"
+      }
+    },
+    "node_modules/type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
+      "dependencies": {
+        "prelude-ls": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/underscore": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz",
+      "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw=="
+    },
+    "node_modules/word-wrap": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    }
+  }
+}
--- a/plugins/filter-jsonpath/package.json
+++ b/plugins/filter-jsonpath/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "filter-jsonpath",
+  "version": "0.0.1",
+  "dependencies": {
+    "jsonpath": "^1.1.1"
+  }
+}
--- a/plugins/filter-jsonpath/src/index.js
+++ b/plugins/filter-jsonpath/src/index.js
@@ -0,0 +1,12 @@
+import jp from 'jsonpath';
+
+export function pluginHookResponseFilter(filter, text) {
+  let parsed;
+  try {
+    parsed = JSON.parse(text);
+  } catch (e) {
+    return;
+  }
+  const filtered = jp.query(parsed, filter);
+  return { filtered: JSON.stringify(filtered, null, 2) };
+}
--- a/plugins/filter-jsonpath/vite.config.js
+++ b/plugins/filter-jsonpath/vite.config.js
@@ -0,0 +1,13 @@
+import { resolve } from 'path';
+import { defineConfig } from 'vite';
+
+export default defineConfig({
+  build: {
+    lib: {
+      entry: resolve(__dirname, 'src/index.js'),
+      fileName: 'index',
+      formats: ['es'],
+    },
+    outDir: resolve(__dirname, '../../src-tauri/plugins/filter-jsonpath'),
+  },
+});
--- a/plugins/filter-xpath/package-lock.json
+++ b/plugins/filter-xpath/package-lock.json
@@ -0,0 +1,32 @@
+{
+  "name": "filter-xpath",
+  "version": "0.0.1",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "filter-xpath",
+      "version": "0.0.1",
+      "dependencies": {
+        "@xmldom/xmldom": "^0.8.10",
+        "xpath": "^0.0.34"
+      }
+    },
+    "node_modules/@xmldom/xmldom": {
+      "version": "0.8.10",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
+      "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==",
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/xpath": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.34.tgz",
+      "integrity": "sha512-FxF6+rkr1rNSQrhUNYrAFJpRXNzlDoMxeXN5qI84939ylEv3qqPFKa85Oxr6tDaJKqwW6KKyo2v26TSv3k6LeA==",
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    }
+  }
+}
--- a/plugins/filter-xpath/package.json
+++ b/plugins/filter-xpath/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "filter-xpath",
+  "version": "0.0.1",
+  "dependencies": {
+    "@xmldom/xmldom": "^0.8.10",
+    "xpath": "^0.0.34"
+  }
+}
--- a/plugins/filter-xpath/src/index.js
+++ b/plugins/filter-xpath/src/index.js
@@ -0,0 +1,8 @@
+import xpath from 'xpath';
+import { DOMParser } from '@xmldom/xmldom';
+
+export function pluginHookResponseFilter(filter, text) {
+  const doc = new DOMParser().parseFromString(text, 'text/xml');
+  const filtered = `${xpath.select(filter, doc)}`;
+  return { filtered };
+}
--- a/src-tauri/plugins/importer-insomnia/vite.config.js
+++ b/src-tauri/plugins/importer-insomnia/vite.config.js
@@ -8,6 +8,6 @@ export default defineConfig({
      fileName: 'index',
      formats: ['es'],
    },
-    outDir: resolve(__dirname, 'out'),
+    outDir: resolve(__dirname, '../../src-tauri/plugins/filter-xpath'),
  },
 });
--- a/plugins/importer-insomnia/package.json
+++ b/plugins/importer-insomnia/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "importer-insomnia",
+  "version": "0.0.1"
+}
--- a/src-tauri/plugins/importer-insomnia/src/helpers/types.js
+++ b/src-tauri/plugins/importer-insomnia/src/helpers/types.js
--- a/src-tauri/plugins/importer-insomnia/src/helpers/variables.js
+++ b/src-tauri/plugins/importer-insomnia/src/helpers/variables.js
--- a/src-tauri/plugins/importer-insomnia/src/importers/environment.js
+++ b/src-tauri/plugins/importer-insomnia/src/importers/environment.js
--- a/src-tauri/plugins/importer-insomnia/src/importers/folder.js
+++ b/src-tauri/plugins/importer-insomnia/src/importers/folder.js
--- a/src-tauri/plugins/importer-insomnia/src/importers/request.js
+++ b/src-tauri/plugins/importer-insomnia/src/importers/request.js
--- a/src-tauri/plugins/importer-insomnia/src/index.js
+++ b/src-tauri/plugins/importer-insomnia/src/index.js
--- a/plugins/importer-insomnia/vite.config.js
+++ b/plugins/importer-insomnia/vite.config.js
@@ -0,0 +1,13 @@
+import { resolve } from 'path';
+import { defineConfig } from 'vite';
+
+export default defineConfig({
+  build: {
+    lib: {
+      entry: resolve(__dirname, 'src/index.js'),
+      fileName: 'index',
+      formats: ['es'],
+    },
+    outDir: resolve(__dirname, '../../src-tauri/plugins/importer-insomnia'),
+  },
+});
--- a/plugins/importer-postman/package.json
+++ b/plugins/importer-postman/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "importer-postman",
+  "version": "0.0.1"
+}
--- a/src-tauri/plugins/importer-postman/src/index.ts
+++ b/src-tauri/plugins/importer-postman/src/index.ts
@@ -32,7 +32,7 @@ export function pluginHookImport(contents: string): { resources: ExportResources

  const workspace: ExportResources['workspaces'][0] = {
    model: 'workspace',
-    id: 'wrk_0',
+    id: generateId('wk'),
    name: info.name || 'Postman Import',
    description: info.description || '',
  };
@@ -43,7 +43,7 @@ export function pluginHookImport(contents: string): { resources: ExportResources
      const folder: ExportResources['folders'][0] = {
        model: 'folder',
        workspaceId: workspace.id,
-        id: `fld_${exportResources.folders.length}`,
+        id: generateId('fl'),
        name: v.name,
        folderId,
      };
@@ -57,7 +57,7 @@ export function pluginHookImport(contents: string): { resources: ExportResources
      const authPatch = importAuth(r.auth);
      const request: ExportResources['requests'][0] = {
        model: 'http_request',
-        id: `req_${exportResources.requests.length}`,
+        id: generateId('rq'),
        workspaceId: workspace.id,
        folderId,
        name: v.name,
@@ -212,3 +212,12 @@ function convertTemplateSyntax<T>(obj: T): T {
    return obj;
  }
 }
+
+function generateId(prefix: 'wk' | 'rq' | 'fl'): string {
+  const alphabet = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+  let id = `${prefix}_`;
+  for (let i = 0; i < 10; i++) {
+    id += alphabet[Math.floor(Math.random() * alphabet.length)];
+  }
+  return id;
+}
--- a/src-tauri/plugins/importer-postman/tsconfig.json
+++ b/src-tauri/plugins/importer-postman/tsconfig.json
@@ -4,7 +4,7 @@
    "useDefineForClassFields": true,
    "module": "ESNext",
    "lib": [
-      "ESNext"
+      "ESNext",
    ],
    "skipLibCheck": true,
    "moduleResolution": "bundler",
@@ -18,6 +18,6 @@
    "noFallthroughCasesInSwitch": true
  },
  "include": [
-    "src"
+    "./src"
  ]
 }
--- a/src-tauri/plugins/importer-postman/vite.config.js
+++ b/src-tauri/plugins/importer-postman/vite.config.js
@@ -8,6 +8,6 @@ export default defineConfig({
      fileName: 'index',
      formats: ['es'],
    },
-    outDir: resolve(__dirname, 'out'),
+    outDir: resolve(__dirname, '../../src-tauri/plugins/importer-postman'),
  },
 });
--- a/plugins/importer-yaak/package.json
+++ b/plugins/importer-yaak/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "importer-yaak",
+  "version": "0.0.1"
+}
--- a/src-tauri/plugins/importer-yaak/src/index.js
+++ b/src-tauri/plugins/importer-yaak/src/index.js
--- a/src-tauri/plugins/importer-yaak/vite.config.js
+++ b/src-tauri/plugins/importer-yaak/vite.config.js
@@ -8,6 +8,6 @@ export default defineConfig({
      fileName: 'index',
      formats: ['es'],
    },
-    outDir: resolve(__dirname, 'out'),
+    outDir: resolve(__dirname, '../../src-tauri/plugins/importer-yaak'),
  },
 });
--- a/src-tauri/.sqlx/query-07b0c398efd1d5f8f479652de658716a9e7faef6aba6583dd209a4f290c5edd1.json
+++ b/src-tauri/.sqlx/query-07b0c398efd1d5f8f479652de658716a9e7faef6aba6583dd209a4f290c5edd1.json
@@ -1,6 +1,6 @@
 {
  "db_name": "SQLite",
-  "query": "\n            SELECT id, model, workspace_id, request_id, updated_at, created_at, url,\n                status, status_reason, content_length, body, body_path, elapsed, error,\n                headers AS \"headers!: sqlx::types::Json<Vec<HttpResponseHeader>>\"\n            FROM http_responses\n            WHERE workspace_id = ?\n            ORDER BY created_at DESC\n        ",
+  "query": "\n            SELECT id, model, workspace_id, request_id, updated_at, created_at, url,\n                status, status_reason, content_length, body_path, elapsed, error,\n                headers AS \"headers!: sqlx::types::Json<Vec<HttpResponseHeader>>\"\n            FROM http_responses\n            WHERE request_id = ?\n            ORDER BY created_at DESC\n            LIMIT ?\n        ",
  "describe": {
    "columns": [
      {
@@ -53,34 +53,29 @@
        "ordinal": 9,
        "type_info": "Int64"
      },
-      {
-        "name": "body",
-        "ordinal": 10,
-        "type_info": "Blob"
-      },
      {
        "name": "body_path",
-        "ordinal": 11,
+        "ordinal": 10,
        "type_info": "Text"
      },
      {
        "name": "elapsed",
-        "ordinal": 12,
+        "ordinal": 11,
        "type_info": "Int64"
      },
      {
        "name": "error",
-        "ordinal": 13,
+        "ordinal": 12,
        "type_info": "Text"
      },
      {
        "name": "headers!: sqlx::types::Json<Vec<HttpResponseHeader>>",
-        "ordinal": 14,
+        "ordinal": 13,
        "type_info": "Text"
      }
    ],
    "parameters": {
-      "Right": 1
+      "Right": 2
    },
    "nullable": [
      false,
@@ -94,11 +89,10 @@
      true,
      true,
      true,
-      true,
      false,
      true,
      false
    ]
  },
-  "hash": "26072725d536c3cfdffd9a681d17c0ee2f246ca98e0459630a2430236d3bbdd2"
+  "hash": "07b0c398efd1d5f8f479652de658716a9e7faef6aba6583dd209a4f290c5edd1"
 }
--- a/src-tauri/.sqlx/query-198bd086ccc87d2e6c24cb1c717f486d3ab58c0c958ede850c018fc266eade87.json
+++ b/src-tauri/.sqlx/query-198bd086ccc87d2e6c24cb1c717f486d3ab58c0c958ede850c018fc266eade87.json
@@ -1,12 +1,12 @@
 {
  "db_name": "SQLite",
-  "query": "\n            INSERT INTO http_responses (\n                id,\n                request_id,\n                workspace_id,\n                elapsed,\n                url,\n                status,\n                status_reason,\n                content_length,\n                body,\n                body_path,\n                headers\n            )\n            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);\n        ",
+  "query": "\n            INSERT INTO http_responses (\n                id,\n                request_id,\n                workspace_id,\n                elapsed,\n                url,\n                status,\n                status_reason,\n                content_length,\n                body_path,\n                headers\n            )\n            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?);\n        ",
  "describe": {
    "columns": [],
    "parameters": {
-      "Right": 11
+      "Right": 10
    },
    "nullable": []
  },
-  "hash": "8947a2a90478277c42fe9b06bc1fa98197642a4d281a3dbc101be2c9c1fec36c"
+  "hash": "198bd086ccc87d2e6c24cb1c717f486d3ab58c0c958ede850c018fc266eade87"
 }
--- a/src-tauri/.sqlx/query-20cf0f8b71e600bc40ee204b60a12b2f3728178f3b8788d2e5cc92821b74d470.json
+++ b/src-tauri/.sqlx/query-20cf0f8b71e600bc40ee204b60a12b2f3728178f3b8788d2e5cc92821b74d470.json
@@ -0,0 +1,74 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            SELECT\n                id,\n                model,\n                created_at,\n                updated_at,\n                name,\n                description,\n                setting_request_timeout,\n                setting_follow_redirects,\n                setting_validate_certificates,\n                variables AS \"variables!: sqlx::types::Json<Vec<EnvironmentVariable>>\"\n            FROM workspaces\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": "name",
+        "ordinal": 4,
+        "type_info": "Text"
+      },
+      {
+        "name": "description",
+        "ordinal": 5,
+        "type_info": "Text"
+      },
+      {
+        "name": "setting_request_timeout",
+        "ordinal": 6,
+        "type_info": "Int64"
+      },
+      {
+        "name": "setting_follow_redirects",
+        "ordinal": 7,
+        "type_info": "Bool"
+      },
+      {
+        "name": "setting_validate_certificates",
+        "ordinal": 8,
+        "type_info": "Bool"
+      },
+      {
+        "name": "variables!: sqlx::types::Json<Vec<EnvironmentVariable>>",
+        "ordinal": 9,
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Right": 0
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "20cf0f8b71e600bc40ee204b60a12b2f3728178f3b8788d2e5cc92821b74d470"
+}
--- a/src-tauri/.sqlx/query-294cbe19f9ddd9519ace3558df4308948082ec0ce7096855aa7d8fba519b8b4f.json
+++ b/src-tauri/.sqlx/query-294cbe19f9ddd9519ace3558df4308948082ec0ce7096855aa7d8fba519b8b4f.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            UPDATE http_responses SET (\n                elapsed,\n                url,\n                status,\n                status_reason,\n                content_length,\n                body_path,\n                error,\n                headers,\n                updated_at\n            ) = (?, ?, ?, ?, ?, ?, ?, ?, CURRENT_TIMESTAMP) WHERE id = ?;\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 9
+    },
+    "nullable": []
+  },
+  "hash": "294cbe19f9ddd9519ace3558df4308948082ec0ce7096855aa7d8fba519b8b4f"
+}
--- a/src-tauri/.sqlx/query-2c181a4dc13efc52fe6a5a68291c5678a9624020df4ea744e78396f6926d5c88.json
+++ b/src-tauri/.sqlx/query-2c181a4dc13efc52fe6a5a68291c5678a9624020df4ea744e78396f6926d5c88.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n                INSERT INTO settings (id)\n                VALUES ('default')\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 0
+    },
+    "nullable": []
+  },
+  "hash": "2c181a4dc13efc52fe6a5a68291c5678a9624020df4ea744e78396f6926d5c88"
+}
--- a/src-tauri/.sqlx/query-3b3fb6271340c6ec21a10b4f1b20502c86c425e0b53ac07692f8a4ed0be09335.json
+++ b/src-tauri/.sqlx/query-3b3fb6271340c6ec21a10b4f1b20502c86c425e0b53ac07692f8a4ed0be09335.json
@@ -1,6 +1,6 @@
 {
  "db_name": "SQLite",
-  "query": "\n            SELECT id, model, created_at, updated_at, name, description,\n                variables AS \"variables!: sqlx::types::Json<Vec<EnvironmentVariable>>\"\n            FROM workspaces\n        ",
+  "query": "\n            SELECT\n                id,\n                model,\n                created_at,\n                updated_at,\n                theme,\n                appearance,\n                update_channel\n            FROM settings\n            WHERE id = 'default'\n        ",
  "describe": {
    "columns": [
      {
@@ -24,17 +24,17 @@
        "type_info": "Datetime"
      },
      {
-        "name": "name",
+        "name": "theme",
        "ordinal": 4,
        "type_info": "Text"
      },
      {
-        "name": "description",
+        "name": "appearance",
        "ordinal": 5,
        "type_info": "Text"
      },
      {
-        "name": "variables!: sqlx::types::Json<Vec<EnvironmentVariable>>",
+        "name": "update_channel",
        "ordinal": 6,
        "type_info": "Text"
      }
@@ -52,5 +52,5 @@
      false
    ]
  },
-  "hash": "5588db23df7f30dc75857e05395ebbcf2384e2ac0d7cb87f76d74c6d50781d7b"
+  "hash": "3b3fb6271340c6ec21a10b4f1b20502c86c425e0b53ac07692f8a4ed0be09335"
 }
--- a/src-tauri/.sqlx/query-3d199d371be948211f4a50c869b307f5df60784293c52397d77a187633a406dd.json
+++ b/src-tauri/.sqlx/query-3d199d371be948211f4a50c869b307f5df60784293c52397d77a187633a406dd.json
@@ -1,6 +1,6 @@
 {
  "db_name": "SQLite",
-  "query": "\n            SELECT id, model, workspace_id, request_id, updated_at, created_at, url,\n                status, status_reason, content_length, body, body_path, elapsed, error,\n                headers AS \"headers!: sqlx::types::Json<Vec<HttpResponseHeader>>\"\n            FROM http_responses\n            WHERE id = ?\n        ",
+  "query": "\n            SELECT id, model, workspace_id, request_id, updated_at, created_at, url,\n                status, status_reason, content_length, body_path, elapsed, error,\n                headers AS \"headers!: sqlx::types::Json<Vec<HttpResponseHeader>>\"\n            FROM http_responses\n            WHERE workspace_id = ?\n            ORDER BY created_at DESC\n        ",
  "describe": {
    "columns": [
      {
@@ -53,29 +53,24 @@
        "ordinal": 9,
        "type_info": "Int64"
      },
-      {
-        "name": "body",
-        "ordinal": 10,
-        "type_info": "Blob"
-      },
      {
        "name": "body_path",
-        "ordinal": 11,
+        "ordinal": 10,
        "type_info": "Text"
      },
      {
        "name": "elapsed",
-        "ordinal": 12,
+        "ordinal": 11,
        "type_info": "Int64"
      },
      {
        "name": "error",
-        "ordinal": 13,
+        "ordinal": 12,
        "type_info": "Text"
      },
      {
        "name": "headers!: sqlx::types::Json<Vec<HttpResponseHeader>>",
-        "ordinal": 14,
+        "ordinal": 13,
        "type_info": "Text"
      }
    ],
@@ -94,11 +89,10 @@
      true,
      true,
      true,
-      true,
      false,
      true,
      false
    ]
  },
-  "hash": "c23c61b05a4c9e04ab0c1fc2c579d6f2a82a37aeed8addf9861b4985f2a5422e"
+  "hash": "3d199d371be948211f4a50c869b307f5df60784293c52397d77a187633a406dd"
 }
--- a/src-tauri/.sqlx/query-610223ad10b6e25926d486ba775a74b55625fcc4e6637d8a805d44ec3f3b9532.json
+++ b/src-tauri/.sqlx/query-610223ad10b6e25926d486ba775a74b55625fcc4e6637d8a805d44ec3f3b9532.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n            INSERT INTO workspaces (id, name, description, variables)\n            VALUES (?, ?, ?, ?)\n            ON CONFLICT (id) DO UPDATE SET\n               updated_at = CURRENT_TIMESTAMP,\n               name = excluded.name,\n               description = excluded.description,\n               variables = excluded.variables\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 4
-    },
-    "nullable": []
-  },
-  "hash": "610223ad10b6e25926d486ba775a74b55625fcc4e6637d8a805d44ec3f3b9532"
-}
--- a/src-tauri/.sqlx/query-62475fd9483fb5eda01c937949da2ef66ac7005b4be06b87aa6210d462348aca.json
+++ b/src-tauri/.sqlx/query-62475fd9483fb5eda01c937949da2ef66ac7005b4be06b87aa6210d462348aca.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n            UPDATE http_responses SET (\n                elapsed,\n                url,\n                status,\n                status_reason,\n                content_length,\n                body,\n                body_path,\n                error,\n                headers,\n                updated_at\n            ) = (?, ?, ?, ?, ?, ?, ?, ?, ?, CURRENT_TIMESTAMP) WHERE id = ?;\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 10
-    },
-    "nullable": []
-  },
-  "hash": "62475fd9483fb5eda01c937949da2ef66ac7005b4be06b87aa6210d462348aca"
-}
--- a/src-tauri/.sqlx/query-679a519475adeb50abf046114d3c0d1e48e103f2bb11ef47637d7f0b00ed241f.json
+++ b/src-tauri/.sqlx/query-679a519475adeb50abf046114d3c0d1e48e103f2bb11ef47637d7f0b00ed241f.json
@@ -1,6 +1,6 @@
 {
  "db_name": "SQLite",
-  "query": "\n            SELECT id, model, workspace_id, request_id, updated_at, created_at, url,\n                status, status_reason, content_length, body, body_path, elapsed, error,\n                headers AS \"headers!: sqlx::types::Json<Vec<HttpResponseHeader>>\"\n            FROM http_responses\n            WHERE request_id = ?\n            ORDER BY created_at DESC\n        ",
+  "query": "\n            SELECT id, model, workspace_id, request_id, updated_at, created_at, url,\n                status, status_reason, content_length, body_path, elapsed, error,\n                headers AS \"headers!: sqlx::types::Json<Vec<HttpResponseHeader>>\"\n            FROM http_responses\n            WHERE id = ?\n        ",
  "describe": {
    "columns": [
      {
@@ -53,29 +53,24 @@
        "ordinal": 9,
        "type_info": "Int64"
      },
-      {
-        "name": "body",
-        "ordinal": 10,
-        "type_info": "Blob"
-      },
      {
        "name": "body_path",
-        "ordinal": 11,
+        "ordinal": 10,
        "type_info": "Text"
      },
      {
        "name": "elapsed",
-        "ordinal": 12,
+        "ordinal": 11,
        "type_info": "Int64"
      },
      {
        "name": "error",
-        "ordinal": 13,
+        "ordinal": 12,
        "type_info": "Text"
      },
      {
        "name": "headers!: sqlx::types::Json<Vec<HttpResponseHeader>>",
-        "ordinal": 14,
+        "ordinal": 13,
        "type_info": "Text"
      }
    ],
@@ -94,11 +89,10 @@
      true,
      true,
      true,
-      true,
      false,
      true,
      false
    ]
  },
-  "hash": "5aa070e61995f8b1724efaa94c5f0cef5a4be6efda5d70354ad449d7d4b5aee4"
+  "hash": "679a519475adeb50abf046114d3c0d1e48e103f2bb11ef47637d7f0b00ed241f"
 }
--- a/src-tauri/.sqlx/query-86a9d12d7b00217f3143671908c31c2c6a3c24774a505280dcba169eb5b6b0fb.json
+++ b/src-tauri/.sqlx/query-86a9d12d7b00217f3143671908c31c2c6a3c24774a505280dcba169eb5b6b0fb.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            UPDATE settings SET (\n                theme,\n                appearance,\n                update_channel\n            ) = (?, ?, ?) WHERE id = 'default';\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 3
+    },
+    "nullable": []
+  },
+  "hash": "86a9d12d7b00217f3143671908c31c2c6a3c24774a505280dcba169eb5b6b0fb"
+}
--- a/src-tauri/.sqlx/query-cae4e905515ddea1ec2cd685020241f06b49719085a695b897ef8ad409d2cef2.json
+++ b/src-tauri/.sqlx/query-cae4e905515ddea1ec2cd685020241f06b49719085a695b897ef8ad409d2cef2.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            INSERT INTO workspaces (\n                id,\n                name,\n                description,\n                variables,\n                setting_request_timeout,\n                setting_follow_redirects,\n                setting_validate_certificates\n             )\n            VALUES (?, ?, ?, ?, ?, ?, ?)\n            ON CONFLICT (id) DO UPDATE SET\n               updated_at = CURRENT_TIMESTAMP,\n               name = excluded.name,\n               description = excluded.description,\n               variables = excluded.variables,\n               setting_request_timeout = excluded.setting_request_timeout,\n               setting_follow_redirects = excluded.setting_follow_redirects,\n               setting_validate_certificates = excluded.setting_validate_certificates\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 7
+    },
+    "nullable": []
+  },
+  "hash": "cae4e905515ddea1ec2cd685020241f06b49719085a695b897ef8ad409d2cef2"
+}
--- a/src-tauri/.sqlx/query-e08fa4f9b2929f20a01d1dc43d6847a309d3e8c5b324df2d039d1c6e07e6eb2f.json
+++ b/src-tauri/.sqlx/query-e08fa4f9b2929f20a01d1dc43d6847a309d3e8c5b324df2d039d1c6e07e6eb2f.json
@@ -1,6 +1,6 @@
 {
  "db_name": "SQLite",
-  "query": "\n            SELECT id, model, created_at, updated_at, name, description,\n                variables AS \"variables!: sqlx::types::Json<Vec<EnvironmentVariable>>\"\n            FROM workspaces WHERE id = ?\n        ",
+  "query": "\n            SELECT\n                id,\n                model,\n                created_at,\n                updated_at,\n                name,\n                description,\n                setting_request_timeout,\n                setting_follow_redirects,\n                setting_validate_certificates,\n                variables AS \"variables!: sqlx::types::Json<Vec<EnvironmentVariable>>\"\n            FROM workspaces WHERE id = ?\n        ",
  "describe": {
    "columns": [
      {
@@ -34,8 +34,23 @@
        "type_info": "Text"
      },
      {
-        "name": "variables!: sqlx::types::Json<Vec<EnvironmentVariable>>",
+        "name": "setting_request_timeout",
        "ordinal": 6,
+        "type_info": "Int64"
+      },
+      {
+        "name": "setting_follow_redirects",
+        "ordinal": 7,
+        "type_info": "Bool"
+      },
+      {
+        "name": "setting_validate_certificates",
+        "ordinal": 8,
+        "type_info": "Bool"
+      },
+      {
+        "name": "variables!: sqlx::types::Json<Vec<EnvironmentVariable>>",
+        "ordinal": 9,
        "type_info": "Null"
      }
    ],
@@ -49,8 +64,11 @@
      false,
      false,
      false,
+      false,
+      false,
+      false,
      false
    ]
  },
-  "hash": "dbe457087a7bccbca4c1d673aa8e547df04530a7f860a6ccd4e20126a7cdfa4f"
+  "hash": "e08fa4f9b2929f20a01d1dc43d6847a309d3e8c5b324df2d039d1c6e07e6eb2f"
 }
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -81,6 +81,20 @@ version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"

+[[package]]
+name = "async-compression"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5"
+dependencies = [
+ "brotli",
+ "flate2",
+ "futures-core",
+ "memchr",
+ "pin-project-lite",
+ "tokio",
+]
+
 [[package]]
 name = "atk"
 version = "0.15.1"
@@ -114,15 +128,6 @@ dependencies = [
 "num-traits",
 ]

-[[package]]
-name = "atomic-polyfill"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4"
-dependencies = [
- "critical-section",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -288,7 +293,7 @@ checksum = "f3e5afa991908cfbe79bd3109b824e473a1dc5f74f31fab91bb44c9e245daa77"
 dependencies = [
 "boa_gc",
 "boa_macros",
- "hashbrown 0.14.2",
+ "hashbrown 0.14.3",
 "indexmap 2.1.0",
 "once_cell",
 "phf 0.11.2",
@@ -304,7 +309,7 @@ checksum = "005fa0c5bd20805466dda55eb34cd709bb31a2592bb26927b47714eeed6914d8"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 "synstructure",
 ]

@@ -764,17 +769,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
 dependencies = [
 "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 ]

 [[package]]
 name = "ctor"
-version = "0.1.26"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
+checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e"
 dependencies = [
 "quote",
- "syn 1.0.109",
+ "syn 2.0.48",
 ]

 [[package]]
@@ -798,7 +803,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "strsim",
- "syn 2.0.39",
+ "syn 2.0.48",
 ]

 [[package]]
@@ -809,7 +814,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
 dependencies = [
 "darling_core",
 "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 ]

 [[package]]
@@ -819,7 +824,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
 dependencies = [
 "cfg-if",
- "hashbrown 0.14.2",
+ "hashbrown 0.14.3",
 "lock_api",
 "once_cell",
 "parking_lot_core",
@@ -920,7 +925,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 ]

 [[package]]
@@ -961,11 +966,12 @@ dependencies = [

 [[package]]
 name = "embed-resource"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f54cc3e827ee1c3812239a9a41dede7b4d7d5d5464faa32d71bd7cba28ce2cb2"
+checksum = "3bde55e389bea6a966bd467ad1ad7da0ae14546a5bc794d16d1e55e7fca44881"
 dependencies = [
 "cc",
+ "memchr",
 "rustc_version",
 "toml 0.8.8",
 "vswhom",
@@ -1139,7 +1145,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 ]

 [[package]]
@@ -1240,7 +1246,7 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 ]

 [[package]]
@@ -1615,9 +1621,9 @@ dependencies = [

 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
 "ahash",
 "allocator-api2",
@@ -1629,7 +1635,7 @@ version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
 dependencies = [
- "hashbrown 0.14.2",
+ "hashbrown 0.14.3",
 ]

 [[package]]
@@ -2007,15 +2013,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
 dependencies = [
 "equivalent",
- "hashbrown 0.14.2",
+ "hashbrown 0.14.3",
 "serde",
 ]

 [[package]]
 name = "infer"
-version = "0.12.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a898e4b7951673fce96614ce5751d13c40fc5674bc2d759288e46c3ab62598b3"
+checksum = "f551f8c3a39f68f986517db0d1759de85881894fdc7db798bd2a9df9cb04b7fc"
 dependencies = [
 "cfb",
 ]
@@ -2225,9 +2231,9 @@ checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829"

 [[package]]
 name = "litemap"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a1a2647d5b7134127971a6de0d533c49de2159167e7f259c427195f87168a1"
+checksum = "f9d642685b028806386b2b6e75685faadd3eb65a85fff7df711ce18446a422da"

 [[package]]
 name = "locale"
@@ -2342,9 +2348,9 @@ dependencies = [

 [[package]]
 name = "memchr"
-version = "2.6.4"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
+checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"

 [[package]]
 name = "memoffset"
@@ -2612,7 +2618,7 @@ dependencies = [
 "proc-macro-crate",
 "proc-macro2",
 "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 ]

 [[package]]
@@ -2674,12 +2680,12 @@ dependencies = [

 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 dependencies = [
- "atomic-polyfill",
 "critical-section",
+ "portable-atomic",
 ]

 [[package]]
@@ -2715,7 +2721,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 ]

 [[package]]
@@ -2724,6 +2730,15 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"

+[[package]]
+name = "openssl-src"
+version = "300.1.6+3.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439fac53e092cd7442a3660c85dde4643ab3b5bd39040912388dcdabf6b88085"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "openssl-sys"
 version = "0.9.95"
@@ -2732,6 +2747,7 @@ checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9"
 dependencies = [
 "cc",
 "libc",
+ "openssl-src",
 "pkg-config",
 "vcpkg",
 ]
@@ -2854,9 +2870,7 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
 dependencies = [
- "phf_macros 0.10.0",
 "phf_shared 0.10.0",
- "proc-macro-hack",
 ]

 [[package]]
@@ -2933,20 +2947,6 @@ dependencies = [
 "syn 1.0.109",
 ]

-[[package]]
-name = "phf_macros"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0"
-dependencies = [
- "phf_generator 0.10.0",
- "phf_shared 0.10.0",
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "phf_macros"
 version = "0.11.2"
@@ -2957,7 +2957,7 @@ dependencies = [
 "phf_shared 0.11.2",
 "proc-macro2",
 "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 ]

 [[package]]
@@ -3059,6 +3059,12 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2"

+[[package]]
+name = "portable-atomic"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
+
 [[package]]
 name = "postcard"
 version = "1.0.8"
@@ -3130,9 +3136,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"

 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c"
 dependencies = [
 "unicode-ident",
 ]
@@ -3148,9 +3154,9 @@ dependencies = [

 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
 "proc-macro2",
 ]
@@ -3337,6 +3343,7 @@ version = "0.11.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
 dependencies = [
+ "async-compression",
 "base64 0.21.5",
 "bytes",
 "encoding_rs",
@@ -3612,29 +3619,29 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "1.0.192"
+version = "1.0.195"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001"
+checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.192"
+version = "1.0.195"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1"
+checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 ]

 [[package]]
 name = "serde_json"
-version = "1.0.108"
+version = "1.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
+checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4"
 dependencies = [
 "itoa 1.0.9",
 "ryu",
@@ -3649,7 +3656,7 @@ checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 ]

 [[package]]
@@ -3699,7 +3706,7 @@ dependencies = [
 "darling",
 "proc-macro2",
 "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 ]

 [[package]]
@@ -4181,9 +4188,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "2.0.39"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -4198,7 +4205,7 @@ checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 "unicode-xid",
 ]

@@ -4401,9 +4408,9 @@ dependencies = [

 [[package]]
 name = "tauri-build"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defbfc551bd38ab997e5f8e458f87396d2559d05ce32095076ad6c30f7fc5f9c"
+checksum = "e9914a4715e0b75d9f387a285c7e26b5bbfeb1249ad9f842675a82481565c532"
 dependencies = [
 "anyhow",
 "cargo_toml",
@@ -4530,9 +4537,9 @@ dependencies = [

 [[package]]
 name = "tauri-utils"
-version = "1.5.0"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34d55e185904a84a419308d523c2c6891d5e2dbcee740c4997eb42e75a7b0f46"
+checksum = "ece74810b1d3d44f29f732a7ae09a63183d63949bbdd59c61f8ed2a1b70150db"
 dependencies = [
 "brotli",
 "ctor",
@@ -4545,7 +4552,7 @@ dependencies = [
 "kuchikiki",
 "log",
 "memchr",
- "phf 0.10.1",
+ "phf 0.11.2",
 "proc-macro2",
 "quote",
 "semver",
@@ -4553,10 +4560,10 @@ dependencies = [
 "serde_json",
 "serde_with",
 "thiserror",
- "toml 0.5.11",
+ "toml 0.7.8",
 "url",
 "walkdir",
- "windows 0.39.0",
+ "windows-version",
 ]

 [[package]]
@@ -4601,28 +4608,28 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c"

 [[package]]
 name = "thin-vec"
-version = "0.2.12"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aac81b6fd6beb5884b0cf3321b8117e6e5d47ecb6fc89f414cfdcca8b2fe2dd8"
+checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b"

 [[package]]
 name = "thiserror"
-version = "1.0.50"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
+checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.50"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
+checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 ]

 [[package]]
@@ -4837,7 +4844,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 ]

 [[package]]
@@ -5119,7 +5126,7 @@ dependencies = [
 "once_cell",
 "proc-macro2",
 "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 "wasm-bindgen-shared",
 ]

@@ -5153,7 +5160,7 @@ checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
 ]
@@ -5318,6 +5325,18 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

+[[package]]
+name = "window-shadows"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67ff424735b1ac21293b0492b069394b0a189c8a463fb015a16dea7c2e221c08"
+dependencies = [
+ "cocoa 0.25.0",
+ "objc",
+ "raw-window-handle",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "windows"
 version = "0.37.0"
@@ -5452,12 +5471,36 @@ dependencies = [
 "windows_x86_64_msvc 0.48.5",
 ]

+[[package]]
+name = "windows-targets"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.0",
+ "windows_aarch64_msvc 0.52.0",
+ "windows_i686_gnu 0.52.0",
+ "windows_i686_msvc 0.52.0",
+ "windows_x86_64_gnu 0.52.0",
+ "windows_x86_64_gnullvm 0.52.0",
+ "windows_x86_64_msvc 0.52.0",
+]
+
 [[package]]
 name = "windows-tokens"
 version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597"

+[[package]]
+name = "windows-version"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75aa004c988e080ad34aff5739c39d0312f4684699d6d71fc8a198d057b8b9b4"
+dependencies = [
+ "windows-targets 0.52.0",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.42.2"
@@ -5470,6 +5513,12 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"

+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.37.0"
@@ -5494,6 +5543,12 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"

+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.37.0"
@@ -5518,6 +5573,12 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"

+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.37.0"
@@ -5542,6 +5603,12 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"

+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.37.0"
@@ -5566,6 +5633,12 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"

+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.2"
@@ -5578,6 +5651,12 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"

+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.37.0"
@@ -5602,6 +5681,12 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"

+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+
 [[package]]
 name = "winnow"
 version = "0.5.19"
@@ -5639,9 +5724,9 @@ checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"

 [[package]]
 name = "writeable"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0af0c3d13faebf8dda0b5256fa7096a2d5ccb662f7b9f54a40fe201077ab1c2"
+checksum = "dad7bb64b8ef9c0aa27b6da38b452b0ee9fd82beaf276a87dd796fb55cbae14e"

 [[package]]
 name = "wry"
@@ -5725,6 +5810,7 @@ dependencies = [
 "http",
 "log",
 "objc",
+ "openssl-sys",
 "rand 0.8.5",
 "reqwest",
 "serde",
@@ -5736,13 +5822,14 @@ dependencies = [
 "tauri-plugin-window-state",
 "tokio",
 "uuid",
+ "window-shadows",
 ]

 [[package]]
 name = "yoke"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e38c508604d6bbbd292dadb3c02559aa7fff6b654a078a36217cad871636e4"
+checksum = "65e71b2e4f287f467794c671e2b8f8a5f3716b3c829079a1c44740148eff07e4"
 dependencies = [
 "serde",
 "stable_deref_trait",
@@ -5752,13 +5839,13 @@ dependencies = [

 [[package]]
 name = "yoke-derive"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5e19fb6ed40002bab5403ffa37e53e0e56f914a4450c8765f533018db1db35f"
+checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 "synstructure",
 ]

@@ -5779,7 +5866,7 @@ checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 ]

 [[package]]
@@ -5799,7 +5886,7 @@ checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 "synstructure",
 ]

@@ -5829,7 +5916,7 @@ checksum = "7a4a1638a1934450809c2266a70362bfc96cd90550c073f5b8a55014d1010157"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 ]

 [[package]]
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -17,30 +17,38 @@ tauri-build = { version = "1.2", features = [] }
 objc = "0.2.7"
 cocoa = "0.25.0"

+[target.'cfg(target_os = "linux")'.dependencies]
+openssl-sys = { version = "0.9", features = ["vendored"] } # For Ubuntu installation to work
+
 [dependencies]
 base64 = "0.21.0"
-boa_engine = "0.17.3"
-boa_runtime = "0.17.3"
-chrono = { version = "0.4.23", features = ["serde"] }
+boa_engine = { version = "0.17.3", features = ["annex-b"] }
+boa_runtime = { version = "0.17.3" }
+chrono = { version = "0.4.31", features = ["serde"] }
 futures = "0.3.26"
 http = "0.2.8"
 rand = "0.8.5"
-reqwest = { version = "0.11.14", features = ["json", "multipart"] }
-serde = { version = "1.0", features = ["derive"] }
-serde_json = { version = "1.0", features = ["raw_value"] }
+reqwest = { version = "0.11.14", features = ["json", "multipart", "gzip", "brotli", "deflate"] }
+serde = { version = "1.0.195", features = ["derive"] }
+serde_json = { version = "1.0.111", features = ["raw_value"] }
 sqlx = { version = "0.7.2", features = ["sqlite", "runtime-tokio-rustls", "json", "chrono", "time"] }
-tauri = { version = "1.3", features = [
+tauri = { version = "1.5.2", features = [
    "config-toml",
    "devtools",
+    "dialog-open",
+    "dialog-save",
    "fs-read-file",
    "os-all",
    "protocol-asset",
    "shell-open",
    "updater",
-    "window-start-dragging",
-    "dialog-open",
-    "dialog-save",
+    "window-close",
+    "window-maximize",
+    "window-minimize",
+    "window-set-decorations",
    "window-set-title",
+    "window-start-dragging",
+    "window-unmaximize",
 ] }
 tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
 tauri-plugin-log = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1", features = ["colored"] }
@@ -48,6 +56,7 @@ tokio = { version = "1.25.0", features = ["sync"] }
 uuid = "1.3.0"
 log = "0.4.20"
 datetime = "0.5.2"
+window-shadows = "0.2.2"

 [features]
 # by default Tauri runs in production mode
--- a/src-tauri/macos/entitlements.plist
+++ b/src-tauri/macos/entitlements.plist
@@ -2,13 +2,9 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>com.apple.security.app-sandbox</key>
-    <true/>
-
-    <key>com.apple.security.files.user-selected.read-write</key>
-    <true/>
-
-    <key>com.apple.security.network.client</key>
-    <true/>
+<!--    Re-enable for sandboxing. Currently disabled because auto-updater doesn't work with sandboxing.-->
+<!--    <key>com.apple.security.app-sandbox</key> <true/>-->
+<!--    <key>com.apple.security.files.user-selected.read-write</key> <true/>-->
+<!--    <key>com.apple.security.network.client</key> <true/>-->
 </dict>
 </plist>
--- a/src-tauri/migrations/20231122055216_remove_body.sql
+++ b/src-tauri/migrations/20231122055216_remove_body.sql
@@ -0,0 +1 @@
+ALTER TABLE http_responses DROP COLUMN body;
--- a/src-tauri/migrations/20240111221224_settings.sql
+++ b/src-tauri/migrations/20240111221224_settings.sql
@@ -0,0 +1,13 @@
+CREATE TABLE settings
+(
+    id                    TEXT                               NOT NULL
+        PRIMARY KEY,
+    model                 TEXT     DEFAULT 'settings'        NOT NULL,
+    created_at            DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    updated_at            DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    follow_redirects      BOOLEAN  DEFAULT TRUE              NOT NULL,
+    validate_certificates BOOLEAN  DEFAULT TRUE              NOT NULL,
+    request_timeout       INTEGER  DEFAULT 0                 NOT NULL,
+    theme                 TEXT     DEFAULT 'default'         NOT NULL,
+    appearance            TEXT     DEFAULT 'system'          NOT NULL
+);
--- a/src-tauri/migrations/20240115193751_workspace_settings.sql
+++ b/src-tauri/migrations/20240115193751_workspace_settings.sql
@@ -0,0 +1,9 @@
+-- Add existing request-related settings to workspace
+ALTER TABLE workspaces ADD COLUMN setting_request_timeout INTEGER DEFAULT '0' NOT NULL;
+ALTER TABLE workspaces ADD COLUMN setting_validate_certificates BOOLEAN DEFAULT TRUE NOT NULL;
+ALTER TABLE workspaces ADD COLUMN setting_follow_redirects BOOLEAN DEFAULT TRUE NOT NULL;
+
+-- Remove old settings that used to be global
+ALTER TABLE settings DROP COLUMN request_timeout;
+ALTER TABLE settings DROP COLUMN follow_redirects;
+ALTER TABLE settings DROP COLUMN validate_certificates;
--- a/src-tauri/migrations/20240118181105_channel_setting.sql
+++ b/src-tauri/migrations/20240118181105_channel_setting.sql
@@ -0,0 +1 @@
+ALTER TABLE settings ADD COLUMN update_channel TEXT DEFAULT 'stable' NOT NULL;
--- a/src-tauri/plugins/filter-jsonpath/index.mjs
+++ b/src-tauri/plugins/filter-jsonpath/index.mjs
--- a/src-tauri/plugins/filter-xpath/index.mjs
+++ b/src-tauri/plugins/filter-xpath/index.mjs
--- a/src-tauri/plugins/importer-insomnia/out/index.js
+++ b/src-tauri/plugins/importer-insomnia/out/index.js
--- a/src-tauri/plugins/importer-postman/index.mjs
+++ b/src-tauri/plugins/importer-postman/index.mjs
@@ -0,0 +1,160 @@
+const T = "https://schema.getpostman.com/json/collection/v2.1.0/collection.json", w = "https://schema.getpostman.com/json/collection/v2.0.0/collection.json", A = [w, T];
+function q(e) {
+  const t = b(e);
+  if (t == null)
+    return;
+  const n = a(t.info);
+  if (!A.includes(n.schema) || !Array.isArray(t.item))
+    return;
+  const i = {
+    workspaces: [],
+    environments: [],
+    requests: [],
+    folders: []
+  }, c = {
+    model: "workspace",
+    id: m("wk"),
+    name: n.name || "Postman Import",
+    description: n.description || ""
+  };
+  i.workspaces.push(c);
+  const f = (r, u = null) => {
+    if (typeof r.name == "string" && Array.isArray(r.item)) {
+      const o = {
+        model: "folder",
+        workspaceId: c.id,
+        id: m("fl"),
+        name: r.name,
+        folderId: u
+      };
+      i.folders.push(o);
+      for (const s of r.item)
+        f(s, o.id);
+    } else if (typeof r.name == "string" && "request" in r) {
+      const o = a(r.request), s = k(o.body), d = S(o.auth), g = {
+        model: "http_request",
+        id: m("rq"),
+        workspaceId: c.id,
+        folderId: u,
+        name: r.name,
+        method: o.method || "GET",
+        url: typeof o.url == "string" ? o.url : a(o.url).raw,
+        body: s.body,
+        bodyType: s.bodyType,
+        authentication: d.authentication,
+        authenticationType: d.authenticationType,
+        headers: [
+          ...s.headers,
+          ...d.headers,
+          ...y(o.header).map((p) => ({
+            name: p.key,
+            value: p.value,
+            enabled: !p.disabled
+          }))
+        ]
+      };
+      i.requests.push(g);
+    } else
+      console.log("Unknown item", r, u);
+  };
+  for (const r of t.item)
+    f(r);
+  return { resources: h(i) };
+}
+function S(e) {
+  const t = a(e);
+  return "basic" in t ? {
+    headers: [],
+    authenticationType: "basic",
+    authentication: {
+      username: t.basic.username || "",
+      password: t.basic.password || ""
+    }
+  } : { headers: [], authenticationType: null, authentication: {} };
+}
+function k(e) {
+  const t = a(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: b(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: y(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: y(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 ?? ""
+        }
+      )
+    }
+  } : { headers: [], bodyType: null, body: {} };
+}
+function b(e) {
+  try {
+    return a(JSON.parse(e));
+  } catch {
+  }
+  return null;
+}
+function a(e) {
+  return Object.prototype.toString.call(e) === "[object Object]" ? e : {};
+}
+function y(e) {
+  return Object.prototype.toString.call(e) === "[object Array]" ? e : [];
+}
+function h(e) {
+  return typeof e == "string" ? e.replace(/{{\s*(_\.)?([^}]+)\s*}}/g, "${[$2]}") : Array.isArray(e) && e != null ? e.map(h) : typeof e == "object" && e != null ? Object.fromEntries(
+    Object.entries(e).map(([t, n]) => [t, h(n)])
+  ) : e;
+}
+function m(e) {
+  const t = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+  let n = `${e}_`;
+  for (let l = 0; l < 10; l++)
+    n += t[Math.floor(Math.random() * t.length)];
+  return n;
+}
+export {
+  q as pluginHookImport
+};
--- a/src-tauri/plugins/importer-postman/out/index.js
+++ b/src-tauri/plugins/importer-postman/out/index.js
@@ -1,153 +0,0 @@
-const b = "https://schema.getpostman.com/json/collection/v2.1.0/collection.json", g = "https://schema.getpostman.com/json/collection/v2.0.0/collection.json", T = [g, b];
-function S(e) {
-  const t = h(e);
-  if (t == null)
-    return;
-  const r = s(t.info);
-  if (!T.includes(r.schema) || !Array.isArray(t.item))
-    return;
-  const a = {
-    workspaces: [],
-    environments: [],
-    requests: [],
-    folders: []
-  }, l = {
-    model: "workspace",
-    id: "wrk_0",
-    name: r.name || "Postman Import",
-    description: r.description || ""
-  };
-  a.workspaces.push(l);
-  const y = (n, c = null) => {
-    if (typeof n.name == "string" && Array.isArray(n.item)) {
-      const o = {
-        model: "folder",
-        workspaceId: l.id,
-        id: `fld_${a.folders.length}`,
-        name: n.name,
-        folderId: c
-      };
-      a.folders.push(o);
-      for (const i of n.item)
-        y(i, o.id);
-    } else if (typeof n.name == "string" && "request" in n) {
-      const o = s(n.request), i = A(o.body), u = w(o.auth), f = {
-        model: "http_request",
-        id: `req_${a.requests.length}`,
-        workspaceId: l.id,
-        folderId: c,
-        name: n.name,
-        method: o.method || "GET",
-        url: typeof o.url == "string" ? o.url : s(o.url).raw,
-        body: i.body,
-        bodyType: i.bodyType,
-        authentication: u.authentication,
-        authenticationType: u.authenticationType,
-        headers: [
-          ...i.headers,
-          ...u.headers,
-          ...p(o.header).map((d) => ({
-            name: d.key,
-            value: d.value,
-            enabled: !d.disabled
-          }))
-        ]
-      };
-      a.requests.push(f);
-    } else
-      console.log("Unknown item", n, c);
-  };
-  for (const n of t.item)
-    y(n);
-  return { resources: m(a) };
-}
-function w(e) {
-  const t = s(e);
-  return "basic" in t ? {
-    headers: [],
-    authenticationType: "basic",
-    authentication: {
-      username: t.basic.username || "",
-      password: t.basic.password || ""
-    }
-  } : { headers: [], authenticationType: null, authentication: {} };
-}
-function A(e) {
-  const t = s(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: h(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: p(t.urlencoded).map((r) => ({
-        enabled: !r.disabled,
-        name: r.key ?? "",
-        value: r.value ?? ""
-      }))
-    }
-  } : "formdata" in t ? {
-    headers: [
-      {
-        name: "Content-Type",
-        value: "multipart/form-data",
-        enabled: !0
-      }
-    ],
-    bodyType: "multipart/form-data",
-    body: {
-      form: p(t.formdata).map(
-        (r) => r.src != null ? {
-          enabled: !r.disabled,
-          name: r.key ?? "",
-          file: r.src ?? ""
-        } : {
-          enabled: !r.disabled,
-          name: r.key ?? "",
-          value: r.value ?? ""
-        }
-      )
-    }
-  } : { headers: [], bodyType: null, body: {} };
-}
-function h(e) {
-  try {
-    return s(JSON.parse(e));
-  } catch {
-  }
-  return null;
-}
-function s(e) {
-  return Object.prototype.toString.call(e) === "[object Object]" ? e : {};
-}
-function p(e) {
-  return Object.prototype.toString.call(e) === "[object Array]" ? e : [];
-}
-function m(e) {
-  return typeof e == "string" ? e.replace(/{{\s*(_\.)?([^}]+)\s*}}/g, "${[$2]}") : Array.isArray(e) && e != null ? e.map(m) : typeof e == "object" && e != null ? Object.fromEntries(
-    Object.entries(e).map(([t, r]) => [t, m(r)])
-  ) : e;
-}
-export {
-  S as pluginHookImport
-};
--- a/src-tauri/plugins/importer-yaak/out/index.js
+++ b/src-tauri/plugins/importer-yaak/out/index.js
--- a/src-tauri/src/analytics.rs
+++ b/src-tauri/src/analytics.rs
@@ -1,89 +1,216 @@
 use log::{debug, warn};
+use serde::{Deserialize, Serialize};
+use serde_json::json;
+use sqlx::{Pool, Sqlite};
 use sqlx::types::JsonValue;
-use tauri::{async_runtime, AppHandle, Manager};
+use tauri::{AppHandle, Manager, State};
+use tokio::sync::Mutex;

-use crate::is_dev;
+use crate::{is_dev, models};

+// serializable
+#[derive(Serialize, Deserialize)]
 pub enum AnalyticsResource {
    App,
-    // Workspace,
-    // Environment,
-    // Folder,
-    // HttpRequest,
-    // HttpResponse,
+    Sidebar,
+    Workspace,
+    Environment,
+    Folder,
+    HttpRequest,
+    HttpResponse,
+    KeyValue,
 }

+impl AnalyticsResource {
+    pub fn from_str(s: &str) -> Option<AnalyticsResource> {
+        match s {
+            "App" => Some(AnalyticsResource::App),
+            "Sidebar" => Some(AnalyticsResource::Sidebar),
+            "Workspace" => Some(AnalyticsResource::Workspace),
+            "Environment" => Some(AnalyticsResource::Environment),
+            "Folder" => Some(AnalyticsResource::Folder),
+            "HttpRequest" => Some(AnalyticsResource::HttpRequest),
+            "HttpResponse" => Some(AnalyticsResource::HttpResponse),
+            "KeyValue" => Some(AnalyticsResource::KeyValue),
+            _ => None,
+        }
+    }
+}
+
+#[derive(Serialize, Deserialize)]
 pub enum AnalyticsAction {
    Launch,
-    // Create,
-    // Update,
-    // Upsert,
-    // Delete,
-    // Send,
-    // Duplicate,
+    LaunchFirst,
+    LaunchUpdate,
+    Create,
+    Update,
+    Upsert,
+    Delete,
+    DeleteMany,
+    Send,
+    Toggle,
+    Duplicate,
+}
+
+impl AnalyticsAction {
+    pub fn from_str(s: &str) -> Option<AnalyticsAction> {
+        match s {
+            "Launch" => Some(AnalyticsAction::Launch),
+            "LaunchFirst" => Some(AnalyticsAction::LaunchFirst),
+            "LaunchUpdate" => Some(AnalyticsAction::LaunchUpdate),
+            "Create" => Some(AnalyticsAction::Create),
+            "Update" => Some(AnalyticsAction::Update),
+            "Upsert" => Some(AnalyticsAction::Upsert),
+            "Delete" => Some(AnalyticsAction::Delete),
+            "DeleteMany" => Some(AnalyticsAction::DeleteMany),
+            "Send" => Some(AnalyticsAction::Send),
+            "Duplicate" => Some(AnalyticsAction::Duplicate),
+            "Toggle" => Some(AnalyticsAction::Toggle),
+            _ => None,
+        }
+    }
 }

 fn resource_name(resource: AnalyticsResource) -> &'static str {
    match resource {
        AnalyticsResource::App => "app",
-        // AnalyticsResource::Workspace => "workspace",
-        // AnalyticsResource::Environment => "environment",
-        // AnalyticsResource::Folder => "folder",
-        // AnalyticsResource::HttpRequest => "http_request",
-        // AnalyticsResource::HttpResponse => "http_response",
+        AnalyticsResource::Sidebar => "sidebar",
+        AnalyticsResource::Workspace => "workspace",
+        AnalyticsResource::Environment => "environment",
+        AnalyticsResource::Folder => "folder",
+        AnalyticsResource::HttpRequest => "http_request",
+        AnalyticsResource::HttpResponse => "http_response",
+        AnalyticsResource::KeyValue => "key_value",
    }
 }

 fn action_name(action: AnalyticsAction) -> &'static str {
    match action {
        AnalyticsAction::Launch => "launch",
-        // AnalyticsAction::Create => "create",
-        // AnalyticsAction::Update => "update",
-        // AnalyticsAction::Upsert => "upsert",
-        // AnalyticsAction::Delete => "delete",
-        // AnalyticsAction::Send => "send",
-        // AnalyticsAction::Duplicate => "duplicate",
+        AnalyticsAction::LaunchFirst => "launch_first",
+        AnalyticsAction::LaunchUpdate => "launch_update",
+        AnalyticsAction::Create => "create",
+        AnalyticsAction::Update => "update",
+        AnalyticsAction::Upsert => "upsert",
+        AnalyticsAction::Delete => "delete",
+        AnalyticsAction::DeleteMany => "delete_many",
+        AnalyticsAction::Send => "send",
+        AnalyticsAction::Duplicate => "duplicate",
+        AnalyticsAction::Toggle => "toggle",
    }
 }

-pub fn track_event(
+#[derive(Default, Debug)]
+pub struct LaunchEventInfo {
+    pub current_version: String,
+    pub previous_version: String,
+    pub launched_after_update: bool,
+    pub num_launches: i32,
+}
+
+pub async fn track_launch_event(app_handle: &AppHandle) -> LaunchEventInfo {
+    let namespace = "analytics";
+    let last_tracked_version_key = "last_tracked_version";
+    let db_instance: State<'_, Mutex<Pool<Sqlite>>> = app_handle.state();
+    let pool = &*db_instance.lock().await;
+
+    let mut info = LaunchEventInfo::default();
+
+    info.num_launches = models::get_key_value_int(namespace, "num_launches", 0, pool).await + 1;
+    info.previous_version =
+        models::get_key_value_string(namespace, last_tracked_version_key, "", pool).await;
+    info.current_version = app_handle.package_info().version.to_string();
+
+    if info.previous_version.is_empty() {
+        track_event(
+            app_handle,
+            AnalyticsResource::App,
+            AnalyticsAction::LaunchFirst,
+            None,
+        )
+        .await;
+    } else {
+        info.launched_after_update = info.current_version != info.previous_version;
+        if info.launched_after_update {
+            track_event(
+                app_handle,
+                AnalyticsResource::App,
+                AnalyticsAction::LaunchUpdate,
+                Some(json!({ "num_launches": info.num_launches })),
+            )
+            .await;
+        }
+    };
+
+    // Track a launch event in all cases
+    track_event(
+        app_handle,
+        AnalyticsResource::App,
+        AnalyticsAction::Launch,
+        Some(json!({ "num_launches": info.num_launches })),
+    )
+        .await;
+
+
+    // Update key values
+
+    models::set_key_value_string(
+        namespace,
+        last_tracked_version_key,
+        info.current_version.as_str(),
+        pool,
+    )
+    .await;
+    models::set_key_value_int(namespace, "num_launches", info.num_launches, pool).await;
+
+    info
+}
+
+pub async fn track_event(
    app_handle: &AppHandle,
    resource: AnalyticsResource,
    action: AnalyticsAction,
    attributes: Option<JsonValue>,
 ) {
-    async_runtime::block_on(async move {
-        let event = format!("{}.{}", resource_name(resource), action_name(action));
-        let attributes_json = attributes.unwrap_or("{}".to_string().into()).to_string();
-        let info = app_handle.package_info();
-        let tz = datetime::sys_timezone().unwrap_or("unknown".to_string());
-        let params = vec![
-            ("e", event.clone()),
-            ("a", attributes_json.clone()),
-            ("id", "site_zOK0d7jeBy2TLxFCnZ".to_string()),
-            ("v", info.version.clone().to_string()),
-            ("os", get_os().to_string()),
-            ("tz", tz),
-            ("xy", get_window_size(app_handle)),
-        ];
-        let url = "https://t.yaak.app/t/e".to_string();
-        let req = reqwest::Client::builder()
-            .build()
-            .unwrap()
-            .get(&url)
-            .query(&params);
+    let event = format!("{}.{}", resource_name(resource), action_name(action));
+    let attributes_json = attributes.unwrap_or("{}".to_string().into()).to_string();
+    let info = app_handle.package_info();
+    let tz = datetime::sys_timezone().unwrap_or("unknown".to_string());
+    let site = match is_dev() {
+        true => "site_TkHWjoXwZPq3HfhERb",
+        false => "site_zOK0d7jeBy2TLxFCnZ",
+    };
+    let base_url = match is_dev() {
+        true => "http://localhost:7194",
+        false => "https://t.yaak.app",
+    };
+    let params = vec![
+        ("e", event.clone()),
+        ("a", attributes_json.clone()),
+        ("id", site.to_string()),
+        ("v", info.version.clone().to_string()),
+        ("os", get_os().to_string()),
+        ("tz", tz),
+        ("xy", get_window_size(app_handle)),
+    ];
+    let req = reqwest::Client::builder()
+        .build()
+        .unwrap()
+        .get(format!("{base_url}/t/e"))
+        .query(&params);

-        if is_dev() {
-            debug!("Send event (dev): {}", event);
-        } else if let Err(e) = req.send().await {
-            warn!(
-                "Error sending analytics event: {} {} {:?}",
-                e, event, params
-            );
-        } else {
-            debug!("Send event: {}: {:?}", event, params);
-        }
-    });
+    // Disable analytics actual sending in dev
+    if is_dev() {
+        debug!("track: {} {}", event, attributes_json);
+        return;
+    }
+
+    if let Err(e) = req.send().await {
+        warn!(
+            "Error sending analytics event: {} {} {} {:?}",
+            e, event, attributes_json, params,
+        );
+    }
 }

 fn get_os() -> &'static str {
--- a/src-tauri/src/http.rs
+++ b/src-tauri/src/http.rs
@@ -1,11 +1,13 @@
 use std::fs;
 use std::fs::{create_dir_all, File};
 use std::io::Write;
+use std::path::PathBuf;
+use std::time::Duration;

 use base64::Engine;
 use http::{HeaderMap, HeaderName, HeaderValue, Method};
 use http::header::{ACCEPT, USER_AGENT};
-use log::warn;
+use log::{error, info, warn};
 use reqwest::multipart;
 use reqwest::redirect::Policy;
 use sqlx::{Pool, Sqlite};
@@ -14,12 +16,13 @@ use tauri::{AppHandle, Wry};

 use crate::{emit_side_effect, models, render, response_err};

-pub async fn actually_send_request(
+pub async fn send_http_request(
    request: models::HttpRequest,
    response: &models::HttpResponse,
    environment_id: &str,
    app_handle: &AppHandle<Wry>,
    pool: &Pool<Sqlite>,
+    download_path: Option<PathBuf>,
 ) -> Result<models::HttpResponse, String> {
    let start = std::time::Instant::now();
    let environment = models::get_environment(environment_id, pool).await.ok();
@@ -34,11 +37,26 @@ pub async fn actually_send_request(
        url_string = format!("http://{}", url_string);
    }

-    let client = reqwest::Client::builder()
-        .redirect(Policy::none())
-        // .danger_accept_invalid_certs(true)
-        .build()
-        .expect("Failed to build client");
+    let mut client_builder = reqwest::Client::builder()
+        .redirect(match workspace.setting_follow_redirects {
+            true => Policy::limited(10), // TODO: Handle redirects natively
+            false => Policy::none(),
+        })
+        .gzip(true)
+        .brotli(true)
+        .deflate(true)
+        .referer(false)
+        .danger_accept_invalid_certs(!workspace.setting_validate_certificates)
+        .tls_info(true);
+
+    if workspace.setting_request_timeout > 0 {
+        client_builder = client_builder.timeout(Duration::from_millis(
+            workspace.setting_request_timeout.unsigned_abs(),
+        ));
+    }
+
+    // .use_rustls_tls() // TODO: Make this configurable (maybe)
+    let client = client_builder.build().expect("Failed to build client");

    let m = Method::from_bytes(request.method.to_uppercase().as_bytes())
        .expect("Failed to create method");
@@ -63,14 +81,14 @@ pub async fn actually_send_request(
        let header_name = match HeaderName::from_bytes(name.as_bytes()) {
            Ok(n) => n,
            Err(e) => {
-                eprintln!("Failed to create header name: {}", e);
+                error!("Failed to create header name: {}", e);
                continue;
            }
        };
        let header_value = match HeaderValue::from_str(value.as_str()) {
            Ok(n) => n,
            Err(e) => {
-                eprintln!("Failed to create header value: {}", e);
+                error!("Failed to create header value: {}", e);
                continue;
            }
        };
@@ -114,7 +132,9 @@ pub async fn actually_send_request(

    let mut query_params = Vec::new();
    for p in request.url_parameters.0 {
-        if !p.enabled || p.name.is_empty() { continue; }
+        if !p.enabled || p.name.is_empty() {
+            continue;
+        }
        query_params.push((
            render::render(&p.name, &workspace, environment_ref),
            render::render(&p.value, &workspace, environment_ref),
@@ -128,18 +148,38 @@ pub async fn actually_send_request(
        let request_body = request.body.0;

        if request_body.contains_key("text") {
-            let raw_text = request_body.get("text").unwrap_or(empty_string).as_str().unwrap_or("");
+            let raw_text = request_body
+                .get("text")
+                .unwrap_or(empty_string)
+                .as_str()
+                .unwrap_or("");
            let body = render::render(raw_text, &workspace, environment_ref);
            request_builder = request_builder.body(body);
-        } else if body_type == "application/x-www-form-urlencoded" && request_body.contains_key("form") {
+        } else if body_type == "application/x-www-form-urlencoded"
+            && request_body.contains_key("form")
+        {
            let mut form_params = Vec::new();
            let form = request_body.get("form");
            if let Some(f) = form {
                for p in f.as_array().unwrap_or(&Vec::new()) {
-                    let enabled = p.get("enabled").unwrap_or(empty_bool).as_bool().unwrap_or(false);
-                    let name = p.get("name").unwrap_or(empty_string).as_str().unwrap_or_default();
-                    if !enabled || name.is_empty() { continue; }
-                    let value = p.get("value").unwrap_or(empty_string).as_str().unwrap_or_default();
+                    let enabled = p
+                        .get("enabled")
+                        .unwrap_or(empty_bool)
+                        .as_bool()
+                        .unwrap_or(false);
+                    let name = p
+                        .get("name")
+                        .unwrap_or(empty_string)
+                        .as_str()
+                        .unwrap_or_default();
+                    if !enabled || name.is_empty() {
+                        continue;
+                    }
+                    let value = p
+                        .get("value")
+                        .unwrap_or(empty_string)
+                        .as_str()
+                        .unwrap_or_default();
                    form_params.push((
                        render::render(name, &workspace, environment_ref),
                        render::render(value, &workspace, environment_ref),
@@ -151,17 +191,41 @@ pub async fn actually_send_request(
            let mut multipart_form = multipart::Form::new();
            if let Some(form_definition) = request_body.get("form") {
                for p in form_definition.as_array().unwrap_or(&Vec::new()) {
-                    let enabled = p.get("enabled").unwrap_or(empty_bool).as_bool().unwrap_or(false);
-                    let name = p.get("name").unwrap_or(empty_string).as_str().unwrap_or_default();
-                    if !enabled || name.is_empty() { continue; }
+                    let enabled = p
+                        .get("enabled")
+                        .unwrap_or(empty_bool)
+                        .as_bool()
+                        .unwrap_or(false);
+                    let name = p
+                        .get("name")
+                        .unwrap_or(empty_string)
+                        .as_str()
+                        .unwrap_or_default();
+                    if !enabled || name.is_empty() {
+                        continue;
+                    }

-                    let file = p.get("file").unwrap_or(empty_string).as_str().unwrap_or_default();
-                    let value = p.get("value").unwrap_or(empty_string).as_str().unwrap_or_default();
+                    let file = p
+                        .get("file")
+                        .unwrap_or(empty_string)
+                        .as_str()
+                        .unwrap_or_default();
+                    let value = p
+                        .get("value")
+                        .unwrap_or(empty_string)
+                        .as_str()
+                        .unwrap_or_default();
                    multipart_form = multipart_form.part(
                        render::render(name, &workspace, environment_ref),
                        match !file.is_empty() {
-                            true => multipart::Part::bytes(fs::read(file).map_err(|e| e.to_string())?),
-                            false => multipart::Part::text(render::render(value, &workspace, environment_ref)),
+                            true => {
+                                multipart::Part::bytes(fs::read(file).map_err(|e| e.to_string())?)
+                            }
+                            false => multipart::Part::text(render::render(
+                                value,
+                                &workspace,
+                                environment_ref,
+                            )),
                        },
                    );
                }
@@ -228,11 +292,6 @@ pub async fn actually_send_request(
                );
            }

-            // Also store body directly on the model, if small enough
-            if body_bytes.len() < 100_000 {
-                response.body = Some(body_bytes);
-            }
-
            response.elapsed = start.elapsed().as_millis() as i64;
            response = models::update_response_if_id(&response, pool)
                .await
@@ -240,8 +299,20 @@ pub async fn actually_send_request(
            if !request.id.is_empty() {
                emit_side_effect(app_handle, "updated_model", &response);
            }
+
+            // Copy response to download path, if specified
+            match (download_path, response.body_path.clone()) {
+                (Some(dl_path), Some(body_path)) => {
+                    info!("Downloading response body to {}", dl_path.display());
+                    fs::copy(body_path, dl_path).expect("Failed to copy file for response download");
+                }
+                _ => {}
+            };
+
            Ok(response)
        }
-        Err(e) => response_err(response, e.to_string(), app_handle, pool).await,
+        Err(e) => {
+            response_err(response, e.to_string(), app_handle, pool).await
+        }
    }
 }
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -9,36 +9,39 @@ extern crate objc;

 use std::collections::HashMap;
 use std::env::current_dir;
-use std::fs::{create_dir_all, File};
+use std::fs::{create_dir_all, read_to_string, File};
 use std::process::exit;

 use fern::colors::ColoredLevelConfig;
-use log::{debug, info, warn};
+use log::{debug, error, info, warn};
 use rand::random;
 use serde::Serialize;
-use sqlx::{Pool, Sqlite, SqlitePool};
+use serde_json::Value;
 use sqlx::migrate::Migrator;
 use sqlx::types::Json;
-use tauri::{AppHandle, Menu, RunEvent, State, Submenu, Window, WindowUrl, Wry};
-use tauri::{CustomMenuItem, Manager, WindowEvent};
+use sqlx::{Pool, Sqlite, SqlitePool};
 #[cfg(target_os = "macos")]
 use tauri::TitleBarStyle;
+use tauri::{AppHandle, RunEvent, State, Window, WindowUrl, Wry};
+use tauri::{Manager, WindowEvent};
 use tauri_plugin_log::{fern, LogTarget};
 use tauri_plugin_window_state::{StateFlags, WindowExt};
 use tokio::sync::Mutex;
+use tokio::time::sleep;
+use window_shadows::set_shadow;

 use window_ext::TrafficLightWindowExt;

-use crate::analytics::{AnalyticsAction, AnalyticsResource, track_event};
+use crate::analytics::{AnalyticsAction, AnalyticsResource};
+use crate::http::send_http_request;
 use crate::plugin::{ImportResources, ImportResult};
-use crate::send::actually_send_request;
 use crate::updates::{update_mode_from_str, UpdateMode, YaakUpdater};

 mod analytics;
+mod http;
 mod models;
 mod plugin;
 mod render;
-mod send;
 mod updates;
 mod window_ext;
 mod window_menu;
@@ -67,7 +70,7 @@ async fn migrate_db(
    info!("Running migrations at {}", p.to_string_lossy());
    let m = Migrator::new(p).await.expect("Failed to load migrations");
    m.run(pool).await.expect("Failed to run migrations");
-    info!("Migrations complete");
+    info!("Migrations complete!");
    Ok(())
 }

@@ -82,7 +85,53 @@ async fn send_ephemeral_request(
    let response = models::HttpResponse::new();
    let environment_id2 = environment_id.unwrap_or("n/a").to_string();
    request.id = "".to_string();
-    actually_send_request(request, &response, &environment_id2, &app_handle, pool).await
+    send_http_request(
+        request,
+        &response,
+        &environment_id2,
+        &app_handle,
+        pool,
+        None,
+    )
+    .await
+}
+
+#[tauri::command]
+async fn filter_response(
+    window: Window<Wry>,
+    db_instance: State<'_, Mutex<Pool<Sqlite>>>,
+    response_id: &str,
+    filter: &str,
+) -> Result<String, String> {
+    let pool = &*db_instance.lock().await;
+    let response = models::get_response(response_id, pool)
+        .await
+        .expect("Failed to get response");
+
+    if let None = response.body_path {
+        return Err("Response body not found".to_string());
+    }
+
+    let mut content_type = "".to_string();
+    for header in response.headers.iter() {
+        if header.name.to_lowercase() == "content-type" {
+            content_type = header.value.to_string().to_lowercase();
+            break;
+        }
+    }
+
+    // TODO: Have plugins register their own content type (regex?)
+    let plugin_name = if content_type.contains("json") {
+        "filter-jsonpath"
+    } else {
+        "filter-xpath"
+    };
+
+    let body = read_to_string(response.body_path.unwrap()).unwrap();
+    let filter_result = plugin::run_plugin_filter(&window.app_handle(), plugin_name, filter, &body)
+        .await
+        .expect("Failed to run filter");
+    Ok(filter_result.filtered)
 }

 #[tauri::command]
@@ -179,6 +228,7 @@ async fn send_request(
    db_instance: State<'_, Mutex<Pool<Sqlite>>>,
    request_id: &str,
    environment_id: Option<&str>,
+    download_dir: Option<&str>,
 ) -> Result<models::HttpResponse, String> {
    let pool = &*db_instance.lock().await;

@@ -186,7 +236,7 @@ async fn send_request(
        .await
        .expect("Failed to get request");

-    let response = models::create_response(&req.id, 0, "", 0, None, None, None, None, vec![], pool)
+    let response = models::create_response(&req.id, 0, "", 0, None, None, None, vec![], pool)
        .await
        .expect("Failed to create response");

@@ -195,9 +245,22 @@ async fn send_request(
    let app_handle2 = window.app_handle().clone();
    let pool2 = pool.clone();

+    let download_path = if let Some(p) = download_dir {
+        Some(std::path::Path::new(p).to_path_buf())
+    } else {
+        None
+    };
+
    tokio::spawn(async move {
-        if let Err(e) =
-            actually_send_request(req, &response2, &environment_id2, &app_handle2, &pool2).await
+        if let Err(e) = send_http_request(
+            req,
+            &response2,
+            &environment_id2,
+            &app_handle2,
+            &pool2,
+            download_path,
+        )
+        .await
        {
            response_err(&response2, e, &app_handle2, &pool2)
                .await
@@ -224,6 +287,28 @@ async fn response_err(
    Ok(response)
 }

+#[tauri::command]
+async fn track_event(
+    window: Window<Wry>,
+    resource: &str,
+    action: &str,
+    attributes: Option<Value>,
+) -> Result<(), String> {
+    match (
+        AnalyticsResource::from_str(resource),
+        AnalyticsAction::from_str(action),
+    ) {
+        (Some(resource), Some(action)) => {
+            analytics::track_event(&window.app_handle(), resource, action, attributes).await;
+        }
+        _ => {
+            error!("Invalid action/resource for track_event: {action} {resource}");
+            return Err("Invalid event".to_string());
+        }
+    };
+    Ok(())
+}
+
 #[tauri::command]
 async fn set_update_mode(
    update_mode: &str,
@@ -240,7 +325,7 @@ async fn get_key_value(
    db_instance: State<'_, Mutex<Pool<Sqlite>>>,
 ) -> Result<Option<models::KeyValue>, ()> {
    let pool = &*db_instance.lock().await;
-    let result = models::get_key_value(namespace, key, pool).await;
+    let result = models::get_key_value_raw(namespace, key, pool).await;
    Ok(result)
 }

@@ -253,7 +338,7 @@ async fn set_key_value(
    db_instance: State<'_, Mutex<Pool<Sqlite>>>,
 ) -> Result<models::KeyValue, String> {
    let pool = &*db_instance.lock().await;
-    let (key_value, created) = models::set_key_value(namespace, key, value, pool).await;
+    let (key_value, created) = models::set_key_value_raw(namespace, key, value, pool).await;

    if created {
        emit_and_return(&window, "created_model", key_value)
@@ -269,15 +354,10 @@ async fn create_workspace(
    db_instance: State<'_, Mutex<Pool<Sqlite>>>,
 ) -> Result<models::Workspace, String> {
    let pool = &*db_instance.lock().await;
-    let created_workspace = models::upsert_workspace(
-        pool,
-        models::Workspace {
-            name: name.to_string(),
-            ..Default::default()
-        },
-    )
-    .await
-    .expect("Failed to create Workspace");
+    let created_workspace =
+        models::upsert_workspace(pool, models::Workspace::new(name.to_string()))
+            .await
+            .expect("Failed to create Workspace");

    emit_and_return(&window, "created_model", created_workspace)
 }
@@ -504,6 +584,27 @@ async fn list_environments(
    Ok(environments)
 }

+#[tauri::command]
+async fn get_settings(db_instance: State<'_, Mutex<Pool<Sqlite>>>) -> Result<models::Settings, ()> {
+    let pool = &*db_instance.lock().await;
+    Ok(models::get_or_create_settings(pool).await)
+}
+
+#[tauri::command]
+async fn update_settings(
+    settings: models::Settings,
+    window: Window<Wry>,
+    db_instance: State<'_, Mutex<Pool<Sqlite>>>,
+) -> Result<models::Settings, String> {
+    let pool = &*db_instance.lock().await;
+
+    let updated_settings = models::update_settings(pool, settings)
+        .await
+        .expect("Failed to update settings");
+
+    emit_and_return(&window, "updated_model", updated_settings)
+}
+
 #[tauri::command]
 async fn get_folder(
    id: &str,
@@ -551,10 +652,11 @@ async fn get_workspace(
 #[tauri::command]
 async fn list_responses(
    request_id: &str,
+    limit: Option<i64>,
    db_instance: State<'_, Mutex<Pool<Sqlite>>>,
 ) -> Result<Vec<models::HttpResponse>, String> {
    let pool = &*db_instance.lock().await;
-    models::find_responses(request_id, pool)
+    models::find_responses(request_id, limit, pool)
        .await
        .map_err(|e| e.to_string())
 }
@@ -651,25 +753,37 @@ fn main() {
                .level_for("sqlx", log::LevelFilter::Warn)
                .level_for("hyper", log::LevelFilter::Info)
                .level_for("tracing", log::LevelFilter::Info)
-                .level_for("reqwest", log::LevelFilter::Debug)
+                .level_for("reqwest", log::LevelFilter::Info)
+                .level_for("tokio_util", log::LevelFilter::Info)
                .with_colors(ColoredLevelConfig::default())
                .level(log::LevelFilter::Trace)
                .build(),
        )
        .plugin(tauri_plugin_window_state::Builder::default().build())
        .setup(|app| {
+            let app_data_dir = app.path_resolver().app_data_dir().unwrap();
+            let app_config_dir = app.path_resolver().app_config_dir().unwrap();
+            info!(
+                "App Config Dir: {}",
+                app_config_dir.as_path().to_string_lossy(),
+            );
+            info!("App Data Dir: {}", app_data_dir.as_path().to_string_lossy(),);
            let dir = match is_dev() {
                true => current_dir().unwrap(),
-                false => app.path_resolver().app_data_dir().unwrap(),
+                false => app_data_dir,
            };

            create_dir_all(dir.clone()).expect("Problem creating App directory!");
            let p = dir.join("db.sqlite");
-            File::options().write(true).create(true).open(&p).expect("Problem creating database file!");
+            File::options()
+                .write(true)
+                .create(true)
+                .open(&p)
+                .expect("Problem creating database file!");

            let p_string = p.to_string_lossy().replace(' ', "%20");
            let url = format!("sqlite://{}?mode=rwc", p_string);
-            println!("Connecting to database at {}", url);
+            info!("Connecting to database at {}", url);

            tauri::async_runtime::block_on(async move {
                let pool = SqlitePool::connect(p.to_str().unwrap())
@@ -705,10 +819,12 @@ fn main() {
            delete_workspace,
            duplicate_request,
            export_data,
+            filter_response,
            get_key_value,
            get_environment,
            get_folder,
            get_request,
+            get_settings,
            get_workspace,
            import_data,
            list_environments,
@@ -721,9 +837,11 @@ fn main() {
            send_request,
            set_key_value,
            set_update_mode,
+            track_event,
            update_environment,
            update_folder,
            update_request,
+            update_settings,
            update_workspace,
        ])
        .build(tauri::generate_context!())
@@ -754,15 +872,21 @@ fn main() {
                },
                RunEvent::Ready => {
                    let w = create_window(app_handle, None);
-                    w.restore_state(StateFlags::all())
-                        .expect("Failed to restore window state");
+                    if let Err(e) = w.restore_state(StateFlags::all()) {
+                        error!("Failed to restore window state {}", e);
+                    }

-                    track_event(
-                        app_handle,
-                        AnalyticsResource::App,
-                        AnalyticsAction::Launch,
-                        None,
-                    );
+                    let h = app_handle.clone();
+                    tauri::async_runtime::spawn(async move {
+                        let info = analytics::track_launch_event(&h).await;
+                        info!("Launched Yaak {:?}", info);
+
+                        // Wait for window render and give a chance for the user to notice
+                        if info.launched_after_update && info.num_launches > 1 {
+                            sleep(std::time::Duration::from_secs(5)).await;
+                            let _ = w.emit("show_changelog", true);
+                        }
+                    });
                }
                RunEvent::WindowEvent {
                    label: _label,
@@ -785,28 +909,18 @@ fn main() {
 }

 fn is_dev() -> bool {
-    let env = option_env!("YAAK_ENV");
-    env.unwrap_or("production") != "production"
+    #[cfg(dev)]
+    {
+        return true;
+    }
+    #[cfg(not(dev))]
+    {
+        return false;
+    }
 }

 fn create_window(handle: &AppHandle<Wry>, url: Option<&str>) -> Window<Wry> {
-    let mut app_menu = window_menu::os_default("Yaak".to_string().as_str());
-    if is_dev() {
-        let submenu = Submenu::new(
-            "Developer",
-            Menu::new()
-                .add_item(
-                    CustomMenuItem::new("refresh".to_string(), "Refresh")
-                        .accelerator("CmdOrCtrl + Shift + r"),
-                )
-                .add_item(
-                    CustomMenuItem::new("toggle_devtools".to_string(), "Open Devtools")
-                        .accelerator("CmdOrCtrl + Option + i"),
-                ),
-        );
-        app_menu = app_menu.add_submenu(submenu);
-    }
-
+    let app_menu = window_menu::os_default("Yaak".to_string().as_str());
    let window_num = handle.windows().len();
    let window_id = format!("wnd_{}", window_num);
    let mut win_builder = tauri::WindowBuilder::new(
@@ -814,7 +928,6 @@ fn create_window(handle: &AppHandle<Wry>, url: Option<&str>) -> Window<Wry> {
        window_id,
        WindowUrl::App(url.unwrap_or_default().into()),
    )
-    .menu(app_menu)
    .fullscreen(false)
    .resizable(true)
    .inner_size(1100.0, 600.0)
@@ -829,12 +942,24 @@ fn create_window(handle: &AppHandle<Wry>, url: Option<&str>) -> Window<Wry> {
    #[cfg(target_os = "macos")]
    {
        win_builder = win_builder
+            .menu(app_menu)
            .hidden_title(true)
            .title_bar_style(TitleBarStyle::Overlay);
    }

+    // Add non-MacOS things
+    #[cfg(not(target_os = "macos"))]
+    {
+        // 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");

+    // 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();
    let handle2 = handle.clone();
    win.on_menu_event(move |event| match event.menu_item_id() {
@@ -874,7 +999,6 @@ fn create_window(handle: &AppHandle<Wry>, url: Option<&str>) -> Window<Wry> {
            WindowEvent::Focused(..) => apply_offset(),
            WindowEvent::ScaleFactorChanged { .. } => apply_offset(),
            WindowEvent::CloseRequested { .. } => {
-                println!("CLOSE REQUESTED");
                // api.prevent_close();
            }
            _ => {}
@@ -901,10 +1025,6 @@ fn emit_side_effect<S: Serialize + Clone>(app_handle: &AppHandle<Wry>, event: &s
 }

 async fn get_update_mode(pool: &Pool<Sqlite>) -> UpdateMode {
-     let mode = models::get_key_value_string("app", "update_mode", pool)
-        .await;
-    match mode {
-        Some(mode) => update_mode_from_str(&mode),
-        None => UpdateMode::Stable,
-    }
+    let settings = models::get_or_create_settings(pool).await;
+    update_mode_from_str(settings.update_channel.as_str())
 }
--- a/src-tauri/src/models.rs
+++ b/src-tauri/src/models.rs
@@ -1,5 +1,6 @@
 use std::collections::HashMap;
 use std::fs;
+use log::error;

 use rand::distributions::{Alphanumeric, DistString};
 use serde::{Deserialize, Serialize};
@@ -8,6 +9,22 @@ use sqlx::types::{Json, JsonValue};
 use sqlx::types::chrono::NaiveDateTime;
 use tauri::AppHandle;

+fn default_true() -> bool {
+    true
+}
+
+#[derive(sqlx::FromRow, Debug, Clone, Serialize, Deserialize, Default)]
+#[serde(default, rename_all = "camelCase")]
+pub struct Settings {
+    pub id: String,
+    pub model: String,
+    pub created_at: NaiveDateTime,
+    pub updated_at: NaiveDateTime,
+    pub theme: String,
+    pub appearance: String,
+    pub update_channel: String,
+}
+
 #[derive(sqlx::FromRow, Debug, Clone, Serialize, Deserialize, Default)]
 #[serde(default, rename_all = "camelCase")]
 pub struct Workspace {
@@ -18,6 +35,26 @@ pub struct Workspace {
    pub name: String,
    pub description: String,
    pub variables: Json<Vec<EnvironmentVariable>>,
+
+    // Settings
+    #[serde(default = "default_true")]
+    pub setting_validate_certificates: bool,
+    #[serde(default = "default_true")]
+    pub setting_follow_redirects: bool,
+    pub setting_request_timeout: i64,
+}
+
+// Implement default for Workspace
+impl Workspace {
+    pub(crate) fn new(name: String) -> Self {
+        Self {
+            name,
+            model: "workspace".to_string(),
+            setting_validate_certificates: true,
+            setting_follow_redirects: true,
+            ..Default::default()
+        }
+    }
 }

 #[derive(sqlx::FromRow, Debug, Clone, Serialize, Deserialize, Default)]
@@ -32,14 +69,10 @@ pub struct Environment {
    pub variables: Json<Vec<EnvironmentVariable>>,
 }

-fn default_enabled() -> bool {
-    true
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize, Default)]
 #[serde(default, rename_all = "camelCase")]
 pub struct EnvironmentVariable {
-    #[serde(default = "default_enabled")]
+    #[serde(default = "default_true")]
    pub enabled: bool,
    pub name: String,
    pub value: String,
@@ -48,7 +81,7 @@ pub struct EnvironmentVariable {
 #[derive(Debug, Clone, Serialize, Deserialize, Default)]
 #[serde(default, rename_all = "camelCase")]
 pub struct HttpRequestHeader {
-    #[serde(default = "default_enabled")]
+    #[serde(default = "default_true")]
    pub enabled: bool,
    pub name: String,
    pub value: String,
@@ -57,7 +90,7 @@ pub struct HttpRequestHeader {
 #[derive(Debug, Clone, Serialize, Deserialize, Default)]
 #[serde(default, rename_all = "camelCase")]
 pub struct HttpUrlParameter {
-    #[serde(default = "default_enabled")]
+    #[serde(default = "default_true")]
    pub enabled: bool,
    pub name: String,
    pub value: String,
@@ -124,7 +157,6 @@ pub struct HttpResponse {
    pub elapsed: i64,
    pub status: i64,
    pub status_reason: Option<String>,
-    pub body: Option<Vec<u8>>,
    pub body_path: Option<String>,
    pub headers: Json<Vec<HttpResponseHeader>>,
 }
@@ -149,13 +181,75 @@ pub struct KeyValue {
    pub value: String,
 }

-pub async fn set_key_value(
+pub async fn set_key_value_string(
    namespace: &str,
    key: &str,
    value: &str,
    pool: &Pool<Sqlite>,
 ) -> (KeyValue, bool) {
-    let existing = get_key_value(namespace, key, pool).await;
+    let encoded = serde_json::to_string(value);
+    set_key_value_raw(namespace, key, &encoded.unwrap(), pool).await
+}
+
+pub async fn set_key_value_int(
+    namespace: &str,
+    key: &str,
+    value: i32,
+    pool: &Pool<Sqlite>,
+) -> (KeyValue, bool) {
+    let encoded = serde_json::to_string(&value);
+    set_key_value_raw(namespace, key, &encoded.unwrap(), pool).await
+}
+
+pub async fn get_key_value_string(
+    namespace: &str,
+    key: &str,
+    default: &str,
+    pool: &Pool<Sqlite>,
+) -> String {
+    match get_key_value_raw(namespace, key, pool).await {
+        None => default.to_string(),
+        Some(v) => {
+            let result = serde_json::from_str(&v.value);
+            match result {
+                Ok(v) => v,
+                Err(e) => {
+                    error!("Failed to parse string key value: {}", e);
+                    default.to_string()
+                }
+            }
+        },
+    }
+}
+
+pub async fn get_key_value_int(
+    namespace: &str,
+    key: &str,
+    default: i32,
+    pool: &Pool<Sqlite>,
+) -> i32 {
+    match get_key_value_raw(namespace, key, pool).await {
+        None => default.clone(),
+        Some(v) => {
+            let result = serde_json::from_str(&v.value);
+            match result {
+                Ok(v) => v,
+                Err(e) => {
+                    error!("Failed to parse int key value: {}", e);
+                    default.clone()
+                }
+            }
+        },
+    }
+}
+
+pub async fn set_key_value_raw(
+    namespace: &str,
+    key: &str,
+    value: &str,
+    pool: &Pool<Sqlite>,
+) -> (KeyValue, bool) {
+    let existing = get_key_value_raw(namespace, key, pool).await;
    sqlx::query!(
        r#"
            INSERT INTO key_values (namespace, key, value)
@@ -171,13 +265,13 @@ pub async fn set_key_value(
    .await
    .expect("Failed to insert key value");

-    let kv = get_key_value(namespace, key, pool)
+    let kv = get_key_value_raw(namespace, key, pool)
        .await
        .expect("Failed to get key value");
    (kv, existing.is_none())
 }

-pub async fn get_key_value(namespace: &str, key: &str, pool: &Pool<Sqlite>) -> Option<KeyValue> {
+pub async fn get_key_value_raw(namespace: &str, key: &str, pool: &Pool<Sqlite>) -> Option<KeyValue> {
    sqlx::query_as!(
        KeyValue,
        r#"
@@ -193,23 +287,20 @@ pub async fn get_key_value(namespace: &str, key: &str, pool: &Pool<Sqlite>) -> O
    .ok()
 }

-pub async fn get_key_value_string(namespace: &str, key: &str, pool: &Pool<Sqlite>) -> Option<String> {
-    let kv = get_key_value(namespace, key, pool).await?;
-    let result = serde_json::from_str(&kv.value);
-    match result {
-        Ok(v) => Some(v),
-        Err(e) => {
-            println!("Failed to parse key value: {}", e);
-            None
-        }
-    }
-}
-
 pub async fn find_workspaces(pool: &Pool<Sqlite>) -> Result<Vec<Workspace>, sqlx::Error> {
    sqlx::query_as!(
        Workspace,
        r#"
-            SELECT id, model, created_at, updated_at, name, description,
+            SELECT
+                id,
+                model,
+                created_at,
+                updated_at,
+                name,
+                description,
+                setting_request_timeout,
+                setting_follow_redirects,
+                setting_validate_certificates,
                variables AS "variables!: sqlx::types::Json<Vec<EnvironmentVariable>>"
            FROM workspaces
        "#,
@@ -222,7 +313,16 @@ pub async fn get_workspace(id: &str, pool: &Pool<Sqlite>) -> Result<Workspace, s
    sqlx::query_as!(
        Workspace,
        r#"
-            SELECT id, model, created_at, updated_at, name, description,
+            SELECT
+                id,
+                model,
+                created_at,
+                updated_at,
+                name,
+                description,
+                setting_request_timeout,
+                setting_follow_redirects,
+                setting_validate_certificates,
                variables AS "variables!: sqlx::types::Json<Vec<EnvironmentVariable>>"
            FROM workspaces WHERE id = ?
        "#,
@@ -284,6 +384,63 @@ pub async fn delete_environment(id: &str, pool: &Pool<Sqlite>) -> Result<Environ
    Ok(env)
 }

+async fn get_settings(pool: &Pool<Sqlite>) -> Result<Settings, sqlx::Error> {
+    sqlx::query_as!(
+        Settings,
+        r#"
+            SELECT
+                id,
+                model,
+                created_at,
+                updated_at,
+                theme,
+                appearance,
+                update_channel
+            FROM settings
+            WHERE id = 'default'
+        "#,
+    )
+    .fetch_one(pool)
+    .await
+}
+
+pub async fn get_or_create_settings(pool: &Pool<Sqlite>) -> Settings {
+    if let Ok(settings) = get_settings(pool).await {
+        settings
+    } else {
+        sqlx::query!(
+            r#"
+                INSERT INTO settings (id)
+                VALUES ('default')
+            "#,
+        )
+        .execute(pool)
+        .await.expect("Failed to insert settings");
+        get_settings(pool).await.expect("Failed to get settings")
+    }
+}
+
+pub async fn update_settings(
+    pool: &Pool<Sqlite>,
+    settings: Settings,
+) -> Result<Settings, sqlx::Error> {
+    sqlx::query!(
+        r#"
+            UPDATE settings SET (
+                theme,
+                appearance,
+                update_channel
+            ) = (?, ?, ?) WHERE id = 'default';
+        "#,
+        settings.theme,
+        settings.appearance,
+        settings.update_channel
+    )
+    .execute(pool)
+    .await?;
+    get_settings(pool).await
+}
+
 pub async fn upsert_environment(
    pool: &Pool<Sqlite>,
    environment: Environment,
@@ -594,7 +751,6 @@ pub async fn create_response(
    status: i64,
    status_reason: Option<&str>,
    content_length: Option<i64>,
-    body: Option<Vec<u8>>,
    body_path: Option<&str>,
    headers: Vec<HttpResponseHeader>,
    pool: &Pool<Sqlite>,
@@ -613,11 +769,10 @@ pub async fn create_response(
                status,
                status_reason,
                content_length,
-                body,
                body_path,
                headers
            )
-            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
+            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
        "#,
        id,
        request_id,
@@ -627,7 +782,6 @@ pub async fn create_response(
        status,
        status_reason,
        content_length,
-        body,
        body_path,
        headers_json,
    )
@@ -672,18 +826,32 @@ pub async fn upsert_workspace(
    let trimmed_name = workspace.name.trim();
    sqlx::query!(
        r#"
-            INSERT INTO workspaces (id, name, description, variables)
-            VALUES (?, ?, ?, ?)
+            INSERT INTO workspaces (
+                id,
+                name,
+                description,
+                variables,
+                setting_request_timeout,
+                setting_follow_redirects,
+                setting_validate_certificates
+             )
+            VALUES (?, ?, ?, ?, ?, ?, ?)
            ON CONFLICT (id) DO UPDATE SET
               updated_at = CURRENT_TIMESTAMP,
               name = excluded.name,
               description = excluded.description,
-               variables = excluded.variables
+               variables = excluded.variables,
+               setting_request_timeout = excluded.setting_request_timeout,
+               setting_follow_redirects = excluded.setting_follow_redirects,
+               setting_validate_certificates = excluded.setting_validate_certificates
        "#,
        id,
        trimmed_name,
        workspace.description,
        workspace.variables,
+        workspace.setting_request_timeout,
+        workspace.setting_follow_redirects,
+        workspace.setting_validate_certificates,
    )
    .execute(pool)
    .await?;
@@ -704,19 +872,17 @@ pub async fn update_response(
                status,
                status_reason,
                content_length,
-                body,
                body_path,
                error,
                headers,
                updated_at
-            ) = (?, ?, ?, ?, ?, ?, ?, ?, ?, CURRENT_TIMESTAMP) WHERE id = ?;
+            ) = (?, ?, ?, ?, ?, ?, ?, ?, CURRENT_TIMESTAMP) WHERE id = ?;
        "#,
        response.elapsed,
        response.url,
        response.status,
        response.status_reason,
        response.content_length,
-        response.body,
        response.body_path,
        response.error,
        headers_json,
@@ -732,7 +898,7 @@ pub async fn get_response(id: &str, pool: &Pool<Sqlite>) -> Result<HttpResponse,
        HttpResponse,
        r#"
            SELECT id, model, workspace_id, request_id, updated_at, created_at, url,
-                status, status_reason, content_length, body, body_path, elapsed, error,
+                status, status_reason, content_length, body_path, elapsed, error,
                headers AS "headers!: sqlx::types::Json<Vec<HttpResponseHeader>>"
            FROM http_responses
            WHERE id = ?
@@ -745,19 +911,26 @@ pub async fn get_response(id: &str, pool: &Pool<Sqlite>) -> Result<HttpResponse,

 pub async fn find_responses(
    request_id: &str,
+    limit: Option<i64>,
    pool: &Pool<Sqlite>,
 ) -> Result<Vec<HttpResponse>, sqlx::Error> {
+    let limit_unwrapped = match limit {
+        Some(l) => l,
+        None => i64::MAX,
+    };
    sqlx::query_as!(
        HttpResponse,
        r#"
            SELECT id, model, workspace_id, request_id, updated_at, created_at, url,
-                status, status_reason, content_length, body, body_path, elapsed, error,
+                status, status_reason, content_length, body_path, elapsed, error,
                headers AS "headers!: sqlx::types::Json<Vec<HttpResponseHeader>>"
            FROM http_responses
            WHERE request_id = ?
            ORDER BY created_at DESC
+            LIMIT ?
        "#,
        request_id,
+        limit_unwrapped,
    )
    .fetch_all(pool)
    .await
@@ -771,7 +944,7 @@ pub async fn find_responses_by_workspace_id(
        HttpResponse,
        r#"
            SELECT id, model, workspace_id, request_id, updated_at, created_at, url,
-                status, status_reason, content_length, body, body_path, elapsed, error,
+                status, status_reason, content_length, body_path, elapsed, error,
                headers AS "headers!: sqlx::types::Json<Vec<HttpResponseHeader>>"
            FROM http_responses
            WHERE workspace_id = ?
@@ -789,7 +962,7 @@ pub async fn delete_response(id: &str, pool: &Pool<Sqlite>) -> Result<HttpRespon
    // Delete the body file if it exists
    if let Some(p) = resp.body_path.clone() {
        if let Err(e) = fs::remove_file(p) {
-            println!("Failed to delete body file: {}", e);
+            error!("Failed to delete body file: {}", e);
        };
    }

@@ -810,7 +983,7 @@ pub async fn delete_all_responses(
    request_id: &str,
    pool: &Pool<Sqlite>,
 ) -> Result<(), sqlx::Error> {
-    for r in find_responses(request_id, pool).await? {
+    for r in find_responses(request_id, None, pool).await? {
        delete_response(&r.id, pool).await?;
    }
    Ok(())
--- a/src-tauri/src/plugin.rs
+++ b/src-tauri/src/plugin.rs
@@ -1,20 +1,24 @@
 use std::fs;

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

 use crate::models::{Environment, Folder, HttpRequest, Workspace};

+#[derive(Default, Debug, Deserialize, Serialize)]
+pub struct FilterResult {
+    pub filtered: String,
+}
+
 #[derive(Default, Debug, Deserialize, Serialize)]
 pub struct ImportResult {
    pub resources: ImportResources,
@@ -28,6 +32,29 @@ pub struct ImportResources {
    pub requests: Vec<HttpRequest>,
 }

+pub async fn run_plugin_filter(
+    app_handle: &AppHandle,
+    plugin_name: &str,
+    response_body: &str,
+    filter: &str,
+) -> Option<FilterResult> {
+    let result_json = run_plugin(
+        app_handle,
+        plugin_name,
+        "pluginHookResponseFilter",
+        &[js_string!(response_body).into(), js_string!(filter).into()],
+    );
+
+    if result_json.is_null() {
+        error!("Plugin {} failed to run", plugin_name);
+        return None;
+    }
+
+    let resources: FilterResult =
+        serde_json::from_value(result_json).expect("failed to parse filter plugin result json");
+    Some(resources)
+}
+
 pub async fn run_plugin_import(
    app_handle: &AppHandle,
    plugin_name: &str,
@@ -63,7 +90,7 @@ fn run_plugin(
        .resolve_resource("plugins")
        .expect("failed to resolve plugin directory resource")
        .join(plugin_name);
-    let plugin_index_file = plugin_dir.join("out/index.js");
+    let plugin_index_file = plugin_dir.join("index.mjs");

    debug!(
        "Running plugin dir={:?} file={:?}",
@@ -80,7 +107,6 @@ fn run_plugin(
        .expect("failed to create context");

    add_runtime(context);
-    add_globals(context);

    let source = Source::from_filepath(&plugin_index_file).expect("Error opening file");

@@ -88,7 +114,6 @@ fn run_plugin(
    let module = Module::parse(source, None, context).expect("failed to parse module");

    // Insert parsed entrypoint into the module loader
-    // TODO: Is this needed if loaded from file already?
    loader.insert(plugin_index_file, module.clone());

    let promise_result = module
@@ -131,26 +156,9 @@ fn run_plugin(
    }
 }

-fn add_runtime(context: &mut Context<'_>) {
+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");
 }
-
-fn add_globals(context: &mut Context<'_>) {
-    context
-        .register_global_builtin_callable(
-            "sayHello",
-            1,
-            NativeFunction::from_fn_ptr(|_, args, context| {
-                let value: String = args
-                    .get_or_undefined(0)
-                    .try_js_into(context)
-                    .expect("failed to convert arg");
-                println!("Hello {}!", value);
-                Ok(value.into())
-            }),
-        )
-        .expect("failed to register global");
-}
--- a/src-tauri/src/updates.rs
+++ b/src-tauri/src/updates.rs
@@ -30,13 +30,16 @@ impl YaakUpdater {
        app_handle: &AppHandle<Wry>,
        mode: UpdateMode,
    ) -> Result<(), updater::Error> {
-        if is_dev() {
-            info!("Skipping update check because we are in dev mode");
+        self.last_update_check = SystemTime::now();
+
+        let update_mode = get_update_mode_str(mode);
+        let enabled = !is_dev();
+        info!("Checking for updates mode={} enabled={}", update_mode, enabled);
+
+        if !enabled {
            return Ok(());
        }
-        self.last_update_check = SystemTime::now();
-        let update_mode = get_update_mode_str(mode);
-        info!("Checking for updates mode={}", update_mode);
+
        match app_handle
            .updater()
            .header("X-Update-Mode", update_mode)?
@@ -62,7 +65,7 @@ impl YaakUpdater {
                                    if dialog::blocking::ask(
                                        None::<&Window>,
                                        "Update Installed",
-                                        format!("Would you like to restart the app?",),
+                                        "Would you like to restart the app?",
                                    ) {
                                        h.restart();
                                    }
--- a/src-tauri/src/window_menu.rs
+++ b/src-tauri/src/window_menu.rs
@@ -1,4 +1,5 @@
 use tauri::{AboutMetadata, CustomMenuItem, Menu, MenuItem, Submenu};
+use crate::is_dev;

 pub fn os_default(#[allow(unused)] app_name: &str) -> Menu {
    let mut menu = Menu::new();
@@ -12,6 +13,11 @@ pub fn os_default(#[allow(unused)] app_name: &str) -> Menu {
                    AboutMetadata::default(),
                ))
                .add_native_item(MenuItem::Separator)
+                .add_item(
+                    CustomMenuItem::new("toggle_settings".to_string(), "Settings")
+                        .accelerator("CmdOrCtrl+,"),
+                )
+                .add_native_item(MenuItem::Separator)
                .add_native_item(MenuItem::Services)
                .add_native_item(MenuItem::Separator)
                .add_native_item(MenuItem::Hide)
@@ -69,23 +75,23 @@ pub fn os_default(#[allow(unused)] app_name: &str) -> Menu {
        )
        .add_item(
            CustomMenuItem::new("zoom_out".to_string(), "Zoom Out").accelerator("CmdOrCtrl+-"),
-        )
-        .add_native_item(MenuItem::Separator)
-        .add_item(
-            CustomMenuItem::new("toggle_sidebar".to_string(), "Toggle Sidebar")
-                .accelerator("CmdOrCtrl+b"),
-        )
-        .add_item(
-            CustomMenuItem::new("focus_sidebar".to_string(), "Focus Sidebar")
-                .accelerator("CmdOrCtrl+1"),
-        )
-        .add_item(
-            CustomMenuItem::new("toggle_settings".to_string(), "Toggle Settings")
-                .accelerator("CmdOrCtrl+,"),
-        )
-        .add_item(
-            CustomMenuItem::new("focus_url".to_string(), "Focus URL").accelerator("CmdOrCtrl+l"),
        );
+        // .add_native_item(MenuItem::Separator)
+        // .add_item(
+        //     CustomMenuItem::new("toggle_sidebar".to_string(), "Toggle Sidebar")
+        //         .accelerator("CmdOrCtrl+b"),
+        // )
+        // .add_item(
+        //     CustomMenuItem::new("focus_sidebar".to_string(), "Focus Sidebar")
+        //         .accelerator("CmdOrCtrl+1"),
+        // )
+        // .add_item(
+        //     CustomMenuItem::new("toggle_settings".to_string(), "Toggle Settings")
+        //         .accelerator("CmdOrCtrl+,"),
+        // )
+        // .add_item(
+        //     CustomMenuItem::new("focus_url".to_string(), "Focus URL").accelerator("CmdOrCtrl+l"),
+        // );
    menu = menu.add_submenu(Submenu::new("View", view_menu));

    let mut window_menu = Menu::new();
@@ -98,22 +104,37 @@ pub fn os_default(#[allow(unused)] app_name: &str) -> Menu {
    window_menu = window_menu.add_native_item(MenuItem::CloseWindow);
    menu = menu.add_submenu(Submenu::new("Window", window_menu));

-    menu = menu.add_submenu(Submenu::new(
-        "Workspace",
-        Menu::new()
-            .add_item(
-                CustomMenuItem::new("send_request".to_string(), "Send Request")
-                    .accelerator("CmdOrCtrl+r"),
-            )
-            .add_item(
-                CustomMenuItem::new("new_request".to_string(), "New Request")
-                    .accelerator("CmdOrCtrl+n"),
-            )
-            .add_item(
-                CustomMenuItem::new("duplicate_request".to_string(), "Duplicate Request")
-                    .accelerator("CmdOrCtrl+d"),
-            ),
-    ));
+    // menu = menu.add_submenu(Submenu::new(
+    //     "Workspace",
+    //     Menu::new()
+    //         .add_item(
+    //             CustomMenuItem::new("send_request".to_string(), "Send Request")
+    //                 .accelerator("CmdOrCtrl+r"),
+    //         )
+    //         .add_item(
+    //             CustomMenuItem::new("new_request".to_string(), "New Request")
+    //                 .accelerator("CmdOrCtrl+n"),
+    //         )
+    //         .add_item(
+    //             CustomMenuItem::new("duplicate_request".to_string(), "Duplicate Request")
+    //                 .accelerator("CmdOrCtrl+d"),
+    //         ),
+    // ));
+
+    if is_dev() {
+        menu = menu.add_submenu(Submenu::new(
+            "Developer",
+            Menu::new()
+                .add_item(
+                    CustomMenuItem::new("refresh".to_string(), "Refresh")
+                        .accelerator("CmdOrCtrl + Shift + r"),
+                )
+                .add_item(
+                    CustomMenuItem::new("toggle_devtools".to_string(), "Open Devtools")
+                        .accelerator("CmdOrCtrl + Option + i"),
+                ),
+        ));
+    }

    menu
 }
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
  },
  "package": {
    "productName": "Yaak",
-    "version": "2023.4.0-beta.3"
+    "version": "2024.0.1"
  },
  "tauri": {
    "windows": [],
@@ -35,8 +35,13 @@
        "open": true
      },
      "window": {
+        "close": true,
+        "maximize": true,
+        "minimize": true,
+        "setDecorations": true,
+        "setTitle": true,
        "startDragging": true,
-        "setTitle": true
+        "unmaximize": true
      },
      "dialog": {
        "all": false,
--- a/src-web/assets/icons/LeftPanelHiddenIcon.svg
+++ b/src-web/assets/icons/LeftPanelHiddenIcon.svg
@@ -1,5 +0,0 @@
-<svg width="100%" height="100%" viewBox="0 0 15 15" version="1.1" xmlns="http://www.w3.org/2000/svg"
-     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-        <path fill="currentColor"
-              d="M2.5,1C1.672,1 1,1.672 1,2.5L1,12.5C1,13.328 1.672,14 2.5,14L12.5,14C13.328,14 14,13.328 14,12.5L14,2.5C14,1.672 13.328,1 12.5,1L2.5,1ZM12.5,13C12.776,13 13,12.776 13,12.5L13,2.5C13,2.224 12.776,2 12.5,2L6,2L6,13L12.5,13ZM2.5,2L5,2L5,13L2.5,13C2.224,13 2,12.776 2,12.5L2,2.5C2,2.224 2.224,2 2.5,2Z"/>
-</svg>
--- a/src-web/assets/icons/LeftPanelVisibleIcon.svg
+++ b/src-web/assets/icons/LeftPanelVisibleIcon.svg
@@ -1,6 +0,0 @@
-<svg width="100%" height="100%" viewBox="0 0 15 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-            <rect x="0" y="0" width="15" height="15" style="fill:none;"/>
-            <g transform="matrix(1,0,0,1,-16,-8.88178e-16)">
-                <path fill="currentColor" d="M18.5,1C17.672,1 17,1.672 17,2.5L17,12.5C17,13.328 17.672,14 18.5,14L28.5,14C29.328,14 30,13.328 30,12.5L30,2.5C30,1.672 29.328,1 28.5,1L18.5,1ZM28.5,13C28.776,13 29,12.776 29,12.5L29,2.5C29,2.224 28.776,2 28.5,2L22,2L22,13L28.5,13ZM18,11.535L21,12.285L21,13L18.5,13C18.224,13 18,12.776 18,12.5L18,11.535ZM18,10.504L21,11.254L21,9.81L18,9.06L18,10.504ZM18,8.029L21,8.779L21,7.327L18,6.577L18,8.029ZM18,5.546L21,6.296L21,4.833L18,4.083L18,5.546ZM21,3.802L18,3.052L18,2.5C18,2.224 18.224,2 18.5,2L21,2L21,3.802Z"/>
-            </g>
-</svg>
--- a/src-web/components/App.tsx
+++ b/src-web/components/App.tsx
@@ -1,5 +1,4 @@
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
 import { MotionConfig } from 'framer-motion';
 import { Suspense } from 'react';
 import { DndProvider } from 'react-dnd';
@@ -26,7 +25,7 @@ export function App() {
          <DndProvider backend={HTML5Backend}>
            <Suspense>
              <AppRouter />
-              <ReactQueryDevtools initialIsOpen={false} />
+              {/*<ReactQueryDevtools initialIsOpen={false} />*/}
            </Suspense>
          </DndProvider>
        </HelmetProvider>
--- a/src-web/components/DialogContext.tsx
+++ b/src-web/components/DialogContext.tsx
@@ -16,6 +16,7 @@ interface State {

 interface Actions {
  show: (d: DialogEntryOptionalId) => void;
+  toggle: (d: DialogEntry) => void;
  hide: (id: string) => void;
 }

@@ -26,15 +27,20 @@ export const DialogProvider = ({ children }: { children: React.ReactNode }) => {
  const [dialogs, setDialogs] = useState<State['dialogs']>([]);
  const actions = useMemo<Actions>(
    () => ({
-      show: ({ id: oid, ...props }: DialogEntryOptionalId) => {
+      show({ id: oid, ...props }: DialogEntryOptionalId) {
        const id = oid ?? Math.random().toString(36).slice(2);
        setDialogs((a) => [...a.filter((d) => d.id !== id), { id, ...props }]);
      },
+      toggle({ id: oid, ...props }: DialogEntryOptionalId) {
+        const id = oid ?? Math.random().toString(36).slice(2);
+        if (dialogs.some((d) => d.id === id)) this.hide(id);
+        else this.show({ id, ...props });
+      },
      hide: (id: string) => {
        setDialogs((a) => a.filter((d) => d.id !== id));
      },
    }),
-    [],
+    [dialogs],
  );

  const state: State = {
--- a/src-web/components/EnvironmentActionsDropdown.tsx
+++ b/src-web/components/EnvironmentActionsDropdown.tsx
@@ -2,6 +2,7 @@ import classNames from 'classnames';
 import { memo, useCallback, useMemo } from 'react';
 import { useActiveEnvironment } from '../hooks/useActiveEnvironment';
 import { useAppRoutes } from '../hooks/useAppRoutes';
+import { useCreateEnvironment } from '../hooks/useCreateEnvironment';
 import { useEnvironments } from '../hooks/useEnvironments';
 import type { ButtonProps } from './core/Button';
 import { Button } from './core/Button';
@@ -21,11 +22,13 @@ export const EnvironmentActionsDropdown = memo(function EnvironmentActionsDropdo
 }: Props) {
  const environments = useEnvironments();
  const activeEnvironment = useActiveEnvironment();
+  const createEnvironment = useCreateEnvironment();
  const dialog = useDialog();
  const routes = useAppRoutes();

  const showEnvironmentDialog = useCallback(() => {
-    dialog.show({
+    dialog.toggle({
+      id: 'environment-editor',
      title: 'Manage Environments',
      render: () => <EnvironmentEditDialog initialEnvironment={activeEnvironment} />,
    });
@@ -51,14 +54,25 @@ export const EnvironmentActionsDropdown = memo(function EnvironmentActionsDropdo
      ...((environments.length > 0
        ? [{ type: 'separator', label: 'Environments' }]
        : []) as DropdownItem[]),
-      {
-        key: 'edit',
-        label: 'Manage Environments',
-        leftSlot: <Icon icon="gear" />,
-        onSelect: showEnvironmentDialog,
-      },
+      environments.length
+        ? {
+            key: 'edit',
+            label: 'Manage Environments',
+            hotKeyAction: 'environmentEditor.toggle',
+            leftSlot: <Icon icon="box" />,
+            onSelect: showEnvironmentDialog,
+          }
+        : {
+            key: 'new',
+            label: 'New Environment',
+            leftSlot: <Icon icon="plus" />,
+            onSelect: async () => {
+              await createEnvironment.mutateAsync();
+              showEnvironmentDialog();
+            },
+          },
    ],
-    [activeEnvironment, environments, routes, showEnvironmentDialog],
+    [activeEnvironment?.id, createEnvironment, environments, routes, showEnvironmentDialog],
  );

  return (
--- a/src-web/components/EnvironmentEditDialog.tsx
+++ b/src-web/components/EnvironmentEditDialog.tsx
@@ -43,6 +43,11 @@ export const EnvironmentEditDialog = function ({ initialEnvironment }: Props) {
    [environments, selectedEnvironmentId],
  );

+  const handleCreateEnvironment = async () => {
+    const e = await createEnvironment.mutateAsync();
+    setSelectedEnvironmentId(e.id);
+  };
+
  return (
    <div
      className={classNames(
@@ -53,30 +58,22 @@ export const EnvironmentEditDialog = function ({ initialEnvironment }: Props) {
      {showSidebar && (
        <aside className="grid grid-rows-[minmax(0,1fr)_auto] gap-y-0.5 h-full max-w-[250px] pr-3 border-r border-gray-100 -ml-2">
          <div className="min-w-0 h-full w-full overflow-y-scroll">
-            <SidebarButton
-              active={selectedEnvironment == null}
-              onClick={() => setSelectedEnvironmentId(null)}
-            >
-              Base Environment
-            </SidebarButton>
-            <div className="ml-3 pl-2 border-l border-highlight">
-              {environments.map((e) => (
-                <SidebarButton
-                  key={e.id}
-                  active={selectedEnvironment?.id === e.id}
-                  onClick={() => setSelectedEnvironmentId(e.id)}
-                >
-                  {e.name}
-                </SidebarButton>
-              ))}
-            </div>
+            {environments.map((e) => (
+              <SidebarButton
+                key={e.id}
+                active={selectedEnvironment?.id === e.id}
+                onClick={() => setSelectedEnvironmentId(e.id)}
+              >
+                {e.name}
+              </SidebarButton>
+            ))}
          </div>
          <Button
            size="sm"
            className="w-full text-center"
            color="gray"
            justify="center"
-            onClick={() => createEnvironment.mutate()}
+            onClick={handleCreateEnvironment}
          >
            New Environment
          </Button>
@@ -191,7 +188,12 @@ const EnvironmentEditor = function ({
        <h1 className="text-xl">{environment?.name ?? 'Base Environment'}</h1>
        {items != null && (
          <Dropdown items={items}>
-            <IconButton icon="gear" title="Environment Actions" size="sm" className="!h-auto w-8" />
+            <IconButton
+              icon="moreVertical"
+              title="Environment Actions"
+              size="sm"
+              className="!h-auto w-8"
+            />
          </Dropdown>
        )}
      </HStack>
@@ -199,7 +201,6 @@ const EnvironmentEditor = function ({
        nameAutocomplete={nameAutocomplete}
        nameAutocompleteVariables={false}
        namePlaceholder="VAR_NAME"
-        valuePlaceholder="variable value"
        nameValidate={validateName}
        valueAutocompleteVariables={false}
        forceUpdateKey={environment?.id ?? workspace?.id ?? 'n/a'}
--- a/src-web/components/GlobalHooks.tsx
+++ b/src-web/components/GlobalHooks.tsx
@@ -2,7 +2,6 @@ import { useQueryClient } from '@tanstack/react-query';
 import { appWindow } from '@tauri-apps/api/window';
 import { useEffect } from 'react';
 import { useLocation } from 'react-router-dom';
-import { useEffectOnce } from 'react-use';
 import { keyValueQueryKey } from '../hooks/useKeyValue';
 import { useListenToTauriEvent } from '../hooks/useListenToTauriEvent';
 import { useRecentEnvironments } from '../hooks/useRecentEnvironments';
@@ -11,9 +10,10 @@ import { useRecentWorkspaces } from '../hooks/useRecentWorkspaces';
 import { requestsQueryKey } from '../hooks/useRequests';
 import { useRequestUpdateKey } from '../hooks/useRequestUpdateKey';
 import { responsesQueryKey } from '../hooks/useResponses';
+import { settingsQueryKey } from '../hooks/useSettings';
 import { useSyncWindowTitle } from '../hooks/useSyncWindowTitle';
+import { useSyncAppearance } from '../hooks/useSyncAppearance';
 import { workspacesQueryKey } from '../hooks/useWorkspaces';
-import { trackPage } from '../lib/analytics';
 import { NAMESPACE_NO_SYNC } from '../lib/keyValueStore';
 import type { HttpRequest, HttpResponse, Model, Workspace } from '../lib/models';
 import { modelsEq } from '../lib/models';
@@ -28,6 +28,8 @@ export function GlobalHooks() {
  useRecentEnvironments();
  useRecentRequests();

+  useSyncAppearance();
+
  useSyncWindowTitle();

  const queryClient = useQueryClient();
@@ -39,10 +41,6 @@ export function GlobalHooks() {
    setPathname(location.pathname).catch(console.error);
  }, [location.pathname]);

-  useEffectOnce(() => {
-    trackPage('/');
-  });
-
  useListenToTauriEvent<Model>('created_model', ({ payload, windowLabel }) => {
    if (shouldIgnoreEvent(payload, windowLabel)) return;

@@ -55,6 +53,8 @@ export function GlobalHooks() {
        ? workspacesQueryKey(payload)
        : payload.model === 'key_value'
        ? keyValueQueryKey(payload)
+        : payload.model === 'settings'
+        ? settingsQueryKey()
        : null;

    if (queryKey === null) {
@@ -80,6 +80,8 @@ export function GlobalHooks() {
        ? workspacesQueryKey(payload)
        : payload.model === 'key_value'
        ? keyValueQueryKey(payload)
+        : payload.model === 'settings'
+        ? settingsQueryKey()
        : null;

    if (queryKey === null) {
@@ -92,9 +94,11 @@ export function GlobalHooks() {
    }

    if (!shouldIgnoreModel(payload)) {
+      console.time('set query date');
      queryClient.setQueryData<Model[]>(queryKey, (values) =>
        values?.map((v) => (modelsEq(v, payload) ? payload : v)),
      );
+      console.timeEnd('set query date');
    }
  });

@@ -111,6 +115,8 @@ export function GlobalHooks() {
      queryClient.setQueryData<HttpResponse[]>(responsesQueryKey(payload), removeById(payload));
    } else if (payload.model === 'key_value') {
      queryClient.setQueryData(keyValueQueryKey(payload), undefined);
+    } else if (payload.model === 'settings') {
+      queryClient.setQueryData(settingsQueryKey(), undefined);
    }
  });
  useListenToTauriEvent<number>('zoom', ({ payload: zoomDelta, windowLabel }) => {
--- a/src-web/components/GraphQLEditor.tsx
+++ b/src-web/components/GraphQLEditor.tsx
@@ -82,40 +82,43 @@ export function GraphQLEditor({ defaultValue, onChange, baseRequest, ...extraEdi
        placeholder="..."
        ref={editorViewRef}
        actions={
-          (error || isLoading) && (
-            <Button
-              size="xs"
-              color={error ? 'danger' : 'gray'}
-              isLoading={isLoading}
-              onClick={() => {
-                dialog.show({
-                  title: 'Introspection Failed',
-                  size: 'dynamic',
-                  id: 'introspection-failed',
-                  render: () => (
-                    <>
-                      <FormattedError>{error ?? 'unknown'}</FormattedError>
-                      <div className="w-full mt-3">
-                        <Button
-                          onClick={() => {
-                            dialog.hide('introspection-failed');
-                            refetch();
-                          }}
-                          className="ml-auto"
-                          color="secondary"
-                          size="sm"
-                        >
-                          Try Again
-                        </Button>
-                      </div>
-                    </>
-                  ),
-                });
-              }}
-            >
-              {error ? 'Introspection Failed' : 'Introspecting'}
-            </Button>
-          )
+          error || isLoading
+            ? [
+                <Button
+                  key="introspection"
+                  size="xs"
+                  color={error ? 'danger' : 'gray'}
+                  isLoading={isLoading}
+                  onClick={() => {
+                    dialog.show({
+                      title: 'Introspection Failed',
+                      size: 'dynamic',
+                      id: 'introspection-failed',
+                      render: () => (
+                        <>
+                          <FormattedError>{error ?? 'unknown'}</FormattedError>
+                          <div className="w-full mt-3">
+                            <Button
+                              onClick={() => {
+                                dialog.hide('introspection-failed');
+                                refetch();
+                              }}
+                              className="ml-auto"
+                              color="secondary"
+                              size="sm"
+                            >
+                              Try Again
+                            </Button>
+                          </div>
+                        </>
+                      ),
+                    });
+                  }}
+                >
+                  {error ? 'Introspection Failed' : 'Introspecting'}
+                </Button>,
+              ]
+            : []
        }
        {...extraEditorProps}
      />
--- a/src-web/components/KeyboardShortcutsDialog.tsx
+++ b/src-web/components/KeyboardShortcutsDialog.tsx
@@ -0,0 +1,10 @@
+import { hotkeyActions } from '../hooks/useHotKey';
+import { HotKeyList } from './core/HotKeyList';
+
+export const KeyboardShortcutsDialog = () => {
+  return (
+    <div className="h-full w-full">
+      <HotKeyList hotkeys={hotkeyActions} />
+    </div>
+  );
+};
--- a/src-web/components/RecentRequestsDropdown.tsx
+++ b/src-web/components/RecentRequestsDropdown.tsx
@@ -5,6 +5,7 @@ import { useActiveEnvironmentId } from '../hooks/useActiveEnvironmentId';
 import { useActiveRequest } from '../hooks/useActiveRequest';
 import { useActiveWorkspaceId } from '../hooks/useActiveWorkspaceId';
 import { useAppRoutes } from '../hooks/useAppRoutes';
+import { useHotKey } from '../hooks/useHotKey';
 import { useRecentRequests } from '../hooks/useRecentRequests';
 import { useRequests } from '../hooks/useRequests';
 import { fallbackRequestName } from '../lib/fallbackRequestName';
@@ -33,25 +34,19 @@ export function RecentRequestsDropdown({ className }: Pick<ButtonProps, 'classNa

  // Handle key-up
  useKeyPressEvent('Control', undefined, () => {
+    if (!dropdownRef.current?.isOpen) return;
    dropdownRef.current?.select?.();
  });

-  useKey(
-    'Tab',
-    (e) => {
-      if (!e.ctrlKey || recentRequestIds.length === 0) return;
+  useHotKey('requestSwitcher.prev', () => {
+    if (!dropdownRef.current?.isOpen) dropdownRef.current?.open(1);
+    dropdownRef.current?.next?.();
+  });

-      if (!dropdownRef.current?.isOpen) {
-        dropdownRef.current?.open(e.shiftKey ? -1 : 1);
-        return;
-      }
-
-      if (e.shiftKey) dropdownRef.current?.prev?.();
-      else dropdownRef.current?.next?.();
-    },
-    undefined,
-    [recentRequestIds.length],
-  );
+  useHotKey('requestSwitcher.next', () => {
+    if (!dropdownRef.current?.isOpen) dropdownRef.current?.open(-1);
+    dropdownRef.current?.prev?.();
+  });

  const items = useMemo<DropdownItem[]>(() => {
    if (activeWorkspaceId === null) return [];
--- a/src-web/components/RecentResponsesDropdown.tsx
+++ b/src-web/components/RecentResponsesDropdown.tsx
@@ -54,7 +54,7 @@ export const RecentResponsesDropdown = function ResponsePane({
    >
      <IconButton
        title="Show response history"
-        icon="triangleDown"
+        icon="chevronDown"
        className="ml-auto"
        size="sm"
        iconSize="md"
--- a/src-web/components/RequestActionsDropdown.tsx
+++ b/src-web/components/RequestActionsDropdown.tsx
@@ -1,56 +0,0 @@
-import { useRef } from 'react';
-import { useDeleteRequest } from '../hooks/useDeleteRequest';
-import { useDuplicateRequest } from '../hooks/useDuplicateRequest';
-import { useListenToTauriEvent } from '../hooks/useListenToTauriEvent';
-import type { DropdownProps, DropdownRef } from './core/Dropdown';
-import { Dropdown } from './core/Dropdown';
-import { HotKey } from './core/HotKey';
-import { Icon } from './core/Icon';
-
-interface Props {
-  requestId: string | null;
-  children: DropdownProps['children'];
-}
-
-export function RequestActionsDropdown({ requestId, children }: Props) {
-  const deleteRequest = useDeleteRequest(requestId);
-  const duplicateRequest = useDuplicateRequest({ id: requestId, navigateAfter: true });
-  const dropdownRef = useRef<DropdownRef>(null);
-
-  useListenToTauriEvent('toggle_settings', () => {
-    dropdownRef.current?.toggle();
-  });
-
-  // TODO: Put this somewhere better
-  useListenToTauriEvent('duplicate_request', () => {
-    duplicateRequest.mutate();
-  });
-
-  if (requestId == null) {
-    return null;
-  }
-
-  return (
-    <Dropdown
-      ref={dropdownRef}
-      items={[
-        {
-          key: 'duplicate',
-          label: 'Duplicate',
-          onSelect: duplicateRequest.mutate,
-          leftSlot: <Icon icon="copy" />,
-          rightSlot: <HotKey modifier="Meta" keyName="D" />,
-        },
-        {
-          key: 'delete',
-          label: 'Delete',
-          onSelect: deleteRequest.mutate,
-          variant: 'danger',
-          leftSlot: <Icon icon="trash" />,
-        },
-      ]}
-    >
-      {children}
-    </Dropdown>
-  );
-}
--- a/src-web/components/RequestMethodDropdown.tsx
+++ b/src-web/components/RequestMethodDropdown.tsx
@@ -1,5 +1,9 @@
-import { memo } from 'react';
+import { memo, useMemo } from 'react';
+import { usePrompt } from '../hooks/usePrompt';
 import { Button } from './core/Button';
+import type { DropdownItem } from './core/Dropdown';
+import { Icon } from './core/Icon';
+import type { RadioDropdownItem } from './core/RadioDropdown';
 import { RadioDropdown } from './core/RadioDropdown';

 type Props = {
@@ -8,7 +12,15 @@ type Props = {
  onChange: (method: string) => void;
 };

-const methodItems = ['GET', 'PUT', 'POST', 'PATCH', 'DELETE', 'OPTIONS', 'HEAD'].map((m) => ({
+const radioItems: RadioDropdownItem<string>[] = [
+  'GET',
+  'PUT',
+  'POST',
+  'PATCH',
+  'DELETE',
+  'OPTIONS',
+  'HEAD',
+].map((m) => ({
  value: m,
  label: m,
 }));
@@ -18,8 +30,32 @@ export const RequestMethodDropdown = memo(function RequestMethodDropdown({
  onChange,
  className,
 }: Props) {
+  const prompt = usePrompt();
+  const extraItems = useMemo<DropdownItem[]>(
+    () => [
+      { type: 'separator' },
+      {
+        key: 'custom',
+        label: 'CUSTOM',
+        leftSlot: <Icon icon="sparkles" />,
+        onSelect: async () => {
+          const newMethod = await prompt({
+            label: 'Http Method',
+            name: 'httpMethod',
+            defaultValue: '',
+            title: 'Custom Method',
+            description: 'Enter a custom method name',
+            placeholder: 'CUSTOM',
+          });
+          onChange(newMethod);
+        },
+      },
+    ],
+    [onChange, prompt],
+  );
+
  return (
-    <RadioDropdown value={method} items={methodItems} onChange={onChange}>
+    <RadioDropdown value={method} items={radioItems} extraItems={extraItems} onChange={onChange}>
      <Button size="xs" className={className}>
        {method.toUpperCase()}
      </Button>
--- a/src-web/components/RequestPane.tsx
+++ b/src-web/components/RequestPane.tsx
@@ -1,14 +1,12 @@
-import { invoke } from '@tauri-apps/api';
-import { appWindow } from '@tauri-apps/api/window';
 import classNames from 'classnames';
 import type { CSSProperties } from 'react';
 import { memo, useCallback, useMemo, useState } from 'react';
 import { createGlobalState } from 'react-use';
-import { useActiveEnvironmentId } from '../hooks/useActiveEnvironmentId';
 import { useActiveRequest } from '../hooks/useActiveRequest';
-import { useListenToTauriEvent } from '../hooks/useListenToTauriEvent';
 import { useRequestUpdateKey } from '../hooks/useRequestUpdateKey';
+import { useSettings } from '../hooks/useSettings';
 import { useUpdateRequest } from '../hooks/useUpdateRequest';
+import { useUpdateSettings } from '../hooks/useUpdateSettings';
 import { tryFormatJson } from '../lib/formatters';
 import type { HttpHeader, HttpRequest, HttpUrlParameter } from '../lib/models';
 import {
@@ -24,10 +22,13 @@ import {
 } from '../lib/models';
 import { BasicAuth } from './BasicAuth';
 import { BearerAuth } from './BearerAuth';
+import { Checkbox } from './core/Checkbox';
 import { CountBadge } from './core/CountBadge';
 import { Editor } from './core/Editor';
-import type { TabItem } from './core/Tabs/Tabs';
+import { Input } from './core/Input';
+import { VStack } from './core/Stacks';
 import { TabContent, Tabs } from './core/Tabs/Tabs';
+import type { TabItem } from './core/Tabs/Tabs';
 import { EmptyStateText } from './EmptyStateText';
 import { FormMultipartEditor } from './FormMultipartEditor';
 import { FormUrlencodedEditor } from './FormUrlencodedEditor';
@@ -47,7 +48,6 @@ const useActiveTab = createGlobalState<string>('body');
 export const RequestPane = memo(function RequestPane({ style, fullHeight, className }: Props) {
  const activeRequest = useActiveRequest();
  const activeRequestId = activeRequest?.id ?? null;
-  const activeEnvironmentId = useActiveEnvironmentId();
  const updateRequest = useUpdateRequest(activeRequestId);
  const [activeTab, setActiveTab] = useActiveTab();
  const [forceUpdateHeaderEditorKey, setForceUpdateHeaderEditorKey] = useState<number>(0);
@@ -183,18 +183,6 @@ export const RequestPane = memo(function RequestPane({ style, fullHeight, classN
    [updateRequest],
  );

-  useListenToTauriEvent(
-    'send_request',
-    async ({ windowLabel }) => {
-      if (windowLabel !== appWindow.label) return;
-      await invoke('send_request', {
-        requestId: activeRequestId,
-        environmentId: activeEnvironmentId,
-      });
-    },
-    [activeRequestId, activeEnvironmentId],
-  );
-
  return (
    <div
      style={style}
@@ -202,7 +190,12 @@ export const RequestPane = memo(function RequestPane({ style, fullHeight, classN
    >
      {activeRequest && (
        <>
-          <UrlBar id={activeRequest.id} url={activeRequest.url} method={activeRequest.method} />
+          <UrlBar
+            key={activeRequest.id} // Force-reset the url bar when the active request changes
+            id={activeRequest.id}
+            url={activeRequest.url}
+            method={activeRequest.method}
+          />
          <Tabs
            value={activeTab}
            label="Request"
--- a/src-web/components/RequestResponse.tsx
+++ b/src-web/components/RequestResponse.tsx
@@ -3,8 +3,10 @@ import classNames from 'classnames';
 import type { CSSProperties, MouseEvent as ReactMouseEvent } from 'react';
 import React, { memo, useCallback, useMemo, useRef, useState } from 'react';
 import { useLocalStorage } from 'react-use';
+import { useActiveRequest } from '../hooks/useActiveRequest';
 import { useActiveWorkspaceId } from '../hooks/useActiveWorkspaceId';
 import { clamp } from '../lib/clamp';
+import { HotKeyList } from './core/HotKeyList';
 import { RequestPane } from './RequestPane';
 import { ResizeHandle } from './ResizeHandle';
 import { ResponsePane } from './ResponsePane';
@@ -20,10 +22,11 @@ const drag = { gridArea: 'drag' };
 const DEFAULT = 0.5;
 const MIN_WIDTH_PX = 10;
 const MIN_HEIGHT_PX = 30;
-const STACK_VERTICAL_WIDTH = 600;
+const STACK_VERTICAL_WIDTH = 700;

 export const RequestResponse = memo(function RequestResponse({ style }: Props) {
  const containerRef = useRef<HTMLDivElement>(null);
+  const activeRequest = useActiveRequest();
  const [vertical, setVertical] = useState<boolean>(false);
  const [widthRaw, setWidth] = useLocalStorage<number>(`body_width::${useActiveWorkspaceId()}`);
  const [heightRaw, setHeight] = useLocalStorage<number>(`body_height::${useActiveWorkspaceId()}`);
@@ -34,7 +37,7 @@ export const RequestResponse = memo(function RequestResponse({ style }: Props) {
    null,
  );

-  useResizeObserver(containerRef, ({ contentRect }) => {
+  useResizeObserver(containerRef.current, ({ contentRect }) => {
    setVertical(contentRect.width < STACK_VERTICAL_WIDTH);
  });

@@ -114,6 +117,10 @@ export const RequestResponse = memo(function RequestResponse({ style }: Props) {
    [width, height, vertical, setHeight, setWidth],
  );

+  if (activeRequest === null) {
+    return <HotKeyList hotkeys={['request.create', 'sidebar.toggle']} />;
+  }
+
  return (
    <div ref={containerRef} className="grid gap-1.5 w-full h-full p-3" style={styles}>
      <RequestPane style={rqst} fullHeight={!vertical} />
--- a/src-web/components/ResponsePane.tsx
+++ b/src-web/components/ResponsePane.tsx
@@ -1,8 +1,8 @@
 import classNames from 'classnames';
 import type { CSSProperties } from 'react';
-import { useCallback, memo, useEffect, useMemo, useState } from 'react';
+import { memo, useCallback, useEffect, useMemo, useState } from 'react';
 import { createGlobalState } from 'react-use';
-import { useActiveRequestId } from '../hooks/useActiveRequestId';
+import { useActiveRequest } from '../hooks/useActiveRequest';
 import { useLatestResponse } from '../hooks/useLatestResponse';
 import { useResponseContentType } from '../hooks/useResponseContentType';
 import { useResponses } from '../hooks/useResponses';
@@ -12,18 +12,19 @@ import { isResponseLoading } from '../lib/models';
 import { Banner } from './core/Banner';
 import { CountBadge } from './core/CountBadge';
 import { DurationTag } from './core/DurationTag';
+import { HotKeyList } from './core/HotKeyList';
 import { SizeTag } from './core/SizeTag';
 import { HStack } from './core/Stacks';
 import { StatusTag } from './core/StatusTag';
 import type { TabItem } from './core/Tabs/Tabs';
 import { TabContent, Tabs } from './core/Tabs/Tabs';
 import { EmptyStateText } from './EmptyStateText';
+import { RecentResponsesDropdown } from './RecentResponsesDropdown';
 import { ResponseHeaders } from './ResponseHeaders';
 import { CsvViewer } from './responseViewers/CsvViewer';
 import { ImageViewer } from './responseViewers/ImageViewer';
 import { TextViewer } from './responseViewers/TextViewer';
 import { WebPageViewer } from './responseViewers/WebPageViewer';
-import { RecentResponsesDropdown } from './RecentResponsesDropdown';

 interface Props {
  style?: CSSProperties;
@@ -34,9 +35,9 @@ const useActiveTab = createGlobalState<string>('body');

 export const ResponsePane = memo(function ResponsePane({ style, className }: Props) {
  const [pinnedResponseId, setPinnedResponseId] = useState<string | null>(null);
-  const activeRequestId = useActiveRequestId();
-  const latestResponse = useLatestResponse(activeRequestId);
-  const responses = useResponses(activeRequestId);
+  const activeRequest = useActiveRequest();
+  const latestResponse = useLatestResponse(activeRequest?.id ?? null);
+  const responses = useResponses(activeRequest?.id ?? null);
  const activeResponse: HttpResponse | null = pinnedResponseId
    ? responses.find((r) => r.id === pinnedResponseId) ?? null
    : latestResponse ?? null;
@@ -48,11 +49,14 @@ export const ResponsePane = memo(function ResponsePane({ style, className }: Pro

  const contentType = useResponseContentType(activeResponse);

-  const handlePinnedResponse = useCallback((r: HttpResponse) => {
-    setPinnedResponseId(r.id);
-  }, [setPinnedResponseId])
+  const handlePinnedResponse = useCallback(
+    (r: HttpResponse) => {
+      setPinnedResponseId(r.id);
+    },
+    [setPinnedResponseId],
+  );

-  const tabs: TabItem[] = useMemo(
+  const tabs = useMemo<TabItem[]>(
    () => [
      {
        value: 'body',
@@ -62,7 +66,7 @@ export const ResponsePane = memo(function ResponsePane({ style, className }: Pro
          onChange: setViewMode,
          items: [
            { label: 'Pretty', value: 'pretty' },
-            { label: 'Raw', value: 'raw' },
+            ...(contentType?.startsWith('image') ? [] : [{ label: 'Raw', value: 'raw' }]),
          ],
        },
      },
@@ -78,20 +82,32 @@ export const ResponsePane = memo(function ResponsePane({ style, className }: Pro
        value: 'headers',
      },
    ],
-    [activeResponse?.headers, setViewMode, viewMode],
+    [activeResponse?.headers, contentType, setViewMode, viewMode],
  );

+  if (activeRequest === null) {
+    return null;
+  }
+
  return (
    <div
      style={style}
      className={classNames(
        className,
-        'bg-gray-50 max-h-full h-full grid grid-rows-[auto_minmax(0,1fr)] grid-cols-1',
-        'dark:bg-gray-100 rounded-md border border-highlight',
+        'max-h-full h-full grid grid-rows-[auto_minmax(0,1fr)] grid-cols-1',
+        'bg-gray-50 dark:bg-gray-100 rounded-md border border-highlight',
        'shadow shadow-gray-100 dark:shadow-gray-0 relative',
      )}
    >
      {activeResponse?.error && <Banner className="m-2">{activeResponse.error}</Banner>}
+      {!activeResponse && (
+        <>
+          <span />
+          <HotKeyList
+            hotkeys={['request.send', 'request.create', 'sidebar.toggle', 'urlBar.focus']}
+          />
+        </>
+      )}
      {activeResponse && !activeResponse.error && !isResponseLoading(activeResponse) && (
        <>
          <HStack
@@ -145,10 +161,14 @@ export const ResponsePane = memo(function ResponsePane({ style, className }: Pro
            <TabContent value="body">
              {!activeResponse.contentLength ? (
                <EmptyStateText>Empty Body</EmptyStateText>
-              ) : viewMode === 'pretty' && contentType?.includes('html') ? (
-                <WebPageViewer response={activeResponse} />
              ) : contentType?.startsWith('image') ? (
                <ImageViewer className="pb-2" response={activeResponse} />
+              ) : activeResponse.contentLength > 2 * 1000 * 1000 ? (
+                <div className="text-sm italic text-gray-500">
+                  Cannot preview text responses larger than 2MB
+                </div>
+              ) : viewMode === 'pretty' && contentType?.includes('html') ? (
+                <WebPageViewer response={activeResponse} />
              ) : contentType?.match(/csv|tab-separated/) ? (
                <CsvViewer className="pb-2" response={activeResponse} />
              ) : (
--- a/src-web/components/RouteError.tsx
+++ b/src-web/components/RouteError.tsx
@@ -7,7 +7,7 @@ import { VStack } from './core/Stacks';

 export default function RouteError() {
  const error = useRouteError();
-  console.log("Error", error);
+  console.log('Error', error);
  const stringified = JSON.stringify(error);
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
  const message = (error as any).message ?? stringified;
--- a/src-web/components/SettingsDialog.tsx
+++ b/src-web/components/SettingsDialog.tsx
@@ -0,0 +1,92 @@
+import { useActiveWorkspace } from '../hooks/useActiveWorkspace';
+import { useSettings } from '../hooks/useSettings';
+import { useUpdateSettings } from '../hooks/useUpdateSettings';
+import { useUpdateWorkspace } from '../hooks/useUpdateWorkspace';
+import { Checkbox } from './core/Checkbox';
+import { Heading } from './core/Heading';
+import { Input } from './core/Input';
+import { Select } from './core/Select';
+import { Separator } from './core/Separator';
+import { VStack } from './core/Stacks';
+
+export const SettingsDialog = () => {
+  const workspace = useActiveWorkspace();
+  const updateWorkspace = useUpdateWorkspace(workspace?.id ?? null);
+  const settings = useSettings();
+  const updateSettings = useUpdateSettings();
+
+  if (settings == null || workspace == null) {
+    return null;
+  }
+
+  return (
+    <VStack space={2} className="mb-2">
+      <Select
+        name="appearance"
+        label="Appearance"
+        labelPosition="left"
+        labelClassName="w-1/3"
+        size="sm"
+        value={settings.appearance}
+        onChange={(appearance) => updateSettings.mutateAsync({ ...settings, appearance })}
+        options={{
+          system: 'System',
+          light: 'Light',
+          dark: 'Dark',
+        }}
+      />
+
+      <Select
+        name="updateChannel"
+        label="Update Channel"
+        labelPosition="left"
+        labelClassName="w-1/3"
+        size="sm"
+        value={settings.updateChannel}
+        onChange={(updateChannel) => updateSettings.mutateAsync({ ...settings, updateChannel })}
+        options={{
+          stable: 'Release',
+          beta: 'Early Bird (Beta)',
+        }}
+      />
+
+      <Separator className="my-4" />
+
+      <Heading size={2}>
+        Workspace{' '}
+        <div className="inline-block ml-1 bg-gray-500 dark:bg-gray-300 px-2 py-0.5 text-sm rounded text-white dark:text-gray-900">
+          {workspace.name}
+        </div>
+      </Heading>
+      <VStack className="mt-1 w-full" space={3}>
+        <Input
+          size="sm"
+          name="requestTimeout"
+          label="Request Timeout (ms)"
+          labelPosition="left"
+          labelClassName="w-1/3"
+          containerClassName="col-span-2"
+          defaultValue={`${workspace.settingRequestTimeout}`}
+          validate={(value) => parseInt(value) >= 0}
+          onChange={(v) => updateWorkspace.mutateAsync({ settingRequestTimeout: parseInt(v) || 0 })}
+        />
+
+        <Checkbox
+          checked={workspace.settingValidateCertificates}
+          title="Validate TLS Certificates"
+          onChange={(settingValidateCertificates) =>
+            updateWorkspace.mutateAsync({ settingValidateCertificates })
+          }
+        />
+
+        <Checkbox
+          checked={workspace.settingFollowRedirects}
+          title="Follow Redirects"
+          onChange={(settingFollowRedirects) =>
+            updateWorkspace.mutateAsync({ settingFollowRedirects })
+          }
+        />
+      </VStack>
+    </VStack>
+  );
+};
--- a/src-web/components/SettingsDropdown.tsx
+++ b/src-web/components/SettingsDropdown.tsx
@@ -0,0 +1,129 @@
+import { invoke, shell } from '@tauri-apps/api';
+import { useRef, useState } from 'react';
+import { useAppVersion } from '../hooks/useAppVersion';
+import { useExportData } from '../hooks/useExportData';
+import { useImportData } from '../hooks/useImportData';
+import { useListenToTauriEvent } from '../hooks/useListenToTauriEvent';
+import { Button } from './core/Button';
+import type { DropdownRef } from './core/Dropdown';
+import { Dropdown } from './core/Dropdown';
+import { Icon } from './core/Icon';
+import { IconButton } from './core/IconButton';
+import { VStack } from './core/Stacks';
+import { useDialog } from './DialogContext';
+import { KeyboardShortcutsDialog } from './KeyboardShortcutsDialog';
+import { SettingsDialog } from './SettingsDialog';
+
+export function SettingsDropdown() {
+  const importData = useImportData();
+  const exportData = useExportData();
+  const appVersion = useAppVersion();
+  const dropdownRef = useRef<DropdownRef>(null);
+  const dialog = useDialog();
+  const [showChangelog, setShowChangelog] = useState<boolean>(false);
+
+  useListenToTauriEvent('show_changelog', () => {
+    setShowChangelog(true);
+  });
+
+  return (
+    <Dropdown
+      ref={dropdownRef}
+      onClose={() => setShowChangelog(false)}
+      items={[
+        {
+          key: 'settings',
+          label: 'Settings',
+          hotKeyAction: 'settings.show',
+          leftSlot: <Icon icon="settings" />,
+          onSelect: () => {
+            dialog.show({
+              id: 'settings',
+              size: 'md',
+              title: 'Settings',
+              render: () => <SettingsDialog />,
+            });
+          },
+        },
+        {
+          key: 'hotkeys',
+          label: 'Keyboard shortcuts',
+          hotKeyAction: 'hotkeys.showHelp',
+          leftSlot: <Icon icon="keyboard" />,
+          onSelect: () => {
+            dialog.show({
+              id: 'hotkey-help',
+              title: 'Keyboard Shortcuts',
+              size: 'sm',
+              render: () => <KeyboardShortcutsDialog />,
+            });
+          },
+        },
+        {
+          key: 'import-data',
+          label: 'Import Data',
+          leftSlot: <Icon icon="folderInput" />,
+          onSelect: () => {
+            dialog.show({
+              title: 'Import Data',
+              size: 'sm',
+              render: ({ hide }) => {
+                return (
+                  <VStack space={3}>
+                    <p>Insomnia or Postman Collection v2/v2.1 formats are supported</p>
+                    <Button
+                      size="sm"
+                      color="primary"
+                      onClick={async () => {
+                        await importData.mutateAsync();
+                        hide();
+                      }}
+                    >
+                      Select File
+                    </Button>
+                  </VStack>
+                );
+              },
+            });
+          },
+        },
+        {
+          key: 'export-data',
+          label: 'Export Data',
+          leftSlot: <Icon icon="folderOutput" />,
+          onSelect: () => exportData.mutate(),
+        },
+        { type: 'separator', label: `Yaak v${appVersion.data}` },
+        {
+          key: 'update-check',
+          label: 'Check for Updates',
+          leftSlot: <Icon icon="update" />,
+          onSelect: () => invoke('check_for_updates'),
+        },
+        {
+          key: 'feedback',
+          label: 'Feedback',
+          leftSlot: <Icon icon="chat" />,
+          rightSlot: <Icon icon="externalLink" />,
+          onSelect: () => shell.open('https://yaak.canny.io'),
+        },
+        {
+          key: 'changelog',
+          label: 'Changelog',
+          variant: showChangelog ? 'notify' : 'default',
+          leftSlot: <Icon icon="cake" />,
+          rightSlot: <Icon icon="externalLink" />,
+          onSelect: () => shell.open(`https://yaak.app/changelog/${appVersion.data}`),
+        },
+      ]}
+    >
+      <IconButton
+        size="sm"
+        title="Main Menu"
+        icon="settings"
+        className="pointer-events-auto"
+        showBadge={showChangelog}
+      />
+    </Dropdown>
+  );
+}
--- a/src-web/components/Sidebar.tsx
+++ b/src-web/components/Sidebar.tsx
@@ -6,6 +6,7 @@ import { useDrag, useDrop } from 'react-dnd';
 import { useKey, useKeyPressEvent } from 'react-use';

 import { useActiveEnvironmentId } from '../hooks/useActiveEnvironmentId';
+import { useActiveRequest } from '../hooks/useActiveRequest';
 import { useActiveRequestId } from '../hooks/useActiveRequestId';
 import { useActiveWorkspace } from '../hooks/useActiveWorkspace';
 import { useAppRoutes } from '../hooks/useAppRoutes';
@@ -13,13 +14,16 @@ import { useCreateFolder } from '../hooks/useCreateFolder';
 import { useCreateRequest } from '../hooks/useCreateRequest';
 import { useDeleteAnyRequest } from '../hooks/useDeleteAnyRequest';
 import { useDeleteFolder } from '../hooks/useDeleteFolder';
+import { useDeleteRequest } from '../hooks/useDeleteRequest';
+import { useDuplicateRequest } from '../hooks/useDuplicateRequest';
 import { useFolders } from '../hooks/useFolders';
+import { useHotKey } from '../hooks/useHotKey';
 import { useKeyValue } from '../hooks/useKeyValue';
 import { useLatestResponse } from '../hooks/useLatestResponse';
-import { useListenToTauriEvent } from '../hooks/useListenToTauriEvent';
 import { usePrompt } from '../hooks/usePrompt';
 import { useRequests } from '../hooks/useRequests';
 import { useSendManyRequests } from '../hooks/useSendFolder';
+import { useSendRequest } from '../hooks/useSendRequest';
 import { useSidebarHidden } from '../hooks/useSidebarHidden';
 import { useUpdateAnyFolder } from '../hooks/useUpdateAnyFolder';
 import { useUpdateAnyRequest } from '../hooks/useUpdateAnyRequest';
@@ -28,9 +32,8 @@ import { fallbackRequestName } from '../lib/fallbackRequestName';
 import { NAMESPACE_NO_SYNC } from '../lib/keyValueStore';
 import type { Folder, HttpRequest, Workspace } from '../lib/models';
 import { isResponseLoading } from '../lib/models';
-import { Dropdown } from './core/Dropdown';
+import { ContextMenu } from './core/Dropdown';
 import { Icon } from './core/Icon';
-import { IconButton } from './core/IconButton';
 import { InlineCode } from './core/InlineCode';
 import { VStack } from './core/Stacks';
 import { StatusTag } from './core/StatusTag';
@@ -52,7 +55,6 @@ interface TreeNode {

 export function Sidebar({ className }: Props) {
  const { hidden } = useSidebarHidden();
-  const createRequest = useCreateRequest();
  const sidebarRef = useRef<HTMLLIElement>(null);
  const activeRequestId = useActiveRequestId();
  const activeEnvironmentId = useActiveEnvironmentId();
@@ -60,6 +62,7 @@ export function Sidebar({ className }: Props) {
  const folders = useFolders();
  const deleteAnyRequest = useDeleteAnyRequest();
  const activeWorkspace = useActiveWorkspace();
+  const duplicateRequest = useDuplicateRequest({ id: activeRequestId, navigateAfter: true });
  const routes = useAppRoutes();
  const [hasFocus, setHasFocus] = useState<boolean>(false);
  const [selectedId, setSelectedId] = useState<string | null>(null);
@@ -75,6 +78,10 @@ export function Sidebar({ className }: Props) {
    namespace: NAMESPACE_NO_SYNC,
  });

+  useHotKey('request.duplicate', () => {
+    duplicateRequest.mutate();
+  });
+
  const isCollapsed = useCallback(
    (id: string) => collapsed.value?.[id] ?? false,
    [collapsed.value],
@@ -83,10 +90,18 @@ export function Sidebar({ className }: Props) {
  const { tree, treeParentMap, selectableRequests } = useMemo<{
    tree: TreeNode | null;
    treeParentMap: Record<string, TreeNode>;
-    selectableRequests: { id: string; index: number; tree: TreeNode }[];
+    selectableRequests: {
+      id: string;
+      index: number;
+      tree: TreeNode;
+    }[];
  }>(() => {
    const treeParentMap: Record<string, TreeNode> = {};
-    const selectableRequests: { id: string; index: number; tree: TreeNode }[] = [];
+    const selectableRequests: {
+      id: string;
+      index: number;
+      tree: TreeNode;
+    }[] = [];
    if (activeWorkspace == null) {
      return { tree: null, treeParentMap, selectableRequests };
    }
@@ -116,11 +131,16 @@ export function Sidebar({ className }: Props) {
    return { tree, treeParentMap, selectableRequests };
  }, [activeWorkspace, requests, folders]);

-  // TODO: Move these listeners to a central place
-  useListenToTauriEvent('new_request', async () => createRequest.mutate({}));
-
  const focusActiveRequest = useCallback(
-    (args: { forced?: { id: string; tree: TreeNode }; noFocusSidebar?: boolean } = {}) => {
+    (
+      args: {
+        forced?: {
+          id: string;
+          tree: TreeNode;
+        };
+        noFocusSidebar?: boolean;
+      } = {},
+    ) => {
      const { forced, noFocusSidebar } = args;
      const tree = forced?.tree ?? treeParentMap[activeRequestId ?? 'n/a'] ?? null;
      const children = tree?.children ?? [];
@@ -193,19 +213,15 @@ export function Sidebar({ className }: Props) {
  useKeyPressEvent('Backspace', handleDeleteKey);
  useKeyPressEvent('Delete', handleDeleteKey);

-  useListenToTauriEvent(
-    'focus_sidebar',
-    () => {
-      if (hidden || hasFocus) return;
-      // Select 0 index on focus if none selected
-      focusActiveRequest(
-        selectedTree != null && selectedId != null
-          ? { forced: { id: selectedId, tree: selectedTree } }
-          : undefined,
-      );
-    },
-    [focusActiveRequest, hidden, activeRequestId],
-  );
+  useHotKey('sidebar.focus', () => {
+    if (hidden || hasFocus) return;
+    // Select 0 index on focus if none selected
+    focusActiveRequest(
+      selectedTree != null && selectedId != null
+        ? { forced: { id: selectedId, tree: selectedTree } }
+        : undefined,
+    );
+  });

  useKeyPressEvent('Enter', (e) => {
    if (!hasFocus) return;
@@ -307,8 +323,9 @@ export function Sidebar({ className }: Props) {
        newChildren.splice(hoveredIndex - 1, 0, child);
      }

-      const prev = newChildren[hoveredIndex - 1]?.item;
-      const next = newChildren[hoveredIndex + 1]?.item;
+      const insertedIndex = newChildren.findIndex((c) => c.item === child.item);
+      const prev = newChildren[insertedIndex - 1]?.item;
+      const next = newChildren[insertedIndex + 1]?.item;
      const beforePriority = prev == null || prev.model === 'workspace' ? 0 : prev.sortPriority;
      const afterPriority = next == null || next.model === 'workspace' ? 0 : next.sortPriority;

@@ -506,17 +523,21 @@ const SidebarItem = forwardRef(function SidebarItem(
  }: SidebarItemProps,
  ref: ForwardedRef<HTMLLIElement>,
 ) {
+  const activeRequest = useActiveRequest();
  const createRequest = useCreateRequest();
  const createFolder = useCreateFolder();
  const deleteFolder = useDeleteFolder(itemId);
+  const deleteRequest = useDeleteRequest(itemId);
+  const duplicateRequest = useDuplicateRequest({ id: itemId, navigateAfter: true });
+  const sendRequest = useSendRequest(itemId);
+  const sendAndDownloadRequest = useSendRequest(itemId, { download: true });
  const sendManyRequests = useSendManyRequests();
  const latestResponse = useLatestResponse(itemId);
  const updateRequest = useUpdateRequest(itemId);
  const updateAnyFolder = useUpdateAnyFolder();
  const prompt = usePrompt();
  const [editing, setEditing] = useState<boolean>(false);
-  const activeRequestId = useActiveRequestId();
-  const isActive = activeRequestId === itemId;
+  const isActive = activeRequest?.id === itemId;

  const handleSubmitNameEdit = useCallback(
    (el: HTMLInputElement) => {
@@ -561,74 +582,108 @@ const SidebarItem = forwardRef(function SidebarItem(
  );

  const handleSelect = useCallback(() => onSelect(itemId), [onSelect, itemId]);
+  const [showContextMenu, setShowContextMenu] = useState<{
+    x: number;
+    y: number;
+  } | null>(null);
+
+  const handleContextMenu = useCallback((e: React.MouseEvent<HTMLElement>) => {
+    e.preventDefault();
+    e.stopPropagation();
+    setShowContextMenu({ x: e.clientX, y: e.clientY });
+  }, []);

  return (
    <li ref={ref}>
      <div className={classNames(className, 'block relative group/item px-2 pb-0.5')}>
-        {itemModel === 'folder' && (
-          <Dropdown
-            items={[
-              {
-                key: 'sendAll',
-                label: 'Send All',
-                leftSlot: <Icon icon="paperPlane" />,
-                onSelect: () => sendManyRequests.mutate(child.children.map((c) => c.item.id)),
-              },
-              { type: 'separator', label: itemName },
-              {
-                key: 'rename',
-                label: 'Rename',
-                leftSlot: <Icon icon="pencil" />,
-                onSelect: async () => {
-                  const name = await prompt({
-                    title: 'Rename Folder',
-                    description: (
-                      <>
-                        Enter a new name for <InlineCode>{itemName}</InlineCode>
-                      </>
-                    ),
-                    name: 'name',
-                    label: 'Name',
-                    defaultValue: itemName,
-                  });
-                  updateAnyFolder.mutate({ id: itemId, update: (f) => ({ ...f, name }) });
-                },
-              },
-              {
-                key: 'deleteFolder',
-                label: 'Delete',
-                variant: 'danger',
-                leftSlot: <Icon icon="trash" />,
-                onSelect: () => deleteFolder.mutate(),
-              },
-              { type: 'separator' },
-              {
-                key: 'createRequest',
-                label: 'New Request',
-                leftSlot: <Icon icon="plus" />,
-                onSelect: () => createRequest.mutate({ folderId: itemId, sortPriority: -1 }),
-              },
-              {
-                key: 'createFolder',
-                label: 'New Folder',
-                leftSlot: <Icon icon="plus" />,
-                onSelect: () => createFolder.mutate({ folderId: itemId, sortPriority: -1 }),
-              },
-            ]}
-          >
-            <IconButton
-              title="Folder options"
-              size="xs"
-              icon="dotsV"
-              className="ml-auto !bg-transparent absolute right-2 opacity-0 group-hover/item:opacity-70 transition-opacity"
-            />
-          </Dropdown>
-        )}
+        <ContextMenu
+          show={showContextMenu}
+          items={
+            itemModel === 'folder'
+              ? [
+                  {
+                    key: 'sendAll',
+                    label: 'Send All',
+                    leftSlot: <Icon icon="sendHorizontal" />,
+                    onSelect: () => sendManyRequests.mutate(child.children.map((c) => c.item.id)),
+                  },
+                  {
+                    key: 'rename',
+                    label: 'Rename',
+                    leftSlot: <Icon icon="pencil" />,
+                    onSelect: async () => {
+                      const name = await prompt({
+                        title: 'Rename Folder',
+                        description: (
+                          <>
+                            Enter a new name for <InlineCode>{itemName}</InlineCode>
+                          </>
+                        ),
+                        name: 'name',
+                        label: 'Name',
+                        defaultValue: itemName,
+                      });
+                      updateAnyFolder.mutate({ id: itemId, update: (f) => ({ ...f, name }) });
+                    },
+                  },
+                  {
+                    key: 'deleteFolder',
+                    label: 'Delete',
+                    variant: 'danger',
+                    leftSlot: <Icon icon="trash" />,
+                    onSelect: () => deleteFolder.mutate(),
+                  },
+                  { type: 'separator' },
+                  {
+                    key: 'createRequest',
+                    label: 'New Request',
+                    leftSlot: <Icon icon="plus" />,
+                    onSelect: () => createRequest.mutate({ folderId: itemId }),
+                  },
+                  {
+                    key: 'createFolder',
+                    label: 'New Folder',
+                    leftSlot: <Icon icon="plus" />,
+                    onSelect: () => createFolder.mutate({ folderId: itemId, sortPriority: -1 }),
+                  },
+                ]
+              : [
+                  {
+                    key: 'sendRequest',
+                    label: 'Send',
+                    hotKeyAction: 'request.send',
+                    hotKeyLabelOnly: true, // Already bound in URL bar
+                    leftSlot: <Icon icon="sendHorizontal" />,
+                    onSelect: () => sendRequest.mutate(),
+                  },
+                  { type: 'separator' },
+                  {
+                    key: 'duplicateRequest',
+                    label: 'Duplicate',
+                    hotKeyAction: 'request.duplicate',
+                    hotKeyLabelOnly: true, // Would trigger for every request (bad)
+                    leftSlot: <Icon icon="copy" />,
+                    onSelect: () => {
+                      duplicateRequest.mutate();
+                    },
+                  },
+                  {
+                    key: 'deleteRequest',
+                    variant: 'danger',
+                    label: 'Delete',
+                    leftSlot: <Icon icon="trash" />,
+                    onSelect: () => deleteRequest.mutate(),
+                  },
+                ]
+          }
+          onClose={() => setShowContextMenu(null)}
+        />
        <button
          // tabIndex={-1} // Will prevent drag-n-drop
          disabled={editing}
          onClick={handleSelect}
          onDoubleClick={handleStartEditing}
+          onContextMenu={handleContextMenu}
          data-active={isActive}
          data-selected={selected}
          className={classNames(
@@ -717,7 +772,13 @@ function DraggableSidebarItem({
    [onMove],
  );

-  const [{ isDragging }, connectDrag] = useDrag<DragItem, unknown, { isDragging: boolean }>(
+  const [{ isDragging }, connectDrag] = useDrag<
+    DragItem,
+    unknown,
+    {
+      isDragging: boolean;
+    }
+  >(
    () => ({
      type: ItemTypes.REQUEST,
      item: () => {
--- a/src-web/components/SidebarActions.tsx
+++ b/src-web/components/SidebarActions.tsx
@@ -2,8 +2,8 @@ import { memo } from 'react';
 import { useCreateFolder } from '../hooks/useCreateFolder';
 import { useCreateRequest } from '../hooks/useCreateRequest';
 import { useSidebarHidden } from '../hooks/useSidebarHidden';
+import { trackEvent } from '../lib/analytics';
 import { Dropdown } from './core/Dropdown';
-import { Icon } from './core/Icon';
 import { IconButton } from './core/IconButton';
 import { HStack } from './core/Stacks';

@@ -15,10 +15,14 @@ export const SidebarActions = memo(function SidebarActions() {
  return (
    <HStack>
      <IconButton
-        onClick={toggle}
+        onClick={() => {
+          trackEvent('Sidebar', 'Toggle');
+          toggle();
+        }}
        className="pointer-events-auto"
        size="sm"
        title="Show sidebar"
+        hotkeyAction="sidebar.toggle"
        icon={hidden ? 'leftPanelHidden' : 'leftPanelVisible'}
      />
      <Dropdown
@@ -26,13 +30,12 @@ export const SidebarActions = memo(function SidebarActions() {
          {
            key: 'create-request',
            label: 'New Request',
-            leftSlot: <Icon icon="plus" />,
+            hotKeyAction: 'request.create',
            onSelect: () => createRequest.mutate({}),
          },
          {
            key: 'create-folder',
            label: 'New Folder',
-            leftSlot: <Icon icon="plus" />,
            onSelect: () => createFolder.mutate({}),
          },
        ]}
--- a/src-web/components/UrlBar.tsx
+++ b/src-web/components/UrlBar.tsx
@@ -2,8 +2,8 @@ import classNames from 'classnames';
 import type { EditorView } from 'codemirror';
 import type { FormEvent } from 'react';
 import { memo, useCallback, useRef, useState } from 'react';
+import { useHotKey } from '../hooks/useHotKey';
 import { useIsResponseLoading } from '../hooks/useIsResponseLoading';
-import { useListenToTauriEvent } from '../hooks/useListenToTauriEvent';
 import { useRequestUpdateKey } from '../hooks/useRequestUpdateKey';
 import { useSendRequest } from '../hooks/useSendRequest';
 import { useUpdateRequest } from '../hooks/useUpdateRequest';
@@ -40,7 +40,11 @@ export const UrlBar = memo(function UrlBar({ id: requestId, url, method, classNa
    [sendRequest],
  );

-  useListenToTauriEvent('focus_url', () => {
+  useHotKey('urlBar.focus', () => {
+    const head = inputRef.current?.state.doc.length ?? 0;
+    inputRef.current?.dispatch({
+      selection: { anchor: 0, head },
+    });
    inputRef.current?.focus();
  });

@@ -67,18 +71,19 @@ export const UrlBar = memo(function UrlBar({ id: requestId, url, method, classNa
          <RequestMethodDropdown
            method={method}
            onChange={handleMethodChange}
-            className="!h-auto mx-0.5 my-0.5"
+            className="mx-0.5 my-0.5"
          />
        }
        rightSlot={
          <IconButton
            size="xs"
-            iconSize="sm"
+            iconSize="md"
            title="Send Request"
            type="submit"
-            className="!h-auto w-8 mr-0.5 my-0.5"
-            icon={loading ? 'update' : 'paperPlane'}
+            className="w-8 mr-0.5 my-0.5"
+            icon={loading ? 'update' : 'sendHorizontal'}
            spin={loading}
+            hotkeyAction="request.send"
          />
        }
      />
--- a/src-web/components/Workspace.tsx
+++ b/src-web/components/Workspace.tsx
@@ -8,7 +8,7 @@ import type {
 } from 'react';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useWindowSize } from 'react-use';
-import { useListenToTauriEvent } from '../hooks/useListenToTauriEvent';
+import { useIsFullscreen } from '../hooks/useIsFullscreen';
 import { useOsInfo } from '../hooks/useOsInfo';
 import { useSidebarHidden } from '../hooks/useSidebarHidden';
 import { useSidebarWidth } from '../hooks/useSidebarWidth';
@@ -30,7 +30,7 @@ const WINDOW_FLOATING_SIDEBAR_WIDTH = 600;

 export default function Workspace() {
  const { setWidth, width, resetWidth } = useSidebarWidth();
-  const { hide, show, hidden, toggle } = useSidebarHidden();
+  const { hide, show, hidden } = useSidebarHidden();

  const windowSize = useWindowSize();
  const [floating, setFloating] = useState<boolean>(false);
@@ -39,14 +39,16 @@ export default function Workspace() {
    null,
  );

-  useListenToTauriEvent('toggle_sidebar', toggle);
-
  // float/un-float sidebar on window resize
  useEffect(() => {
    const shouldHide = windowSize.width <= WINDOW_FLOATING_SIDEBAR_WIDTH;
-    if (shouldHide) setFloating(true);
-    else if (!shouldHide) setFloating(false);
-  }, [windowSize.width]);
+    if (shouldHide && !floating) {
+      setFloating(true);
+      hide();
+    } else if (!shouldHide && floating) {
+      setFloating(false);
+    }
+  }, [floating, hide, windowSize.width]);

  const unsub = () => {
    if (moveState.current !== null) {
@@ -172,12 +174,14 @@ interface HeaderSizeProps extends HTMLAttributes<HTMLDivElement> {

 function HeaderSize({ className, ...props }: HeaderSizeProps) {
  const platform = useOsInfo();
+  const fullscreen = useIsFullscreen();
+  const stoplightsVisible = platform?.osType === 'Darwin' && !fullscreen;
  return (
    <div
      className={classNames(
        className,
-        'h-md pt-[1px] flex items-center w-full pr-3 border-b',
-        platform?.osType === 'Darwin' && 'pl-20',
+        'h-md pt-[1px] flex items-center w-full border-b',
+        stoplightsVisible ? 'pl-20 pr-1' : 'pl-1',
      )}
      {...props}
    />
--- a/src-web/components/WorkspaceActionsDropdown.tsx
+++ b/src-web/components/WorkspaceActionsDropdown.tsx
@@ -3,15 +3,10 @@ import classNames from 'classnames';
 import { memo, useMemo } from 'react';
 import { useActiveWorkspace } from '../hooks/useActiveWorkspace';
 import { useAppRoutes } from '../hooks/useAppRoutes';
-import { useAppVersion } from '../hooks/useAppVersion';
 import { useCreateWorkspace } from '../hooks/useCreateWorkspace';
 import { useDeleteWorkspace } from '../hooks/useDeleteWorkspace';
-import { useExportData } from '../hooks/useExportData';
-import { useImportData } from '../hooks/useImportData';
 import { usePrompt } from '../hooks/usePrompt';
 import { getRecentEnvironments } from '../hooks/useRecentEnvironments';
-import { useTheme } from '../hooks/useTheme';
-import { useUpdateMode } from '../hooks/useUpdateMode';
 import { useUpdateWorkspace } from '../hooks/useUpdateWorkspace';
 import { useWorkspaces } from '../hooks/useWorkspaces';
 import type { ButtonProps } from './core/Button';
@@ -32,17 +27,12 @@ export const WorkspaceActionsDropdown = memo(function WorkspaceActionsDropdown({
  const workspaces = useWorkspaces();
  const activeWorkspace = useActiveWorkspace();
  const activeWorkspaceId = activeWorkspace?.id ?? null;
-  const createWorkspace = useCreateWorkspace({ navigateAfter: true });
  const updateWorkspace = useUpdateWorkspace(activeWorkspaceId);
  const deleteWorkspace = useDeleteWorkspace(activeWorkspace);
-  const importData = useImportData();
-  const exportData = useExportData();
-  const { appearance, toggleAppearance } = useTheme();
+  const createWorkspace = useCreateWorkspace({ navigateAfter: true });
  const dialog = useDialog();
  const prompt = usePrompt();
  const routes = useAppRoutes();
-  const appVersion = useAppVersion();
-  const [updateMode, setUpdateMode] = useUpdateMode();

  const items: DropdownItem[] = useMemo(() => {
    const workspaceItems: DropdownItem[] = workspaces.map((w) => ({
@@ -65,7 +55,7 @@ export const WorkspaceActionsDropdown = memo(function WorkspaceActionsDropdown({
                <Button
                  className="focus"
                  color="gray"
-                  rightSlot={<Icon icon="openNewWindow" />}
+                  rightSlot={<Icon icon="externalLink" />}
                  onClick={async () => {
                    hide();
                    const environmentId = (await getRecentEnvironments(w.id))[0];
@@ -149,52 +139,14 @@ export const WorkspaceActionsDropdown = memo(function WorkspaceActionsDropdown({
          createWorkspace.mutate({ name });
        },
      },
-      {
-        key: 'import-data',
-        label: 'Import Data',
-        leftSlot: <Icon icon="download" />,
-        onSelect: () => importData.mutate(),
-      },
-      {
-        key: 'export-data',
-        label: 'Export Data',
-        leftSlot: <Icon icon="upload" />,
-        onSelect: () => exportData.mutate(),
-      },
-      { type: 'separator', label: `v${appVersion.data}` },
-      {
-        key: 'appearance',
-        label: 'Toggle Theme',
-        onSelect: toggleAppearance,
-        leftSlot: <Icon icon={appearance === 'dark' ? 'sun' : 'moon'} />,
-      },
-      {
-        key: 'update-mode',
-        label: updateMode === 'stable' ? 'Enable Beta' : 'Disable Beta',
-        onSelect: () => setUpdateMode(updateMode === 'stable' ? 'beta' : 'stable'),
-        leftSlot: <Icon icon="camera" />,
-      },
-      {
-        key: 'update-check',
-        label: 'Check for Updates',
-        onSelect: () => invoke('check_for_updates'),
-        leftSlot: <Icon icon="update" />,
-      },
    ];
  }, [
    activeWorkspace?.name,
    activeWorkspaceId,
-    appearance,
-    createWorkspace,
    deleteWorkspace.mutate,
    dialog,
-    exportData,
-    importData,
    prompt,
    routes,
-    setUpdateMode,
-    toggleAppearance,
-    updateMode,
    updateWorkspace,
    workspaces,
  ]);
--- a/src-web/components/WorkspaceHeader.tsx
+++ b/src-web/components/WorkspaceHeader.tsx
@@ -1,22 +1,23 @@
 import classNames from 'classnames';
-import React, { memo } from 'react';
-import { useActiveRequest } from '../hooks/useActiveRequest';
+import React, { memo, useState } from 'react';
 import { Icon } from './core/Icon';
-import { IconButton } from './core/IconButton';
 import { HStack } from './core/Stacks';
 import { EnvironmentActionsDropdown } from './EnvironmentActionsDropdown';
 import { RecentRequestsDropdown } from './RecentRequestsDropdown';
-import { RequestActionsDropdown } from './RequestActionsDropdown';
+import { SettingsDropdown } from './SettingsDropdown';
 import { SidebarActions } from './SidebarActions';
 import { WorkspaceActionsDropdown } from './WorkspaceActionsDropdown';
+import { useOsInfo } from '../hooks/useOsInfo';
+import { Button } from './core/Button';
+import { appWindow } from '@tauri-apps/api/window';

 interface Props {
  className?: string;
 }

 export const WorkspaceHeader = memo(function WorkspaceHeader({ className }: Props) {
-  const activeRequest = useActiveRequest();
-
+  const osInfo = useOsInfo();
+  const [maximized, setMaximized] = useState<boolean>(false);
  return (
    <HStack
      space={2}
@@ -35,15 +36,54 @@ export const WorkspaceHeader = memo(function WorkspaceHeader({ className }: Prop
      <div className="pointer-events-none">
        <RecentRequestsDropdown />
      </div>
-      <div className="flex-1 flex justify-end -mr-2 pointer-events-none">
-        <RequestActionsDropdown requestId={activeRequest?.id ?? null}>
-          <IconButton
-            size="sm"
-            title="Request Options"
-            icon="gear"
-            className="pointer-events-auto"
-          />
-        </RequestActionsDropdown>
+      <div className="flex-1 flex items-center h-full justify-end pointer-events-none">
+        <SettingsDropdown />
+        {(osInfo?.osType === 'Linux' || osInfo?.osType === 'Windows_NT') && (
+          <HStack className="ml-4" alignItems="center">
+            <Button
+              className="px-4 !text-gray-600 rounded-none"
+              onClick={() => appWindow.minimize()}
+            >
+              <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+                <path fill="currentColor" d="M14 8v1H3V8z" />
+              </svg>
+            </Button>
+            <Button
+              className="px-4 !text-gray-600 rounded-none"
+              onClick={async () => {
+                await appWindow.toggleMaximize();
+                setMaximized(await appWindow.isMaximized());
+              }}
+            >
+              {maximized ? (
+                <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+                  <g fill="currentColor">
+                    <path d="M3 5v9h9V5zm8 8H4V6h7z" />
+                    <path fillRule="evenodd" d="M5 5h1V4h7v7h-1v1h2V3H5z" clipRule="evenodd" />
+                  </g>
+                </svg>
+              ) : (
+                <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+                  <path fill="currentColor" d="M3 3v10h10V3zm9 9H4V4h8z" />
+                </svg>
+              )}
+            </Button>
+            <Button
+              color="custom"
+              className="px-4 text-gray-600 rounded-none hocus:bg-red-200 hocus:text-gray-800"
+              onClick={() => appWindow.close()}
+            >
+              <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+                <path
+                  fill="currentColor"
+                  fillRule="evenodd"
+                  d="m7.116 8l-4.558 4.558l.884.884L8 8.884l4.558 4.558l.884-.884L8.884 8l4.558-4.558l-.884-.884L8 7.116L3.442 2.558l-.884.884z"
+                  clipRule="evenodd"
+                />
+              </svg>
+            </Button>
+          </HStack>
+        )}
      </div>
    </HStack>
  );
--- a/src-web/components/core/Button.tsx
+++ b/src-web/components/core/Button.tsx
@@ -1,6 +1,8 @@
 import classNames from 'classnames';
 import type { HTMLAttributes, ReactNode } from 'react';
-import { forwardRef, memo, useMemo } from 'react';
+import { forwardRef, useImperativeHandle, useMemo, useRef } from 'react';
+import type { HotkeyAction } from '../../hooks/useHotKey';
+import { useFormattedHotkey, useHotKey } from '../../hooks/useHotKey';
 import { Icon } from './Icon';

 const colorStyles = {
@@ -26,10 +28,10 @@ export type ButtonProps = HTMLAttributes<HTMLButtonElement> & {
  title?: string;
  leftSlot?: ReactNode;
  rightSlot?: ReactNode;
+  hotkeyAction?: HotkeyAction;
 };

-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const _Button = forwardRef<HTMLButtonElement, ButtonProps>(function Button(
+export const Button = forwardRef<HTMLButtonElement, ButtonProps>(function Button(
  {
    isLoading,
    className,
@@ -43,10 +45,16 @@ const _Button = forwardRef<HTMLButtonElement, ButtonProps>(function Button(
    leftSlot,
    rightSlot,
    disabled,
+    hotkeyAction,
+    title,
+    onClick,
    ...props
  }: ButtonProps,
  ref,
 ) {
+  const hotkeyTrigger = useFormattedHotkey(hotkeyAction ?? null)?.join('');
+  const fullTitle = hotkeyTrigger ? `${title}  ${hotkeyTrigger}` : title;
+
  const classes = useMemo(
    () =>
      classNames(
@@ -66,8 +74,26 @@ const _Button = forwardRef<HTMLButtonElement, ButtonProps>(function Button(
    [className, disabled, color, justify, size],
  );

+  const buttonRef = useRef<HTMLButtonElement>(null);
+  useImperativeHandle<HTMLButtonElement | null, HTMLButtonElement | null>(
+    ref,
+    () => buttonRef.current,
+  );
+
+  useHotKey(hotkeyAction ?? null, () => {
+    buttonRef.current?.click();
+  });
+
  return (
-    <button ref={ref} type={type} className={classes} disabled={disabled} {...props}>
+    <button
+      ref={buttonRef}
+      type={type}
+      className={classes}
+      disabled={disabled}
+      onClick={onClick}
+      title={fullTitle}
+      {...props}
+    >
      {isLoading ? (
        <Icon icon="update" size={size} className="animate-spin mr-1" />
      ) : leftSlot ? (
@@ -87,5 +113,3 @@ const _Button = forwardRef<HTMLButtonElement, ButtonProps>(function Button(
    </button>
  );
 });
-
-export const Button = memo(_Button);
--- a/src-web/components/core/Checkbox.tsx
+++ b/src-web/components/core/Checkbox.tsx
@@ -1,6 +1,6 @@
 import classNames from 'classnames';
-import { useCallback } from 'react';
 import { Icon } from './Icon';
+import { HStack } from './Stacks';

 interface Props {
  checked: boolean;
@@ -8,33 +8,47 @@ interface Props {
  onChange: (checked: boolean) => void;
  disabled?: boolean;
  className?: string;
+  hideLabel?: boolean;
 }

-export function Checkbox({ checked, onChange, className, disabled, title }: Props) {
-  const handleClick = useCallback(() => {
-    onChange(!checked);
-  }, [onChange, checked]);
-
+export function Checkbox({ checked, onChange, className, disabled, title, hideLabel }: Props) {
  return (
-    <button
-      role="checkbox"
-      aria-checked={checked ? 'true' : 'false'}
-      disabled={disabled}
-      onClick={handleClick}
-      title={title}
-      className={classNames(
-        className,
-        'flex-shrink-0 w-4 h-4 border border-gray-200 rounded',
-        'focus:border-focus',
-        'disabled:opacity-disabled',
-        checked && 'bg-gray-200/10',
-        // Remove focus style
-        'outline-none',
-      )}
+    <HStack
+      as="label"
+      space={2}
+      alignItems="center"
+      className={classNames(className, 'text-gray-900 text-sm', disabled && 'opacity-disabled')}
    >
-      <div className="flex items-center justify-center">
-        <Icon size="sm" icon={checked ? 'check' : 'empty'} />
+      <div className="relative flex">
+        <input
+          aria-hidden
+          className="appearance-none w-4 h-4 flex-shrink-0 border border-gray-200 rounded focus:border-focus outline-none ring-0"
+          type="checkbox"
+          disabled={disabled}
+          onChange={() => onChange(!checked)}
+        />
+        <div className="absolute inset-0 flex items-center justify-center">
+          <Icon size="sm" icon={checked ? 'check' : 'empty'} />
+        </div>
      </div>
-    </button>
+      {/*<button*/}
+      {/*  role="checkbox"*/}
+      {/*  aria-checked={checked ? 'true' : 'false'}*/}
+      {/*  disabled={disabled}*/}
+      {/*  onClick={handleClick}*/}
+      {/*  title={title}*/}
+      {/*  className={classNames(*/}
+      {/*    className,*/}
+      {/*    'flex-shrink-0 w-4 h-4 border border-gray-200 rounded',*/}
+      {/*    'focus:border-focus',*/}
+      {/*    'disabled:opacity-disabled',*/}
+      {/*    checked && 'bg-gray-200/10',*/}
+      {/*    // Remove focus style*/}
+      {/*    'outline-none',*/}
+      {/*  )}*/}
+      {/*>*/}
+      {/*</button>*/}
+      {!hideLabel && title}
+    </HStack>
  );
 }
--- a/src-web/components/core/Dialog.tsx
+++ b/src-web/components/core/Dialog.tsx
@@ -65,24 +65,27 @@ export function Dialog({
            )}
          >
            {title ? (
-              <Heading className="text-xl font-semibold w-full" id={titleId}>
-                {title}
+              <Heading size={1} id={titleId}>
+                {' '}
+                {title}{' '}
              </Heading>
            ) : (
              <span />
            )}
            {description && <p id={descriptionId}>{description}</p>}
            <div className="h-full w-full grid grid-cols-[minmax(0,1fr)]">{children}</div>
+
            {/*Put close at the end so that it's the last thing to be tabbed to*/}
            {!hideX && (
-              <IconButton
-                onClick={onClose}
-                title="Close dialog"
-                aria-label="Close"
-                icon="x"
-                size="sm"
-                className="ml-auto absolute right-1 top-1"
-              />
+              <div className="ml-auto absolute right-1 top-1">
+                <IconButton
+                  onClick={onClose}
+                  title="Close dialog"
+                  aria-label="Close"
+                  size="sm"
+                  icon="x"
+                />
+              </div>
            )}
          </motion.div>
        </div>
--- a/src-web/components/core/Dropdown.tsx
+++ b/src-web/components/core/Dropdown.tsx
@@ -7,6 +7,7 @@ import type {
  MouseEvent,
  ReactElement,
  ReactNode,
+  SetStateAction,
 } from 'react';
 import React, {
  Children,
@@ -20,8 +21,11 @@ import React, {
  useState,
 } from 'react';
 import { useKey, useKeyPressEvent, useWindowSize } from 'react-use';
+import type { HotkeyAction } from '../../hooks/useHotKey';
+import { useHotKey } from '../../hooks/useHotKey';
 import { Overlay } from '../Overlay';
 import { Button } from './Button';
+import { HotKey } from './HotKey';
 import { Separator } from './Separator';
 import { VStack } from './Stacks';

@@ -30,23 +34,28 @@ export type DropdownItemSeparator = {
  label?: string;
 };

-export type DropdownItem =
-  | {
-      key: string;
-      type?: 'default';
-      label: ReactNode;
-      variant?: 'danger';
-      disabled?: boolean;
-      hidden?: boolean;
-      leftSlot?: ReactNode;
-      rightSlot?: ReactNode;
-      onSelect?: () => void;
-    }
-  | DropdownItemSeparator;
+export type DropdownItemDefault = {
+  key: string;
+  type?: 'default';
+  label: ReactNode;
+  hotKeyAction?: HotkeyAction;
+  hotKeyLabelOnly?: boolean;
+  variant?: 'default' | 'danger' | 'notify';
+  disabled?: boolean;
+  hidden?: boolean;
+  leftSlot?: ReactNode;
+  rightSlot?: ReactNode;
+  onSelect?: () => void;
+};
+
+export type DropdownItem = DropdownItemDefault | DropdownItemSeparator;

 export interface DropdownProps {
  children: ReactElement<HTMLAttributes<HTMLButtonElement>>;
  items: DropdownItem[];
+  openOnHotKeyAction?: HotkeyAction;
+  onOpen?: () => void;
+  onClose?: () => void;
 }

 export interface DropdownRef {
@@ -60,20 +69,33 @@ export interface DropdownRef {
 }

 export const Dropdown = forwardRef<DropdownRef, DropdownProps>(function Dropdown(
-  { children, items }: DropdownProps,
+  { children, items, openOnHotKeyAction, onOpen, onClose }: DropdownProps,
  ref,
 ) {
-  const [open, setOpen] = useState<boolean>(false);
+  const [isOpen, _setIsOpen] = useState<boolean>(false);
  const [defaultSelectedIndex, setDefaultSelectedIndex] = useState<number>();
  const buttonRef = useRef<HTMLButtonElement>(null);
  const menuRef = useRef<Omit<DropdownRef, 'open'>>(null);

+  const setIsOpen = useCallback(
+    (o: SetStateAction<boolean>) => {
+      _setIsOpen(o);
+      if (o) onOpen?.();
+      else onClose?.();
+    },
+    [onClose, onOpen],
+  );
+
+  useHotKey(openOnHotKeyAction ?? null, () => {
+    setIsOpen(true);
+  });
+
  useImperativeHandle(ref, () => ({
    ...menuRef.current,
-    isOpen: open,
+    isOpen: isOpen,
    toggle(activeIndex?: number) {
-      if (!open) this.open(activeIndex);
-      else setOpen(false);
+      if (!isOpen) this.open(activeIndex);
+      else setIsOpen(false);
    },
    open(activeIndex?: number) {
      if (activeIndex === undefined) {
@@ -81,7 +103,7 @@ export const Dropdown = forwardRef<DropdownRef, DropdownProps>(function Dropdown
      } else {
        setDefaultSelectedIndex(activeIndex >= 0 ? activeIndex : items.length + activeIndex);
      }
-      setOpen(true);
+      setIsOpen(true);
    },
  }));

@@ -98,54 +120,97 @@ export const Dropdown = forwardRef<DropdownRef, DropdownProps>(function Dropdown
          e.preventDefault();
          e.stopPropagation();
          setDefaultSelectedIndex(undefined);
-          setOpen((o) => !o);
+          setIsOpen((o) => !o);
        }),
    };
    return cloneElement(existingChild, props);
-  }, [children]);
+  }, [children, setIsOpen]);

  const handleClose = useCallback(() => {
-    setOpen(false);
+    setIsOpen(false);
    buttonRef.current?.focus();
-  }, []);
+  }, [setIsOpen]);

  useEffect(() => {
-    buttonRef.current?.setAttribute('aria-expanded', open.toString());
-  }, [open]);
+    buttonRef.current?.setAttribute('aria-expanded', isOpen.toString());
+  }, [isOpen]);

  const windowSize = useWindowSize();
  const triggerRect = useMemo(() => {
    if (!windowSize) return null; // No-op to TS happy with this dep
-    if (!open) return null;
+    if (!isOpen) return null;
    return buttonRef.current?.getBoundingClientRect();
-  }, [open, windowSize]);
+  }, [isOpen, windowSize]);

  return (
    <>
      {child}
-      {open && triggerRect && (
-        <Menu
-          ref={menuRef}
-          defaultSelectedIndex={defaultSelectedIndex}
-          items={items}
-          triggerRect={triggerRect}
-          onClose={handleClose}
-        />
-      )}
+      <Menu
+        ref={menuRef}
+        showTriangle
+        defaultSelectedIndex={defaultSelectedIndex}
+        items={items}
+        triggerShape={triggerRect ?? null}
+        onClose={handleClose}
+        isOpen={isOpen}
+      />
    </>
  );
 });

+interface ContextMenuProps {
+  show: { x: number; y: number } | null;
+  className?: string;
+  items: DropdownProps['items'];
+  onClose: () => void;
+}
+
+export const ContextMenu = forwardRef<DropdownRef, ContextMenuProps>(function ContextMenu(
+  { show, className, items, onClose },
+  ref,
+) {
+  const triggerShape = useMemo(
+    () => ({
+      top: show?.y ?? 0,
+      bottom: show?.y ?? 0,
+      left: show?.x ?? 0,
+      right: show?.x ?? 0,
+    }),
+    [show],
+  );
+
+  return (
+    <Menu
+      className={className}
+      ref={ref}
+      items={items}
+      isOpen={show != null}
+      onClose={onClose}
+      triggerShape={triggerShape}
+    />
+  );
+});
+
 interface MenuProps {
  className?: string;
  defaultSelectedIndex?: number;
  items: DropdownProps['items'];
-  triggerRect: DOMRect;
+  triggerShape: Pick<DOMRect, 'top' | 'bottom' | 'left' | 'right'> | null;
  onClose: () => void;
+  showTriangle?: boolean;
+  isOpen: boolean;
 }

 const Menu = forwardRef<Omit<DropdownRef, 'open' | 'isOpen' | 'toggle'>, MenuProps>(function Menu(
-  { className, items, onClose, triggerRect, defaultSelectedIndex }: MenuProps,
+  {
+    className,
+    isOpen,
+    items,
+    onClose,
+    triggerShape,
+    defaultSelectedIndex,
+    showTriangle,
+  }: MenuProps,
  ref,
 ) {
  const containerRef = useRef<HTMLDivElement | null>(null);
@@ -248,21 +313,30 @@ const Menu = forwardRef<Omit<DropdownRef, 'open' | 'isOpen' | 'toggle'>, MenuPro

  const { containerStyles, triangleStyles } = useMemo<{
    containerStyles: CSSProperties;
-    triangleStyles: CSSProperties;
+    triangleStyles: CSSProperties | null;
  }>(() => {
-    const docWidth = document.documentElement.getBoundingClientRect().width;
-    const spaceRemaining = docWidth - triggerRect.left;
-    const top = triggerRect?.bottom + 5;
-    const onRight = spaceRemaining < 200;
-    const containerStyles = onRight
-      ? { top, right: docWidth - triggerRect?.right }
-      : { top, left: triggerRect?.left };
+    if (triggerShape == null) return { containerStyles: {}, triangleStyles: null };
+
+    const docRect = document.documentElement.getBoundingClientRect();
+    const width = triggerShape.right - triggerShape.left;
+    const heightAbove = triggerShape.top;
+    const heightBelow = docRect.height - triggerShape.bottom;
+    const hSpaceRemaining = docRect.width - triggerShape.left;
+    const top = triggerShape?.bottom + 5;
+    const onRight = hSpaceRemaining < 200;
+    const upsideDown = heightAbove > heightBelow && heightBelow < 200;
+    const containerStyles = {
+      top: !upsideDown ? top : undefined,
+      bottom: upsideDown ? docRect.height - top : undefined,
+      right: onRight ? docRect.width - triggerShape?.right : undefined,
+      left: !onRight ? triggerShape?.left : undefined,
+    };
    const size = { top: '-0.2rem', width: '0.4rem', height: '0.4rem' };
    const triangleStyles = onRight
-      ? { right: triggerRect.width / 2, marginRight: '-0.2rem', ...size }
-      : { left: triggerRect.width / 2, marginLeft: '-0.2rem', ...size };
+      ? { right: width / 2, marginRight: '-0.2rem', ...size }
+      : { left: width / 2, marginLeft: '-0.2rem', ...size };
    return { containerStyles, triangleStyles };
-  }, [triggerRect]);
+  }, [triggerShape]);

  const handleFocus = useCallback(
    (i: DropdownItem) => {
@@ -275,67 +349,89 @@ const Menu = forwardRef<Omit<DropdownRef, 'open' | 'isOpen' | 'toggle'>, MenuPro
  if (items.length === 0) return null;

  return (
-    <Overlay open variant="transparent" portalName="dropdown" zIndex={50}>
-      <div>
-        <div tabIndex={-1} aria-hidden className="fixed inset-0 z-30" onClick={onClose} />
-        <motion.div
-          tabIndex={0}
-          onKeyDown={handleMenuKeyDown}
-          initial={{ opacity: 0, y: -5, scale: 0.98 }}
-          animate={{ opacity: 1, y: 0, scale: 1 }}
-          role="menu"
-          aria-orientation="vertical"
-          dir="ltr"
-          ref={containerRef}
-          style={containerStyles}
-          className={classNames(className, 'outline-none mt-1 pointer-events-auto fixed z-50')}
-        >
-          <span
-            aria-hidden
-            style={triangleStyles}
-            className="bg-gray-50 absolute rotate-45 border-gray-200 border-t border-l"
-          />
-          {containerStyles && (
-            <VStack
-              space={0.5}
-              ref={initMenu}
-              style={menuStyles}
-              className={classNames(
-                className,
-                'h-auto bg-gray-50 rounded-md shadow-lg dark:shadow-gray-0 py-1.5 border',
-                'border-gray-200 overflow-auto mb-1 mx-0.5',
-              )}
+    <>
+      {items.map(
+        (item) =>
+          item.type !== 'separator' &&
+          !item.hotKeyLabelOnly && (
+            <MenuItemHotKey
+              key={item.key}
+              onSelect={handleSelect}
+              item={item}
+              action={item.hotKeyAction}
+            />
+          ),
+      )}
+      {isOpen && (
+        <Overlay open variant="transparent" portalName="dropdown" zIndex={50}>
+          <div>
+            <div tabIndex={-1} aria-hidden className="fixed inset-0 z-30" onClick={onClose} />
+            <motion.div
+              tabIndex={0}
+              onKeyDown={handleMenuKeyDown}
+              initial={{ opacity: 0, y: -5, scale: 0.98 }}
+              animate={{ opacity: 1, y: 0, scale: 1 }}
+              role="menu"
+              aria-orientation="vertical"
+              dir="ltr"
+              ref={containerRef}
+              style={containerStyles}
+              className={classNames(className, 'outline-none my-1 pointer-events-auto fixed z-50')}
            >
-              {items.map((item, i) => {
-                if (item.type === 'separator') {
-                  return <Separator key={i} className="my-1.5" label={item.label} />;
-                }
-                if (item.hidden) {
-                  return null;
-                }
-                return (
-                  <MenuItem
-                    focused={i === selectedIndex}
-                    onFocus={handleFocus}
-                    onSelect={handleSelect}
-                    key={item.key}
-                    item={item}
-                  />
-                );
-              })}
-            </VStack>
-          )}
-        </motion.div>
-      </div>
-    </Overlay>
+              {triangleStyles && showTriangle && (
+                <span
+                  aria-hidden
+                  style={triangleStyles}
+                  className="bg-gray-50 absolute rotate-45 border-gray-200 border-t border-l"
+                />
+              )}
+              {containerStyles && (
+                <VStack
+                  space={0.5}
+                  ref={initMenu}
+                  style={menuStyles}
+                  className={classNames(
+                    className,
+                    'h-auto bg-gray-50 rounded-md shadow-lg dark:shadow-gray-0 py-1.5 border',
+                    'border-gray-200 overflow-auto mb-1 mx-0.5',
+                  )}
+                >
+                  {items.map((item, i) => {
+                    if (item.type === 'separator') {
+                      return (
+                        <Separator key={i} className="my-1.5">
+                          {item.label}
+                        </Separator>
+                      );
+                    }
+                    if (item.hidden) {
+                      return null;
+                    }
+                    return (
+                      <MenuItem
+                        focused={i === selectedIndex}
+                        onFocus={handleFocus}
+                        onSelect={handleSelect}
+                        key={item.key}
+                        item={item}
+                      />
+                    );
+                  })}
+                </VStack>
+              )}
+            </motion.div>
+          </div>
+        </Overlay>
+      )}
+    </>
  );
 });

 interface MenuItemProps {
  className?: string;
-  item: DropdownItem;
-  onSelect: (item: DropdownItem) => void;
-  onFocus: (item: DropdownItem) => void;
+  item: DropdownItemDefault;
+  onSelect: (item: DropdownItemDefault) => void;
+  onFocus: (item: DropdownItemDefault) => void;
  focused: boolean;
 }

@@ -359,7 +455,7 @@ function MenuItem({ className, focused, onFocus, item, onSelect, ...props }: Men
    [focused],
  );

-  if (item.type === 'separator') return <Separator className="my-1.5" />;
+  const rightSlot = item.rightSlot ?? <HotKey action={item.hotKeyAction ?? null} />;

  return (
    <Button
@@ -373,12 +469,13 @@ function MenuItem({ className, focused, onFocus, item, onSelect, ...props }: Men
      onClick={handleClick}
      justify="start"
      leftSlot={item.leftSlot && <div className="pr-2 flex justify-start">{item.leftSlot}</div>}
-      rightSlot={item.rightSlot && <div className="ml-auto pl-3">{item.rightSlot}</div>}
+      rightSlot={rightSlot && <div className="ml-auto pl-3">{rightSlot}</div>}
      className={classNames(
        className,
        'min-w-[8rem] outline-none px-2 mx-1.5 flex text-sm text-gray-700 whitespace-nowrap',
        'focus:bg-highlight focus:text-gray-900 rounded',
        item.variant === 'danger' && 'text-red-600',
+        item.variant === 'notify' && 'text-pink-600',
      )}
      innerClassName="!text-left"
      {...props}
@@ -394,3 +491,14 @@ function MenuItem({ className, focused, onFocus, item, onSelect, ...props }: Men
    </Button>
  );
 }
+
+interface MenuItemHotKeyProps {
+  action: HotkeyAction | undefined;
+  onSelect: MenuItemProps['onSelect'];
+  item: MenuItemProps['item'];
+}
+
+function MenuItemHotKey({ action, onSelect, item }: MenuItemHotKeyProps) {
+  useHotKey(action ?? null, () => onSelect(item));
+  return null;
+}
--- a/src-web/components/core/Editor/Editor.css
+++ b/src-web/components/core/Editor/Editor.css
@@ -74,7 +74,7 @@
    }

    .cm-scroller {
-      @apply font-mono text-[0.8rem] overflow-hidden;
+      @apply font-mono text-xs overflow-hidden;
    }

    .cm-line {
@@ -215,6 +215,28 @@
  }
 }

+.cm-editor .cm-panels {
+  @apply bg-transparent border-0 text-gray-800 z-50;
+
+  input,
+  button {
+    @apply rounded-sm outline-none;
+  }
+
+  button {
+    @apply appearance-none bg-none bg-gray-800 text-gray-100 focus:bg-gray-900 cursor-default;
+  }
+
+  input {
+    @apply bg-gray-50 border border-highlight focus:border-focus outline-none;
+  }
+
+  /* Hide the "All" button */
+  button[name='select'] {
+    @apply hidden;
+  }
+}
+
 /* Add default icon. Needs low priority so it can be overwritten */
 .cm-completionIcon::after {
  content: '𝑥';
--- a/src-web/components/core/Editor/Editor.tsx
+++ b/src-web/components/core/Editor/Editor.tsx
@@ -5,7 +5,18 @@ import { keymap, placeholder as placeholderExt, tooltips } from '@codemirror/vie
 import classNames from 'classnames';
 import { EditorView } from 'codemirror';
 import type { MutableRefObject, ReactNode } from 'react';
-import { forwardRef, memo, useCallback, useEffect, useImperativeHandle, useRef } from 'react';
+import {
+  Children,
+  cloneElement,
+  forwardRef,
+  isValidElement,
+  memo,
+  useCallback,
+  useEffect,
+  useImperativeHandle,
+  useMemo,
+  useRef,
+} from 'react';
 import { useActiveEnvironment } from '../../../hooks/useActiveEnvironment';
 import { useActiveWorkspace } from '../../../hooks/useActiveWorkspace';
 import { IconButton } from '../IconButton';
@@ -145,6 +156,12 @@ const _Editor = forwardRef<EditorView | undefined, EditorProps>(function Editor(
    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, [forceUpdateKey]);

+  const classList = className?.split(/\s+/) ?? [];
+  const bgClassList = classList
+    .filter((c) => c.match(/(^|:)?bg-.+/)) // Find bg-* classes
+    .map((c) => c.replace(/^bg-/, '!bg-')) // !important
+    .map((c) => c.replace(/^dark:bg-/, 'dark:!bg-')); // !important
+
  // Initialize the editor when ref mounts
  const initEditorRef = useCallback((container: HTMLDivElement | null) => {
    if (container === null) {
@@ -184,7 +201,7 @@ const _Editor = forwardRef<EditorView | undefined, EditorProps>(function Editor(

      view = new EditorView({ state, parent: container });
      cm.current = { view, languageCompartment };
-      syncGutterBg({ parent: container, className });
+      syncGutterBg({ parent: container, bgClassList });
      if (autoFocus) {
        view.focus();
      }
@@ -198,6 +215,50 @@ const _Editor = forwardRef<EditorView | undefined, EditorProps>(function Editor(
    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, []);

+  // Add bg classes to actions, so they appear over the text
+  const decoratedActions = useMemo(() => {
+    const results = [];
+    const actionClassName = classNames(
+      'transition-opacity opacity-0 group-hover:opacity-50 hover:!opacity-100 shadow',
+      bgClassList,
+    );
+
+    if (format) {
+      results.push(
+        <IconButton
+          showConfirm
+          key="format"
+          size="sm"
+          title="Reformat contents"
+          icon="magicWand"
+          className={classNames(actionClassName)}
+          onClick={() => {
+            if (cm.current === null) return;
+            const { doc } = cm.current.view.state;
+            const formatted = format(doc.toString());
+            // Update editor and blur because the cursor will reset anyway
+            cm.current.view.dispatch({
+              changes: { from: 0, to: doc.length, insert: formatted },
+            });
+            cm.current.view.contentDOM.blur();
+            // Fire change event
+            onChange?.(formatted);
+          }}
+        />,
+      );
+    }
+    results.push(
+      Children.map(actions, (existingChild) => {
+        if (!isValidElement(existingChild)) return null;
+        return cloneElement(existingChild, {
+          ...existingChild.props,
+          className: classNames(existingChild.props.className, actionClassName),
+        });
+      }),
+    );
+    return results;
+  }, [actions, bgClassList, format, onChange]);
+
  const cmContainer = (
    <div
      ref={initEditorRef}
@@ -219,28 +280,17 @@ const _Editor = forwardRef<EditorView | undefined, EditorProps>(function Editor(
  return (
    <div className="group relative h-full w-full">
      {cmContainer}
-      {format && (
-        <HStack space={0.5} alignItems="center" className="absolute bottom-2 right-0 ">
-          {actions}
-          <IconButton
-            showConfirm
-            size="sm"
-            title="Reformat contents"
-            icon="magicWand"
-            className="transition-opacity opacity-0 group-hover:opacity-70"
-            onClick={() => {
-              if (cm.current === null) return;
-              const { doc } = cm.current.view.state;
-              const formatted = format(doc.toString());
-              // Update editor and blur because the cursor will reset anyway
-              cm.current.view.dispatch({
-                changes: { from: 0, to: doc.length, insert: formatted },
-              });
-              cm.current.view.contentDOM.blur();
-              // Fire change event
-              onChange?.(formatted);
-            }}
-          />
+      {decoratedActions && (
+        <HStack
+          space={1}
+          alignItems="center"
+          justifyContent="end"
+          className={classNames(
+            'absolute bottom-2 left-0 right-0',
+            'pointer-events-none', // No pointer events so we don't block the editor
+          )}
+        >
+          {decoratedActions}
        </HStack>
      )}
    </div>
@@ -290,6 +340,8 @@ function getExtensions({

    // Handle onChange
    EditorView.updateListener.of((update) => {
+      // Only fire onChange if the document changed and the update was from user input. This prevents firing onChange when the document is updated when
+      // changing pages (one request to another in header editor)
      if (onChange && update.docChanged && isViewUpdateFromUserInput(update)) {
        onChange.current?.(update.state.doc.toString());
      }
@@ -313,19 +365,14 @@ function isViewUpdateFromUserInput(viewUpdate: ViewUpdate) {

 const syncGutterBg = ({
  parent,
-  className = '',
+  bgClassList,
 }: {
  parent: HTMLDivElement;
-  className?: string;
+  bgClassList: string[];
 }) => {
  const gutterEl = parent.querySelector<HTMLDivElement>('.cm-gutters');
-  const classList = className?.split(/\s+/) ?? [];
-  const bgClasses = classList
-    .filter((c) => c.match(/(^|:)?bg-.+/)) // Find bg-* classes
-    .map((c) => c.replace(/^bg-/, '!bg-')) // !important
-    .map((c) => c.replace(/^dark:bg-/, 'dark:!bg-')); // !important
  if (gutterEl) {
-    gutterEl?.classList.add(...bgClasses);
+    gutterEl?.classList.add(...bgClassList);
  }
 };

--- a/src-web/components/core/Heading.tsx
+++ b/src-web/components/core/Heading.tsx
@@ -1,10 +1,22 @@
 import classNames from 'classnames';
-import type { HTMLAttributes } from 'react';
+import type { ComponentType, HTMLAttributes } from 'react';

-export function Heading({ className, children, ...props }: HTMLAttributes<HTMLHeadingElement>) {
+interface Props extends HTMLAttributes<HTMLHeadingElement> {
+  size?: 1 | 2 | 3;
+}
+
+export function Heading({ className, size = 1, ...props }: Props) {
+  const Component = size === 1 ? 'h1' : size === 2 ? 'h2' : 'h3';
  return (
-    <h1 className={classNames(className, 'text-2xl font-semibold text-gray-900 mb-3')} {...props}>
-      {children}
-    </h1>
+    <Component
+      className={classNames(
+        className,
+        'font-semibold text-gray-900',
+        size === 1 && 'text-2xl',
+        size === 2 && 'text-xl',
+        size === 3 && 'text-lg',
+      )}
+      {...props}
+    />
  );
 }
--- a/src-web/components/core/HotKey.tsx
+++ b/src-web/components/core/HotKey.tsx
@@ -1,21 +1,35 @@
 import classNames from 'classnames';
+import type { HotkeyAction } from '../../hooks/useHotKey';
+import { useFormattedHotkey } from '../../hooks/useHotKey';
+import { useOsInfo } from '../../hooks/useOsInfo';
+import { HStack } from './Stacks';

 interface Props {
-  modifier: 'Meta' | 'Control' | 'Shift';
-  keyName: string;
+  action: HotkeyAction | null;
+  className?: string;
+  variant?: 'text' | 'with-bg';
 }

-const keys: Record<Props['modifier'], string> = {
-  Control: '⌃',
-  Meta: '⌘',
-  Shift: '⇧',
-};
+export function HotKey({ action, className, variant }: Props) {
+  const osInfo = useOsInfo();
+  const labelParts = useFormattedHotkey(action);
+  if (labelParts === null || osInfo == null) {
+    return null;
+  }

-export function HotKey({ modifier, keyName }: Props) {
  return (
-    <span className={classNames('text-sm text-gray-600')}>
-      {keys[modifier]}
-      {keyName}
-    </span>
+    <HStack
+      className={classNames(
+        className,
+        variant === 'with-bg' && 'rounded border',
+        'text-gray-1000 text-opacity-disabled',
+      )}
+    >
+      {labelParts.map((char, index) => (
+        <div key={index} className="min-w-[1.1em] text-center">
+          {char}
+        </div>
+      ))}
+    </HStack>
  );
 }
--- a/src-web/components/core/HotKeyLabel.tsx
+++ b/src-web/components/core/HotKeyLabel.tsx
@@ -0,0 +1,11 @@
+import type { HotkeyAction } from '../../hooks/useHotKey';
+import { useHotKeyLabel } from '../../hooks/useHotKey';
+
+interface Props {
+  action: HotkeyAction;
+}
+
+export function HotKeyLabel({ action }: Props) {
+  const label = useHotKeyLabel(action);
+  return <span>{label}</span>;
+}
--- a/src-web/components/core/HotKeyList.tsx
+++ b/src-web/components/core/HotKeyList.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import type { HotkeyAction } from '../../hooks/useHotKey';
+import { HotKey } from './HotKey';
+import { HotKeyLabel } from './HotKeyLabel';
+import { HStack, VStack } from './Stacks';
+
+interface Props {
+  hotkeys: HotkeyAction[];
+}
+
+export const HotKeyList = ({ hotkeys }: Props) => {
+  return (
+    <div className="mx-auto h-full flex items-center text-gray-700 text-sm">
+      <VStack space={2}>
+        {hotkeys.map((hotkey) => (
+          <HStack key={hotkey} className="grid grid-cols-2">
+            <HotKeyLabel action={hotkey} />
+            <HotKey className="ml-auto" action={hotkey} />
+          </HStack>
+        ))}
+      </VStack>
+    </div>
+  );
+};
--- a/src-web/components/core/Icon.tsx
+++ b/src-web/components/core/Icon.tsx
@@ -1,92 +1,45 @@
-import {
-  ArchiveIcon,
-  CameraIcon,
-  CheckboxIcon,
-  CheckIcon,
-  ChevronDownIcon,
-  ChevronRightIcon,
-  ClockIcon,
-  CodeIcon,
-  ColorWheelIcon,
-  CopyIcon,
-  Cross2Icon,
-  DividerHorizontalIcon,
-  DotsHorizontalIcon,
-  DotsVerticalIcon,
-  DownloadIcon,
-  DragHandleDots2Icon,
-  EyeClosedIcon,
-  EyeOpenIcon,
-  GearIcon,
-  HamburgerMenuIcon,
-  HomeIcon,
-  ListBulletIcon,
-  MagicWandIcon,
-  MagnifyingGlassIcon,
-  MoonIcon,
-  OpenInNewWindowIcon,
-  PaperPlaneIcon,
-  Pencil2Icon,
-  PlusCircledIcon,
-  PlusIcon,
-  QuestionMarkIcon,
-  RowsIcon,
-  SunIcon,
-  TrashIcon,
-  TriangleDownIcon,
-  TriangleLeftIcon,
-  TriangleRightIcon,
-  UpdateIcon,
-  UploadIcon,
-} from '@radix-ui/react-icons';
+import * as lucide from 'lucide-react';
 import classNames from 'classnames';
 import type { HTMLAttributes } from 'react';
 import { memo } from 'react';
-import { ReactComponent as LeftPanelHiddenIcon } from '../../assets/icons/LeftPanelHiddenIcon.svg';
-import { ReactComponent as LeftPanelVisibleIcon } from '../../assets/icons/LeftPanelVisibleIcon.svg';

 const icons = {
-  archive: ArchiveIcon,
-  camera: CameraIcon,
-  check: CheckIcon,
-  checkbox: CheckboxIcon,
-  clock: ClockIcon,
-  chevronDown: ChevronDownIcon,
-  chevronRight: ChevronRightIcon,
-  code: CodeIcon,
-  colorWheel: ColorWheelIcon,
-  copy: CopyIcon,
-  dividerH: DividerHorizontalIcon,
-  dotsH: DotsHorizontalIcon,
-  dotsV: DotsVerticalIcon,
-  download: DownloadIcon,
-  drag: DragHandleDots2Icon,
-  eye: EyeOpenIcon,
-  eyeClosed: EyeClosedIcon,
-  gear: GearIcon,
-  hamburger: HamburgerMenuIcon,
-  home: HomeIcon,
-  leftPanelHidden: LeftPanelHiddenIcon,
-  leftPanelVisible: LeftPanelVisibleIcon,
-  listBullet: ListBulletIcon,
-  magicWand: MagicWandIcon,
-  magnifyingGlass: MagnifyingGlassIcon,
-  moon: MoonIcon,
-  openNewWindow: OpenInNewWindowIcon,
-  paperPlane: PaperPlaneIcon,
-  pencil: Pencil2Icon,
-  plus: PlusIcon,
-  plusCircle: PlusCircledIcon,
-  question: QuestionMarkIcon,
-  rows: RowsIcon,
-  sun: SunIcon,
-  trash: TrashIcon,
-  triangleDown: TriangleDownIcon,
-  triangleLeft: TriangleLeftIcon,
-  triangleRight: TriangleRightIcon,
-  update: UpdateIcon,
-  upload: UploadIcon,
-  x: Cross2Icon,
+  archive: lucide.ArchiveIcon,
+  box: lucide.BoxIcon,
+  cake: lucide.CakeIcon,
+  chat: lucide.MessageSquare,
+  check: lucide.CheckIcon,
+  chevronDown: lucide.ChevronDownIcon,
+  chevronRight: lucide.ChevronRightIcon,
+  code: lucide.CodeIcon,
+  copy: lucide.CopyIcon,
+  download: lucide.DownloadIcon,
+  folderInput: lucide.FolderInputIcon,
+  folderOutput: lucide.FolderOutputIcon,
+  externalLink: lucide.ExternalLinkIcon,
+  eye: lucide.EyeIcon,
+  eyeClosed: lucide.EyeOffIcon,
+  filter: lucide.FilterIcon,
+  flask: lucide.FlaskConicalIcon,
+  gripVertical: lucide.GripVerticalIcon,
+  keyboard: lucide.KeyboardIcon,
+  leftPanelHidden: lucide.PanelLeftOpenIcon,
+  leftPanelVisible: lucide.PanelLeftCloseIcon,
+  magicWand: lucide.Wand2Icon,
+  moreVertical: lucide.MoreVerticalIcon,
+  pencil: lucide.PencilIcon,
+  plus: lucide.PlusIcon,
+  plusCircle: lucide.PlusCircleIcon,
+  question: lucide.ShieldQuestionIcon,
+  sendHorizontal: lucide.SendHorizonalIcon,
+  settings2: lucide.Settings2Icon,
+  settings: lucide.SettingsIcon,
+  sparkles: lucide.SparklesIcon,
+  trash: lucide.TrashIcon,
+  update: lucide.RefreshCcwIcon,
+  upload: lucide.UploadIcon,
+  x: lucide.XIcon,
+
  empty: (props: HTMLAttributes<HTMLSpanElement>) => <span {...props} />,
 };

--- a/src-web/components/core/IconButton.tsx
+++ b/src-web/components/core/IconButton.tsx
@@ -13,6 +13,7 @@ type Props = IconProps &
    iconClassName?: string;
    iconSize?: IconProps['size'];
    title: string;
+    showBadge?: boolean;
  };

 export const IconButton = forwardRef<HTMLButtonElement, Props>(function IconButton(
@@ -26,6 +27,7 @@ export const IconButton = forwardRef<HTMLButtonElement, Props>(function IconButt
    tabIndex,
    size = 'md',
    iconSize,
+    showBadge,
    ...props
  }: Props,
  ref,
@@ -38,6 +40,7 @@ export const IconButton = forwardRef<HTMLButtonElement, Props>(function IconButt
    },
    [onClick, setConfirmed, showConfirm],
  );
+
  return (
    <Button
      ref={ref}
@@ -46,17 +49,22 @@ export const IconButton = forwardRef<HTMLButtonElement, Props>(function IconButt
      tabIndex={tabIndex ?? icon === 'empty' ? -1 : undefined}
      onClick={handleClick}
      innerClassName="flex items-center justify-center"
+      size={size}
      className={classNames(
        className,
-        'flex-shrink-0 text-gray-700 hover:text-gray-1000',
+        'relative flex-shrink-0 text-gray-700 hover:text-gray-1000',
        '!px-0',
        size === 'md' && 'w-9',
        size === 'sm' && 'w-8',
        size === 'xs' && 'w-6',
      )}
-      size={size}
      {...props}
    >
+      {showBadge && (
+        <div className="absolute top-0 right-0 w-1/2 h-1/2 flex items-center justify-center">
+          <div className="w-2.5 h-2.5 bg-pink-500 rounded-full" />
+        </div>
+      )}
      <Icon
        size={iconSize}
        icon={confirmed ? 'check' : icon}
--- a/src-web/components/core/Input.tsx
+++ b/src-web/components/core/Input.tsx
@@ -5,7 +5,7 @@ import { forwardRef, useCallback, useMemo, useRef, useState } from 'react';
 import type { EditorProps } from './Editor';
 import { Editor } from './Editor';
 import { IconButton } from './IconButton';
-import { HStack, VStack } from './Stacks';
+import { HStack } from './Stacks';

 export type InputProps = Omit<
  HTMLAttributes<HTMLInputElement>,
@@ -26,6 +26,7 @@ export type InputProps = Omit<
    type?: 'text' | 'password';
    label: string;
    hideLabel?: boolean;
+    labelPosition?: 'top' | 'left';
    labelClassName?: string;
    containerClassName?: string;
    onChange?: (value: string) => void;
@@ -34,7 +35,7 @@ export type InputProps = Omit<
    defaultValue?: string;
    leftSlot?: ReactNode;
    rightSlot?: ReactNode;
-    size?: 'sm' | 'md' | 'auto';
+    size?: 'xs' | 'sm' | 'md' | 'auto';
    className?: string;
    placeholder?: string;
    validate?: (v: string) => boolean;
@@ -50,6 +51,7 @@ export const Input = forwardRef<EditorView | undefined, InputProps>(function Inp
    hideLabel,
    label,
    labelClassName,
+    labelPosition = 'top',
    leftSlot,
    name,
    onBlur,
@@ -115,12 +117,20 @@ export const Input = forwardRef<EditorView | undefined, InputProps>(function Inp
  );

  return (
-    <VStack ref={wrapperRef} className="w-full">
+    <div
+      ref={wrapperRef}
+      className={classNames(
+        'w-full',
+        'pointer-events-auto', // Just in case we're placing in disabled parent
+        labelPosition === 'left' && 'flex items-center gap-2',
+        labelPosition === 'top' && 'flex-row gap-0.5',
+      )}
+    >
      <label
        htmlFor={id}
        className={classNames(
          labelClassName,
-          'font-semibold text-xs uppercase text-gray-700',
+          'text-sm text-gray-900 whitespace-nowrap',
          hideLabel && 'sr-only',
        )}
      >
@@ -136,6 +146,7 @@ export const Input = forwardRef<EditorView | undefined, InputProps>(function Inp
          !isValid && '!border-invalid',
          size === 'md' && 'h-md',
          size === 'sm' && 'h-sm',
+          size === 'xs' && 'h-xs',
          size === 'auto' && 'min-h-sm',
        )}
      >
@@ -177,7 +188,7 @@ export const Input = forwardRef<EditorView | undefined, InputProps>(function Inp
        )}
        {rightSlot}
      </HStack>
-    </VStack>
+    </div>
  );
 });

--- a/src-web/components/core/PairEditor.tsx
+++ b/src-web/components/core/PairEditor.tsx
@@ -326,16 +326,17 @@ const FormRow = memo(function FormRow({
        <div
          className={classNames(
            'py-2 h-7 w-3 flex items-center',
-            'justify-center opacity-0 hover:opacity-100',
+            'justify-center opacity-0 group-hover:opacity-70',
          )}
        >
-          <Icon icon="drag" className="pointer-events-none" />
+          <Icon icon="gripVertical" className="pointer-events-none" />
        </div>
      ) : (
        <span className="w-3" />
      )}
      <Checkbox
-        title={pairContainer.pair.enabled ? 'disable entry' : 'Enable item'}
+        hideLabel
+        title={pairContainer.pair.enabled ? 'Disable item' : 'Enable item'}
        disabled={isLast}
        checked={isLast ? false : !!pairContainer.pair.enabled}
        className={classNames('mr-2', isLast && '!opacity-disabled')}
@@ -426,7 +427,7 @@ const FormRow = memo(function FormRow({
        size="sm"
        title="Delete header"
        onClick={!isLast ? handleDelete : undefined}
-        className="ml-0.5 group-hover:!opacity-100 focus-visible:!opacity-100"
+        className="ml-0.5 opacity-0 group-hover:!opacity-100 focus-visible:!opacity-100"
      />
    </div>
  );
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Gregory Schier	efce69292d	Fix analytics again	2024-01-18 22:28:25 -08:00
Gregory Schier	0ccc893440	Fix dialog close button	2024-01-18 20:57:42 -08:00
Gregory Schier	1f9756c917	Fix URLBar expanded state inner buttons	2024-01-18 20:40:56 -08:00
Gregory Schier	be8f0e4521	Some analytics fixes	2024-01-18 20:23:02 -08:00
Gregory Schier	bcdf51d231	Launch analytics events, changelog, better filter styles	2024-01-18 14:42:02 -08:00
Gregory Schier	1a1553eebd	Bump version	2024-01-17 14:56:47 -08:00
Gregory Schier	321c3862fe	Custom HTTP method names	2024-01-17 14:52:19 -08:00
Gregory Schier	466d412e65	Workspace header tweak Windows	2024-01-17 18:48:43 -08:00
Gregory Schier	86f50b826f	Fix header in fullscreen mode on Mac	2024-01-17 09:34:47 -08:00
Gregory Schier	ac1e646e68	Download response, and some fixes	2024-01-16 17:02:55 -08:00
Gregory Schier	33374eefc7	Fix editor toolbar blocking things	2024-01-15 21:44:53 -08:00
Gregory Schier	7047df4f7e	Better request creation (Closes #14 )	2024-01-15 21:39:27 -08:00
Gregory Schier	c8bd4d0ae0	XPath plugin	2024-01-15 21:27:47 -08:00
Gregory Schier	1e79f76701	Fix send icon	2024-01-15 15:43:55 -08:00
Gregory Schier	18852dca06	Switch to Lucide icons	2024-01-15 15:42:28 -08:00
Gregory Schier	408e7e80b7	Improve response filter UX	2024-01-15 15:19:29 -08:00
Gregory Schier	fc185de023	JSONPath filter plugins working	2024-01-15 15:06:49 -08:00
Gregory Schier	bb9d3a42f3	Move plugin stuff around	2024-01-15 14:33:51 -08:00
Gregory Schier	baf0f4291d	Fix request duplication	2024-01-15 13:47:44 -08:00
Gregory Schier	536066142c	Fix workspace defaults	2024-01-15 12:25:13 -08:00
Gregory Schier	04cf16497d	Better settings dialog	2024-01-15 12:16:44 -08:00
Gregory Schier	feb5972090	Fix resize observer	2024-01-15 12:02:08 -08:00
Gregory Schier	77bf5a58d8	Move request-related settings to workspace	2024-01-15 11:52:36 -08:00
Gregory Schier	3539642491	Bump beta version	2024-01-14 20:30:25 -08:00
Gregory Schier	08abea6a6f	fix mac decorations	2024-01-14 17:22:31 -08:00
Gregory Schier	0045b85f00	Integrated titlebar windows	2024-01-14 16:44:04 -08:00
Gregory Schier	4b34c3d101	Further titlebar tweaks	2024-01-14 12:02:44 -08:00
Gregory Schier	4af0a15d9f	Better titlebar control icons	2024-01-14 11:56:21 -08:00
Gregory Schier	3a4a76c58d	Basic Linux/Windows integrated titlebar	2024-01-13 23:40:32 -08:00
Gregory Schier	3086d815c1	Fix hotkey formatting	2024-01-12 22:12:01 -08:00
Gregory Schier	a48a9eab4a	beta tag	2024-01-12 22:00:55 -08:00
Gregory Schier	48664c66e5	fix appearance init	2024-01-12 21:59:46 -08:00
Gregory Schier	7aee5176a9	Vendor Openssl	2024-01-12 21:03:28 -08:00
Gregory Schier	0da68ced18	Hotkeys for request switcher	2024-01-12 21:03:20 -08:00
Gregory Schier	39f7d9c113	Appearance setting and gzip/etc support	2024-01-12 13:39:08 -08:00
Gregory Schier	138943bfb6	Initial settings implementation	2024-01-11 21:13:17 -08:00
Gregory Schier	c1c9f882a6	Dropdown manages hotkeys now	2024-01-11 10:18:05 -08:00
Gregory Schier	1bcf26f656	Hotkey for keyboard shortcut help	2024-01-10 22:05:16 -08:00
Gregory Schier	7c2466da5e	Bump version number	2024-01-10 16:25:55 -08:00
Gregory Schier	7dc78a1f6f	Add hotkey dialog and rust-only analytics	2024-01-10 16:18:08 -08:00
Gregory Schier	88d024023b	Fix beta icon	2024-01-08 17:07:42 -08:00
Gregory Schier	626aacf982	Bump version to 2024.0.0	2024-01-08 15:57:59 -08:00
Gregory Schier	d5855c45a6	Hotkey labels	2024-01-08 15:57:21 -08:00
Gregory Schier	793bff9f27	Show hotkeys on empty views	2024-01-08 15:13:44 -08:00
Gregory Schier	88ea68e72f	Remove base env, fix hotkeys, and QoL improvements	2024-01-07 22:24:19 -08:00
Gregory Schier	35e40d2c55	Fix hotkeys getting stuck on cmd+tab	2024-01-07 21:32:25 -08:00
Gregory Schier	c472b83409	Always show settings dropdown	2023-11-22 09:39:30 -08:00
Gregory Schier	52c26d235c	Tweak margin	2023-11-22 09:37:50 -08:00
Gregory Schier	ac54729012	Fix bottom-up dropdown positioning	2023-11-22 09:35:56 -08:00
Gregory Schier	0586034ef4	Bump version	2023-11-22 09:06:47 -08:00
Gregory Schier	91790ba708	Better linux/Windows support for hotkeys	2023-11-22 09:06:22 -08:00
Gregory Schier	d8ab6c0b50	Good hotkey support	2023-11-22 09:01:48 -08:00
Gregory Schier	b600a21a2b	Reset URL bar when request changes	2023-11-21 23:26:29 -08:00
Gregory Schier	4f9d1278f7	Env dialog hotkey	2023-11-21 22:35:28 -08:00
Gregory Schier	15aa93f5f9	Remove response body and basic hotkeys	2023-11-21 22:15:01 -08:00
Gregory Schier	c7798092d8	Remove app-specific menu items	2023-11-21 19:18:40 -08:00
Gregory Schier	5560593aaa	Fix macOS menu and fallback URL	2023-11-21 09:24:13 -08:00
Gregory Schier	66639e651d	Hide menu on windows/linux	2023-11-21 08:17:37 -08:00
Gregory Schier	8e42d5ccdb	Disable sandboxing (again)	2023-11-19 21:59:55 -08:00
Gregory Schier	5c62594087	Fix drag-drop reorder	2023-11-19 21:43:01 -08:00
Gregory Schier	26b6c48657	Postman ID generation	2023-11-19 20:54:02 -08:00
				`@@ -0,0 +1 @@`
				`ALTER TABLE http_responses DROP COLUMN body;`
				`@@ -0,0 +1 @@`
				`ALTER TABLE settings ADD COLUMN update_channel TEXT DEFAULT 'stable' NOT NULL;`