diff --git a/package-lock.json b/package-lock.json
index 6de2a014..ced673e8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,6 +34,7 @@
         "plugins/template-function-response",
         "plugins/template-function-uuid",
         "plugins/template-function-xml",
+        "plugins/themes-yaak",
         "src-tauri/yaak-crypto",
         "src-tauri/yaak-git",
         "src-tauri/yaak-fonts",
@@ -3784,6 +3785,102 @@
       "integrity": "sha512-N8tkAACJx2ww8vFMneJmaAgmjAG1tnVBZJRLRcx061tmsLRZHSEZSLuGWnwPtunsSLvSqXQ2wfp7Mgqg1I+2dQ==",
       "license": "MIT"
     },
+    "node_modules/@yaak/auth-basic": {
+      "resolved": "plugins/auth-basic",
+      "link": true
+    },
+    "node_modules/@yaak/auth-bearer": {
+      "resolved": "plugins/auth-bearer",
+      "link": true
+    },
+    "node_modules/@yaak/auth-jwt": {
+      "resolved": "plugins/auth-jwt",
+      "link": true
+    },
+    "node_modules/@yaak/auth-oauth2": {
+      "resolved": "plugins/auth-oauth2",
+      "link": true
+    },
+    "node_modules/@yaak/exporter-curl": {
+      "resolved": "plugins/exporter-curl",
+      "link": true
+    },
+    "node_modules/@yaak/filter-jsonpath": {
+      "resolved": "plugins/filter-jsonpath",
+      "link": true
+    },
+    "node_modules/@yaak/filter-xpath": {
+      "resolved": "plugins/filter-xpath",
+      "link": true
+    },
+    "node_modules/@yaak/importer-curl": {
+      "resolved": "plugins/importer-curl",
+      "link": true
+    },
+    "node_modules/@yaak/importer-insomnia": {
+      "resolved": "plugins/importer-insomnia",
+      "link": true
+    },
+    "node_modules/@yaak/importer-openapi": {
+      "resolved": "plugins/importer-openapi",
+      "link": true
+    },
+    "node_modules/@yaak/importer-postman": {
+      "resolved": "plugins/importer-postman",
+      "link": true
+    },
+    "node_modules/@yaak/importer-yaak": {
+      "resolved": "plugins/importer-yaak",
+      "link": true
+    },
+    "node_modules/@yaak/template-function-cookie": {
+      "resolved": "plugins/template-function-cookie",
+      "link": true
+    },
+    "node_modules/@yaak/template-function-encode": {
+      "resolved": "plugins/template-function-encode",
+      "link": true
+    },
+    "node_modules/@yaak/template-function-fs": {
+      "resolved": "plugins/template-function-fs",
+      "link": true
+    },
+    "node_modules/@yaak/template-function-hash": {
+      "resolved": "plugins/template-function-hash",
+      "link": true
+    },
+    "node_modules/@yaak/template-function-json": {
+      "resolved": "plugins/template-function-json",
+      "link": true
+    },
+    "node_modules/@yaak/template-function-prompt": {
+      "resolved": "plugins/template-function-prompt",
+      "link": true
+    },
+    "node_modules/@yaak/template-function-regex": {
+      "resolved": "plugins/template-function-regex",
+      "link": true
+    },
+    "node_modules/@yaak/template-function-request": {
+      "resolved": "plugins/template-function-request",
+      "link": true
+    },
+    "node_modules/@yaak/template-function-response": {
+      "resolved": "plugins/template-function-response",
+      "link": true
+    },
+    "node_modules/@yaak/template-function-uuid": {
+      "resolved": "plugins/template-function-uuid",
+      "link": true
+    },
+    "node_modules/@yaak/template-function-xml": {
+      "resolved": "plugins/template-function-xml",
+      "link": true
+    },
+    "node_modules/@yaak/themes-yaak": {
+      "resolved": "plugins/themes-yaak",
+      "link": true
+    },
     "node_modules/@yaakapp-internal/crypto": {
       "resolved": "src-tauri/yaak-crypto",
       "link": true
@@ -3844,22 +3941,6 @@
       "resolved": "src-web",
       "link": true
     },
-    "node_modules/@yaakapp/auth-basic": {
-      "resolved": "plugins/auth-basic",
-      "link": true
-    },
-    "node_modules/@yaakapp/auth-bearer": {
-      "resolved": "plugins/auth-bearer",
-      "link": true
-    },
-    "node_modules/@yaakapp/auth-jwt": {
-      "resolved": "plugins/auth-jwt",
-      "link": true
-    },
-    "node_modules/@yaakapp/auth-oauth2": {
-      "resolved": "plugins/auth-oauth2",
-      "link": true
-    },
     "node_modules/@yaakapp/cli": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/@yaakapp/cli/-/cli-0.1.5.tgz",
@@ -3933,82 +4014,6 @@
         "win32"
       ]
     },
-    "node_modules/@yaakapp/exporter-curl": {
-      "resolved": "plugins/exporter-curl",
-      "link": true
-    },
-    "node_modules/@yaakapp/filter-jsonpath": {
-      "resolved": "plugins/filter-jsonpath",
-      "link": true
-    },
-    "node_modules/@yaakapp/filter-xpath": {
-      "resolved": "plugins/filter-xpath",
-      "link": true
-    },
-    "node_modules/@yaakapp/importer-curl": {
-      "resolved": "plugins/importer-curl",
-      "link": true
-    },
-    "node_modules/@yaakapp/importer-insomnia": {
-      "resolved": "plugins/importer-insomnia",
-      "link": true
-    },
-    "node_modules/@yaakapp/importer-openapi": {
-      "resolved": "plugins/importer-openapi",
-      "link": true
-    },
-    "node_modules/@yaakapp/importer-postman": {
-      "resolved": "plugins/importer-postman",
-      "link": true
-    },
-    "node_modules/@yaakapp/importer-yaak": {
-      "resolved": "plugins/importer-yaak",
-      "link": true
-    },
-    "node_modules/@yaakapp/template-function-cookie": {
-      "resolved": "plugins/template-function-cookie",
-      "link": true
-    },
-    "node_modules/@yaakapp/template-function-encode": {
-      "resolved": "plugins/template-function-encode",
-      "link": true
-    },
-    "node_modules/@yaakapp/template-function-fs": {
-      "resolved": "plugins/template-function-fs",
-      "link": true
-    },
-    "node_modules/@yaakapp/template-function-hash": {
-      "resolved": "plugins/template-function-hash",
-      "link": true
-    },
-    "node_modules/@yaakapp/template-function-json": {
-      "resolved": "plugins/template-function-json",
-      "link": true
-    },
-    "node_modules/@yaakapp/template-function-prompt": {
-      "resolved": "plugins/template-function-prompt",
-      "link": true
-    },
-    "node_modules/@yaakapp/template-function-regex": {
-      "resolved": "plugins/template-function-regex",
-      "link": true
-    },
-    "node_modules/@yaakapp/template-function-request": {
-      "resolved": "plugins/template-function-request",
-      "link": true
-    },
-    "node_modules/@yaakapp/template-function-response": {
-      "resolved": "plugins/template-function-response",
-      "link": true
-    },
-    "node_modules/@yaakapp/template-function-uuid": {
-      "resolved": "plugins/template-function-uuid",
-      "link": true
-    },
-    "node_modules/@yaakapp/template-function-xml": {
-      "resolved": "plugins/template-function-xml",
-      "link": true
-    },
     "node_modules/abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -17662,15 +17667,15 @@
       }
     },
     "plugins/auth-basic": {
-      "name": "@yaakapp/auth-basic",
+      "name": "@yaak/auth-basic",
       "version": "0.0.1"
     },
     "plugins/auth-bearer": {
-      "name": "@yaakapp/auth-bearer",
+      "name": "@yaak/auth-bearer",
       "version": "0.0.1"
     },
     "plugins/auth-jwt": {
-      "name": "@yaakapp/auth-jwt",
+      "name": "@yaak/auth-jwt",
       "version": "0.0.1",
       "dependencies": {
         "jsonwebtoken": "^9.0.2"
@@ -17680,15 +17685,15 @@
       }
     },
     "plugins/auth-oauth2": {
-      "name": "@yaakapp/auth-oauth2",
+      "name": "@yaak/auth-oauth2",
       "version": "0.0.1"
     },
     "plugins/exporter-curl": {
-      "name": "@yaakapp/exporter-curl",
+      "name": "@yaak/exporter-curl",
       "version": "0.0.1"
     },
     "plugins/filter-jsonpath": {
-      "name": "@yaakapp/filter-jsonpath",
+      "name": "@yaak/filter-jsonpath",
       "version": "0.0.1",
       "dependencies": {
         "jsonpath-plus": "^10.3.0"
@@ -17698,7 +17703,7 @@
       }
     },
     "plugins/filter-xpath": {
-      "name": "@yaakapp/filter-xpath",
+      "name": "@yaak/filter-xpath",
       "version": "0.0.1",
       "dependencies": {
         "@xmldom/xmldom": "^0.8.10",
@@ -17706,7 +17711,7 @@
       }
     },
     "plugins/importer-curl": {
-      "name": "@yaakapp/importer-curl",
+      "name": "@yaak/importer-curl",
       "version": "0.0.1",
       "dependencies": {
         "shell-quote": "^1.8.1"
@@ -17716,14 +17721,14 @@
       }
     },
     "plugins/importer-insomnia": {
-      "name": "@yaakapp/importer-insomnia",
+      "name": "@yaak/importer-insomnia",
       "version": "0.0.1",
       "dependencies": {
         "yaml": "^2.4.2"
       }
     },
     "plugins/importer-openapi": {
-      "name": "@yaakapp/importer-openapi",
+      "name": "@yaak/importer-openapi",
       "version": "0.0.1",
       "dependencies": {
         "openapi-to-postmanv2": "^5.0.0",
@@ -17734,31 +17739,31 @@
       }
     },
     "plugins/importer-postman": {
-      "name": "@yaakapp/importer-postman",
+      "name": "@yaak/importer-postman",
       "version": "0.0.1"
     },
     "plugins/importer-yaak": {
-      "name": "@yaakapp/importer-yaak",
+      "name": "@yaak/importer-yaak",
       "version": "0.0.1"
     },
     "plugins/template-function-cookie": {
-      "name": "@yaakapp/template-function-cookie",
+      "name": "@yaak/template-function-cookie",
       "version": "0.0.1"
     },
     "plugins/template-function-encode": {
-      "name": "@yaakapp/template-function-encode",
+      "name": "@yaak/template-function-encode",
       "version": "0.0.1"
     },
     "plugins/template-function-fs": {
-      "name": "@yaakapp/template-function-fs",
+      "name": "@yaak/template-function-fs",
       "version": "0.0.1"
     },
     "plugins/template-function-hash": {
-      "name": "@yaakapp/template-function-hash",
+      "name": "@yaak/template-function-hash",
       "version": "0.0.1"
     },
     "plugins/template-function-json": {
-      "name": "@yaakapp/template-function-json",
+      "name": "@yaak/template-function-json",
       "version": "0.0.1",
       "dependencies": {
         "jsonpath-plus": "^10.3.0"
@@ -17768,19 +17773,19 @@
       }
     },
     "plugins/template-function-prompt": {
-      "name": "@yaakapp/template-function-prompt",
+      "name": "@yaak/template-function-prompt",
       "version": "0.0.1"
     },
     "plugins/template-function-regex": {
-      "name": "@yaakapp/template-function-regex",
+      "name": "@yaak/template-function-regex",
       "version": "0.0.1"
     },
     "plugins/template-function-request": {
-      "name": "@yaakapp/template-function-request",
+      "name": "@yaak/template-function-request",
       "version": "0.0.1"
     },
     "plugins/template-function-response": {
-      "name": "@yaakapp/template-function-response",
+      "name": "@yaak/template-function-response",
       "version": "0.0.1",
       "dependencies": {
         "@xmldom/xmldom": "^0.8.10",
@@ -17792,7 +17797,7 @@
       }
     },
     "plugins/template-function-uuid": {
-      "name": "@yaakapp/template-function-uuid",
+      "name": "@yaak/template-function-uuid",
       "version": "0.0.1",
       "dependencies": {
         "uuid": "^11.1.0"
@@ -17812,13 +17817,17 @@
       }
     },
     "plugins/template-function-xml": {
-      "name": "@yaakapp/template-function-xml",
+      "name": "@yaak/template-function-xml",
       "version": "0.0.1",
       "dependencies": {
         "@xmldom/xmldom": "^0.8.10",
         "xpath": "^0.0.34"
       }
     },
+    "plugins/themes-yaak": {
+      "name": "@yaak/themes-yaak",
+      "version": "0.0.1"
+    },
     "src-tauri/yaak_git": {
       "name": "@yaakapp-internal/git",
       "version": "1.0.0",
diff --git a/src-tauri/yaak-plugins/src/manager.rs b/src-tauri/yaak-plugins/src/manager.rs
index 499a7071..92089928 100644
--- a/src-tauri/yaak-plugins/src/manager.rs
+++ b/src-tauri/yaak-plugins/src/manager.rs
@@ -692,9 +692,9 @@ impl PluginManager {
         content_type: &str,
     ) -> Result<FilterResponse> {
         let plugin_name = if content_type.to_lowercase().contains("json") {
-            "@yaakapp/filter-jsonpath"
+            "@yaak/filter-jsonpath"
         } else {
-            "@yaakapp/filter-xpath"
+            "@yaak/filter-xpath"
         };
 
         let plugin = self