diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml
index 5f052770b..b53771d7b 100644
--- a/.github/workflows/format.yaml
+++ b/.github/workflows/format.yaml
@@ -20,4 +20,4 @@ jobs:
       run: npm ci
 
     - name: Run Prettier check
-      run: npx prettier --check './**/*.{js,ts,tsx,vue}'
\ No newline at end of file
+      run: npm run format:check
\ No newline at end of file
diff --git a/.prettierrc b/.prettierrc
index f36bb1cd2..9bed0b8e2 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -3,5 +3,8 @@
   "tabWidth": 2,
   "semi": false,
   "trailingComma": "none",
-  "printWidth": 80
+  "printWidth": 80,
+  "importOrder": ["^@core/(.*)$", "<THIRD_PARTY_MODULES>", "^@/(.*)$", "^[./]"],
+  "importOrderSeparation": true,
+  "importOrderSortSpecifiers": true
 }
\ No newline at end of file
diff --git a/browser_tests/actionbar.spec.ts b/browser_tests/actionbar.spec.ts
index b85e284f8..690d4be76 100644
--- a/browser_tests/actionbar.spec.ts
+++ b/browser_tests/actionbar.spec.ts
@@ -1,6 +1,7 @@
 import type { Response } from '@playwright/test'
-import type { StatusWsMessage } from '../src/types/apiTypes.ts'
 import { expect, mergeTests } from '@playwright/test'
+
+import type { StatusWsMessage } from '../src/types/apiTypes.ts'
 import { comfyPageFixture } from './fixtures/ComfyPage'
 import { webSocketFixture } from './fixtures/ws.ts'
 
diff --git a/browser_tests/browserTabTitle.spec.ts b/browser_tests/browserTabTitle.spec.ts
index 068963eab..af7f568e6 100644
--- a/browser_tests/browserTabTitle.spec.ts
+++ b/browser_tests/browserTabTitle.spec.ts
@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Browser tab title', () => {
diff --git a/browser_tests/changeTracker.spec.ts b/browser_tests/changeTracker.spec.ts
index e21a105c0..87c3e78bb 100644
--- a/browser_tests/changeTracker.spec.ts
+++ b/browser_tests/changeTracker.spec.ts
@@ -1,7 +1,7 @@
 import {
   ComfyPage,
-  comfyPageFixture as test,
-  comfyExpect as expect
+  comfyExpect as expect,
+  comfyPageFixture as test
 } from './fixtures/ComfyPage'
 
 async function beforeChange(comfyPage: ComfyPage) {
diff --git a/browser_tests/colorPalette.spec.ts b/browser_tests/colorPalette.spec.ts
index b16f08498..aa5f30f9a 100644
--- a/browser_tests/colorPalette.spec.ts
+++ b/browser_tests/colorPalette.spec.ts
@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 const customColorPalettes = {
diff --git a/browser_tests/commands.spec.ts b/browser_tests/commands.spec.ts
index 65a30e648..f15ad2475 100644
--- a/browser_tests/commands.spec.ts
+++ b/browser_tests/commands.spec.ts
@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Keybindings', () => {
diff --git a/browser_tests/copyPaste.spec.ts b/browser_tests/copyPaste.spec.ts
index 3394b19bf..7ebc56dbd 100644
--- a/browser_tests/copyPaste.spec.ts
+++ b/browser_tests/copyPaste.spec.ts
@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Copy Paste', () => {
diff --git a/browser_tests/dialog.spec.ts b/browser_tests/dialog.spec.ts
index 0cff88ccb..d7dcfda2e 100644
--- a/browser_tests/dialog.spec.ts
+++ b/browser_tests/dialog.spec.ts
@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Load workflow warning', () => {
diff --git a/browser_tests/extensionAPI.spec.ts b/browser_tests/extensionAPI.spec.ts
index d4e638156..9e95e31df 100644
--- a/browser_tests/extensionAPI.spec.ts
+++ b/browser_tests/extensionAPI.spec.ts
@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Topbar commands', () => {
diff --git a/browser_tests/fixtures/ComfyPage.ts b/browser_tests/fixtures/ComfyPage.ts
index e3d886626..b0bc69816 100644
--- a/browser_tests/fixtures/ComfyPage.ts
+++ b/browser_tests/fixtures/ComfyPage.ts
@@ -1,24 +1,26 @@
-import type { Page, Locator, APIRequestContext } from '@playwright/test'
+import type { APIRequestContext, Locator, Page } from '@playwright/test'
 import { expect } from '@playwright/test'
 import { test as base } from '@playwright/test'
-import { ComfyActionbar } from '../helpers/actionbar'
 import dotenv from 'dotenv'
-dotenv.config()
 import * as fs from 'fs'
-import { NodeBadgeMode } from '../../src/types/nodeSource'
+
+import type { useWorkspaceStore } from '../../src/stores/workspaceStore'
 import type { NodeId } from '../../src/types/comfyWorkflow'
 import type { KeyCombo } from '../../src/types/keyBindingTypes'
+import { NodeBadgeMode } from '../../src/types/nodeSource'
+import { ComfyActionbar } from '../helpers/actionbar'
 import { ComfyTemplates } from '../helpers/templates'
 import { ComfyNodeSearchBox } from './components/ComfyNodeSearchBox'
+import { SettingDialog } from './components/SettingDialog'
 import {
   NodeLibrarySidebarTab,
   WorkflowsSidebarTab
 } from './components/SidebarTab'
 import { Topbar } from './components/Topbar'
-import { NodeReference } from './utils/litegraphUtils'
 import type { Position, Size } from './types'
-import type { useWorkspaceStore } from '../../src/stores/workspaceStore'
-import { SettingDialog } from './components/SettingDialog'
+import { NodeReference } from './utils/litegraphUtils'
+
+dotenv.config()
 
 type WorkspaceStore = ReturnType<typeof useWorkspaceStore>
 
diff --git a/browser_tests/fixtures/UserSelectPage.ts b/browser_tests/fixtures/UserSelectPage.ts
index 4b78076ca..c0d4c90d3 100644
--- a/browser_tests/fixtures/UserSelectPage.ts
+++ b/browser_tests/fixtures/UserSelectPage.ts
@@ -1,5 +1,5 @@
-import { Page } from 'playwright'
 import { test as base } from '@playwright/test'
+import { Page } from 'playwright'
 
 export class UserSelectPage {
   constructor(
diff --git a/browser_tests/fixtures/utils/litegraphUtils.ts b/browser_tests/fixtures/utils/litegraphUtils.ts
index 8736c5440..6e6011b64 100644
--- a/browser_tests/fixtures/utils/litegraphUtils.ts
+++ b/browser_tests/fixtures/utils/litegraphUtils.ts
@@ -1,6 +1,7 @@
-import { ManageGroupNode } from '../../helpers/manageGroupNode'
-import type { NodeId } from '../../../src/types/comfyWorkflow'
 import type { Page } from '@playwright/test'
+
+import type { NodeId } from '../../../src/types/comfyWorkflow'
+import { ManageGroupNode } from '../../helpers/manageGroupNode'
 import type { ComfyPage } from '../ComfyPage'
 import type { Position, Size } from '../types'
 
diff --git a/browser_tests/globalSetup.ts b/browser_tests/globalSetup.ts
index 86626480f..12033fce3 100644
--- a/browser_tests/globalSetup.ts
+++ b/browser_tests/globalSetup.ts
@@ -1,7 +1,8 @@
 import { FullConfig } from '@playwright/test'
-import { backupPath } from './utils/backupUtils'
 import dotenv from 'dotenv'
 
+import { backupPath } from './utils/backupUtils'
+
 dotenv.config()
 
 export default function globalSetup(config: FullConfig) {
diff --git a/browser_tests/globalTeardown.ts b/browser_tests/globalTeardown.ts
index 8ebb71339..47bab3db9 100644
--- a/browser_tests/globalTeardown.ts
+++ b/browser_tests/globalTeardown.ts
@@ -1,7 +1,8 @@
 import { FullConfig } from '@playwright/test'
-import { restorePath } from './utils/backupUtils'
 import dotenv from 'dotenv'
 
+import { restorePath } from './utils/backupUtils'
+
 dotenv.config()
 
 export default function globalTeardown(config: FullConfig) {
diff --git a/browser_tests/graphCanvasMenu.spec.ts b/browser_tests/graphCanvasMenu.spec.ts
index ca934af40..331d72204 100644
--- a/browser_tests/graphCanvasMenu.spec.ts
+++ b/browser_tests/graphCanvasMenu.spec.ts
@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Graph Canvas Menu', () => {
diff --git a/browser_tests/groupNode.spec.ts b/browser_tests/groupNode.spec.ts
index 831c1cb43..7e44ec7ab 100644
--- a/browser_tests/groupNode.spec.ts
+++ b/browser_tests/groupNode.spec.ts
@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { ComfyPage, comfyPageFixture as test } from './fixtures/ComfyPage'
 import type { NodeReference } from './fixtures/utils/litegraphUtils'
 
diff --git a/browser_tests/helpers/actionbar.ts b/browser_tests/helpers/actionbar.ts
index 674979e59..f37de855a 100644
--- a/browser_tests/helpers/actionbar.ts
+++ b/browser_tests/helpers/actionbar.ts
@@ -1,4 +1,5 @@
-import type { Page, Locator } from '@playwright/test'
+import type { Locator, Page } from '@playwright/test'
+
 import type { AutoQueueMode } from '../../src/stores/queueStore'
 
 export class ComfyActionbar {
diff --git a/browser_tests/helpers/manageGroupNode.ts b/browser_tests/helpers/manageGroupNode.ts
index beebabd69..a444a97c6 100644
--- a/browser_tests/helpers/manageGroupNode.ts
+++ b/browser_tests/helpers/manageGroupNode.ts
@@ -1,4 +1,5 @@
 import { Locator, Page } from '@playwright/test'
+
 export class ManageGroupNode {
   footer: Locator
   header: Locator
diff --git a/browser_tests/helpers/templates.ts b/browser_tests/helpers/templates.ts
index d4f4ad716..3eee39128 100644
--- a/browser_tests/helpers/templates.ts
+++ b/browser_tests/helpers/templates.ts
@@ -1,4 +1,5 @@
 import { Locator, Page } from '@playwright/test'
+
 export class ComfyTemplates {
   readonly content: Locator
 
diff --git a/browser_tests/interaction.spec.ts b/browser_tests/interaction.spec.ts
index c4b695682..6730bf50c 100644
--- a/browser_tests/interaction.spec.ts
+++ b/browser_tests/interaction.spec.ts
@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Item Interaction', () => {
diff --git a/browser_tests/keybindings.spec.ts b/browser_tests/keybindings.spec.ts
index e7a26dc8e..7c7d556e2 100644
--- a/browser_tests/keybindings.spec.ts
+++ b/browser_tests/keybindings.spec.ts
@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Keybindings', () => {
diff --git a/browser_tests/litegraphEvent.spec.ts b/browser_tests/litegraphEvent.spec.ts
index b00db91be..26b95e07f 100644
--- a/browser_tests/litegraphEvent.spec.ts
+++ b/browser_tests/litegraphEvent.spec.ts
@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 function listenForEvent(): Promise<Event> {
diff --git a/browser_tests/loadWorkflowInMedia.spec.ts b/browser_tests/loadWorkflowInMedia.spec.ts
index 05511386d..e4a89b270 100644
--- a/browser_tests/loadWorkflowInMedia.spec.ts
+++ b/browser_tests/loadWorkflowInMedia.spec.ts
@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Load Workflow in Media', () => {
diff --git a/browser_tests/menu.spec.ts b/browser_tests/menu.spec.ts
index ded2772ec..3c5997c94 100644
--- a/browser_tests/menu.spec.ts
+++ b/browser_tests/menu.spec.ts
@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Menu', () => {
diff --git a/browser_tests/nodeBadge.spec.ts b/browser_tests/nodeBadge.spec.ts
index 78785f84b..897037536 100644
--- a/browser_tests/nodeBadge.spec.ts
+++ b/browser_tests/nodeBadge.spec.ts
@@ -1,7 +1,8 @@
 import { expect } from '@playwright/test'
-import { comfyPageFixture as test } from './fixtures/ComfyPage'
+
 import type { ComfyApp } from '../src/scripts/app'
 import { NodeBadgeMode } from '../src/types/nodeSource'
+import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Node Badge', () => {
   test('Can add badge', async ({ comfyPage }) => {
diff --git a/browser_tests/nodeDisplay.spec.ts b/browser_tests/nodeDisplay.spec.ts
index 937263d23..95fc58311 100644
--- a/browser_tests/nodeDisplay.spec.ts
+++ b/browser_tests/nodeDisplay.spec.ts
@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 // If an input is optional by node definition, it should be shown as
diff --git a/browser_tests/nodeSearchBox.spec.ts b/browser_tests/nodeSearchBox.spec.ts
index f02c588ee..f6c2feacc 100644
--- a/browser_tests/nodeSearchBox.spec.ts
+++ b/browser_tests/nodeSearchBox.spec.ts
@@ -1,6 +1,6 @@
 import {
-  comfyPageFixture as test,
-  comfyExpect as expect
+  comfyExpect as expect,
+  comfyPageFixture as test
 } from './fixtures/ComfyPage'
 
 test.describe('Node search box', () => {
diff --git a/browser_tests/primitiveNode.spec.ts b/browser_tests/primitiveNode.spec.ts
index 6ac3ef8a2..65ea7af6c 100644
--- a/browser_tests/primitiveNode.spec.ts
+++ b/browser_tests/primitiveNode.spec.ts
@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 import type { NodeReference } from './fixtures/utils/litegraphUtils'
 
diff --git a/browser_tests/propertiesPanel.spec.ts b/browser_tests/propertiesPanel.spec.ts
index 964dc6f3f..866ae0015 100644
--- a/browser_tests/propertiesPanel.spec.ts
+++ b/browser_tests/propertiesPanel.spec.ts
@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Properties Panel', () => {
diff --git a/browser_tests/rerouteNode.spec.ts b/browser_tests/rerouteNode.spec.ts
index 2ebb7b8f6..ea0345f70 100644
--- a/browser_tests/rerouteNode.spec.ts
+++ b/browser_tests/rerouteNode.spec.ts
@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Reroute Node', () => {
diff --git a/browser_tests/rightClickMenu.spec.ts b/browser_tests/rightClickMenu.spec.ts
index a7a28b21f..389d07104 100644
--- a/browser_tests/rightClickMenu.spec.ts
+++ b/browser_tests/rightClickMenu.spec.ts
@@ -1,6 +1,7 @@
 import { expect } from '@playwright/test'
-import { comfyPageFixture as test } from './fixtures/ComfyPage'
+
 import { NodeBadgeMode } from '../src/types/nodeSource'
+import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Canvas Right Click Menu', () => {
   // See https://github.com/comfyanonymous/ComfyUI/issues/3883
diff --git a/browser_tests/templates.spec.ts b/browser_tests/templates.spec.ts
index ea5101a1e..78ba800d6 100644
--- a/browser_tests/templates.spec.ts
+++ b/browser_tests/templates.spec.ts
@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Templates', () => {
diff --git a/browser_tests/textWidgetTruncate.spec.ts b/browser_tests/textWidgetTruncate.spec.ts
index 772b7c417..0d90f42d7 100644
--- a/browser_tests/textWidgetTruncate.spec.ts
+++ b/browser_tests/textWidgetTruncate.spec.ts
@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Combo text widget', () => {
diff --git a/browser_tests/userSelectView.spec.ts b/browser_tests/userSelectView.spec.ts
index 68d822b84..a3a846f7c 100644
--- a/browser_tests/userSelectView.spec.ts
+++ b/browser_tests/userSelectView.spec.ts
@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+
 import { userSelectPageFixture as test } from './fixtures/UserSelectPage'
 
 /**
diff --git a/browser_tests/utils/backupUtils.ts b/browser_tests/utils/backupUtils.ts
index 0d2ae1f4d..0e969c706 100644
--- a/browser_tests/utils/backupUtils.ts
+++ b/browser_tests/utils/backupUtils.ts
@@ -1,5 +1,5 @@
-import path from 'path'
 import fs from 'fs-extra'
+import path from 'path'
 
 type PathParts = readonly [string, ...string[]]
 
diff --git a/eslint.config.js b/eslint.config.js
index f65f862eb..660f911d1 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -1,8 +1,8 @@
-import globals from 'globals'
 import pluginJs from '@eslint/js'
-import tseslint from 'typescript-eslint'
-import pluginVue from 'eslint-plugin-vue'
 import unusedImports from 'eslint-plugin-unused-imports'
+import pluginVue from 'eslint-plugin-vue'
+import globals from 'globals'
+import tseslint from 'typescript-eslint'
 
 export default [
   {
diff --git a/lint-staged.config.js b/lint-staged.config.js
index a62f5669d..10205624f 100644
--- a/lint-staged.config.js
+++ b/lint-staged.config.js
@@ -11,7 +11,7 @@ export default {
 
 function formatAndEslint(fileNames) {
   return [
-    `prettier --write ${fileNames.join(' ')}`,
+    `prettier --write ${fileNames.join(' ')} --plugin @trivago/prettier-plugin-sort-imports`,
     `eslint --fix ${fileNames.join(' ')}`
   ]
 }
diff --git a/package-lock.json b/package-lock.json
index 163887916..0b7b3e512 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -48,6 +48,7 @@
         "@lobehub/i18n-cli": "^1.20.0",
         "@pinia/testing": "^0.1.5",
         "@playwright/test": "^1.44.1",
+        "@trivago/prettier-plugin-sort-imports": "^5.2.0",
         "@types/jest": "^29.5.12",
         "@types/lodash": "^4.17.6",
         "@types/node": "^20.14.8",
@@ -197,12 +198,14 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
-      "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
+      "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/highlight": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "js-tokens": "^4.0.0",
         "picocolors": "^1.0.0"
       },
       "engines": {
@@ -249,15 +252,17 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.7.tgz",
-      "integrity": "sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.3.tgz",
+      "integrity": "sha512-6FF/urZvD0sTeO7k6/B15pMLC4CHUv1426lzr3N01aHJTl046uCAh9LXW/fzeXXjPNCJ6iABW5XaWOsIZB93aQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.24.7",
+        "@babel/parser": "^7.26.3",
+        "@babel/types": "^7.26.3",
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25",
-        "jsesc": "^2.5.1"
+        "jsesc": "^3.0.2"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -590,42 +595,13 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/highlight": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
-      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0",
-        "picocolors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@babel/parser": {
-      "version": "7.26.2",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.2.tgz",
-      "integrity": "sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.3.tgz",
+      "integrity": "sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.26.0"
+        "@babel/types": "^7.26.3"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -1895,33 +1871,32 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz",
-      "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
+      "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/parser": "^7.24.7",
-        "@babel/types": "^7.24.7"
+        "@babel/code-frame": "^7.25.9",
+        "@babel/parser": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.7.tgz",
-      "integrity": "sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==",
+      "version": "7.26.4",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.4.tgz",
+      "integrity": "sha512-fH+b7Y4p3yqvApJALCPJcwb0/XaOSgtK4pzV6WVjPR5GLFQBRI7pfoX2V2iM48NXvX07NUxxm1Vw98YjqTcU5w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.24.7",
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-function-name": "^7.24.7",
-        "@babel/helper-hoist-variables": "^7.24.7",
-        "@babel/helper-split-export-declaration": "^7.24.7",
-        "@babel/parser": "^7.24.7",
-        "@babel/types": "^7.24.7",
+        "@babel/code-frame": "^7.26.2",
+        "@babel/generator": "^7.26.3",
+        "@babel/parser": "^7.26.3",
+        "@babel/template": "^7.25.9",
+        "@babel/types": "^7.26.3",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -1940,9 +1915,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.26.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.0.tgz",
-      "integrity": "sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.3.tgz",
+      "integrity": "sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.25.9",
@@ -4917,6 +4892,41 @@
         "node": ">= 10"
       }
     },
+    "node_modules/@trivago/prettier-plugin-sort-imports": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-5.2.0.tgz",
+      "integrity": "sha512-yEIJ7xMKYQwyNRjxSdi4Gs37iszikAjxfky+3hu9bn24u8eHLJNDMAoOTyowp8p6EpSl8IQMdkfBx+WnJTttsw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@babel/generator": "^7.26.2",
+        "@babel/parser": "^7.26.2",
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.26.0",
+        "javascript-natural-sort": "^0.7.1",
+        "lodash": "^4.17.21"
+      },
+      "engines": {
+        "node": ">18.12"
+      },
+      "peerDependencies": {
+        "@vue/compiler-sfc": "3.x",
+        "prettier": "2.x - 3.x",
+        "prettier-plugin-svelte": "3.x",
+        "svelte": "4.x"
+      },
+      "peerDependenciesMeta": {
+        "@vue/compiler-sfc": {
+          "optional": true
+        },
+        "prettier-plugin-svelte": {
+          "optional": true
+        },
+        "svelte": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@tsconfig/node10": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
@@ -6937,9 +6947,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001640",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001640.tgz",
-      "integrity": "sha512-lA4VMpW0PSUrFnkmVuEKBUovSWKhj7puyCg8StBChgu298N1AtuF1sKWEvfDuimSEDbhlb/KqPKC3fs1HbuQUA==",
+      "version": "1.0.30001690",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001690.tgz",
+      "integrity": "sha512-5ExiE3qQN6oF8Clf8ifIDcMRCRE/dMGcETG/XGMD8/XiXm6HXQgQTh1yZYLXXpSOsEUlJm1Xr7kGULZTuGtP/w==",
       "dev": true,
       "funding": [
         {
@@ -6954,7 +6964,8 @@
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
-      ]
+      ],
+      "license": "CC-BY-4.0"
     },
     "node_modules/ccount": {
       "version": "2.0.1",
@@ -10353,6 +10364,13 @@
         "@pkgjs/parseargs": "^0.11.0"
       }
     },
+    "node_modules/javascript-natural-sort": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz",
+      "integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/jest": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
@@ -12106,15 +12124,16 @@
       }
     },
     "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "jsesc": "bin/jsesc"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
     "node_modules/json-buffer": {
diff --git a/package.json b/package.json
index 4ad620964..7b1485400 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,8 @@
     "update-litegraph": "node scripts/update-litegraph.js",
     "zipdist": "node scripts/zipdist.js",
     "typecheck": "vue-tsc --noEmit && tsc --noEmit && tsc-strict",
-    "format": "prettier --write './**/*.{js,ts,tsx,vue}'",
+    "format": "prettier --write './**/*.{js,ts,tsx,vue,mts}' --plugin @trivago/prettier-plugin-sort-imports",
+    "format:check": "prettier --check './**/*.{js,ts,tsx,vue,mts}' --plugin @trivago/prettier-plugin-sort-imports",
     "test:jest": "jest --config jest.config.ts",
     "test:generate": "npx tsx tests-ui/setup",
     "test:browser": "npx playwright test",
@@ -37,6 +38,7 @@
     "@lobehub/i18n-cli": "^1.20.0",
     "@pinia/testing": "^0.1.5",
     "@playwright/test": "^1.44.1",
+    "@trivago/prettier-plugin-sort-imports": "^5.2.0",
     "@types/jest": "^29.5.12",
     "@types/lodash": "^4.17.6",
     "@types/node": "^20.14.8",
diff --git a/scripts/collect-i18n.ts b/scripts/collect-i18n.ts
index 5148ea238..5e6fe53ec 100644
--- a/scripts/collect-i18n.ts
+++ b/scripts/collect-i18n.ts
@@ -1,12 +1,13 @@
 import * as fs from 'fs'
+
 import { comfyPageFixture as test } from '../browser_tests/fixtures/ComfyPage'
 import { CORE_MENU_COMMANDS } from '../src/constants/coreMenuCommands'
 import { SERVER_CONFIG_ITEMS } from '../src/constants/serverConfig'
-import { formatCamelCase, normalizeI18nKey } from '../src/utils/formatUtil'
-import { ComfyNodeDefImpl } from '../src/stores/nodeDefStore'
-import type { ComfyCommandImpl } from '../src/stores/commandStore'
-import type { FormItem, SettingParams } from '../src/types/settingTypes'
 import type { ComfyApi } from '../src/scripts/api'
+import type { ComfyCommandImpl } from '../src/stores/commandStore'
+import { ComfyNodeDefImpl } from '../src/stores/nodeDefStore'
+import type { FormItem, SettingParams } from '../src/types/settingTypes'
+import { formatCamelCase, normalizeI18nKey } from '../src/utils/formatUtil'
 
 const localePath = './src/locales/en/main.json'
 const nodeDefsPath = './src/locales/en/nodeDefs.json'
diff --git a/scripts/deploy.js b/scripts/deploy.js
index 1e2a49447..5d77e7ae6 100644
--- a/scripts/deploy.js
+++ b/scripts/deploy.js
@@ -1,8 +1,10 @@
-import { copy } from 'fs-extra'
 import { config } from 'dotenv'
+import { copy } from 'fs-extra'
+
 config()
 
 const sourceDir = './dist'
+// eslint-disable-next-line no-undef
 const targetDir = process.env.DEPLOY_COMFYUI_DIR
 
 copy(sourceDir, targetDir)
diff --git a/scripts/diff-i18n.ts b/scripts/diff-i18n.ts
index b365bf45a..331333367 100644
--- a/scripts/diff-i18n.ts
+++ b/scripts/diff-i18n.ts
@@ -1,12 +1,12 @@
 import {
-  readFileSync,
-  writeFileSync,
-  readdirSync,
-  mkdirSync,
   existsSync,
-  rmSync
+  mkdirSync,
+  readFileSync,
+  readdirSync,
+  rmSync,
+  writeFileSync
 } from 'fs'
-import { join, dirname } from 'path'
+import { dirname, join } from 'path'
 
 // Ensure directories exist
 function ensureDir(dir: string) {
diff --git a/src/App.vue b/src/App.vue
index 73222bd14..2a8bae885 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,13 +9,15 @@
 </template>
 
 <script setup lang="ts">
-import config from '@/config'
-import { computed, onMounted } from 'vue'
-import { useWorkspaceStore } from '@/stores/workspaceStore'
+import { useEventListener } from '@vueuse/core'
 import BlockUI from 'primevue/blockui'
 import ProgressSpinner from 'primevue/progressspinner'
+import { computed, onMounted } from 'vue'
+
 import GlobalDialog from '@/components/dialog/GlobalDialog.vue'
-import { useEventListener } from '@vueuse/core'
+import config from '@/config'
+import { useWorkspaceStore } from '@/stores/workspaceStore'
+
 import { isElectron, showNativeMenu } from './utils/envUtil'
 
 const workspaceStore = useWorkspaceStore()
diff --git a/src/components/BrowserTabTitle.vue b/src/components/BrowserTabTitle.vue
index 2a651fcbb..13b2911bd 100644
--- a/src/components/BrowserTabTitle.vue
+++ b/src/components/BrowserTabTitle.vue
@@ -5,11 +5,12 @@
 </template>
 
 <script setup lang="ts">
+import { useTitle } from '@vueuse/core'
+import { computed } from 'vue'
+
 import { useExecutionStore } from '@/stores/executionStore'
 import { useSettingStore } from '@/stores/settingStore'
 import { useWorkflowStore } from '@/stores/workflowStore'
-import { useTitle } from '@vueuse/core'
-import { computed } from 'vue'
 
 const DEFAULT_TITLE = 'ComfyUI'
 const TITLE_SUFFIX = ' - ComfyUI'
diff --git a/src/components/LiteGraphCanvasSplitterOverlay.vue b/src/components/LiteGraphCanvasSplitterOverlay.vue
index af27be4cc..3b4c7c2ca 100644
--- a/src/components/LiteGraphCanvasSplitterOverlay.vue
+++ b/src/components/LiteGraphCanvasSplitterOverlay.vue
@@ -46,13 +46,14 @@
 </template>
 
 <script setup lang="ts">
-import { useSettingStore } from '@/stores/settingStore'
-import { useBottomPanelStore } from '@/stores/workspace/bottomPanelStore'
-import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore'
 import Splitter from 'primevue/splitter'
 import SplitterPanel from 'primevue/splitterpanel'
 import { computed } from 'vue'
 
+import { useSettingStore } from '@/stores/settingStore'
+import { useBottomPanelStore } from '@/stores/workspace/bottomPanelStore'
+import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore'
+
 const settingStore = useSettingStore()
 const sidebarLocation = computed<'left' | 'right'>(() =>
   settingStore.get('Comfy.Sidebar.Location')
diff --git a/src/components/MenuHamburger.vue b/src/components/MenuHamburger.vue
index 2b1de81d6..e9f313ef2 100644
--- a/src/components/MenuHamburger.vue
+++ b/src/components/MenuHamburger.vue
@@ -15,10 +15,11 @@
 
 <script setup lang="ts">
 import Button from 'primevue/button'
-import { useWorkspaceStore } from '@/stores/workspaceStore'
-import { computed, CSSProperties, watchEffect } from 'vue'
+import { CSSProperties, computed, watchEffect } from 'vue'
+
 import { app } from '@/scripts/app'
 import { useSettingStore } from '@/stores/settingStore'
+import { useWorkspaceStore } from '@/stores/workspaceStore'
 import { showNativeMenu } from '@/utils/envUtil'
 
 const workspaceState = useWorkspaceStore()
diff --git a/src/components/actionbar/BatchCountEdit.vue b/src/components/actionbar/BatchCountEdit.vue
index fa70b9025..797786adb 100644
--- a/src/components/actionbar/BatchCountEdit.vue
+++ b/src/components/actionbar/BatchCountEdit.vue
@@ -30,12 +30,13 @@
 </template>
 
 <script lang="ts" setup>
-import { useQueueSettingsStore } from '@/stores/queueStore'
-import { useSettingStore } from '@/stores/settingStore'
 import { storeToRefs } from 'pinia'
 import InputNumber from 'primevue/inputnumber'
 import { computed } from 'vue'
 
+import { useQueueSettingsStore } from '@/stores/queueStore'
+import { useSettingStore } from '@/stores/settingStore'
+
 interface Props {
   class?: string
 }
diff --git a/src/components/actionbar/ComfyActionbar.vue b/src/components/actionbar/ComfyActionbar.vue
index 28e646cc5..04bfa51a4 100644
--- a/src/components/actionbar/ComfyActionbar.vue
+++ b/src/components/actionbar/ComfyActionbar.vue
@@ -13,10 +13,6 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, inject, nextTick, onMounted, Ref, ref, watch } from 'vue'
-import Panel from 'primevue/panel'
-import ComfyQueueButton from './ComfyQueueButton.vue'
-import { useSettingStore } from '@/stores/settingStore'
 import {
   useDraggable,
   useElementBounding,
@@ -26,6 +22,12 @@ import {
   watchDebounced
 } from '@vueuse/core'
 import { clamp } from 'lodash'
+import Panel from 'primevue/panel'
+import { Ref, computed, inject, nextTick, onMounted, ref, watch } from 'vue'
+
+import { useSettingStore } from '@/stores/settingStore'
+
+import ComfyQueueButton from './ComfyQueueButton.vue'
 
 const settingsStore = useSettingStore()
 
diff --git a/src/components/actionbar/ComfyQueueButton.vue b/src/components/actionbar/ComfyQueueButton.vue
index 99a5dd033..b6c65d833 100644
--- a/src/components/actionbar/ComfyQueueButton.vue
+++ b/src/components/actionbar/ComfyQueueButton.vue
@@ -55,20 +55,22 @@
 </template>
 
 <script setup lang="ts">
-import SplitButton from 'primevue/splitbutton'
+import { storeToRefs } from 'pinia'
 import Button from 'primevue/button'
-import BatchCountEdit from './BatchCountEdit.vue'
 import ButtonGroup from 'primevue/buttongroup'
+import SplitButton from 'primevue/splitbutton'
+import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
+
+import { useCommandStore } from '@/stores/commandStore'
 import {
   useQueuePendingTaskCountStore,
   useQueueSettingsStore
 } from '@/stores/queueStore'
-import { storeToRefs } from 'pinia'
-import { computed } from 'vue'
-import { useCommandStore } from '@/stores/commandStore'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
 
+import BatchCountEdit from './BatchCountEdit.vue'
+
 const workspaceStore = useWorkspaceStore()
 const queueCountStore = storeToRefs(useQueuePendingTaskCountStore())
 const { mode: queueMode } = storeToRefs(useQueueSettingsStore())
diff --git a/src/components/bottomPanel/BottomPanel.vue b/src/components/bottomPanel/BottomPanel.vue
index 8e5e04a83..205e4f405 100644
--- a/src/components/bottomPanel/BottomPanel.vue
+++ b/src/components/bottomPanel/BottomPanel.vue
@@ -41,9 +41,10 @@
 
 <script setup lang="ts">
 import Button from 'primevue/button'
-import Tabs from 'primevue/tabs'
-import TabList from 'primevue/tablist'
 import Tab from 'primevue/tab'
+import TabList from 'primevue/tablist'
+import Tabs from 'primevue/tabs'
+
 import ExtensionSlot from '@/components/common/ExtensionSlot.vue'
 import { useBottomPanelStore } from '@/stores/workspace/bottomPanelStore'
 
diff --git a/src/components/bottomPanel/tabs/terminal/BaseTerminal.vue b/src/components/bottomPanel/tabs/terminal/BaseTerminal.vue
index bde9adaf1..dc65a5e19 100644
--- a/src/components/bottomPanel/tabs/terminal/BaseTerminal.vue
+++ b/src/components/bottomPanel/tabs/terminal/BaseTerminal.vue
@@ -7,7 +7,8 @@
 </template>
 
 <script setup lang="ts">
-import { ref, Ref } from 'vue'
+import { Ref, ref } from 'vue'
+
 import { useTerminal } from '@/hooks/bottomPanelTabs/useTerminal'
 
 const emit = defineEmits<{
diff --git a/src/components/bottomPanel/tabs/terminal/CommandTerminal.vue b/src/components/bottomPanel/tabs/terminal/CommandTerminal.vue
index ef646abb8..29a9eabc7 100644
--- a/src/components/bottomPanel/tabs/terminal/CommandTerminal.vue
+++ b/src/components/bottomPanel/tabs/terminal/CommandTerminal.vue
@@ -3,10 +3,12 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, onUnmounted, Ref } from 'vue'
+import { IDisposable } from '@xterm/xterm'
+import { Ref, onMounted, onUnmounted } from 'vue'
+
 import type { useTerminal } from '@/hooks/bottomPanelTabs/useTerminal'
 import { electronAPI } from '@/utils/envUtil'
-import { IDisposable } from '@xterm/xterm'
+
 import BaseTerminal from './BaseTerminal.vue'
 
 const terminalCreated = (
diff --git a/src/components/bottomPanel/tabs/terminal/LogsTerminal.vue b/src/components/bottomPanel/tabs/terminal/LogsTerminal.vue
index 460d56b78..7c1d4652e 100644
--- a/src/components/bottomPanel/tabs/terminal/LogsTerminal.vue
+++ b/src/components/bottomPanel/tabs/terminal/LogsTerminal.vue
@@ -10,15 +10,17 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, onUnmounted, Ref, ref } from 'vue'
-import type { useTerminal } from '@/hooks/bottomPanelTabs/useTerminal'
-import { LogEntry, LogsWsMessage, TerminalSize } from '@/types/apiTypes'
-import { api } from '@/scripts/api'
-import { useExecutionStore } from '@/stores/executionStore'
 import { until } from '@vueuse/core'
 import { storeToRefs } from 'pinia'
-import BaseTerminal from './BaseTerminal.vue'
 import ProgressSpinner from 'primevue/progressspinner'
+import { Ref, onMounted, onUnmounted, ref } from 'vue'
+
+import type { useTerminal } from '@/hooks/bottomPanelTabs/useTerminal'
+import { api } from '@/scripts/api'
+import { useExecutionStore } from '@/stores/executionStore'
+import { LogEntry, LogsWsMessage, TerminalSize } from '@/types/apiTypes'
+
+import BaseTerminal from './BaseTerminal.vue'
 
 const errorMessage = ref('')
 const loading = ref(true)
diff --git a/src/components/common/CustomFormValue.vue b/src/components/common/CustomFormValue.vue
index 2b91fa3bf..1776bb82c 100644
--- a/src/components/common/CustomFormValue.vue
+++ b/src/components/common/CustomFormValue.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted, watch } from 'vue'
+import { onMounted, ref, watch } from 'vue'
 
 const props = defineProps<{
   renderFunction: () => HTMLElement
diff --git a/src/components/common/CustomizationDialog.vue b/src/components/common/CustomizationDialog.vue
index 6808b993f..eb1d38afc 100644
--- a/src/components/common/CustomizationDialog.vue
+++ b/src/components/common/CustomizationDialog.vue
@@ -70,15 +70,16 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, watch } from 'vue'
-import Dialog from 'primevue/dialog'
-import SelectButton from 'primevue/selectbutton'
 import Button from 'primevue/button'
-import Divider from 'primevue/divider'
 import ColorPicker from 'primevue/colorpicker'
-import { useNodeBookmarkStore } from '@/stores/nodeBookmarkStore'
+import Dialog from 'primevue/dialog'
+import Divider from 'primevue/divider'
+import SelectButton from 'primevue/selectbutton'
+import { computed, ref, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 
+import { useNodeBookmarkStore } from '@/stores/nodeBookmarkStore'
+
 const { t } = useI18n()
 
 const props = defineProps<{
diff --git a/src/components/common/ElectronFileDownload.vue b/src/components/common/ElectronFileDownload.vue
index d79b8627e..64adbff36 100644
--- a/src/components/common/ElectronFileDownload.vue
+++ b/src/components/common/ElectronFileDownload.vue
@@ -75,13 +75,14 @@
 </template>
 
 <script setup lang="ts">
-import { useDownload } from '@/hooks/downloadHooks'
 import Button from 'primevue/button'
 import ProgressBar from 'primevue/progressbar'
-import { ref, computed } from 'vue'
-import { formatSize } from '@/utils/formatUtil'
+import { computed, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
+
+import { useDownload } from '@/hooks/downloadHooks'
 import { useElectronDownloadStore } from '@/stores/electronDownloadStore'
+import { formatSize } from '@/utils/formatUtil'
 
 const props = defineProps<{
   url: string
diff --git a/src/components/common/ExtensionSlot.vue b/src/components/common/ExtensionSlot.vue
index 8cf725dab..4374ed773 100644
--- a/src/components/common/ExtensionSlot.vue
+++ b/src/components/common/ExtensionSlot.vue
@@ -15,9 +15,10 @@
 </template>
 
 <script setup lang="ts">
-import { CustomExtension, VueExtension } from '@/types/extensionTypes'
 import { onBeforeUnmount } from 'vue'
 
+import { CustomExtension, VueExtension } from '@/types/extensionTypes'
+
 const props = defineProps<{
   extension: VueExtension | CustomExtension
 }>()
diff --git a/src/components/common/FileDownload.vue b/src/components/common/FileDownload.vue
index 8ceb37590..643ba3732 100644
--- a/src/components/common/FileDownload.vue
+++ b/src/components/common/FileDownload.vue
@@ -24,9 +24,10 @@
 </template>
 
 <script setup lang="ts">
-import { useDownload } from '@/hooks/downloadHooks'
 import Button from 'primevue/button'
 import { computed } from 'vue'
+
+import { useDownload } from '@/hooks/downloadHooks'
 import { formatSize } from '@/utils/formatUtil'
 
 const props = defineProps<{
diff --git a/src/components/common/FormImageUpload.vue b/src/components/common/FormImageUpload.vue
index 7d5e8d9d0..e4ee9d518 100644
--- a/src/components/common/FormImageUpload.vue
+++ b/src/components/common/FormImageUpload.vue
@@ -42,8 +42,8 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
 import Button from 'primevue/button'
+import { ref } from 'vue'
 
 const props = defineProps<{
   modelValue: string
diff --git a/src/components/common/FormItem.vue b/src/components/common/FormItem.vue
index 2a6cfad4d..6bb934f40 100644
--- a/src/components/common/FormItem.vue
+++ b/src/components/common/FormItem.vue
@@ -25,16 +25,17 @@
 </template>
 
 <script setup lang="ts">
-import { FormItem } from '@/types/settingTypes'
-import { markRaw, type Component } from 'vue'
-import InputText from 'primevue/inputtext'
 import InputNumber from 'primevue/inputnumber'
+import InputText from 'primevue/inputtext'
 import Select from 'primevue/select'
 import ToggleSwitch from 'primevue/toggleswitch'
+import { type Component, markRaw } from 'vue'
+
 import CustomFormValue from '@/components/common/CustomFormValue.vue'
-import InputSlider from '@/components/common/InputSlider.vue'
-import FormImageUpload from '@/components/common/FormImageUpload.vue'
 import FormColorPicker from '@/components/common/FormColorPicker.vue'
+import FormImageUpload from '@/components/common/FormImageUpload.vue'
+import InputSlider from '@/components/common/InputSlider.vue'
+import { FormItem } from '@/types/settingTypes'
 
 const formValue = defineModel<any>('formValue')
 const props = defineProps<{
diff --git a/src/components/common/InputSlider.vue b/src/components/common/InputSlider.vue
index 5388ca6b4..1c9bda36e 100644
--- a/src/components/common/InputSlider.vue
+++ b/src/components/common/InputSlider.vue
@@ -24,9 +24,9 @@
 </template>
 
 <script setup lang="ts">
-import { ref, watch } from 'vue'
 import InputNumber from 'primevue/inputnumber'
 import Slider from 'primevue/slider'
+import { ref, watch } from 'vue'
 
 const props = defineProps<{
   modelValue: number
diff --git a/src/components/common/NoResultsPlaceholder.vue b/src/components/common/NoResultsPlaceholder.vue
index 1b4038177..81ffc1d0a 100644
--- a/src/components/common/NoResultsPlaceholder.vue
+++ b/src/components/common/NoResultsPlaceholder.vue
@@ -19,8 +19,8 @@
 </template>
 
 <script setup lang="ts">
-import Card from 'primevue/card'
 import Button from 'primevue/button'
+import Card from 'primevue/card'
 
 const props = defineProps<{
   class?: string
diff --git a/src/components/common/SearchBox.vue b/src/components/common/SearchBox.vue
index 80fafa162..c4da7fc2f 100644
--- a/src/components/common/SearchBox.vue
+++ b/src/components/common/SearchBox.vue
@@ -42,15 +42,16 @@
 </template>
 
 <script setup lang="ts" generic="TFilter extends SearchFilter">
-import type { SearchFilter } from './SearchFilterChip.vue'
 import { debounce } from 'lodash'
+import Button from 'primevue/button'
 import IconField from 'primevue/iconfield'
 import InputIcon from 'primevue/inputicon'
 import InputText from 'primevue/inputtext'
-import Button from 'primevue/button'
-import SearchFilterChip from './SearchFilterChip.vue'
 import { toRefs } from 'vue'
 
+import type { SearchFilter } from './SearchFilterChip.vue'
+import SearchFilterChip from './SearchFilterChip.vue'
+
 const props = withDefaults(
   defineProps<{
     class?: string
diff --git a/src/components/common/SearchFilterChip.vue b/src/components/common/SearchFilterChip.vue
index 11530550c..a1519cfa7 100644
--- a/src/components/common/SearchFilterChip.vue
+++ b/src/components/common/SearchFilterChip.vue
@@ -8,8 +8,8 @@
 </template>
 
 <script setup lang="ts">
-import Chip from 'primevue/chip'
 import Badge from 'primevue/badge'
+import Chip from 'primevue/chip'
 
 export interface SearchFilter {
   text: string
diff --git a/src/components/common/SystemStatsPanel.vue b/src/components/common/SystemStatsPanel.vue
index 3915686e1..236448a98 100644
--- a/src/components/common/SystemStatsPanel.vue
+++ b/src/components/common/SystemStatsPanel.vue
@@ -29,12 +29,13 @@
 </template>
 
 <script setup lang="ts">
-import { computed } from 'vue'
-import TabView from 'primevue/tabview'
-import TabPanel from 'primevue/tabpanel'
 import Divider from 'primevue/divider'
-import type { SystemStats } from '@/types/apiTypes'
+import TabPanel from 'primevue/tabpanel'
+import TabView from 'primevue/tabview'
+import { computed } from 'vue'
+
 import DeviceInfo from '@/components/common/DeviceInfo.vue'
+import type { SystemStats } from '@/types/apiTypes'
 import { formatSize } from '@/utils/formatUtil'
 
 const props = defineProps<{
diff --git a/src/components/common/TreeExplorer.vue b/src/components/common/TreeExplorer.vue
index c1ff99d2a..3e7c9a228 100644
--- a/src/components/common/TreeExplorer.vue
+++ b/src/components/common/TreeExplorer.vue
@@ -33,17 +33,18 @@
   <ContextMenu ref="menu" :model="menuItems" />
 </template>
 <script setup lang="ts">
-import { ref, computed, provide } from 'vue'
-import Tree from 'primevue/tree'
 import ContextMenu from 'primevue/contextmenu'
+import type { MenuItem, MenuItemCommandEvent } from 'primevue/menuitem'
+import Tree from 'primevue/tree'
+import { computed, provide, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
 import TreeExplorerTreeNode from '@/components/common/TreeExplorerTreeNode.vue'
+import { useErrorHandling } from '@/hooks/errorHooks'
 import type {
   RenderedTreeExplorerNode,
   TreeExplorerNode
 } from '@/types/treeExplorerTypes'
-import type { MenuItem, MenuItemCommandEvent } from 'primevue/menuitem'
-import { useI18n } from 'vue-i18n'
-import { useErrorHandling } from '@/hooks/errorHooks'
 
 const expandedKeys = defineModel<Record<string, boolean>>('expandedKeys')
 provide('expandedKeys', expandedKeys)
diff --git a/src/components/common/TreeExplorerTreeNode.vue b/src/components/common/TreeExplorerTreeNode.vue
index d2c4f48e3..3235900d5 100644
--- a/src/components/common/TreeExplorerTreeNode.vue
+++ b/src/components/common/TreeExplorerTreeNode.vue
@@ -34,16 +34,17 @@
 </template>
 
 <script setup lang="ts">
-import { ref, inject, Ref, computed } from 'vue'
 import Badge from 'primevue/badge'
+import { Ref, computed, inject, ref } from 'vue'
+
+import EditableText from '@/components/common/EditableText.vue'
+import { usePragmaticDraggable, usePragmaticDroppable } from '@/hooks/dndHooks'
+import { useErrorHandling } from '@/hooks/errorHooks'
 import type {
-  TreeExplorerDragAndDropData,
   RenderedTreeExplorerNode,
+  TreeExplorerDragAndDropData,
   TreeExplorerNode
 } from '@/types/treeExplorerTypes'
-import EditableText from '@/components/common/EditableText.vue'
-import { useErrorHandling } from '@/hooks/errorHooks'
-import { usePragmaticDraggable, usePragmaticDroppable } from '@/hooks/dndHooks'
 
 const props = defineProps<{
   node: RenderedTreeExplorerNode
diff --git a/src/components/common/__tests__/EditableText.spec.ts b/src/components/common/__tests__/EditableText.spec.ts
index 76f86cfc1..c12035f63 100644
--- a/src/components/common/__tests__/EditableText.spec.ts
+++ b/src/components/common/__tests__/EditableText.spec.ts
@@ -1,11 +1,12 @@
 // @ts-strict-ignore
 import { mount } from '@vue/test-utils'
-import { describe, it, expect, beforeAll } from 'vitest'
-import EditableText from '../EditableText.vue'
 import PrimeVue from 'primevue/config'
 import InputText from 'primevue/inputtext'
+import { beforeAll, describe, expect, it } from 'vitest'
 import { createApp } from 'vue'
 
+import EditableText from '../EditableText.vue'
+
 describe('EditableText', () => {
   beforeAll(() => {
     // Create a Vue app instance for PrimeVue
diff --git a/src/components/common/__tests__/TreeExplorerTreeNode.spec.ts b/src/components/common/__tests__/TreeExplorerTreeNode.spec.ts
index b2074e8ba..582fce4b9 100644
--- a/src/components/common/__tests__/TreeExplorerTreeNode.spec.ts
+++ b/src/components/common/__tests__/TreeExplorerTreeNode.spec.ts
@@ -1,16 +1,17 @@
 // @ts-strict-ignore
-import { describe, it, expect, vi } from 'vitest'
+import { createTestingPinia } from '@pinia/testing'
 import { mount } from '@vue/test-utils'
-import TreeExplorerTreeNode from '@/components/common/TreeExplorerTreeNode.vue'
-import EditableText from '@/components/common/EditableText.vue'
 import Badge from 'primevue/badge'
 import PrimeVue from 'primevue/config'
 import InputText from 'primevue/inputtext'
-import { createTestingPinia } from '@pinia/testing'
-import { RenderedTreeExplorerNode } from '@/types/treeExplorerTypes'
-import { createI18n } from 'vue-i18n'
+import { describe, expect, it, vi } from 'vitest'
 import { createApp } from 'vue'
+import { createI18n } from 'vue-i18n'
+
+import EditableText from '@/components/common/EditableText.vue'
+import TreeExplorerTreeNode from '@/components/common/TreeExplorerTreeNode.vue'
 import { useToastStore } from '@/stores/toastStore'
+import { RenderedTreeExplorerNode } from '@/types/treeExplorerTypes'
 
 // Create a mock i18n instance
 const i18n = createI18n({
diff --git a/src/components/dialog/GlobalDialog.vue b/src/components/dialog/GlobalDialog.vue
index 8df8598a2..f3c7bf073 100644
--- a/src/components/dialog/GlobalDialog.vue
+++ b/src/components/dialog/GlobalDialog.vue
@@ -28,11 +28,12 @@
 </template>
 
 <script setup lang="ts">
-import { computed, onMounted } from 'vue'
 import { ZIndex } from '@primeuix/utils/zindex'
 import { usePrimeVue } from '@primevue/core'
-import { useDialogStore } from '@/stores/dialogStore'
 import Dialog from 'primevue/dialog'
+import { computed, onMounted } from 'vue'
+
+import { useDialogStore } from '@/stores/dialogStore'
 
 const dialogStore = useDialogStore()
 
diff --git a/src/components/dialog/UnloadWindowConfirmDialog.vue b/src/components/dialog/UnloadWindowConfirmDialog.vue
index 192c0896c..f0ef188c3 100644
--- a/src/components/dialog/UnloadWindowConfirmDialog.vue
+++ b/src/components/dialog/UnloadWindowConfirmDialog.vue
@@ -10,8 +10,9 @@
 </template>
 
 <script setup lang="ts">
+import { onBeforeUnmount, onMounted } from 'vue'
+
 import { useSettingStore } from '@/stores/settingStore'
-import { onMounted, onBeforeUnmount } from 'vue'
 
 const settingStore = useSettingStore()
 
diff --git a/src/components/dialog/content/ConfirmationDialogContent.vue b/src/components/dialog/content/ConfirmationDialogContent.vue
index 6e4eb79b6..cb3c364d8 100644
--- a/src/components/dialog/content/ConfirmationDialogContent.vue
+++ b/src/components/dialog/content/ConfirmationDialogContent.vue
@@ -56,8 +56,9 @@
 
 <script setup lang="ts">
 import Button from 'primevue/button'
-import { useDialogStore } from '@/stores/dialogStore'
+
 import type { ConfirmationDialogType } from '@/services/dialogService'
+import { useDialogStore } from '@/stores/dialogStore'
 
 const props = defineProps<{
   message: string
diff --git a/src/components/dialog/content/ExecutionErrorDialogContent.vue b/src/components/dialog/content/ExecutionErrorDialogContent.vue
index 707bad262..722355333 100644
--- a/src/components/dialog/content/ExecutionErrorDialogContent.vue
+++ b/src/components/dialog/content/ExecutionErrorDialogContent.vue
@@ -37,19 +37,20 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted } from 'vue'
-import { useToast } from 'primevue/usetoast'
 import Button from 'primevue/button'
 import Divider from 'primevue/divider'
 import ScrollPanel from 'primevue/scrollpanel'
+import { useToast } from 'primevue/usetoast'
+import { onMounted, ref } from 'vue'
+
 import NoResultsPlaceholder from '@/components/common/NoResultsPlaceholder.vue'
 import FindIssueButton from '@/components/dialog/content/error/FindIssueButton.vue'
 import ReportIssueButton from '@/components/dialog/content/error/ReportIssueButton.vue'
-import type { ExecutionErrorWsMessage, SystemStats } from '@/types/apiTypes'
+import { useCopyToClipboard } from '@/hooks/clipboardHooks'
 import { api } from '@/scripts/api'
 import { app } from '@/scripts/app'
+import type { ExecutionErrorWsMessage, SystemStats } from '@/types/apiTypes'
 import { isElectron } from '@/utils/envUtil'
-import { useCopyToClipboard } from '@/hooks/clipboardHooks'
 
 const props = defineProps<{
   error: ExecutionErrorWsMessage
diff --git a/src/components/dialog/content/LoadWorkflowWarning.vue b/src/components/dialog/content/LoadWorkflowWarning.vue
index cc440611e..64894f61b 100644
--- a/src/components/dialog/content/LoadWorkflowWarning.vue
+++ b/src/components/dialog/content/LoadWorkflowWarning.vue
@@ -33,9 +33,10 @@
 </template>
 
 <script setup lang="ts">
-import { computed } from 'vue'
-import ListBox from 'primevue/listbox'
 import Button from 'primevue/button'
+import ListBox from 'primevue/listbox'
+import { computed } from 'vue'
+
 import NoResultsPlaceholder from '@/components/common/NoResultsPlaceholder.vue'
 import type { MissingNodeType } from '@/types/comfy'
 
diff --git a/src/components/dialog/content/MissingModelsWarning.vue b/src/components/dialog/content/MissingModelsWarning.vue
index 3131e2221..257746d11 100644
--- a/src/components/dialog/content/MissingModelsWarning.vue
+++ b/src/components/dialog/content/MissingModelsWarning.vue
@@ -25,10 +25,11 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed } from 'vue'
 import ListBox from 'primevue/listbox'
-import NoResultsPlaceholder from '@/components/common/NoResultsPlaceholder.vue'
+import { computed, ref } from 'vue'
+
 import FileDownload from '@/components/common/FileDownload.vue'
+import NoResultsPlaceholder from '@/components/common/NoResultsPlaceholder.vue'
 import { isElectron } from '@/utils/envUtil'
 
 // TODO: Read this from server internal API rather than hardcoding here
diff --git a/src/components/dialog/content/PromptDialogContent.vue b/src/components/dialog/content/PromptDialogContent.vue
index 4380b144a..830c410ce 100644
--- a/src/components/dialog/content/PromptDialogContent.vue
+++ b/src/components/dialog/content/PromptDialogContent.vue
@@ -16,9 +16,10 @@
 
 <script setup lang="ts">
 import Button from 'primevue/button'
-import InputText from 'primevue/inputtext'
 import FloatLabel from 'primevue/floatlabel'
+import InputText from 'primevue/inputtext'
 import { ref } from 'vue'
+
 import { useDialogStore } from '@/stores/dialogStore'
 
 const props = defineProps<{
diff --git a/src/components/dialog/content/SettingDialogContent.vue b/src/components/dialog/content/SettingDialogContent.vue
index 90a46ce7b..641a1c459 100644
--- a/src/components/dialog/content/SettingDialogContent.vue
+++ b/src/components/dialog/content/SettingDialogContent.vue
@@ -67,30 +67,32 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, onMounted, watch, defineAsyncComponent } from 'vue'
-import Listbox from 'primevue/listbox'
-import Tabs from 'primevue/tabs'
-import TabPanels from 'primevue/tabpanels'
 import Divider from 'primevue/divider'
+import Listbox from 'primevue/listbox'
 import ScrollPanel from 'primevue/scrollpanel'
+import TabPanels from 'primevue/tabpanels'
+import Tabs from 'primevue/tabs'
+import { computed, defineAsyncComponent, onMounted, ref, watch } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import SearchBox from '@/components/common/SearchBox.vue'
+import { st } from '@/i18n'
 import {
-  getSettingInfo,
   SettingTreeNode,
+  getSettingInfo,
   useSettingStore
 } from '@/stores/settingStore'
 import { ISettingGroup, SettingParams } from '@/types/settingTypes'
-import SearchBox from '@/components/common/SearchBox.vue'
-import SettingsPanel from './setting/SettingsPanel.vue'
-import PanelTemplate from './setting/PanelTemplate.vue'
-import AboutPanel from './setting/AboutPanel.vue'
-import FirstTimeUIMessage from './setting/FirstTimeUIMessage.vue'
-import CurrentUserMessage from './setting/CurrentUserMessage.vue'
-import ColorPaletteMessage from './setting/ColorPaletteMessage.vue'
-import { flattenTree } from '@/utils/treeUtil'
 import { isElectron } from '@/utils/envUtil'
 import { normalizeI18nKey } from '@/utils/formatUtil'
-import { useI18n } from 'vue-i18n'
-import { st } from '@/i18n'
+import { flattenTree } from '@/utils/treeUtil'
+
+import AboutPanel from './setting/AboutPanel.vue'
+import ColorPaletteMessage from './setting/ColorPaletteMessage.vue'
+import CurrentUserMessage from './setting/CurrentUserMessage.vue'
+import FirstTimeUIMessage from './setting/FirstTimeUIMessage.vue'
+import PanelTemplate from './setting/PanelTemplate.vue'
+import SettingsPanel from './setting/SettingsPanel.vue'
 
 const props = defineProps<{
   defaultPanel?: 'about' | 'keybinding' | 'extension' | 'server-config'
diff --git a/src/components/dialog/content/error/FindIssueButton.vue b/src/components/dialog/content/error/FindIssueButton.vue
index dccc6d5bc..6c96d7478 100644
--- a/src/components/dialog/content/error/FindIssueButton.vue
+++ b/src/components/dialog/content/error/FindIssueButton.vue
@@ -9,8 +9,8 @@
 </template>
 
 <script setup lang="ts">
-import { computed } from 'vue'
 import Button from 'primevue/button'
+import { computed } from 'vue'
 
 const props = defineProps<{
   errorMessage: string
diff --git a/src/components/dialog/content/error/ReportIssueButton.vue b/src/components/dialog/content/error/ReportIssueButton.vue
index f5d6de7d2..0bf2e7721 100644
--- a/src/components/dialog/content/error/ReportIssueButton.vue
+++ b/src/components/dialog/content/error/ReportIssueButton.vue
@@ -11,11 +11,12 @@
 </template>
 
 <script setup lang="ts">
-import { computed, ref } from 'vue'
 import Button from 'primevue/button'
 import { useToast } from 'primevue/usetoast'
-import { ExecutionErrorWsMessage } from '@/types/apiTypes'
+import { computed, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
+
+import { ExecutionErrorWsMessage } from '@/types/apiTypes'
 import { electronAPI } from '@/utils/envUtil'
 
 const { error } = defineProps<{
diff --git a/src/components/dialog/content/setting/AboutPanel.vue b/src/components/dialog/content/setting/AboutPanel.vue
index ea4c8c063..271001214 100644
--- a/src/components/dialog/content/setting/AboutPanel.vue
+++ b/src/components/dialog/content/setting/AboutPanel.vue
@@ -30,13 +30,15 @@
 </template>
 
 <script setup lang="ts">
-import PanelTemplate from './PanelTemplate.vue'
-import { useSystemStatsStore } from '@/stores/systemStatsStore'
-import { useAboutPanelStore } from '@/stores/aboutPanelStore'
-import Tag from 'primevue/tag'
 import Divider from 'primevue/divider'
+import Tag from 'primevue/tag'
 import { onMounted } from 'vue'
+
 import SystemStatsPanel from '@/components/common/SystemStatsPanel.vue'
+import { useAboutPanelStore } from '@/stores/aboutPanelStore'
+import { useSystemStatsStore } from '@/stores/systemStatsStore'
+
+import PanelTemplate from './PanelTemplate.vue'
 
 const systemStatsStore = useSystemStatsStore()
 const aboutPanelStore = useAboutPanelStore()
diff --git a/src/components/dialog/content/setting/ColorPaletteMessage.vue b/src/components/dialog/content/setting/ColorPaletteMessage.vue
index 950b77b7a..b6cfd3d6f 100644
--- a/src/components/dialog/content/setting/ColorPaletteMessage.vue
+++ b/src/components/dialog/content/setting/ColorPaletteMessage.vue
@@ -38,14 +38,15 @@
 </template>
 
 <script setup lang="ts">
+import { storeToRefs } from 'pinia'
 import Button from 'primevue/button'
 import Message from 'primevue/message'
 import Select from 'primevue/select'
-import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
-import { useColorPaletteService } from '@/services/colorPaletteService'
-import { storeToRefs } from 'pinia'
 import { watch } from 'vue'
 
+import { useColorPaletteService } from '@/services/colorPaletteService'
+import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
+
 const colorPaletteStore = useColorPaletteStore()
 const colorPaletteService = useColorPaletteService()
 const { palettes, activePaletteId } = storeToRefs(colorPaletteStore)
diff --git a/src/components/dialog/content/setting/CurrentUserMessage.vue b/src/components/dialog/content/setting/CurrentUserMessage.vue
index dd317ad4d..6c1487410 100644
--- a/src/components/dialog/content/setting/CurrentUserMessage.vue
+++ b/src/components/dialog/content/setting/CurrentUserMessage.vue
@@ -16,8 +16,9 @@
 </template>
 
 <script setup lang="ts">
-import Message from 'primevue/message'
 import Button from 'primevue/button'
+import Message from 'primevue/message'
+
 import { useUserStore } from '@/stores/userStore'
 
 const userStore = useUserStore()
diff --git a/src/components/dialog/content/setting/ExtensionPanel.vue b/src/components/dialog/content/setting/ExtensionPanel.vue
index 5295498f2..cffb32797 100644
--- a/src/components/dialog/content/setting/ExtensionPanel.vue
+++ b/src/components/dialog/content/setting/ExtensionPanel.vue
@@ -72,19 +72,21 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, onMounted } from 'vue'
+import { FilterMatchMode } from '@primevue/core/api'
+import Button from 'primevue/button'
+import Column from 'primevue/column'
+import ContextMenu from 'primevue/contextmenu'
+import DataTable from 'primevue/datatable'
+import Message from 'primevue/message'
+import Tag from 'primevue/tag'
+import ToggleSwitch from 'primevue/toggleswitch'
+import { computed, onMounted, ref } from 'vue'
+
+import SearchBox from '@/components/common/SearchBox.vue'
 import { useExtensionStore } from '@/stores/extensionStore'
 import { useSettingStore } from '@/stores/settingStore'
-import DataTable from 'primevue/datatable'
-import Column from 'primevue/column'
-import ToggleSwitch from 'primevue/toggleswitch'
-import Tag from 'primevue/tag'
-import Button from 'primevue/button'
-import ContextMenu from 'primevue/contextmenu'
-import Message from 'primevue/message'
-import { FilterMatchMode } from '@primevue/core/api'
+
 import PanelTemplate from './PanelTemplate.vue'
-import SearchBox from '@/components/common/SearchBox.vue'
 
 const filters = ref({
   global: { value: '', matchMode: FilterMatchMode.CONTAINS }
diff --git a/src/components/dialog/content/setting/FirstTimeUIMessage.vue b/src/components/dialog/content/setting/FirstTimeUIMessage.vue
index 5daee0d73..fa2de09a4 100644
--- a/src/components/dialog/content/setting/FirstTimeUIMessage.vue
+++ b/src/components/dialog/content/setting/FirstTimeUIMessage.vue
@@ -11,10 +11,11 @@
 </template>
 
 <script setup lang="ts">
-import { useSettingStore } from '@/stores/settingStore'
 import Message from 'primevue/message'
 import { computed } from 'vue'
 
+import { useSettingStore } from '@/stores/settingStore'
+
 const settingStore = useSettingStore()
 const show = computed(() => !settingStore.exists('Comfy.UseNewMenu'))
 const handleClose = () => {
diff --git a/src/components/dialog/content/setting/KeybindingPanel.vue b/src/components/dialog/content/setting/KeybindingPanel.vue
index f1d323a1f..60bd7c5e0 100644
--- a/src/components/dialog/content/setting/KeybindingPanel.vue
+++ b/src/components/dialog/content/setting/KeybindingPanel.vue
@@ -114,28 +114,30 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, watchEffect } from 'vue'
-import {
-  useKeybindingStore,
-  KeyComboImpl,
-  KeybindingImpl
-} from '@/stores/keybindingStore'
-import { useCommandStore } from '@/stores/commandStore'
-import DataTable from 'primevue/datatable'
-import Column from 'primevue/column'
+import { FilterMatchMode } from '@primevue/core/api'
 import Button from 'primevue/button'
+import Column from 'primevue/column'
+import DataTable from 'primevue/datatable'
 import Dialog from 'primevue/dialog'
 import InputText from 'primevue/inputtext'
 import Message from 'primevue/message'
 import Tag from 'primevue/tag'
+import { useToast } from 'primevue/usetoast'
+import { computed, ref, watchEffect } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import SearchBox from '@/components/common/SearchBox.vue'
+import { useKeybindingService } from '@/services/keybindingService'
+import { useCommandStore } from '@/stores/commandStore'
+import {
+  KeyComboImpl,
+  KeybindingImpl,
+  useKeybindingStore
+} from '@/stores/keybindingStore'
+import { normalizeI18nKey } from '@/utils/formatUtil'
+
 import PanelTemplate from './PanelTemplate.vue'
 import KeyComboDisplay from './keybinding/KeyComboDisplay.vue'
-import SearchBox from '@/components/common/SearchBox.vue'
-import { useToast } from 'primevue/usetoast'
-import { FilterMatchMode } from '@primevue/core/api'
-import { useI18n } from 'vue-i18n'
-import { normalizeI18nKey } from '@/utils/formatUtil'
-import { useKeybindingService } from '@/services/keybindingService'
 
 const filters = ref({
   global: { value: '', matchMode: FilterMatchMode.CONTAINS }
diff --git a/src/components/dialog/content/setting/PanelTemplate.vue b/src/components/dialog/content/setting/PanelTemplate.vue
index 9bf78412d..160b9a852 100644
--- a/src/components/dialog/content/setting/PanelTemplate.vue
+++ b/src/components/dialog/content/setting/PanelTemplate.vue
@@ -11,8 +11,8 @@
 </template>
 
 <script setup lang="ts">
-import TabPanel from 'primevue/tabpanel'
 import ScrollPanel from 'primevue/scrollpanel'
+import TabPanel from 'primevue/tabpanel'
 
 const props = defineProps<{
   value: string
diff --git a/src/components/dialog/content/setting/ServerConfigPanel.vue b/src/components/dialog/content/setting/ServerConfigPanel.vue
index a1f157c1c..5ced9df41 100644
--- a/src/components/dialog/content/setting/ServerConfigPanel.vue
+++ b/src/components/dialog/content/setting/ServerConfigPanel.vue
@@ -66,21 +66,23 @@
 </template>
 
 <script setup lang="ts">
-import Button from 'primevue/button'
-import Message from 'primevue/message'
-import Divider from 'primevue/divider'
-import FormItem from '@/components/common/FormItem.vue'
-import PanelTemplate from './PanelTemplate.vue'
-import { useServerConfigStore } from '@/stores/serverConfigStore'
 import { storeToRefs } from 'pinia'
-import { electronAPI } from '@/utils/envUtil'
-import { useSettingStore } from '@/stores/settingStore'
+import Button from 'primevue/button'
+import Divider from 'primevue/divider'
+import Message from 'primevue/message'
 import { watch } from 'vue'
-import { useCopyToClipboard } from '@/hooks/clipboardHooks'
-import type { FormItem as FormItemType } from '@/types/settingTypes'
-import type { ServerConfig } from '@/constants/serverConfig'
 import { useI18n } from 'vue-i18n'
 
+import FormItem from '@/components/common/FormItem.vue'
+import type { ServerConfig } from '@/constants/serverConfig'
+import { useCopyToClipboard } from '@/hooks/clipboardHooks'
+import { useServerConfigStore } from '@/stores/serverConfigStore'
+import { useSettingStore } from '@/stores/settingStore'
+import type { FormItem as FormItemType } from '@/types/settingTypes'
+import { electronAPI } from '@/utils/envUtil'
+
+import PanelTemplate from './PanelTemplate.vue'
+
 const settingStore = useSettingStore()
 const serverConfigStore = useServerConfigStore()
 const {
diff --git a/src/components/dialog/content/setting/SettingGroup.vue b/src/components/dialog/content/setting/SettingGroup.vue
index cbaec99c1..28b3c49c6 100644
--- a/src/components/dialog/content/setting/SettingGroup.vue
+++ b/src/components/dialog/content/setting/SettingGroup.vue
@@ -18,6 +18,7 @@
 
 <script setup lang="ts">
 import Divider from 'primevue/divider'
+
 import SettingItem from '@/components/dialog/content/setting/SettingItem.vue'
 import { SettingParams } from '@/types/settingTypes'
 import { normalizeI18nKey } from '@/utils/formatUtil'
diff --git a/src/components/dialog/content/setting/SettingItem.vue b/src/components/dialog/content/setting/SettingItem.vue
index 315761eac..c3b0e114d 100644
--- a/src/components/dialog/content/setting/SettingItem.vue
+++ b/src/components/dialog/content/setting/SettingItem.vue
@@ -18,11 +18,12 @@
 
 <script setup lang="ts">
 import Tag from 'primevue/tag'
+import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
+
 import FormItem from '@/components/common/FormItem.vue'
 import { useSettingStore } from '@/stores/settingStore'
 import type { SettingOption, SettingParams } from '@/types/settingTypes'
-import { computed } from 'vue'
-import { useI18n } from 'vue-i18n'
 import { normalizeI18nKey } from '@/utils/formatUtil'
 
 const props = defineProps<{
diff --git a/src/components/dialog/content/setting/SettingsPanel.vue b/src/components/dialog/content/setting/SettingsPanel.vue
index 269e9f136..443869c36 100644
--- a/src/components/dialog/content/setting/SettingsPanel.vue
+++ b/src/components/dialog/content/setting/SettingsPanel.vue
@@ -17,9 +17,10 @@
 
 <script setup lang="ts">
 import NoResultsPlaceholder from '@/components/common/NoResultsPlaceholder.vue'
-import SettingGroup from './SettingGroup.vue'
 import { ISettingGroup } from '@/types/settingTypes'
 
+import SettingGroup from './SettingGroup.vue'
+
 const props = defineProps<{
   settingGroups: ISettingGroup[]
 }>()
diff --git a/src/components/dialog/content/setting/keybinding/KeyComboDisplay.vue b/src/components/dialog/content/setting/keybinding/KeyComboDisplay.vue
index 25ab289a6..e5dc37c8f 100644
--- a/src/components/dialog/content/setting/keybinding/KeyComboDisplay.vue
+++ b/src/components/dialog/content/setting/keybinding/KeyComboDisplay.vue
@@ -11,9 +11,10 @@
 
 <script setup lang="ts">
 import Tag from 'primevue/tag'
-import { KeyComboImpl } from '@/stores/keybindingStore'
 import { computed } from 'vue'
 
+import { KeyComboImpl } from '@/stores/keybindingStore'
+
 const props = withDefaults(
   defineProps<{
     keyCombo: KeyComboImpl
diff --git a/src/components/graph/GraphCanvas.vue b/src/components/graph/GraphCanvas.vue
index 27ad9f604..287858fa7 100644
--- a/src/components/graph/GraphCanvas.vue
+++ b/src/components/graph/GraphCanvas.vue
@@ -26,50 +26,51 @@
 </template>
 
 <script setup lang="ts">
-import TitleEditor from '@/components/graph/TitleEditor.vue'
-import SideToolbar from '@/components/sidebar/SideToolbar.vue'
-import BottomPanel from '@/components/bottomPanel/BottomPanel.vue'
-import LiteGraphCanvasSplitterOverlay from '@/components/LiteGraphCanvasSplitterOverlay.vue'
-import NodeSearchboxPopover from '@/components/searchbox/NodeSearchBoxPopover.vue'
-import NodeTooltip from '@/components/graph/NodeTooltip.vue'
-import NodeBadge from '@/components/graph/NodeBadge.vue'
-import { ref, computed, onMounted, watchEffect, watch } from 'vue'
-import { app as comfyApp } from '@/scripts/app'
-import { useSettingStore } from '@/stores/settingStore'
-import { ComfyNodeDefImpl, useNodeDefStore } from '@/stores/nodeDefStore'
-import { useWorkspaceStore } from '@/stores/workspaceStore'
 import {
-  LiteGraph,
-  LGraph,
-  LLink,
-  LGraphNode,
-  LGraphGroup,
-  DragAndScale,
-  LGraphCanvas,
+  CanvasPointer,
   ContextMenu,
+  DragAndScale,
+  LGraph,
   LGraphBadge,
-  CanvasPointer
+  LGraphCanvas,
+  LGraphGroup,
+  LGraphNode,
+  LLink,
+  LiteGraph
 } from '@comfyorg/litegraph'
-import type { RenderedTreeExplorerNode } from '@/types/treeExplorerTypes'
+import { computed, onMounted, ref, watch, watchEffect } from 'vue'
+
+import LiteGraphCanvasSplitterOverlay from '@/components/LiteGraphCanvasSplitterOverlay.vue'
+import BottomPanel from '@/components/bottomPanel/BottomPanel.vue'
+import GraphCanvasMenu from '@/components/graph/GraphCanvasMenu.vue'
+import NodeBadge from '@/components/graph/NodeBadge.vue'
+import NodeTooltip from '@/components/graph/NodeTooltip.vue'
+import TitleEditor from '@/components/graph/TitleEditor.vue'
+import NodeSearchboxPopover from '@/components/searchbox/NodeSearchBoxPopover.vue'
+import SideToolbar from '@/components/sidebar/SideToolbar.vue'
+import { CORE_SETTINGS } from '@/constants/coreSettings'
+import { usePragmaticDroppable } from '@/hooks/dndHooks'
+import { api } from '@/scripts/api'
+import { app as comfyApp } from '@/scripts/app'
+import { ChangeTracker } from '@/scripts/changeTracker'
+import { setStorageValue } from '@/scripts/utils'
+import { IS_CONTROL_WIDGET, updateControlWidgetLabel } from '@/scripts/widgets'
+import { useColorPaletteService } from '@/services/colorPaletteService'
+import { useLitegraphService } from '@/services/litegraphService'
+import { useWorkflowService } from '@/services/workflowService'
+import { useCommandStore } from '@/stores/commandStore'
 import { useCanvasStore } from '@/stores/graphStore'
 import { ComfyModelDef } from '@/stores/modelStore'
 import {
   ModelNodeProvider,
   useModelToNodeStore
 } from '@/stores/modelToNodeStore'
-import GraphCanvasMenu from '@/components/graph/GraphCanvasMenu.vue'
-import { usePragmaticDroppable } from '@/hooks/dndHooks'
+import { ComfyNodeDefImpl, useNodeDefStore } from '@/stores/nodeDefStore'
+import { useSettingStore } from '@/stores/settingStore'
 import { useWorkflowStore } from '@/stores/workflowStore'
-import { setStorageValue } from '@/scripts/utils'
-import { ChangeTracker } from '@/scripts/changeTracker'
-import { api } from '@/scripts/api'
-import { useCommandStore } from '@/stores/commandStore'
-import { useWorkflowService } from '@/services/workflowService'
 import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
-import { useColorPaletteService } from '@/services/colorPaletteService'
-import { IS_CONTROL_WIDGET, updateControlWidgetLabel } from '@/scripts/widgets'
-import { CORE_SETTINGS } from '@/constants/coreSettings'
-import { useLitegraphService } from '@/services/litegraphService'
+import { useWorkspaceStore } from '@/stores/workspaceStore'
+import type { RenderedTreeExplorerNode } from '@/types/treeExplorerTypes'
 
 const emit = defineEmits(['ready'])
 const canvasRef = ref<HTMLCanvasElement | null>(null)
diff --git a/src/components/graph/GraphCanvasMenu.vue b/src/components/graph/GraphCanvasMenu.vue
index fa5627198..1b920a276 100644
--- a/src/components/graph/GraphCanvasMenu.vue
+++ b/src/components/graph/GraphCanvasMenu.vue
@@ -50,14 +50,15 @@
 </template>
 
 <script setup lang="ts">
-import ButtonGroup from 'primevue/buttongroup'
+import { LiteGraph } from '@comfyorg/litegraph'
 import Button from 'primevue/button'
+import ButtonGroup from 'primevue/buttongroup'
+import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
+
 import { useCommandStore } from '@/stores/commandStore'
 import { useCanvasStore } from '@/stores/graphStore'
 import { useSettingStore } from '@/stores/settingStore'
-import { useI18n } from 'vue-i18n'
-import { LiteGraph } from '@comfyorg/litegraph'
-import { computed } from 'vue'
 
 const { t } = useI18n()
 const commandStore = useCommandStore()
diff --git a/src/components/graph/NodeBadge.vue b/src/components/graph/NodeBadge.vue
index d21220a7b..80ce22b50 100644
--- a/src/components/graph/NodeBadge.vue
+++ b/src/components/graph/NodeBadge.vue
@@ -5,16 +5,17 @@
 </template>
 
 <script setup lang="ts">
-import { computed, onMounted, watch } from 'vue'
-import { useSettingStore } from '@/stores/settingStore'
-import { app } from '@/scripts/app'
 import type { LGraphNode } from '@comfyorg/litegraph'
 import { BadgePosition } from '@comfyorg/litegraph'
 import { LGraphBadge } from '@comfyorg/litegraph'
 import _ from 'lodash'
-import { NodeBadgeMode } from '@/types/nodeSource'
+import { computed, onMounted, watch } from 'vue'
+
+import { app } from '@/scripts/app'
 import { ComfyNodeDefImpl, useNodeDefStore } from '@/stores/nodeDefStore'
+import { useSettingStore } from '@/stores/settingStore'
 import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
+import { NodeBadgeMode } from '@/types/nodeSource'
 
 const settingStore = useSettingStore()
 const colorPaletteStore = useColorPaletteStore()
diff --git a/src/components/graph/NodeTooltip.vue b/src/components/graph/NodeTooltip.vue
index e4db043f3..69ea6cee7 100644
--- a/src/components/graph/NodeTooltip.vue
+++ b/src/components/graph/NodeTooltip.vue
@@ -10,12 +10,13 @@
 </template>
 
 <script setup lang="ts">
-import { nextTick, ref } from 'vue'
 import { LiteGraph } from '@comfyorg/litegraph'
+import { useEventListener } from '@vueuse/core'
+import { nextTick, ref } from 'vue'
+
+import { st } from '@/i18n'
 import { app as comfyApp } from '@/scripts/app'
 import { useNodeDefStore } from '@/stores/nodeDefStore'
-import { useEventListener } from '@vueuse/core'
-import { st } from '@/i18n'
 import { normalizeI18nKey } from '@/utils/formatUtil'
 
 let idleTimeout: number
diff --git a/src/components/graph/TitleEditor.vue b/src/components/graph/TitleEditor.vue
index ec47ae490..0ce9dae52 100644
--- a/src/components/graph/TitleEditor.vue
+++ b/src/components/graph/TitleEditor.vue
@@ -13,14 +13,15 @@
 </template>
 
 <script setup lang="ts">
-import { ref, CSSProperties, watch } from 'vue'
-import { app } from '@/scripts/app'
 import { LGraphGroup, LGraphNode, LiteGraph } from '@comfyorg/litegraph'
-import EditableText from '@/components/common/EditableText.vue'
-import { useSettingStore } from '@/stores/settingStore'
 import type { LiteGraphCanvasEvent } from '@comfyorg/litegraph'
-import { useCanvasStore, useTitleEditorStore } from '@/stores/graphStore'
 import { useEventListener } from '@vueuse/core'
+import { CSSProperties, ref, watch } from 'vue'
+
+import EditableText from '@/components/common/EditableText.vue'
+import { app } from '@/scripts/app'
+import { useCanvasStore, useTitleEditorStore } from '@/stores/graphStore'
+import { useSettingStore } from '@/stores/settingStore'
 
 const settingStore = useSettingStore()
 
diff --git a/src/components/install/DesktopSettingsConfiguration.vue b/src/components/install/DesktopSettingsConfiguration.vue
index 9eb9d3550..9780a8ee9 100644
--- a/src/components/install/DesktopSettingsConfiguration.vue
+++ b/src/components/install/DesktopSettingsConfiguration.vue
@@ -97,10 +97,10 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
-import ToggleSwitch from 'primevue/toggleswitch'
 import Dialog from 'primevue/dialog'
 import Divider from 'primevue/divider'
+import ToggleSwitch from 'primevue/toggleswitch'
+import { ref } from 'vue'
 
 const showDialog = ref(false)
 const autoUpdate = defineModel('autoUpdate', { required: true })
diff --git a/src/components/install/GpuPicker.vue b/src/components/install/GpuPicker.vue
index 57193b3d7..56f14b427 100644
--- a/src/components/install/GpuPicker.vue
+++ b/src/components/install/GpuPicker.vue
@@ -130,12 +130,13 @@
 </template>
 
 <script setup lang="ts">
-import { computed } from 'vue'
-import { electronAPI, TorchDeviceType } from '@/utils/envUtil'
-import ToggleSwitch from 'primevue/toggleswitch'
 import Tag from 'primevue/tag'
+import ToggleSwitch from 'primevue/toggleswitch'
+import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
 
+import { TorchDeviceType, electronAPI } from '@/utils/envUtil'
+
 const { t } = useI18n()
 
 const cpuMode = computed({
diff --git a/src/components/install/InstallLocationPicker.vue b/src/components/install/InstallLocationPicker.vue
index 37c1f3c2b..bfd330cf5 100644
--- a/src/components/install/InstallLocationPicker.vue
+++ b/src/components/install/InstallLocationPicker.vue
@@ -64,15 +64,16 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted } from 'vue'
-import { electronAPI } from '@/utils/envUtil'
-import InputText from 'primevue/inputtext'
 import Button from 'primevue/button'
 import IconField from 'primevue/iconfield'
 import InputIcon from 'primevue/inputicon'
+import InputText from 'primevue/inputtext'
 import Message from 'primevue/message'
+import { onMounted, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
+import { electronAPI } from '@/utils/envUtil'
+
 const { t } = useI18n()
 
 const installPath = defineModel<string>('installPath', { required: true })
diff --git a/src/components/install/MigrationPicker.vue b/src/components/install/MigrationPicker.vue
index 3865a1860..94656e909 100644
--- a/src/components/install/MigrationPicker.vue
+++ b/src/components/install/MigrationPicker.vue
@@ -68,14 +68,15 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, watchEffect } from 'vue'
-import { electronAPI } from '@/utils/envUtil'
-import InputText from 'primevue/inputtext'
+import { MigrationItems } from '@comfyorg/comfyui-electron-types'
 import Button from 'primevue/button'
 import Checkbox from 'primevue/checkbox'
+import InputText from 'primevue/inputtext'
 import Message from 'primevue/message'
+import { computed, ref, watchEffect } from 'vue'
 import { useI18n } from 'vue-i18n'
-import { MigrationItems } from '@comfyorg/comfyui-electron-types'
+
+import { electronAPI } from '@/utils/envUtil'
 
 const { t } = useI18n()
 
diff --git a/src/components/node/NodePreview.vue b/src/components/node/NodePreview.vue
index 12a03add2..fda7e9c47 100644
--- a/src/components/node/NodePreview.vue
+++ b/src/components/node/NodePreview.vue
@@ -80,12 +80,13 @@ https://github.com/Nuked88/ComfyUI-N-Sidebar/blob/7ae7da4a9761009fb6629bc04c6830
 </template>
 
 <script setup lang="ts">
-import { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
-import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
 import _ from 'lodash'
-import { useWidgetStore } from '@/stores/widgetStore'
 import { computed } from 'vue'
 
+import { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+import { useWidgetStore } from '@/stores/widgetStore'
+import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
+
 const props = defineProps({
   nodeDef: {
     type: ComfyNodeDefImpl,
diff --git a/src/components/searchbox/NodeSearchBox.vue b/src/components/searchbox/NodeSearchBox.vue
index b83f36dc6..cd1dc0b54 100644
--- a/src/components/searchbox/NodeSearchBox.vue
+++ b/src/components/searchbox/NodeSearchBox.vue
@@ -66,21 +66,23 @@
 </template>
 
 <script setup lang="ts">
-import { computed, nextTick, onMounted, ref } from 'vue'
-import AutoCompletePlus from '@/components/primevueOverride/AutoCompletePlus.vue'
-import Dialog from 'primevue/dialog'
 import Button from 'primevue/button'
+import Dialog from 'primevue/dialog'
+import { computed, nextTick, onMounted, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import NodePreview from '@/components/node/NodePreview.vue'
+import AutoCompletePlus from '@/components/primevueOverride/AutoCompletePlus.vue'
 import NodeSearchFilter from '@/components/searchbox/NodeSearchFilter.vue'
 import NodeSearchItem from '@/components/searchbox/NodeSearchItem.vue'
 import { type FilterAndValue } from '@/services/nodeSearchService'
-import NodePreview from '@/components/node/NodePreview.vue'
 import {
   ComfyNodeDefImpl,
   useNodeDefStore,
   useNodeFrequencyStore
 } from '@/stores/nodeDefStore'
 import { useSettingStore } from '@/stores/settingStore'
-import { useI18n } from 'vue-i18n'
+
 import SearchFilterChip from '../common/SearchFilterChip.vue'
 
 const settingStore = useSettingStore()
diff --git a/src/components/searchbox/NodeSearchBoxPopover.vue b/src/components/searchbox/NodeSearchBoxPopover.vue
index f6ea23aca..ec0f7856a 100644
--- a/src/components/searchbox/NodeSearchBoxPopover.vue
+++ b/src/components/searchbox/NodeSearchBoxPopover.vue
@@ -33,26 +33,28 @@
 </template>
 
 <script setup lang="ts">
-import { computed, ref, toRaw, watchEffect } from 'vue'
-import NodeSearchBox from './NodeSearchBox.vue'
-import Dialog from 'primevue/dialog'
-import { FilterAndValue } from '@/services/nodeSearchService'
-import { ComfyNodeDefImpl, useNodeDefStore } from '@/stores/nodeDefStore'
-import { ConnectingLinkImpl } from '@/types/litegraphTypes'
-import { useSettingStore } from '@/stores/settingStore'
-import { LinkReleaseTriggerAction } from '@/types/searchBoxTypes'
-import { useCanvasStore } from '@/stores/graphStore'
 import { LiteGraph } from '@comfyorg/litegraph'
-import type { OriginalEvent } from '@comfyorg/litegraph/dist/types/events'
 import type {
-  Vector2,
+  ConnectingLink,
   LiteGraphCanvasEvent,
-  ConnectingLink
+  Vector2
 } from '@comfyorg/litegraph'
+import type { OriginalEvent } from '@comfyorg/litegraph/dist/types/events'
 import { useEventListener } from '@vueuse/core'
-import { useSearchBoxStore } from '@/stores/workspace/searchBoxStore'
 import { storeToRefs } from 'pinia'
+import Dialog from 'primevue/dialog'
+import { computed, ref, toRaw, watchEffect } from 'vue'
+
 import { useLitegraphService } from '@/services/litegraphService'
+import { FilterAndValue } from '@/services/nodeSearchService'
+import { useCanvasStore } from '@/stores/graphStore'
+import { ComfyNodeDefImpl, useNodeDefStore } from '@/stores/nodeDefStore'
+import { useSettingStore } from '@/stores/settingStore'
+import { useSearchBoxStore } from '@/stores/workspace/searchBoxStore'
+import { ConnectingLinkImpl } from '@/types/litegraphTypes'
+import { LinkReleaseTriggerAction } from '@/types/searchBoxTypes'
+
+import NodeSearchBox from './NodeSearchBox.vue'
 
 const settingStore = useSettingStore()
 const litegraphService = useLitegraphService()
diff --git a/src/components/searchbox/NodeSearchFilter.vue b/src/components/searchbox/NodeSearchFilter.vue
index 2db8364d8..8ec4057a7 100644
--- a/src/components/searchbox/NodeSearchFilter.vue
+++ b/src/components/searchbox/NodeSearchFilter.vue
@@ -22,11 +22,12 @@
 </template>
 
 <script setup lang="ts">
-import { NodeFilter, type FilterAndValue } from '@/services/nodeSearchService'
 import Button from 'primevue/button'
-import SelectButton from 'primevue/selectbutton'
 import Select from 'primevue/select'
-import { ref, onMounted, computed } from 'vue'
+import SelectButton from 'primevue/selectbutton'
+import { computed, onMounted, ref } from 'vue'
+
+import { type FilterAndValue, NodeFilter } from '@/services/nodeSearchService'
 import { useNodeDefStore } from '@/stores/nodeDefStore'
 
 const filters = computed(() => nodeDefStore.nodeSearchService.nodeFilters)
diff --git a/src/components/searchbox/NodeSearchItem.vue b/src/components/searchbox/NodeSearchItem.vue
index 21ebc1d1a..7959ffb0d 100644
--- a/src/components/searchbox/NodeSearchItem.vue
+++ b/src/components/searchbox/NodeSearchItem.vue
@@ -49,14 +49,15 @@
 </template>
 
 <script setup lang="ts">
-import Tag from 'primevue/tag'
 import Chip from 'primevue/chip'
-import { NodeSourceType } from '@/types/nodeSource'
-import { ComfyNodeDefImpl, useNodeFrequencyStore } from '@/stores/nodeDefStore'
-import { highlightQuery } from '@/utils/formatUtil'
+import Tag from 'primevue/tag'
 import { computed } from 'vue'
-import { useSettingStore } from '@/stores/settingStore'
+
 import { useNodeBookmarkStore } from '@/stores/nodeBookmarkStore'
+import { ComfyNodeDefImpl, useNodeFrequencyStore } from '@/stores/nodeDefStore'
+import { useSettingStore } from '@/stores/settingStore'
+import { NodeSourceType } from '@/types/nodeSource'
+import { highlightQuery } from '@/utils/formatUtil'
 import { formatNumberWithSuffix } from '@/utils/formatUtil'
 
 const settingStore = useSettingStore()
diff --git a/src/components/sidebar/SideToolbar.vue b/src/components/sidebar/SideToolbar.vue
index 53626b475..ac6d9f3ec 100644
--- a/src/components/sidebar/SideToolbar.vue
+++ b/src/components/sidebar/SideToolbar.vue
@@ -27,17 +27,19 @@
 </template>
 
 <script setup lang="ts">
-import SidebarIcon from './SidebarIcon.vue'
-import SidebarThemeToggleIcon from './SidebarThemeToggleIcon.vue'
-import SidebarSettingsToggleIcon from './SidebarSettingsToggleIcon.vue'
-import SidebarLogoutIcon from './SidebarLogoutIcon.vue'
-import ExtensionSlot from '@/components/common/ExtensionSlot.vue'
 import { computed } from 'vue'
-import { useWorkspaceStore } from '@/stores/workspaceStore'
-import { useSettingStore } from '@/stores/settingStore'
-import type { SidebarTabExtension } from '@/types/extensionTypes'
+
+import ExtensionSlot from '@/components/common/ExtensionSlot.vue'
 import { useKeybindingStore } from '@/stores/keybindingStore'
+import { useSettingStore } from '@/stores/settingStore'
 import { useUserStore } from '@/stores/userStore'
+import { useWorkspaceStore } from '@/stores/workspaceStore'
+import type { SidebarTabExtension } from '@/types/extensionTypes'
+
+import SidebarIcon from './SidebarIcon.vue'
+import SidebarLogoutIcon from './SidebarLogoutIcon.vue'
+import SidebarSettingsToggleIcon from './SidebarSettingsToggleIcon.vue'
+import SidebarThemeToggleIcon from './SidebarThemeToggleIcon.vue'
 
 const workspaceStore = useWorkspaceStore()
 const settingStore = useSettingStore()
diff --git a/src/components/sidebar/SidebarIcon.vue b/src/components/sidebar/SidebarIcon.vue
index 76316a8a1..a735b4e5c 100644
--- a/src/components/sidebar/SidebarIcon.vue
+++ b/src/components/sidebar/SidebarIcon.vue
@@ -25,9 +25,11 @@
 </template>
 
 <script setup lang="ts">
-import OverlayBadge from 'primevue/overlaybadge'
 import Button from 'primevue/button'
-import { computed, PropType } from 'vue' // Add this line to import PropsType
+import OverlayBadge from 'primevue/overlaybadge'
+import { PropType, computed } from 'vue'
+
+// Add this line to import PropsType
 
 const props = defineProps({
   icon: String,
diff --git a/src/components/sidebar/SidebarLogoutIcon.vue b/src/components/sidebar/SidebarLogoutIcon.vue
index 64060870d..3c212a2d4 100644
--- a/src/components/sidebar/SidebarLogoutIcon.vue
+++ b/src/components/sidebar/SidebarLogoutIcon.vue
@@ -3,11 +3,13 @@
 </template>
 
 <script setup lang="ts">
-import SidebarIcon from './SidebarIcon.vue'
-import { useUserStore } from '@/stores/userStore'
 import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
 
+import { useUserStore } from '@/stores/userStore'
+
+import SidebarIcon from './SidebarIcon.vue'
+
 const { t } = useI18n()
 const userStore = useUserStore()
 
diff --git a/src/components/sidebar/SidebarSettingsToggleIcon.vue b/src/components/sidebar/SidebarSettingsToggleIcon.vue
index cf5904273..11e871925 100644
--- a/src/components/sidebar/SidebarSettingsToggleIcon.vue
+++ b/src/components/sidebar/SidebarSettingsToggleIcon.vue
@@ -8,10 +8,11 @@
 </template>
 
 <script setup lang="ts">
-import SidebarIcon from './SidebarIcon.vue'
-import { useDialogStore } from '@/stores/dialogStore'
 import SettingDialogContent from '@/components/dialog/content/SettingDialogContent.vue'
 import SettingDialogHeader from '@/components/dialog/header/SettingDialogHeader.vue'
+import { useDialogStore } from '@/stores/dialogStore'
+
+import SidebarIcon from './SidebarIcon.vue'
 
 const dialogStore = useDialogStore()
 const showSetting = () => {
diff --git a/src/components/sidebar/SidebarThemeToggleIcon.vue b/src/components/sidebar/SidebarThemeToggleIcon.vue
index 18a6799eb..6428b8b92 100644
--- a/src/components/sidebar/SidebarThemeToggleIcon.vue
+++ b/src/components/sidebar/SidebarThemeToggleIcon.vue
@@ -9,9 +9,11 @@
 
 <script setup lang="ts">
 import { computed } from 'vue'
-import SidebarIcon from './SidebarIcon.vue'
-import { useSettingStore } from '@/stores/settingStore'
+
 import { useCommandStore } from '@/stores/commandStore'
+import { useSettingStore } from '@/stores/settingStore'
+
+import SidebarIcon from './SidebarIcon.vue'
 
 const settingStore = useSettingStore()
 const currentTheme = computed(() => settingStore.get('Comfy.ColorPalette'))
diff --git a/src/components/sidebar/__tests__/SidebarIcon.spec.ts b/src/components/sidebar/__tests__/SidebarIcon.spec.ts
index 97edbaa72..5a1825c4e 100644
--- a/src/components/sidebar/__tests__/SidebarIcon.spec.ts
+++ b/src/components/sidebar/__tests__/SidebarIcon.spec.ts
@@ -1,10 +1,11 @@
 import { mount } from '@vue/test-utils'
-import { expect, describe, it } from 'vitest'
-import SidebarIcon from '../SidebarIcon.vue'
-import OverlayBadge from 'primevue/overlaybadge'
 import Button from 'primevue/button'
-import Tooltip from 'primevue/tooltip'
 import PrimeVue from 'primevue/config'
+import OverlayBadge from 'primevue/overlaybadge'
+import Tooltip from 'primevue/tooltip'
+import { describe, expect, it } from 'vitest'
+
+import SidebarIcon from '../SidebarIcon.vue'
 
 type SidebarIconProps = {
   icon: string
diff --git a/src/components/sidebar/tabs/ModelLibrarySidebarTab.vue b/src/components/sidebar/tabs/ModelLibrarySidebarTab.vue
index 13236b034..448431d02 100644
--- a/src/components/sidebar/tabs/ModelLibrarySidebarTab.vue
+++ b/src/components/sidebar/tabs/ModelLibrarySidebarTab.vue
@@ -46,11 +46,16 @@
 
 <script setup lang="ts">
 import Button from 'primevue/button'
+import type { TreeNode } from 'primevue/treenode'
+import { computed, nextTick, onMounted, ref, toRef, watch } from 'vue'
+
 import SearchBox from '@/components/common/SearchBox.vue'
 import TreeExplorer from '@/components/common/TreeExplorer.vue'
 import SidebarTabTemplate from '@/components/sidebar/tabs/SidebarTabTemplate.vue'
-import ModelTreeLeaf from '@/components/sidebar/tabs/modelLibrary/ModelTreeLeaf.vue'
 import ElectronDownloadItems from '@/components/sidebar/tabs/modelLibrary/ElectronDownloadItems.vue'
+import ModelTreeLeaf from '@/components/sidebar/tabs/modelLibrary/ModelTreeLeaf.vue'
+import { useTreeExpansion } from '@/hooks/treeHooks'
+import { useLitegraphService } from '@/services/litegraphService'
 import {
   ComfyModelDef,
   ModelFolder,
@@ -59,16 +64,12 @@ import {
 } from '@/stores/modelStore'
 import { useModelToNodeStore } from '@/stores/modelToNodeStore'
 import { useSettingStore } from '@/stores/settingStore'
-import { useTreeExpansion } from '@/hooks/treeHooks'
 import type {
   RenderedTreeExplorerNode,
   TreeExplorerNode
 } from '@/types/treeExplorerTypes'
-import { computed, ref, watch, toRef, onMounted, nextTick } from 'vue'
-import type { TreeNode } from 'primevue/treenode'
-import { buildTree } from '@/utils/treeUtil'
 import { isElectron } from '@/utils/envUtil'
-import { useLitegraphService } from '@/services/litegraphService'
+import { buildTree } from '@/utils/treeUtil'
 
 const modelStore = useModelStore()
 const modelToNodeStore = useModelToNodeStore()
diff --git a/src/components/sidebar/tabs/NodeLibrarySidebarTab.vue b/src/components/sidebar/tabs/NodeLibrarySidebarTab.vue
index 3b7f71eb7..7b1385604 100644
--- a/src/components/sidebar/tabs/NodeLibrarySidebarTab.vue
+++ b/src/components/sidebar/tabs/NodeLibrarySidebarTab.vue
@@ -63,31 +63,33 @@
 
 <script setup lang="ts">
 import Button from 'primevue/button'
+import Divider from 'primevue/divider'
+import Popover from 'primevue/popover'
+import type { TreeNode } from 'primevue/treenode'
+import { Ref, computed, nextTick, ref } from 'vue'
+
+import SearchBox from '@/components/common/SearchBox.vue'
+import { SearchFilter } from '@/components/common/SearchFilterChip.vue'
+import TreeExplorer from '@/components/common/TreeExplorer.vue'
+import NodeSearchFilter from '@/components/searchbox/NodeSearchFilter.vue'
+import SidebarTabTemplate from '@/components/sidebar/tabs/SidebarTabTemplate.vue'
+import NodeTreeLeaf from '@/components/sidebar/tabs/nodeLibrary/NodeTreeLeaf.vue'
+import { useTreeExpansion } from '@/hooks/treeHooks'
+import { useLitegraphService } from '@/services/litegraphService'
+import { FilterAndValue } from '@/services/nodeSearchService'
+import { useNodeBookmarkStore } from '@/stores/nodeBookmarkStore'
 import {
-  buildNodeDefTree,
   ComfyNodeDefImpl,
+  buildNodeDefTree,
   useNodeDefStore
 } from '@/stores/nodeDefStore'
-import { computed, nextTick, ref, Ref } from 'vue'
-import type { TreeNode } from 'primevue/treenode'
-import Popover from 'primevue/popover'
-import Divider from 'primevue/divider'
-import SearchBox from '@/components/common/SearchBox.vue'
-import SidebarTabTemplate from '@/components/sidebar/tabs/SidebarTabTemplate.vue'
-import NodeBookmarkTreeExplorer from './nodeLibrary/NodeBookmarkTreeExplorer.vue'
-import TreeExplorer from '@/components/common/TreeExplorer.vue'
-import NodeTreeLeaf from '@/components/sidebar/tabs/nodeLibrary/NodeTreeLeaf.vue'
-import { sortedTree } from '@/utils/treeUtil'
-import { useTreeExpansion } from '@/hooks/treeHooks'
-import NodeSearchFilter from '@/components/searchbox/NodeSearchFilter.vue'
-import { FilterAndValue } from '@/services/nodeSearchService'
-import { SearchFilter } from '@/components/common/SearchFilterChip.vue'
 import type {
   RenderedTreeExplorerNode,
   TreeExplorerNode
 } from '@/types/treeExplorerTypes'
-import { useNodeBookmarkStore } from '@/stores/nodeBookmarkStore'
-import { useLitegraphService } from '@/services/litegraphService'
+import { sortedTree } from '@/utils/treeUtil'
+
+import NodeBookmarkTreeExplorer from './nodeLibrary/NodeBookmarkTreeExplorer.vue'
 
 const nodeDefStore = useNodeDefStore()
 const nodeBookmarkStore = useNodeBookmarkStore()
diff --git a/src/components/sidebar/tabs/QueueSidebarTab.vue b/src/components/sidebar/tabs/QueueSidebarTab.vue
index ca3474869..72ff831de 100644
--- a/src/components/sidebar/tabs/QueueSidebarTab.vue
+++ b/src/components/sidebar/tabs/QueueSidebarTab.vue
@@ -90,27 +90,29 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, onMounted, onUnmounted, watch, nextTick } from 'vue'
 import { useInfiniteScroll, useResizeObserver } from '@vueuse/core'
-import { useI18n } from 'vue-i18n'
-import { useConfirm } from 'primevue/useconfirm'
-import { useToast } from 'primevue/usetoast'
 import Button from 'primevue/button'
 import ConfirmPopup from 'primevue/confirmpopup'
 import ContextMenu from 'primevue/contextmenu'
 import type { MenuItem } from 'primevue/menuitem'
 import ProgressSpinner from 'primevue/progressspinner'
-import TaskItem from './queue/TaskItem.vue'
-import ResultGallery from './queue/ResultGallery.vue'
-import SidebarTabTemplate from './SidebarTabTemplate.vue'
+import { useConfirm } from 'primevue/useconfirm'
+import { useToast } from 'primevue/usetoast'
+import { computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
+import { useI18n } from 'vue-i18n'
+
 import NoResultsPlaceholder from '@/components/common/NoResultsPlaceholder.vue'
-import { TaskItemImpl, useQueueStore } from '@/stores/queueStore'
 import { api } from '@/scripts/api'
-import { ComfyNode } from '@/types/comfyWorkflow'
-import { useSettingStore } from '@/stores/settingStore'
-import { useCommandStore } from '@/stores/commandStore'
 import { app } from '@/scripts/app'
 import { useLitegraphService } from '@/services/litegraphService'
+import { useCommandStore } from '@/stores/commandStore'
+import { TaskItemImpl, useQueueStore } from '@/stores/queueStore'
+import { useSettingStore } from '@/stores/settingStore'
+import { ComfyNode } from '@/types/comfyWorkflow'
+
+import SidebarTabTemplate from './SidebarTabTemplate.vue'
+import ResultGallery from './queue/ResultGallery.vue'
+import TaskItem from './queue/TaskItem.vue'
 
 const IMAGE_FIT = 'Comfy.Queue.ImageFit'
 const confirm = useConfirm()
diff --git a/src/components/sidebar/tabs/SidebarTabTemplate.vue b/src/components/sidebar/tabs/SidebarTabTemplate.vue
index d353f2d7e..4a11563fd 100644
--- a/src/components/sidebar/tabs/SidebarTabTemplate.vue
+++ b/src/components/sidebar/tabs/SidebarTabTemplate.vue
@@ -24,8 +24,8 @@
 </template>
 
 <script setup lang="ts">
-import Toolbar from 'primevue/toolbar'
 import ScrollPanel from 'primevue/scrollpanel'
+import Toolbar from 'primevue/toolbar'
 
 const props = defineProps<{
   title: string
diff --git a/src/components/sidebar/tabs/WorkflowsSidebarTab.vue b/src/components/sidebar/tabs/WorkflowsSidebarTab.vue
index 1346e84ca..020141476 100644
--- a/src/components/sidebar/tabs/WorkflowsSidebarTab.vue
+++ b/src/components/sidebar/tabs/WorkflowsSidebarTab.vue
@@ -139,31 +139,32 @@
 </template>
 
 <script setup lang="ts">
-import SearchBox from '@/components/common/SearchBox.vue'
+import Button from 'primevue/button'
+import ConfirmDialog from 'primevue/confirmdialog'
+import type { TreeNode } from 'primevue/treenode'
+import { computed, nextTick, onMounted, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
 import NoResultsPlaceholder from '@/components/common/NoResultsPlaceholder.vue'
-import WorkflowTreeLeaf from '@/components/sidebar/tabs/workflows/WorkflowTreeLeaf.vue'
-import SidebarTabTemplate from '@/components/sidebar/tabs/SidebarTabTemplate.vue'
+import SearchBox from '@/components/common/SearchBox.vue'
+import TextDivider from '@/components/common/TextDivider.vue'
 import TreeExplorer from '@/components/common/TreeExplorer.vue'
 import TreeExplorerTreeNode from '@/components/common/TreeExplorerTreeNode.vue'
-import Button from 'primevue/button'
-import TextDivider from '@/components/common/TextDivider.vue'
-import { computed, nextTick, onMounted, ref } from 'vue'
+import SidebarTabTemplate from '@/components/sidebar/tabs/SidebarTabTemplate.vue'
+import WorkflowTreeLeaf from '@/components/sidebar/tabs/workflows/WorkflowTreeLeaf.vue'
+import { useTreeExpansion } from '@/hooks/treeHooks'
+import { useWorkflowService } from '@/services/workflowService'
+import { useCommandStore } from '@/stores/commandStore'
+import { useSettingStore } from '@/stores/settingStore'
 import {
   useWorkflowBookmarkStore,
   useWorkflowStore
 } from '@/stores/workflowStore'
-import { useCommandStore } from '@/stores/commandStore'
-import type { TreeNode } from 'primevue/treenode'
-import { TreeExplorerNode } from '@/types/treeExplorerTypes'
 import { ComfyWorkflow } from '@/stores/workflowStore'
-import { useI18n } from 'vue-i18n'
-import { useTreeExpansion } from '@/hooks/treeHooks'
-import { useSettingStore } from '@/stores/settingStore'
-import { useWorkflowService } from '@/services/workflowService'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
+import { TreeExplorerNode } from '@/types/treeExplorerTypes'
 import { appendJsonExt } from '@/utils/formatUtil'
 import { buildTree, sortedTree } from '@/utils/treeUtil'
-import ConfirmDialog from 'primevue/confirmdialog'
 
 const settingStore = useSettingStore()
 const workflowTabsPosition = computed(() =>
diff --git a/src/components/sidebar/tabs/modelLibrary/DownloadItem.vue b/src/components/sidebar/tabs/modelLibrary/DownloadItem.vue
index a54c29af6..471cced8e 100644
--- a/src/components/sidebar/tabs/modelLibrary/DownloadItem.vue
+++ b/src/components/sidebar/tabs/modelLibrary/DownloadItem.vue
@@ -61,14 +61,17 @@
 
 <script setup lang="ts">
 import Button from 'primevue/button'
-import ProgressBar from 'primevue/progressbar'
 import Chip from 'primevue/chip'
+import ProgressBar from 'primevue/progressbar'
 import { useI18n } from 'vue-i18n'
-const { t } = useI18n()
+
 import {
   type ElectronDownload,
   useElectronDownloadStore
 } from '@/stores/electronDownloadStore'
+
+const { t } = useI18n()
+
 const electronDownloadStore = useElectronDownloadStore()
 
 const props = defineProps<{
diff --git a/src/components/sidebar/tabs/modelLibrary/ElectronDownloadItems.vue b/src/components/sidebar/tabs/modelLibrary/ElectronDownloadItems.vue
index ece5bd59c..c1a18abe4 100644
--- a/src/components/sidebar/tabs/modelLibrary/ElectronDownloadItems.vue
+++ b/src/components/sidebar/tabs/modelLibrary/ElectronDownloadItems.vue
@@ -11,10 +11,12 @@
 </template>
 
 <script setup lang="ts">
-import DownloadItem from './DownloadItem.vue'
-import { useElectronDownloadStore } from '@/stores/electronDownloadStore'
 import { storeToRefs } from 'pinia'
 
+import { useElectronDownloadStore } from '@/stores/electronDownloadStore'
+
+import DownloadItem from './DownloadItem.vue'
+
 const electronDownloadStore = useElectronDownloadStore()
 const { inProgressDownloads } = storeToRefs(electronDownloadStore)
 </script>
diff --git a/src/components/sidebar/tabs/modelLibrary/ModelTreeLeaf.vue b/src/components/sidebar/tabs/modelLibrary/ModelTreeLeaf.vue
index c47228bd7..3635059d4 100644
--- a/src/components/sidebar/tabs/modelLibrary/ModelTreeLeaf.vue
+++ b/src/components/sidebar/tabs/modelLibrary/ModelTreeLeaf.vue
@@ -21,19 +21,21 @@
 </template>
 
 <script setup lang="ts">
-import TreeExplorerTreeNode from '@/components/common/TreeExplorerTreeNode.vue'
-import ModelPreview from './ModelPreview.vue'
-import { ComfyModelDef } from '@/stores/modelStore'
-import { RenderedTreeExplorerNode } from '@/types/treeExplorerTypes'
 import {
-  computed,
   CSSProperties,
+  computed,
   nextTick,
   onMounted,
   onUnmounted,
   ref
 } from 'vue'
+
+import TreeExplorerTreeNode from '@/components/common/TreeExplorerTreeNode.vue'
+import { ComfyModelDef } from '@/stores/modelStore'
 import { useSettingStore } from '@/stores/settingStore'
+import { RenderedTreeExplorerNode } from '@/types/treeExplorerTypes'
+
+import ModelPreview from './ModelPreview.vue'
 
 const props = defineProps<{
   node: RenderedTreeExplorerNode<ComfyModelDef>
diff --git a/src/components/sidebar/tabs/nodeLibrary/NodeBookmarkTreeExplorer.vue b/src/components/sidebar/tabs/nodeLibrary/NodeBookmarkTreeExplorer.vue
index f96461e0e..df59aebca 100644
--- a/src/components/sidebar/tabs/nodeLibrary/NodeBookmarkTreeExplorer.vue
+++ b/src/components/sidebar/tabs/nodeLibrary/NodeBookmarkTreeExplorer.vue
@@ -22,10 +22,16 @@
 </template>
 
 <script setup lang="ts">
-import TreeExplorer from '@/components/common/TreeExplorer.vue'
-import NodeTreeLeaf from '@/components/sidebar/tabs/nodeLibrary/NodeTreeLeaf.vue'
-import NodeTreeFolder from '@/components/sidebar/tabs/nodeLibrary/NodeTreeFolder.vue'
+import type { TreeNode } from 'primevue/treenode'
+import { computed, nextTick, ref, watch } from 'vue'
+import { useI18n } from 'vue-i18n'
+
 import FolderCustomizationDialog from '@/components/common/CustomizationDialog.vue'
+import TreeExplorer from '@/components/common/TreeExplorer.vue'
+import NodeTreeFolder from '@/components/sidebar/tabs/nodeLibrary/NodeTreeFolder.vue'
+import NodeTreeLeaf from '@/components/sidebar/tabs/nodeLibrary/NodeTreeLeaf.vue'
+import { useTreeExpansion } from '@/hooks/treeHooks'
+import { useLitegraphService } from '@/services/litegraphService'
 import { useNodeBookmarkStore } from '@/stores/nodeBookmarkStore'
 import { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
 import type {
@@ -33,12 +39,7 @@ import type {
   TreeExplorerDragAndDropData,
   TreeExplorerNode
 } from '@/types/treeExplorerTypes'
-import type { TreeNode } from 'primevue/treenode'
-import { computed, nextTick, ref, watch } from 'vue'
-import { useI18n } from 'vue-i18n'
-import { useTreeExpansion } from '@/hooks/treeHooks'
 import { findNodeByKey } from '@/utils/treeUtil'
-import { useLitegraphService } from '@/services/litegraphService'
 
 const props = defineProps<{
   filteredNodeDefs: ComfyNodeDefImpl[]
diff --git a/src/components/sidebar/tabs/nodeLibrary/NodeTreeFolder.vue b/src/components/sidebar/tabs/nodeLibrary/NodeTreeFolder.vue
index 14cf8f67a..3d38e112f 100644
--- a/src/components/sidebar/tabs/nodeLibrary/NodeTreeFolder.vue
+++ b/src/components/sidebar/tabs/nodeLibrary/NodeTreeFolder.vue
@@ -8,10 +8,11 @@
 </template>
 
 <script setup lang="ts">
+import { Ref, computed, inject, onMounted, onUnmounted, ref, watch } from 'vue'
+
 import TreeExplorerTreeNode from '@/components/common/TreeExplorerTreeNode.vue'
-import { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
 import { useNodeBookmarkStore } from '@/stores/nodeBookmarkStore'
-import { computed, inject, onMounted, onUnmounted, Ref, ref, watch } from 'vue'
+import { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
 import type { BookmarkCustomization } from '@/types/apiTypes'
 import { RenderedTreeExplorerNode } from '@/types/treeExplorerTypes'
 
diff --git a/src/components/sidebar/tabs/nodeLibrary/NodeTreeLeaf.vue b/src/components/sidebar/tabs/nodeLibrary/NodeTreeLeaf.vue
index 893c1ea48..10b5d1e2c 100644
--- a/src/components/sidebar/tabs/nodeLibrary/NodeTreeLeaf.vue
+++ b/src/components/sidebar/tabs/nodeLibrary/NodeTreeLeaf.vue
@@ -36,20 +36,21 @@
 <script setup lang="ts">
 import Button from 'primevue/button'
 import Tag from 'primevue/tag'
-import TreeExplorerTreeNode from '@/components/common/TreeExplorerTreeNode.vue'
-import NodePreview from '@/components/node/NodePreview.vue'
-import { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
 import {
-  computed,
   CSSProperties,
+  computed,
   nextTick,
   onMounted,
   onUnmounted,
   ref
 } from 'vue'
-import { RenderedTreeExplorerNode } from '@/types/treeExplorerTypes'
+
+import TreeExplorerTreeNode from '@/components/common/TreeExplorerTreeNode.vue'
+import NodePreview from '@/components/node/NodePreview.vue'
 import { useNodeBookmarkStore } from '@/stores/nodeBookmarkStore'
+import { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
 import { useSettingStore } from '@/stores/settingStore'
+import { RenderedTreeExplorerNode } from '@/types/treeExplorerTypes'
 
 const props = defineProps<{
   node: RenderedTreeExplorerNode<ComfyNodeDefImpl>
diff --git a/src/components/sidebar/tabs/queue/ResultGallery.vue b/src/components/sidebar/tabs/queue/ResultGallery.vue
index 10afa5757..5d409cbb2 100644
--- a/src/components/sidebar/tabs/queue/ResultGallery.vue
+++ b/src/components/sidebar/tabs/queue/ResultGallery.vue
@@ -33,10 +33,12 @@
 </template>
 
 <script setup lang="ts">
-import { ref, watch, onMounted, onUnmounted } from 'vue'
 import Galleria from 'primevue/galleria'
-import { ResultItemImpl } from '@/stores/queueStore'
+import { onMounted, onUnmounted, ref, watch } from 'vue'
+
 import ComfyImage from '@/components/common/ComfyImage.vue'
+import { ResultItemImpl } from '@/stores/queueStore'
+
 import ResultVideo from './ResultVideo.vue'
 
 const galleryVisible = ref(false)
diff --git a/src/components/sidebar/tabs/queue/ResultItem.vue b/src/components/sidebar/tabs/queue/ResultItem.vue
index 544116a2f..70934143b 100644
--- a/src/components/sidebar/tabs/queue/ResultItem.vue
+++ b/src/components/sidebar/tabs/queue/ResultItem.vue
@@ -24,11 +24,13 @@
 </template>
 
 <script setup lang="ts">
-import { ResultItemImpl } from '@/stores/queueStore'
-import ComfyImage from '@/components/common/ComfyImage.vue'
 import Button from 'primevue/button'
 import { computed, onMounted, ref } from 'vue'
+
+import ComfyImage from '@/components/common/ComfyImage.vue'
+import { ResultItemImpl } from '@/stores/queueStore'
 import { useSettingStore } from '@/stores/settingStore'
+
 import ResultVideo from './ResultVideo.vue'
 
 const props = defineProps<{
diff --git a/src/components/sidebar/tabs/queue/ResultVideo.vue b/src/components/sidebar/tabs/queue/ResultVideo.vue
index 2ef1b9cc7..471175925 100644
--- a/src/components/sidebar/tabs/queue/ResultVideo.vue
+++ b/src/components/sidebar/tabs/queue/ResultVideo.vue
@@ -6,9 +6,10 @@
 </template>
 
 <script setup lang="ts">
+import { computed } from 'vue'
+
 import { ResultItemImpl } from '@/stores/queueStore'
 import { useSettingStore } from '@/stores/settingStore'
-import { computed } from 'vue'
 
 const props = defineProps<{
   result: ResultItemImpl
diff --git a/src/components/sidebar/tabs/queue/TaskItem.vue b/src/components/sidebar/tabs/queue/TaskItem.vue
index bd56f8da3..55b52cb78 100644
--- a/src/components/sidebar/tabs/queue/TaskItem.vue
+++ b/src/components/sidebar/tabs/queue/TaskItem.vue
@@ -69,14 +69,16 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted, onUnmounted, computed } from 'vue'
 import Button from 'primevue/button'
 import Tag from 'primevue/tag'
-import ResultItem from './ResultItem.vue'
+import { computed, onMounted, onUnmounted, ref } from 'vue'
+
+import { api } from '@/scripts/api'
+import { useLitegraphService } from '@/services/litegraphService'
 import { TaskItemDisplayStatus, type TaskItemImpl } from '@/stores/queueStore'
 import { ComfyNode } from '@/types/comfyWorkflow'
-import { useLitegraphService } from '@/services/litegraphService'
-import { api } from '@/scripts/api'
+
+import ResultItem from './ResultItem.vue'
 
 const props = defineProps<{
   task: TaskItemImpl
diff --git a/src/components/sidebar/tabs/queue/__tests__/ResultGallery.ts b/src/components/sidebar/tabs/queue/__tests__/ResultGallery.ts
index 068f32380..28bbea5e5 100644
--- a/src/components/sidebar/tabs/queue/__tests__/ResultGallery.ts
+++ b/src/components/sidebar/tabs/queue/__tests__/ResultGallery.ts
@@ -1,14 +1,15 @@
 // @ts-strict-ignore
 // Disabled because of https://github.com/Comfy-Org/ComfyUI_frontend/issues/1184
-
 import { mount } from '@vue/test-utils'
-import { expect, describe, it } from 'vitest'
-import ResultGallery from '../ResultGallery.vue'
-import Galleria from 'primevue/galleria'
-import ComfyImage from '@/components/common/ComfyImage.vue'
 import PrimeVue from 'primevue/config'
+import Galleria from 'primevue/galleria'
+import { describe, expect, it } from 'vitest'
+
+import ComfyImage from '@/components/common/ComfyImage.vue'
 import { ResultItemImpl } from '@/stores/queueStore'
 
+import ResultGallery from '../ResultGallery.vue'
+
 type ResultGalleryProps = typeof ResultGallery.__props
 
 describe('ResultGallery', () => {
diff --git a/src/components/sidebar/tabs/workflows/WorkflowTreeLeaf.vue b/src/components/sidebar/tabs/workflows/WorkflowTreeLeaf.vue
index 020ffa0bb..cd6468041 100644
--- a/src/components/sidebar/tabs/workflows/WorkflowTreeLeaf.vue
+++ b/src/components/sidebar/tabs/workflows/WorkflowTreeLeaf.vue
@@ -13,11 +13,12 @@
 </template>
 
 <script setup lang="ts">
-import TreeExplorerTreeNode from '@/components/common/TreeExplorerTreeNode.vue'
 import Button from 'primevue/button'
+import { computed } from 'vue'
+
+import TreeExplorerTreeNode from '@/components/common/TreeExplorerTreeNode.vue'
 import { ComfyWorkflow, useWorkflowBookmarkStore } from '@/stores/workflowStore'
 import type { RenderedTreeExplorerNode } from '@/types/treeExplorerTypes'
-import { computed } from 'vue'
 
 const props = defineProps<{
   node: RenderedTreeExplorerNode<ComfyWorkflow>
diff --git a/src/components/templates/TemplateWorkflowsContent.vue b/src/components/templates/TemplateWorkflowsContent.vue
index 02c1d0f3a..e593f3a68 100644
--- a/src/components/templates/TemplateWorkflowsContent.vue
+++ b/src/components/templates/TemplateWorkflowsContent.vue
@@ -41,11 +41,12 @@ import Carousel from 'primevue/carousel'
 import Listbox from 'primevue/listbox'
 import ProgressSpinner from 'primevue/progressspinner'
 import { computed, onMounted, ref } from 'vue'
-import { useDialogStore } from '@/stores/dialogStore'
-import { app } from '@/scripts/app'
-import { api } from '@/scripts/api'
 import { useI18n } from 'vue-i18n'
+
 import TemplateWorkflowCard from '@/components/templates/TemplateWorkflowCard.vue'
+import { api } from '@/scripts/api'
+import { app } from '@/scripts/app'
+import { useDialogStore } from '@/stores/dialogStore'
 import { useWorkflowTemplatesStore } from '@/stores/workflowTemplatesStore'
 
 interface WorkflowTemplatesTab {
diff --git a/src/components/toast/GlobalToast.vue b/src/components/toast/GlobalToast.vue
index b082bc4b8..42fdee6ff 100644
--- a/src/components/toast/GlobalToast.vue
+++ b/src/components/toast/GlobalToast.vue
@@ -3,12 +3,13 @@
 </template>
 
 <script setup lang="ts">
-import { useSettingStore } from '@/stores/settingStore'
-import { useToastStore } from '@/stores/toastStore'
 import Toast from 'primevue/toast'
 import { useToast } from 'primevue/usetoast'
 import { nextTick, watch } from 'vue'
 
+import { useSettingStore } from '@/stores/settingStore'
+import { useToastStore } from '@/stores/toastStore'
+
 const toast = useToast()
 const toastStore = useToastStore()
 const settingStore = useSettingStore()
diff --git a/src/components/topbar/BottomPanelToggleButton.vue b/src/components/topbar/BottomPanelToggleButton.vue
index 5672e212a..cfa4ad435 100644
--- a/src/components/topbar/BottomPanelToggleButton.vue
+++ b/src/components/topbar/BottomPanelToggleButton.vue
@@ -16,8 +16,9 @@
 </template>
 
 <script setup lang="ts">
-import { useBottomPanelStore } from '@/stores/workspace/bottomPanelStore'
 import Button from 'primevue/button'
 
+import { useBottomPanelStore } from '@/stores/workspace/bottomPanelStore'
+
 const bottomPanelStore = useBottomPanelStore()
 </script>
diff --git a/src/components/topbar/CommandMenubar.vue b/src/components/topbar/CommandMenubar.vue
index 49bfb17c4..5319c9fa5 100644
--- a/src/components/topbar/CommandMenubar.vue
+++ b/src/components/topbar/CommandMenubar.vue
@@ -29,14 +29,15 @@
 </template>
 
 <script setup lang="ts">
-import { useMenuItemStore } from '@/stores/menuItemStore'
-import { useSettingStore } from '@/stores/settingStore'
-import { normalizeI18nKey } from '@/utils/formatUtil'
 import Menubar from 'primevue/menubar'
 import type { MenuItem } from 'primevue/menuitem'
 import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
 
+import { useMenuItemStore } from '@/stores/menuItemStore'
+import { useSettingStore } from '@/stores/settingStore'
+import { normalizeI18nKey } from '@/utils/formatUtil'
+
 const settingStore = useSettingStore()
 const dropdownDirection = computed(() =>
   settingStore.get('Comfy.UseNewMenu') === 'Top' ? 'down' : 'up'
diff --git a/src/components/topbar/TopMenubar.vue b/src/components/topbar/TopMenubar.vue
index 0eae74b55..a7001c1e4 100644
--- a/src/components/topbar/TopMenubar.vue
+++ b/src/components/topbar/TopMenubar.vue
@@ -28,16 +28,17 @@
 </template>
 
 <script setup lang="ts">
+import { useEventBus } from '@vueuse/core'
 import Button from 'primevue/button'
 import Divider from 'primevue/divider'
-import WorkflowTabs from '@/components/topbar/WorkflowTabs.vue'
-import CommandMenubar from '@/components/topbar/CommandMenubar.vue'
+import { computed, onMounted, provide, ref } from 'vue'
+
 import Actionbar from '@/components/actionbar/ComfyActionbar.vue'
 import BottomPanelToggleButton from '@/components/topbar/BottomPanelToggleButton.vue'
-import { computed, onMounted, provide, ref } from 'vue'
-import { useSettingStore } from '@/stores/settingStore'
+import CommandMenubar from '@/components/topbar/CommandMenubar.vue'
+import WorkflowTabs from '@/components/topbar/WorkflowTabs.vue'
 import { app } from '@/scripts/app'
-import { useEventBus } from '@vueuse/core'
+import { useSettingStore } from '@/stores/settingStore'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
 import { showNativeMenu } from '@/utils/envUtil'
 
diff --git a/src/components/topbar/WorkflowTab.vue b/src/components/topbar/WorkflowTab.vue
index 644974851..e431efa92 100644
--- a/src/components/topbar/WorkflowTab.vue
+++ b/src/components/topbar/WorkflowTab.vue
@@ -29,13 +29,14 @@
 </template>
 
 <script setup lang="ts">
-import { ComfyWorkflow } from '@/stores/workflowStore'
-import { useWorkflowStore } from '@/stores/workflowStore'
 import Button from 'primevue/button'
 import { ref } from 'vue'
-import { useWorkflowService } from '@/services/workflowService'
-import { useWorkspaceStore } from '@/stores/workspaceStore'
+
 import { usePragmaticDraggable, usePragmaticDroppable } from '@/hooks/dndHooks'
+import { useWorkflowService } from '@/services/workflowService'
+import { ComfyWorkflow } from '@/stores/workflowStore'
+import { useWorkflowStore } from '@/stores/workflowStore'
+import { useWorkspaceStore } from '@/stores/workspaceStore'
 
 interface WorkflowOption {
   value: string
diff --git a/src/components/topbar/WorkflowTabs.vue b/src/components/topbar/WorkflowTabs.vue
index a0c1ddc64..f6d361621 100644
--- a/src/components/topbar/WorkflowTabs.vue
+++ b/src/components/topbar/WorkflowTabs.vue
@@ -27,17 +27,18 @@
 </template>
 
 <script setup lang="ts">
+import Button from 'primevue/button'
+import ContextMenu from 'primevue/contextmenu'
+import SelectButton from 'primevue/selectbutton'
+import { computed, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
 import WorkflowTab from '@/components/topbar/WorkflowTab.vue'
+import { useWorkflowService } from '@/services/workflowService'
+import { useCommandStore } from '@/stores/commandStore'
 import { ComfyWorkflow } from '@/stores/workflowStore'
 import { useWorkflowStore } from '@/stores/workflowStore'
-import { useCommandStore } from '@/stores/commandStore'
-import SelectButton from 'primevue/selectbutton'
-import Button from 'primevue/button'
-import { computed, ref } from 'vue'
-import { useWorkflowService } from '@/services/workflowService'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
-import ContextMenu from 'primevue/contextmenu'
-import { useI18n } from 'vue-i18n'
 
 interface WorkflowOption {
   value: string
diff --git a/src/constants/coreColorPalettes.ts b/src/constants/coreColorPalettes.ts
index 9239a80ce..b6a70cb81 100644
--- a/src/constants/coreColorPalettes.ts
+++ b/src/constants/coreColorPalettes.ts
@@ -1,9 +1,9 @@
-import dark from '@/assets/palettes/dark.json'
-import light from '@/assets/palettes/light.json'
-import solarized from '@/assets/palettes/solarized.json'
 import arc from '@/assets/palettes/arc.json'
-import nord from '@/assets/palettes/nord.json'
+import dark from '@/assets/palettes/dark.json'
 import github from '@/assets/palettes/github.json'
+import light from '@/assets/palettes/light.json'
+import nord from '@/assets/palettes/nord.json'
+import solarized from '@/assets/palettes/solarized.json'
 import type { ColorPalettes } from '@/types/colorPaletteTypes'
 
 export const CORE_COLOR_PALETTES: ColorPalettes = {
diff --git a/src/constants/coreSettings.ts b/src/constants/coreSettings.ts
index 93d6dbff2..97431d722 100644
--- a/src/constants/coreSettings.ts
+++ b/src/constants/coreSettings.ts
@@ -1,10 +1,11 @@
+import { LinkMarkerShape } from '@comfyorg/litegraph'
+import { LiteGraph } from '@comfyorg/litegraph'
+
 import type { ColorPalettes } from '@/types/colorPaletteTypes'
 import type { Keybinding } from '@/types/keyBindingTypes'
 import { NodeBadgeMode } from '@/types/nodeSource'
 import { LinkReleaseTriggerAction } from '@/types/searchBoxTypes'
 import type { SettingParams } from '@/types/settingTypes'
-import { LinkMarkerShape } from '@comfyorg/litegraph'
-import { LiteGraph } from '@comfyorg/litegraph'
 
 export const CORE_SETTINGS: SettingParams[] = [
   {
diff --git a/src/constants/serverConfig.ts b/src/constants/serverConfig.ts
index 59238d094..2f04e4cf3 100644
--- a/src/constants/serverConfig.ts
+++ b/src/constants/serverConfig.ts
@@ -1,14 +1,14 @@
-import { FormItem } from '@/types/settingTypes'
 import {
-  LatentPreviewMethod,
-  LogLevel,
-  HashFunction,
   AutoLaunch,
+  CrossAttentionMethod,
   CudaMalloc,
   FloatingPointPrecision,
-  CrossAttentionMethod,
+  HashFunction,
+  LatentPreviewMethod,
+  LogLevel,
   VramManagement
 } from '@/types/serverArgs'
+import { FormItem } from '@/types/settingTypes'
 
 export type ServerConfigValue = string | number | true | null | undefined
 
diff --git a/src/extensions/core/clipspace.ts b/src/extensions/core/clipspace.ts
index a2c9403ca..36862a791 100644
--- a/src/extensions/core/clipspace.ts
+++ b/src/extensions/core/clipspace.ts
@@ -1,6 +1,6 @@
 import { app } from '../../scripts/app'
-import { ComfyDialog, $el } from '../../scripts/ui'
 import { ComfyApp } from '../../scripts/app'
+import { $el, ComfyDialog } from '../../scripts/ui'
 
 export class ClipspaceDialog extends ComfyDialog {
   static items: Array<
diff --git a/src/extensions/core/contextMenuFilter.ts b/src/extensions/core/contextMenuFilter.ts
index 5ab348a2b..f30beac64 100644
--- a/src/extensions/core/contextMenuFilter.ts
+++ b/src/extensions/core/contextMenuFilter.ts
@@ -1,4 +1,5 @@
-import { LiteGraph, LGraphCanvas } from '@comfyorg/litegraph'
+import { LGraphCanvas, LiteGraph } from '@comfyorg/litegraph'
+
 import { app } from '../../scripts/app'
 
 // Adds filtering to combo context menus
diff --git a/src/extensions/core/electronAdapter.ts b/src/extensions/core/electronAdapter.ts
index cf95756d3..6f9581e2e 100644
--- a/src/extensions/core/electronAdapter.ts
+++ b/src/extensions/core/electronAdapter.ts
@@ -2,6 +2,7 @@ import { t } from '@/i18n'
 import { app } from '@/scripts/app'
 import { useDialogService } from '@/services/dialogService'
 import { electronAPI as getElectronAPI, isElectron } from '@/utils/envUtil'
+
 ;(async () => {
   if (!isElectron()) return
 
diff --git a/src/extensions/core/groupNode.ts b/src/extensions/core/groupNode.ts
index 32629b57b..bf16fbd8a 100644
--- a/src/extensions/core/groupNode.ts
+++ b/src/extensions/core/groupNode.ts
@@ -1,18 +1,20 @@
 // @ts-strict-ignore
-import { app } from '../../scripts/app'
-import { api } from '../../scripts/api'
-import { mergeIfValid } from './widgetInputs'
-import { ManageGroupDialog } from './groupNodeManage'
-import { LGraphCanvas, LiteGraph, type LGraph } from '@comfyorg/litegraph'
+import { type LGraph, LGraphCanvas, LiteGraph } from '@comfyorg/litegraph'
 import { LGraphNode, type NodeId } from '@comfyorg/litegraph/dist/LGraphNode'
-import { useNodeDefStore } from '@/stores/nodeDefStore'
-import { ComfyLink, ComfyNode, ComfyWorkflowJSON } from '@/types/comfyWorkflow'
-import { useToastStore } from '@/stores/toastStore'
-import { ComfyExtension } from '@/types/comfy'
-import { deserialiseAndCreate, serialise } from '@/utils/vintageClipboard'
-import type { ComfyNodeDef } from '@/types/apiTypes'
-import { useDialogService } from '@/services/dialogService'
+
 import { t } from '@/i18n'
+import { useDialogService } from '@/services/dialogService'
+import { useNodeDefStore } from '@/stores/nodeDefStore'
+import { useToastStore } from '@/stores/toastStore'
+import type { ComfyNodeDef } from '@/types/apiTypes'
+import { ComfyExtension } from '@/types/comfy'
+import { ComfyLink, ComfyNode, ComfyWorkflowJSON } from '@/types/comfyWorkflow'
+import { deserialiseAndCreate, serialise } from '@/utils/vintageClipboard'
+
+import { api } from '../../scripts/api'
+import { app } from '../../scripts/app'
+import { ManageGroupDialog } from './groupNodeManage'
+import { mergeIfValid } from './widgetInputs'
 
 type GroupNodeWorkflowData = {
   external: ComfyLink[]
diff --git a/src/extensions/core/groupNodeManage.ts b/src/extensions/core/groupNodeManage.ts
index 00abd14bb..5307f47b9 100644
--- a/src/extensions/core/groupNodeManage.ts
+++ b/src/extensions/core/groupNodeManage.ts
@@ -1,15 +1,17 @@
 // @ts-strict-ignore
+import {
+  type LGraphNode,
+  type LGraphNodeConstructor,
+  LiteGraph
+} from '@comfyorg/litegraph'
+
+import { useToastStore } from '@/stores/toastStore'
+
+import { type ComfyApp, app } from '../../scripts/app'
 import { $el, ComfyDialog } from '../../scripts/ui'
 import { DraggableList } from '../../scripts/ui/draggableList'
 import { GroupNodeConfig, GroupNodeHandler } from './groupNode'
 import './groupNodeManage.css'
-import { app, type ComfyApp } from '../../scripts/app'
-import {
-  LiteGraph,
-  type LGraphNode,
-  type LGraphNodeConstructor
-} from '@comfyorg/litegraph'
-import { useToastStore } from '@/stores/toastStore'
 
 const ORDER: symbol = Symbol()
 const PREFIX = 'workflow'
diff --git a/src/extensions/core/groupOptions.ts b/src/extensions/core/groupOptions.ts
index e8340a321..3b0ae0961 100644
--- a/src/extensions/core/groupOptions.ts
+++ b/src/extensions/core/groupOptions.ts
@@ -1,11 +1,13 @@
 // @ts-strict-ignore
 import { LGraphGroup } from '@comfyorg/litegraph'
-import { app } from '../../scripts/app'
 import { LGraphCanvas } from '@comfyorg/litegraph'
-import type { Positionable } from '@comfyorg/litegraph/dist/interfaces'
 import type { LGraphNode } from '@comfyorg/litegraph'
+import type { Positionable } from '@comfyorg/litegraph/dist/interfaces'
+
 import { useSettingStore } from '@/stores/settingStore'
 
+import { app } from '../../scripts/app'
+
 function setNodeMode(node: LGraphNode, mode: number) {
   node.mode = mode
   node.graph?.change()
diff --git a/src/extensions/core/index.ts b/src/extensions/core/index.ts
index 37afd26f3..5d29b6122 100644
--- a/src/extensions/core/index.ts
+++ b/src/extensions/core/index.ts
@@ -2,10 +2,12 @@ import './clipspace'
 import './contextMenuFilter'
 import './dynamicPrompts'
 import './editAttention'
+import './electronAdapter'
 import './groupNode'
 import './groupNodeManage'
 import './groupOptions'
 import './invertMenuScrolling'
+import './load3d'
 import './maskeditor'
 import './nodeTemplates'
 import './noteNode'
@@ -13,9 +15,7 @@ import './rerouteNode'
 import './saveImageExtraOutput'
 import './simpleTouchSupport'
 import './slotDefaults'
+import './uploadAudio'
 import './uploadImage'
 import './webcamCapture'
 import './widgetInputs'
-import './uploadAudio'
-import './electronAdapter'
-import './load3d'
diff --git a/src/extensions/core/invertMenuScrolling.ts b/src/extensions/core/invertMenuScrolling.ts
index de0d1a601..704a92aba 100644
--- a/src/extensions/core/invertMenuScrolling.ts
+++ b/src/extensions/core/invertMenuScrolling.ts
@@ -1,5 +1,6 @@
 // @ts-strict-ignore
 import { LiteGraph } from '@comfyorg/litegraph'
+
 import { app } from '../../scripts/app'
 
 // Inverts the scrolling of context menus
diff --git a/src/extensions/core/load3d.ts b/src/extensions/core/load3d.ts
index 4733e7054..5900be258 100644
--- a/src/extensions/core/load3d.ts
+++ b/src/extensions/core/load3d.ts
@@ -1,17 +1,18 @@
 // @ts-strict-ignore
-import { app } from '@/scripts/app'
-import { api } from '@/scripts/api'
-import { useToastStore } from '@/stores/toastStore'
+import { IWidget } from '@comfyorg/litegraph'
 import * as THREE from 'three'
 import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls'
-import { GLTF, GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader'
-import { OBJLoader } from 'three/examples/jsm/loaders/OBJLoader'
-import { MTLLoader } from 'three/examples/jsm/loaders/MTLLoader'
 import { FBXLoader } from 'three/examples/jsm/loaders/FBXLoader'
+import { GLTF, GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader'
+import { MTLLoader } from 'three/examples/jsm/loaders/MTLLoader'
+import { OBJLoader } from 'three/examples/jsm/loaders/OBJLoader'
 import { STLLoader } from 'three/examples/jsm/loaders/STLLoader'
-import { IWidget } from '@comfyorg/litegraph'
 import { nextTick } from 'vue'
 
+import { api } from '@/scripts/api'
+import { app } from '@/scripts/app'
+import { useToastStore } from '@/stores/toastStore'
+
 async function uploadFile(
   load3d: Load3d,
   file: File,
diff --git a/src/extensions/core/maskEditorOld.ts b/src/extensions/core/maskEditorOld.ts
index 2011038c5..1e9104b99 100644
--- a/src/extensions/core/maskEditorOld.ts
+++ b/src/extensions/core/maskEditorOld.ts
@@ -1,8 +1,8 @@
 // @ts-strict-ignore
-import { app } from '../../scripts/app'
-import { ComfyDialog, $el } from '../../scripts/ui'
-import { ComfyApp } from '../../scripts/app'
 import { api } from '../../scripts/api'
+import { app } from '../../scripts/app'
+import { ComfyApp } from '../../scripts/app'
+import { $el, ComfyDialog } from '../../scripts/ui'
 import { ClipspaceDialog } from './clipspace'
 
 // Helper function to convert a data URL to a Blob object
diff --git a/src/extensions/core/maskeditor.ts b/src/extensions/core/maskeditor.ts
index 2dbde95a7..33163b032 100644
--- a/src/extensions/core/maskeditor.ts
+++ b/src/extensions/core/maskeditor.ts
@@ -1,7 +1,7 @@
-import { app } from '../../scripts/app'
-import { ComfyDialog, $el } from '../../scripts/ui'
-import { ComfyApp } from '../../scripts/app'
 import { api } from '../../scripts/api'
+import { app } from '../../scripts/app'
+import { ComfyApp } from '../../scripts/app'
+import { $el, ComfyDialog } from '../../scripts/ui'
 import { ClipspaceDialog } from './clipspace'
 import { MaskEditorDialogOld } from './maskEditorOld'
 
diff --git a/src/extensions/core/nodeTemplates.ts b/src/extensions/core/nodeTemplates.ts
index 43b9b5263..af8857942 100644
--- a/src/extensions/core/nodeTemplates.ts
+++ b/src/extensions/core/nodeTemplates.ts
@@ -1,13 +1,15 @@
 // @ts-strict-ignore
-import { app } from '../../scripts/app'
-import { api } from '../../scripts/api'
-import { ComfyDialog, $el } from '../../scripts/ui'
-import { GroupNodeConfig, GroupNodeHandler } from './groupNode'
 import { LGraphCanvas } from '@comfyorg/litegraph'
+
+import { t } from '@/i18n'
+import { useDialogService } from '@/services/dialogService'
 import { useToastStore } from '@/stores/toastStore'
 import { deserialiseAndCreate } from '@/utils/vintageClipboard'
-import { useDialogService } from '@/services/dialogService'
-import { t } from '@/i18n'
+
+import { api } from '../../scripts/api'
+import { app } from '../../scripts/app'
+import { $el, ComfyDialog } from '../../scripts/ui'
+import { GroupNodeConfig, GroupNodeHandler } from './groupNode'
 
 // Adds the ability to save and add multiple nodes as a template
 // To save:
diff --git a/src/extensions/core/noteNode.ts b/src/extensions/core/noteNode.ts
index 213127af7..0e745e6be 100644
--- a/src/extensions/core/noteNode.ts
+++ b/src/extensions/core/noteNode.ts
@@ -1,8 +1,10 @@
 // @ts-strict-ignore
-import { LiteGraph, LGraphCanvas } from '@comfyorg/litegraph'
+import { LGraphCanvas, LiteGraph } from '@comfyorg/litegraph'
+import { LGraphNode } from '@comfyorg/litegraph'
+
 import { app } from '../../scripts/app'
 import { ComfyWidgets } from '../../scripts/widgets'
-import { LGraphNode } from '@comfyorg/litegraph'
+
 // Node that add notes to your project
 
 app.registerExtension({
diff --git a/src/extensions/core/rerouteNode.ts b/src/extensions/core/rerouteNode.ts
index a92581200..828d1e23d 100644
--- a/src/extensions/core/rerouteNode.ts
+++ b/src/extensions/core/rerouteNode.ts
@@ -1,8 +1,9 @@
 // @ts-strict-ignore
 import type { IContextMenuValue } from '@comfyorg/litegraph'
+import { LGraphCanvas, LGraphNode, LiteGraph } from '@comfyorg/litegraph'
+
 import { app } from '../../scripts/app'
-import { mergeIfValid, getWidgetConfig, setWidgetConfig } from './widgetInputs'
-import { LiteGraph, LGraphCanvas, LGraphNode } from '@comfyorg/litegraph'
+import { getWidgetConfig, mergeIfValid, setWidgetConfig } from './widgetInputs'
 
 // Node that allows you to redirect connections for cleaner graphs
 
diff --git a/src/extensions/core/saveImageExtraOutput.ts b/src/extensions/core/saveImageExtraOutput.ts
index 22a12534c..3ebc5a7ed 100644
--- a/src/extensions/core/saveImageExtraOutput.ts
+++ b/src/extensions/core/saveImageExtraOutput.ts
@@ -1,6 +1,7 @@
 // @ts-strict-ignore
 import { app } from '../../scripts/app'
 import { applyTextReplacements } from '../../scripts/utils'
+
 // Use widget values and dates in output filenames
 
 app.registerExtension({
diff --git a/src/extensions/core/simpleTouchSupport.ts b/src/extensions/core/simpleTouchSupport.ts
index c5bc04ffd..9b089439e 100644
--- a/src/extensions/core/simpleTouchSupport.ts
+++ b/src/extensions/core/simpleTouchSupport.ts
@@ -1,7 +1,8 @@
 // @ts-strict-ignore
-import { app } from '../../scripts/app'
 import { LGraphCanvas, LiteGraph } from '@comfyorg/litegraph'
 
+import { app } from '../../scripts/app'
+
 let touchZooming
 let touchCount = 0
 
diff --git a/src/extensions/core/slotDefaults.ts b/src/extensions/core/slotDefaults.ts
index 2d2c3f2c8..07871d465 100644
--- a/src/extensions/core/slotDefaults.ts
+++ b/src/extensions/core/slotDefaults.ts
@@ -1,6 +1,8 @@
+import { LiteGraph } from '@comfyorg/litegraph'
+
 import { app } from '../../scripts/app'
 import { ComfyWidgets } from '../../scripts/widgets'
-import { LiteGraph } from '@comfyorg/litegraph'
+
 // Adds defaults for quickly adding nodes with middle click on the input/output
 
 app.registerExtension({
diff --git a/src/extensions/core/uploadAudio.ts b/src/extensions/core/uploadAudio.ts
index d0b3ad79d..194a5caf3 100644
--- a/src/extensions/core/uploadAudio.ts
+++ b/src/extensions/core/uploadAudio.ts
@@ -1,10 +1,12 @@
 // @ts-strict-ignore
-import { app } from '../../scripts/app'
-import { api } from '../../scripts/api'
 import type { IWidget } from '@comfyorg/litegraph'
+
 import type { DOMWidget } from '@/scripts/domWidget'
-import { ComfyNodeDef } from '@/types/apiTypes'
 import { useToastStore } from '@/stores/toastStore'
+import { ComfyNodeDef } from '@/types/apiTypes'
+
+import { api } from '../../scripts/api'
+import { app } from '../../scripts/app'
 
 type FolderType = 'input' | 'output' | 'temp'
 
diff --git a/src/extensions/core/uploadImage.ts b/src/extensions/core/uploadImage.ts
index 34afbc1ad..8bfeb1077 100644
--- a/src/extensions/core/uploadImage.ts
+++ b/src/extensions/core/uploadImage.ts
@@ -1,6 +1,7 @@
-import { app } from '../../scripts/app'
 import { ComfyNodeDef } from '@/types/apiTypes'
 
+import { app } from '../../scripts/app'
+
 // Adds an upload button to the nodes
 
 app.registerExtension({
diff --git a/src/extensions/core/webcamCapture.ts b/src/extensions/core/webcamCapture.ts
index 313f70645..1d04e164b 100644
--- a/src/extensions/core/webcamCapture.ts
+++ b/src/extensions/core/webcamCapture.ts
@@ -1,8 +1,9 @@
 // @ts-strict-ignore
-import { app } from '../../scripts/app'
-import { api } from '../../scripts/api'
 import { useToastStore } from '@/stores/toastStore'
 
+import { api } from '../../scripts/api'
+import { app } from '../../scripts/app'
+
 const WEBCAM_READY = Symbol()
 
 app.registerExtension({
diff --git a/src/extensions/core/widgetInputs.ts b/src/extensions/core/widgetInputs.ts
index 221b74e08..644219e1f 100644
--- a/src/extensions/core/widgetInputs.ts
+++ b/src/extensions/core/widgetInputs.ts
@@ -1,15 +1,17 @@
 // @ts-strict-ignore
-import { ComfyWidgets, addValueControlWidgets } from '../../scripts/widgets'
-import { app } from '../../scripts/app'
-import { applyTextReplacements } from '../../scripts/utils'
-import { LiteGraph, LGraphNode } from '@comfyorg/litegraph'
+import { LGraphNode, LiteGraph } from '@comfyorg/litegraph'
 import type {
   INodeInputSlot,
   IWidget,
   LiteGraphCanvasEvent
 } from '@comfyorg/litegraph'
-import type { InputSpec } from '@/types/apiTypes'
+
 import { useNodeDefStore } from '@/stores/nodeDefStore'
+import type { InputSpec } from '@/types/apiTypes'
+
+import { app } from '../../scripts/app'
+import { applyTextReplacements } from '../../scripts/utils'
+import { ComfyWidgets, addValueControlWidgets } from '../../scripts/widgets'
 
 const CONVERTED_TYPE = 'converted-widget'
 const VALID_TYPES = [
diff --git a/src/hooks/bottomPanelTabs/terminalTabs.ts b/src/hooks/bottomPanelTabs/terminalTabs.ts
index 1a831c78d..e1c13efe5 100644
--- a/src/hooks/bottomPanelTabs/terminalTabs.ts
+++ b/src/hooks/bottomPanelTabs/terminalTabs.ts
@@ -1,8 +1,9 @@
-import { useI18n } from 'vue-i18n'
 import { markRaw } from 'vue'
-import { BottomPanelExtension } from '@/types/extensionTypes'
-import LogsTerminal from '@/components/bottomPanel/tabs/terminal/LogsTerminal.vue'
+import { useI18n } from 'vue-i18n'
+
 import CommandTerminal from '@/components/bottomPanel/tabs/terminal/CommandTerminal.vue'
+import LogsTerminal from '@/components/bottomPanel/tabs/terminal/LogsTerminal.vue'
+import { BottomPanelExtension } from '@/types/extensionTypes'
 
 export const useLogsTerminalTab = (): BottomPanelExtension => {
   const { t } = useI18n()
diff --git a/src/hooks/bottomPanelTabs/useTerminal.ts b/src/hooks/bottomPanelTabs/useTerminal.ts
index 0709a23bb..beb77c98c 100644
--- a/src/hooks/bottomPanelTabs/useTerminal.ts
+++ b/src/hooks/bottomPanelTabs/useTerminal.ts
@@ -1,8 +1,8 @@
 import { FitAddon } from '@xterm/addon-fit'
 import { Terminal } from '@xterm/xterm'
-import { debounce } from 'lodash'
-import { markRaw, onMounted, onUnmounted, Ref } from 'vue'
 import '@xterm/xterm/css/xterm.css'
+import { debounce } from 'lodash'
+import { Ref, markRaw, onMounted, onUnmounted } from 'vue'
 
 export function useTerminal(element: Ref<HTMLElement>) {
   const fitAddon = new FitAddon()
diff --git a/src/hooks/coreCommandHooks.ts b/src/hooks/coreCommandHooks.ts
index dad40e412..668421dde 100644
--- a/src/hooks/coreCommandHooks.ts
+++ b/src/hooks/coreCommandHooks.ts
@@ -1,5 +1,12 @@
-import { app } from '@/scripts/app'
+import {
+  LGraphEventMode,
+  LGraphGroup,
+  LGraphNode,
+  LiteGraph
+} from '@comfyorg/litegraph'
+
 import { api } from '@/scripts/api'
+import { app } from '@/scripts/app'
 import { useDialogService } from '@/services/dialogService'
 import { useWorkflowService } from '@/services/workflowService'
 import type { ComfyCommand } from '@/stores/commandStore'
@@ -9,14 +16,8 @@ import { useSettingStore } from '@/stores/settingStore'
 import { useToastStore } from '@/stores/toastStore'
 import { type ComfyWorkflow, useWorkflowStore } from '@/stores/workflowStore'
 import { useBottomPanelStore } from '@/stores/workspace/bottomPanelStore'
-import { useWorkspaceStore } from '@/stores/workspaceStore'
-import {
-  LiteGraph,
-  LGraphEventMode,
-  LGraphNode,
-  LGraphGroup
-} from '@comfyorg/litegraph'
 import { useSearchBoxStore } from '@/stores/workspace/searchBoxStore'
+import { useWorkspaceStore } from '@/stores/workspaceStore'
 
 export function useCoreCommands(): ComfyCommand[] {
   const workflowService = useWorkflowService()
diff --git a/src/hooks/dndHooks.ts b/src/hooks/dndHooks.ts
index 1e017c298..642b9e310 100644
--- a/src/hooks/dndHooks.ts
+++ b/src/hooks/dndHooks.ts
@@ -1,8 +1,8 @@
-import { onBeforeUnmount, onMounted } from 'vue'
 import {
-  dropTargetForElements,
-  draggable
+  draggable,
+  dropTargetForElements
 } from '@atlaskit/pragmatic-drag-and-drop/element/adapter'
+import { onBeforeUnmount, onMounted } from 'vue'
 
 export function usePragmaticDroppable(
   dropTargetElement: HTMLElement | (() => HTMLElement),
diff --git a/src/hooks/sidebarTabs/modelLibrarySidebarTab.ts b/src/hooks/sidebarTabs/modelLibrarySidebarTab.ts
index cfb1b93a6..8c32739b8 100644
--- a/src/hooks/sidebarTabs/modelLibrarySidebarTab.ts
+++ b/src/hooks/sidebarTabs/modelLibrarySidebarTab.ts
@@ -1,8 +1,9 @@
 import { markRaw } from 'vue'
 import { useI18n } from 'vue-i18n'
+
 import ModelLibrarySidebarTab from '@/components/sidebar/tabs/ModelLibrarySidebarTab.vue'
-import type { SidebarTabExtension } from '@/types/extensionTypes'
 import { useElectronDownloadStore } from '@/stores/electronDownloadStore'
+import type { SidebarTabExtension } from '@/types/extensionTypes'
 import { isElectron } from '@/utils/envUtil'
 
 export const useModelLibrarySidebarTab = (): SidebarTabExtension => {
diff --git a/src/hooks/sidebarTabs/nodeLibrarySidebarTab.ts b/src/hooks/sidebarTabs/nodeLibrarySidebarTab.ts
index 8e74147a6..6e559f28a 100644
--- a/src/hooks/sidebarTabs/nodeLibrarySidebarTab.ts
+++ b/src/hooks/sidebarTabs/nodeLibrarySidebarTab.ts
@@ -1,5 +1,6 @@
 import { markRaw } from 'vue'
 import { useI18n } from 'vue-i18n'
+
 import NodeLibrarySidebarTab from '@/components/sidebar/tabs/NodeLibrarySidebarTab.vue'
 import type { SidebarTabExtension } from '@/types/extensionTypes'
 
diff --git a/src/hooks/sidebarTabs/queueSidebarTab.ts b/src/hooks/sidebarTabs/queueSidebarTab.ts
index 07d4462da..775dafc31 100644
--- a/src/hooks/sidebarTabs/queueSidebarTab.ts
+++ b/src/hooks/sidebarTabs/queueSidebarTab.ts
@@ -1,7 +1,8 @@
-import { useQueuePendingTaskCountStore } from '@/stores/queueStore'
 import { markRaw } from 'vue'
 import { useI18n } from 'vue-i18n'
+
 import QueueSidebarTab from '@/components/sidebar/tabs/QueueSidebarTab.vue'
+import { useQueuePendingTaskCountStore } from '@/stores/queueStore'
 import type { SidebarTabExtension } from '@/types/extensionTypes'
 
 export const useQueueSidebarTab = (): SidebarTabExtension => {
diff --git a/src/hooks/sidebarTabs/workflowsSidebarTab.ts b/src/hooks/sidebarTabs/workflowsSidebarTab.ts
index df93b631b..bdfd72a65 100644
--- a/src/hooks/sidebarTabs/workflowsSidebarTab.ts
+++ b/src/hooks/sidebarTabs/workflowsSidebarTab.ts
@@ -1,8 +1,9 @@
 import { markRaw } from 'vue'
 import { useI18n } from 'vue-i18n'
-import { useWorkflowStore } from '@/stores/workflowStore'
-import { useSettingStore } from '@/stores/settingStore'
+
 import WorkflowsSidebarTab from '@/components/sidebar/tabs/WorkflowsSidebarTab.vue'
+import { useSettingStore } from '@/stores/settingStore'
+import { useWorkflowStore } from '@/stores/workflowStore'
 import type { SidebarTabExtension } from '@/types/extensionTypes'
 
 export const useWorkflowsSidebarTab = (): SidebarTabExtension => {
diff --git a/src/hooks/treeHooks.ts b/src/hooks/treeHooks.ts
index b9b235bf6..580b3bb00 100644
--- a/src/hooks/treeHooks.ts
+++ b/src/hooks/treeHooks.ts
@@ -1,5 +1,5 @@
-import { Ref } from 'vue'
 import type { TreeNode } from 'primevue/treenode'
+import { Ref } from 'vue'
 
 export function useTreeExpansion(expandedKeys: Ref<Record<string, boolean>>) {
   const toggleNode = (node: TreeNode) => {
diff --git a/src/i18n.ts b/src/i18n.ts
index 437277d77..a138a6b78 100644
--- a/src/i18n.ts
+++ b/src/i18n.ts
@@ -1,28 +1,29 @@
 import { createI18n } from 'vue-i18n'
-import en from './locales/en/main.json'
-import zh from './locales/zh/main.json'
-import ru from './locales/ru/main.json'
-import ja from './locales/ja/main.json'
-import ko from './locales/ko/main.json'
-import fr from './locales/fr/main.json'
-import enNodes from './locales/en/nodeDefs.json'
-import zhNodes from './locales/zh/nodeDefs.json'
-import ruNodes from './locales/ru/nodeDefs.json'
-import jaNodes from './locales/ja/nodeDefs.json'
-import koNodes from './locales/ko/nodeDefs.json'
-import frNodes from './locales/fr/nodeDefs.json'
+
 import enCommands from './locales/en/commands.json'
-import zhCommands from './locales/zh/commands.json'
-import ruCommands from './locales/ru/commands.json'
-import jaCommands from './locales/ja/commands.json'
-import koCommands from './locales/ko/commands.json'
-import frCommands from './locales/fr/commands.json'
+import en from './locales/en/main.json'
+import enNodes from './locales/en/nodeDefs.json'
 import enSettings from './locales/en/settings.json'
-import zhSettings from './locales/zh/settings.json'
-import ruSettings from './locales/ru/settings.json'
-import jaSettings from './locales/ja/settings.json'
-import koSettings from './locales/ko/settings.json'
+import frCommands from './locales/fr/commands.json'
+import fr from './locales/fr/main.json'
+import frNodes from './locales/fr/nodeDefs.json'
 import frSettings from './locales/fr/settings.json'
+import jaCommands from './locales/ja/commands.json'
+import ja from './locales/ja/main.json'
+import jaNodes from './locales/ja/nodeDefs.json'
+import jaSettings from './locales/ja/settings.json'
+import koCommands from './locales/ko/commands.json'
+import ko from './locales/ko/main.json'
+import koNodes from './locales/ko/nodeDefs.json'
+import koSettings from './locales/ko/settings.json'
+import ruCommands from './locales/ru/commands.json'
+import ru from './locales/ru/main.json'
+import ruNodes from './locales/ru/nodeDefs.json'
+import ruSettings from './locales/ru/settings.json'
+import zhCommands from './locales/zh/commands.json'
+import zh from './locales/zh/main.json'
+import zhNodes from './locales/zh/nodeDefs.json'
+import zhSettings from './locales/zh/settings.json'
 
 function buildLocale<M, N, C, S>(main: M, nodes: N, commands: C, settings: S) {
   return {
diff --git a/src/main.ts b/src/main.ts
index 843d10d47..937d7c0ce 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,19 +1,20 @@
 // @ts-strict-ignore
-import App from './App.vue'
-import router from '@/router'
-import { createApp } from 'vue'
-import { createPinia } from 'pinia'
-import { i18n } from './i18n'
+import '@comfyorg/litegraph/style.css'
 import { definePreset } from '@primevue/themes'
-import PrimeVue from 'primevue/config'
 import Aura from '@primevue/themes/aura'
+import { createPinia } from 'pinia'
+import 'primeicons/primeicons.css'
+import PrimeVue from 'primevue/config'
 import ConfirmationService from 'primevue/confirmationservice'
 import ToastService from 'primevue/toastservice'
 import Tooltip from 'primevue/tooltip'
+import { createApp } from 'vue'
 
-import '@comfyorg/litegraph/style.css'
 import '@/assets/css/style.css'
-import 'primeicons/primeicons.css'
+import router from '@/router'
+
+import App from './App.vue'
+import { i18n } from './i18n'
 
 const ComfyUIPreset = definePreset(Aura, {
   semantic: {
diff --git a/src/router.ts b/src/router.ts
index 7c70bc9b1..e06ebded4 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -1,13 +1,15 @@
 import {
+  NavigationGuardNext,
+  RouteLocationNormalized,
   createRouter,
   createWebHashHistory,
-  createWebHistory,
-  NavigationGuardNext,
-  RouteLocationNormalized
+  createWebHistory
 } from 'vue-router'
+
 import LayoutDefault from '@/views/layouts/LayoutDefault.vue'
-import { isElectron } from './utils/envUtil'
+
 import { useUserStore } from './stores/userStore'
+import { isElectron } from './utils/envUtil'
 
 const isFileProtocol = window.location.protocol === 'file:'
 const basePath = isElectron() ? '/' : window.location.pathname
diff --git a/src/scripts/api.ts b/src/scripts/api.ts
index 5b5fe857e..ebe7afc0a 100644
--- a/src/scripts/api.ts
+++ b/src/scripts/api.ts
@@ -1,30 +1,31 @@
-import type { ComfyWorkflowJSON, NodeId } from '@/types/comfyWorkflow'
+import axios from 'axios'
+
 import type {
-  HistoryTaskItem,
-  PendingTaskItem,
-  RunningTaskItem,
   ComfyNodeDef,
   EmbeddingsResponse,
-  ExtensionsResponse,
-  PromptResponse,
-  SystemStats,
-  User,
-  Settings,
-  UserDataFullInfo,
-  LogsRawResponse,
-  ExecutingWsMessage,
   ExecutedWsMessage,
-  ProgressWsMessage,
-  ExecutionStartWsMessage,
+  ExecutingWsMessage,
+  ExecutionCachedWsMessage,
   ExecutionErrorWsMessage,
+  ExecutionStartWsMessage,
+  ExecutionSuccessWsMessage,
+  ExtensionsResponse,
+  HistoryTaskItem,
+  LogsRawResponse,
+  LogsWsMessage,
+  PendingTaskItem,
+  ProgressWsMessage,
+  PromptResponse,
+  RunningTaskItem,
+  Settings,
   StatusWsMessage,
   StatusWsMessageStatus,
-  ExecutionCachedWsMessage,
-  ExecutionSuccessWsMessage,
-  LogsWsMessage
+  SystemStats,
+  User,
+  UserDataFullInfo
 } from '@/types/apiTypes'
 import { validateComfyNodeDef } from '@/types/apiTypes'
-import axios from 'axios'
+import type { ComfyWorkflowJSON, NodeId } from '@/types/comfyWorkflow'
 
 interface QueuePromptRequestBody {
   client_id: string
diff --git a/src/scripts/app.ts b/src/scripts/app.ts
index 747a1b387..1d88e5f3e 100644
--- a/src/scripts/app.ts
+++ b/src/scripts/app.ts
@@ -1,54 +1,56 @@
 // @ts-strict-ignore
-import { type ComfyWidgetConstructor, ComfyWidgets } from './widgets'
-import { ComfyUI, $el } from './ui'
-import { api, type ComfyApi } from './api'
-import { defaultGraph } from './defaultGraph'
 import {
-  getPngMetadata,
-  getWebpMetadata,
-  getFlacMetadata,
-  importA1111,
-  getLatentMetadata
-} from './pnginfo'
+  LGraph,
+  LGraphCanvas,
+  LGraphEventMode,
+  LGraphNode,
+  LiteGraph
+} from '@comfyorg/litegraph'
+import { Vector2 } from '@comfyorg/litegraph'
+import _ from 'lodash'
+import type { ToastMessageOptions } from 'primevue/toast'
+import { shallowReactive } from 'vue'
+
+import { st } from '@/i18n'
+import { useDialogService } from '@/services/dialogService'
+import { useExtensionService } from '@/services/extensionService'
+import { useLitegraphService } from '@/services/litegraphService'
+import { useWorkflowService } from '@/services/workflowService'
+import { useCommandStore } from '@/stores/commandStore'
+import { useExecutionStore } from '@/stores/executionStore'
+import { useExtensionStore } from '@/stores/extensionStore'
+import { KeyComboImpl, useKeybindingStore } from '@/stores/keybindingStore'
+import { useModelStore } from '@/stores/modelStore'
+import { SYSTEM_NODE_DEFS, useNodeDefStore } from '@/stores/nodeDefStore'
+import { useSettingStore } from '@/stores/settingStore'
+import { useToastStore } from '@/stores/toastStore'
+import { useWidgetStore } from '@/stores/widgetStore'
+import { ComfyWorkflow } from '@/stores/workflowStore'
+import { useWorkspaceStore } from '@/stores/workspaceStore'
+import type { ComfyNodeDef } from '@/types/apiTypes'
 import type { ComfyExtension, MissingNodeType } from '@/types/comfy'
 import {
   type ComfyWorkflowJSON,
   type NodeId,
   validateComfyWorkflow
 } from '@/types/comfyWorkflow'
-import type { ComfyNodeDef } from '@/types/apiTypes'
-import { adjustColor, ColorAdjustOptions } from '@/utils/colorUtil'
+import { ExtensionManager } from '@/types/extensionTypes'
+import { ColorAdjustOptions, adjustColor } from '@/utils/colorUtil'
+import { deserialiseAndCreate } from '@/utils/vintageClipboard'
+
+import { type ComfyApi, api } from './api'
+import { defaultGraph } from './defaultGraph'
+import {
+  getFlacMetadata,
+  getLatentMetadata,
+  getPngMetadata,
+  getWebpMetadata,
+  importA1111
+} from './pnginfo'
+import { $el, ComfyUI } from './ui'
 import { ComfyAppMenu } from './ui/menu/index'
 import { getStorageValue } from './utils'
-import { ComfyWorkflow } from '@/stores/workflowStore'
-import {
-  LGraphCanvas,
-  LGraph,
-  LGraphNode,
-  LiteGraph,
-  LGraphEventMode
-} from '@comfyorg/litegraph'
-import { ExtensionManager } from '@/types/extensionTypes'
-import { SYSTEM_NODE_DEFS, useNodeDefStore } from '@/stores/nodeDefStore'
-import { Vector2 } from '@comfyorg/litegraph'
-import _ from 'lodash'
-import { useDialogService } from '@/services/dialogService'
-import { useSettingStore } from '@/stores/settingStore'
-import { useToastStore } from '@/stores/toastStore'
-import { useModelStore } from '@/stores/modelStore'
-import type { ToastMessageOptions } from 'primevue/toast'
-import { useWorkspaceStore } from '@/stores/workspaceStore'
-import { useExecutionStore } from '@/stores/executionStore'
-import { useExtensionStore } from '@/stores/extensionStore'
-import { KeyComboImpl, useKeybindingStore } from '@/stores/keybindingStore'
-import { useCommandStore } from '@/stores/commandStore'
-import { shallowReactive } from 'vue'
-import { useWorkflowService } from '@/services/workflowService'
-import { useWidgetStore } from '@/stores/widgetStore'
-import { deserialiseAndCreate } from '@/utils/vintageClipboard'
-import { st } from '@/i18n'
-import { useExtensionService } from '@/services/extensionService'
-import { useLitegraphService } from '@/services/litegraphService'
+import { type ComfyWidgetConstructor, ComfyWidgets } from './widgets'
 
 export const ANIM_PREVIEW_WIDGET = '$$comfy_animation_preview'
 
diff --git a/src/scripts/changeTracker.ts b/src/scripts/changeTracker.ts
index 5f21cddef..494068d4b 100644
--- a/src/scripts/changeTracker.ts
+++ b/src/scripts/changeTracker.ts
@@ -1,15 +1,17 @@
-import type { ComfyApp } from './app'
-import { api } from './api'
 import { LGraphCanvas, LiteGraph } from '@comfyorg/litegraph'
-import { ComfyWorkflow, useWorkflowStore } from '@/stores/workflowStore'
 import { LGraphNode } from '@comfyorg/litegraph'
-import type { ComfyWorkflowJSON } from '@/types/comfyWorkflow'
-import type { ExecutedWsMessage } from '@/types/apiTypes'
-import { useExecutionStore } from '@/stores/executionStore'
-import _ from 'lodash'
 import * as jsondiffpatch from 'jsondiffpatch'
+import _ from 'lodash'
 import log from 'loglevel'
 
+import { useExecutionStore } from '@/stores/executionStore'
+import { ComfyWorkflow, useWorkflowStore } from '@/stores/workflowStore'
+import type { ExecutedWsMessage } from '@/types/apiTypes'
+import type { ComfyWorkflowJSON } from '@/types/comfyWorkflow'
+
+import { api } from './api'
+import type { ComfyApp } from './app'
+
 function clone<T>(obj: T): T {
   return JSON.parse(JSON.stringify(obj))
 }
diff --git a/src/scripts/domWidget.ts b/src/scripts/domWidget.ts
index 6e477d576..c85bade36 100644
--- a/src/scripts/domWidget.ts
+++ b/src/scripts/domWidget.ts
@@ -1,6 +1,4 @@
 // @ts-strict-ignore
-import { useSettingStore } from '@/stores/settingStore'
-import { app, ANIM_PREVIEW_WIDGET } from './app'
 import { LGraphCanvas, LGraphNode, LiteGraph } from '@comfyorg/litegraph'
 import type { Vector4 } from '@comfyorg/litegraph'
 import {
@@ -8,6 +6,10 @@ import {
   IWidgetOptions
 } from '@comfyorg/litegraph/dist/types/widgets'
 
+import { useSettingStore } from '@/stores/settingStore'
+
+import { ANIM_PREVIEW_WIDGET, app } from './app'
+
 const SIZE = Symbol()
 
 interface Rect {
diff --git a/src/scripts/pnginfo.ts b/src/scripts/pnginfo.ts
index 3473cce2b..acb79a513 100644
--- a/src/scripts/pnginfo.ts
+++ b/src/scripts/pnginfo.ts
@@ -1,8 +1,9 @@
 // @ts-strict-ignore
 import { LiteGraph } from '@comfyorg/litegraph'
+
 import { api } from './api'
-import { getFromPngFile } from './metadata/png'
 import { getFromFlacFile } from './metadata/flac'
+import { getFromPngFile } from './metadata/png'
 
 // Original functions left in for backwards compatibility
 export function getPngMetadata(file: File): Promise<Record<string, string>> {
diff --git a/src/scripts/ui.ts b/src/scripts/ui.ts
index 4ecf8993d..2959fe289 100644
--- a/src/scripts/ui.ts
+++ b/src/scripts/ui.ts
@@ -1,14 +1,15 @@
 // @ts-strict-ignore
-import { api } from './api'
-import { ComfyDialog as _ComfyDialog } from './ui/dialog'
-import { toggleSwitch } from './ui/toggleSwitch'
-import { ComfySettingsDialog } from './ui/settings'
-import { ComfyApp, app } from './app'
-import { TaskItem, type StatusWsMessageStatus } from '@/types/apiTypes'
 import { useDialogService } from '@/services/dialogService'
-import { useSettingStore } from '@/stores/settingStore'
 import { useCommandStore } from '@/stores/commandStore'
+import { useSettingStore } from '@/stores/settingStore'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
+import { type StatusWsMessageStatus, TaskItem } from '@/types/apiTypes'
+
+import { api } from './api'
+import { ComfyApp, app } from './app'
+import { ComfyDialog as _ComfyDialog } from './ui/dialog'
+import { ComfySettingsDialog } from './ui/settings'
+import { toggleSwitch } from './ui/toggleSwitch'
 
 export const ComfyDialog = _ComfyDialog
 
diff --git a/src/scripts/ui/components/asyncDialog.ts b/src/scripts/ui/components/asyncDialog.ts
index 6cbc6af84..c498495d5 100644
--- a/src/scripts/ui/components/asyncDialog.ts
+++ b/src/scripts/ui/components/asyncDialog.ts
@@ -1,6 +1,6 @@
 // @ts-strict-ignore
-import { ComfyDialog } from '../dialog'
 import { $el } from '../../ui'
+import { ComfyDialog } from '../dialog'
 
 export class ComfyAsyncDialog extends ComfyDialog<HTMLDialogElement> {
   #resolve: (value: any) => void
diff --git a/src/scripts/ui/components/button.ts b/src/scripts/ui/components/button.ts
index 32b2f574a..cb9f590b4 100644
--- a/src/scripts/ui/components/button.ts
+++ b/src/scripts/ui/components/button.ts
@@ -1,12 +1,13 @@
 // @ts-strict-ignore
-import { $el } from '../../ui'
-import { applyClasses, ClassList, toggleElement } from '../utils'
-import { prop } from '../../utils'
-import type { ComfyPopup } from './popup'
-import type { ComfyComponent } from '.'
 import type { ComfyApp } from '@/scripts/app'
 import { Settings } from '@/types/apiTypes'
 
+import type { ComfyComponent } from '.'
+import { $el } from '../../ui'
+import { prop } from '../../utils'
+import { ClassList, applyClasses, toggleElement } from '../utils'
+import type { ComfyPopup } from './popup'
+
 type ComfyButtonProps = {
   icon?: string
   overIcon?: string
diff --git a/src/scripts/ui/components/buttonGroup.ts b/src/scripts/ui/components/buttonGroup.ts
index a3d77ca23..774e930cd 100644
--- a/src/scripts/ui/components/buttonGroup.ts
+++ b/src/scripts/ui/components/buttonGroup.ts
@@ -1,7 +1,7 @@
 // @ts-strict-ignore
 import { $el } from '../../ui'
-import { ComfyButton } from './button'
 import { prop } from '../../utils'
+import { ComfyButton } from './button'
 
 export class ComfyButtonGroup {
   element = $el('div.comfyui-button-group')
diff --git a/src/scripts/ui/components/popup.ts b/src/scripts/ui/components/popup.ts
index 73f0aa01f..294c595f2 100644
--- a/src/scripts/ui/components/popup.ts
+++ b/src/scripts/ui/components/popup.ts
@@ -1,7 +1,7 @@
 // @ts-strict-ignore
-import { prop } from '../../utils'
 import { $el } from '../../ui'
-import { applyClasses, ClassList } from '../utils'
+import { prop } from '../../utils'
+import { ClassList, applyClasses } from '../utils'
 
 export class ComfyPopup extends EventTarget {
   element = $el('div.comfyui-popup')
diff --git a/src/scripts/ui/components/splitButton.ts b/src/scripts/ui/components/splitButton.ts
index 833772305..319957859 100644
--- a/src/scripts/ui/components/splitButton.ts
+++ b/src/scripts/ui/components/splitButton.ts
@@ -1,6 +1,6 @@
 import { $el } from '../../ui'
-import { ComfyButton } from './button'
 import { prop } from '../../utils'
+import { ComfyButton } from './button'
 import { ComfyPopup } from './popup'
 
 export class ComfySplitButton {
diff --git a/src/scripts/ui/dialog.ts b/src/scripts/ui/dialog.ts
index 26b823607..7a2faef22 100644
--- a/src/scripts/ui/dialog.ts
+++ b/src/scripts/ui/dialog.ts
@@ -1,5 +1,6 @@
 // @ts-strict-ignore
 import { useDialogStore } from '@/stores/dialogStore'
+
 import { $el } from '../ui'
 
 export class ComfyDialog<
diff --git a/src/scripts/ui/draggableList.ts b/src/scripts/ui/draggableList.ts
index fb74a8baf..7f7ae33bb 100644
--- a/src/scripts/ui/draggableList.ts
+++ b/src/scripts/ui/draggableList.ts
@@ -24,7 +24,6 @@
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
 */
-
 import { $el } from '../ui'
 
 $el('style', {
diff --git a/src/scripts/ui/menu/index.ts b/src/scripts/ui/menu/index.ts
index 5c90bb54a..e776685e1 100644
--- a/src/scripts/ui/menu/index.ts
+++ b/src/scripts/ui/menu/index.ts
@@ -1,4 +1,5 @@
 import type { ComfyApp } from '@/scripts/app'
+
 import { $el } from '../../ui'
 import { ComfyButtonGroup } from '../components/buttonGroup'
 import './menu.css'
diff --git a/src/scripts/ui/settings.ts b/src/scripts/ui/settings.ts
index d379031e2..968b7ce18 100644
--- a/src/scripts/ui/settings.ts
+++ b/src/scripts/ui/settings.ts
@@ -1,9 +1,10 @@
 import type { ComfyApp } from '@/scripts/app'
-import { ComfyDialog } from './dialog'
-import type { SettingParams } from '@/types/settingTypes'
-import type { Settings } from '@/types/apiTypes'
 import { useSettingStore } from '@/stores/settingStore'
 import { useToastStore } from '@/stores/toastStore'
+import type { Settings } from '@/types/apiTypes'
+import type { SettingParams } from '@/types/settingTypes'
+
+import { ComfyDialog } from './dialog'
 
 export class ComfySettingsDialog extends ComfyDialog<HTMLDialogElement> {
   app: ComfyApp
diff --git a/src/scripts/widgets.ts b/src/scripts/widgets.ts
index 6a4f5644a..68566a59b 100644
--- a/src/scripts/widgets.ts
+++ b/src/scripts/widgets.ts
@@ -1,20 +1,22 @@
 // @ts-strict-ignore
-import { api } from './api'
-import './domWidget'
-import type { ComfyApp } from './app'
 import type { LGraphNode } from '@comfyorg/litegraph'
-import { InputSpec } from '@/types/apiTypes'
-import { useSettingStore } from '@/stores/settingStore'
-import { useToastStore } from '@/stores/toastStore'
 import type { IWidget } from '@comfyorg/litegraph'
 import { Editor as TiptapEditor } from '@tiptap/core'
-import TiptapStarterKit from '@tiptap/starter-kit'
-import { Markdown as TiptapMarkdown } from 'tiptap-markdown'
 import TiptapLink from '@tiptap/extension-link'
 import TiptapTable from '@tiptap/extension-table'
 import TiptapTableCell from '@tiptap/extension-table-cell'
 import TiptapTableHeader from '@tiptap/extension-table-header'
 import TiptapTableRow from '@tiptap/extension-table-row'
+import TiptapStarterKit from '@tiptap/starter-kit'
+import { Markdown as TiptapMarkdown } from 'tiptap-markdown'
+
+import { useSettingStore } from '@/stores/settingStore'
+import { useToastStore } from '@/stores/toastStore'
+import { InputSpec } from '@/types/apiTypes'
+
+import { api } from './api'
+import type { ComfyApp } from './app'
+import './domWidget'
 
 export type ComfyWidgetConstructor = (
   node: LGraphNode,
diff --git a/src/services/autoQueueService.ts b/src/services/autoQueueService.ts
index cbd48cbae..4f131edbd 100644
--- a/src/services/autoQueueService.ts
+++ b/src/services/autoQueueService.ts
@@ -1,9 +1,9 @@
-import {
-  useQueueSettingsStore,
-  useQueuePendingTaskCountStore
-} from '@/stores/queueStore'
-import { app } from '@/scripts/app'
 import { api } from '@/scripts/api'
+import { app } from '@/scripts/app'
+import {
+  useQueuePendingTaskCountStore,
+  useQueueSettingsStore
+} from '@/stores/queueStore'
 
 export function setupAutoQueueHandler() {
   const queueCountStore = useQueuePendingTaskCountStore()
diff --git a/src/services/colorPaletteService.ts b/src/services/colorPaletteService.ts
index dfc296e0f..a6fe6f67f 100644
--- a/src/services/colorPaletteService.ts
+++ b/src/services/colorPaletteService.ts
@@ -1,14 +1,15 @@
-import { useSettingStore } from '@/stores/settingStore'
-import { useNodeDefStore } from '@/stores/nodeDefStore'
-import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
-import { useErrorHandling } from '@/hooks/errorHooks'
-import { Colors, paletteSchema, type Palette } from '@/types/colorPaletteTypes'
-import { fromZodError } from 'zod-validation-error'
 import { LGraphCanvas } from '@comfyorg/litegraph'
 import { LiteGraph } from '@comfyorg/litegraph'
+import { toRaw } from 'vue'
+import { fromZodError } from 'zod-validation-error'
+
+import { useErrorHandling } from '@/hooks/errorHooks'
 import { app } from '@/scripts/app'
 import { downloadBlob, uploadFile } from '@/scripts/utils'
-import { toRaw } from 'vue'
+import { useNodeDefStore } from '@/stores/nodeDefStore'
+import { useSettingStore } from '@/stores/settingStore'
+import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
+import { Colors, type Palette, paletteSchema } from '@/types/colorPaletteTypes'
 
 export const useColorPaletteService = () => {
   const colorPaletteStore = useColorPaletteStore()
diff --git a/src/services/dialogService.ts b/src/services/dialogService.ts
index be30c6baa..ccf17b9a4 100644
--- a/src/services/dialogService.ts
+++ b/src/services/dialogService.ts
@@ -1,15 +1,15 @@
-import { useDialogStore, type ShowDialogOptions } from '@/stores/dialogStore'
-import type { ExecutionErrorWsMessage } from '@/types/apiTypes'
-import type { MissingNodeType } from '@/types/comfy'
+import ConfirmationDialogContent from '@/components/dialog/content/ConfirmationDialogContent.vue'
+import ExecutionErrorDialogContent from '@/components/dialog/content/ExecutionErrorDialogContent.vue'
 import LoadWorkflowWarning from '@/components/dialog/content/LoadWorkflowWarning.vue'
 import MissingModelsWarning from '@/components/dialog/content/MissingModelsWarning.vue'
+import PromptDialogContent from '@/components/dialog/content/PromptDialogContent.vue'
 import SettingDialogContent from '@/components/dialog/content/SettingDialogContent.vue'
 import SettingDialogHeader from '@/components/dialog/header/SettingDialogHeader.vue'
-import ExecutionErrorDialogContent from '@/components/dialog/content/ExecutionErrorDialogContent.vue'
 import TemplateWorkflowsContent from '@/components/templates/TemplateWorkflowsContent.vue'
-import PromptDialogContent from '@/components/dialog/content/PromptDialogContent.vue'
-import ConfirmationDialogContent from '@/components/dialog/content/ConfirmationDialogContent.vue'
 import { t } from '@/i18n'
+import { type ShowDialogOptions, useDialogStore } from '@/stores/dialogStore'
+import type { ExecutionErrorWsMessage } from '@/types/apiTypes'
+import type { MissingNodeType } from '@/types/comfy'
 
 export type ConfirmationDialogType =
   | 'overwrite'
diff --git a/src/services/extensionService.ts b/src/services/extensionService.ts
index 0a6f4712a..0b425142d 100644
--- a/src/services/extensionService.ts
+++ b/src/services/extensionService.ts
@@ -1,5 +1,6 @@
-import { app } from '@/scripts/app'
+import { useErrorHandling } from '@/hooks/errorHooks'
 import { api } from '@/scripts/api'
+import { app } from '@/scripts/app'
 import { useCommandStore } from '@/stores/commandStore'
 import { useExtensionStore } from '@/stores/extensionStore'
 import { KeybindingImpl, useKeybindingStore } from '@/stores/keybindingStore'
@@ -8,7 +9,6 @@ import { useSettingStore } from '@/stores/settingStore'
 import { useWidgetStore } from '@/stores/widgetStore'
 import { useBottomPanelStore } from '@/stores/workspace/bottomPanelStore'
 import type { ComfyExtension } from '@/types/comfy'
-import { useErrorHandling } from '@/hooks/errorHooks'
 
 export const useExtensionService = () => {
   const extensionStore = useExtensionStore()
diff --git a/src/services/keybindingService.ts b/src/services/keybindingService.ts
index 830dbc024..a5418afc7 100644
--- a/src/services/keybindingService.ts
+++ b/src/services/keybindingService.ts
@@ -1,8 +1,8 @@
 import { CORE_KEYBINDINGS } from '@/constants/coreKeybindings'
 import { useCommandStore } from '@/stores/commandStore'
 import {
-  KeybindingImpl,
   KeyComboImpl,
+  KeybindingImpl,
   useKeybindingStore
 } from '@/stores/keybindingStore'
 import { useSettingStore } from '@/stores/settingStore'
diff --git a/src/services/litegraphService.ts b/src/services/litegraphService.ts
index 919926ec6..c746e5ad5 100644
--- a/src/services/litegraphService.ts
+++ b/src/services/litegraphService.ts
@@ -1,23 +1,25 @@
 // @ts-strict-ignore
+import {
+  type IContextMenuValue,
+  type INodeInputSlot,
+  LGraphEventMode,
+  LGraphNode,
+  LiteGraph
+} from '@comfyorg/litegraph'
+import { Vector2 } from '@comfyorg/litegraph'
+import { IBaseWidget, IWidget } from '@comfyorg/litegraph/dist/types/widgets'
+
 import { st } from '@/i18n'
 import { api } from '@/scripts/api'
-import { ComfyNodeDef, ExecutedWsMessage } from '@/types/apiTypes'
-import { normalizeI18nKey } from '@/utils/formatUtil'
-import {
-  LGraphNode,
-  LiteGraph,
-  LGraphEventMode,
-  type IContextMenuValue,
-  type INodeInputSlot
-} from '@comfyorg/litegraph'
-import { IBaseWidget, IWidget } from '@comfyorg/litegraph/dist/types/widgets'
-import { useExtensionService } from './extensionService'
-import { ComfyApp, app, ANIM_PREVIEW_WIDGET } from '@/scripts/app'
+import { ANIM_PREVIEW_WIDGET, ComfyApp, app } from '@/scripts/app'
 import { $el } from '@/scripts/ui'
-import { useToastStore } from '@/stores/toastStore'
 import { calculateImageGrid, createImageHost } from '@/scripts/ui/imagePreview'
-import { Vector2 } from '@comfyorg/litegraph'
+import { useToastStore } from '@/stores/toastStore'
+import { ComfyNodeDef, ExecutedWsMessage } from '@/types/apiTypes'
 import type { NodeId } from '@/types/comfyWorkflow'
+import { normalizeI18nKey } from '@/utils/formatUtil'
+
+import { useExtensionService } from './extensionService'
 
 /**
  * Service that augments litegraph with ComfyUI specific functionality.
diff --git a/src/services/nodeSearchService.ts b/src/services/nodeSearchService.ts
index 805850b46..955734a6d 100644
--- a/src/services/nodeSearchService.ts
+++ b/src/services/nodeSearchService.ts
@@ -1,8 +1,9 @@
 // @ts-strict-ignore
-import { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
-import Fuse, { IFuseOptions, FuseSearchOptions } from 'fuse.js'
+import Fuse, { FuseSearchOptions, IFuseOptions } from 'fuse.js'
 import _ from 'lodash'
 
+import { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+
 export type SearchAuxScore = number[]
 
 interface ExtraSearchOptions {
diff --git a/src/services/workflowService.ts b/src/services/workflowService.ts
index 206b896ed..c174c16c6 100644
--- a/src/services/workflowService.ts
+++ b/src/services/workflowService.ts
@@ -1,16 +1,18 @@
-import { downloadBlob } from '@/scripts/utils'
-import { useSettingStore } from '@/stores/settingStore'
-import { useWorkflowStore, ComfyWorkflow } from '@/stores/workflowStore'
-import { useDialogService } from './dialogService'
-import { app } from '@/scripts/app'
-import { useWorkspaceStore } from '@/stores/workspaceStore'
 import { LGraphCanvas } from '@comfyorg/litegraph'
 import { toRaw } from 'vue'
-import { ComfyWorkflowJSON } from '@/types/comfyWorkflow'
-import { blankGraph, defaultGraph } from '@/scripts/defaultGraph'
-import { appendJsonExt } from '@/utils/formatUtil'
+
 import { t } from '@/i18n'
+import { app } from '@/scripts/app'
+import { blankGraph, defaultGraph } from '@/scripts/defaultGraph'
+import { downloadBlob } from '@/scripts/utils'
+import { useSettingStore } from '@/stores/settingStore'
 import { useToastStore } from '@/stores/toastStore'
+import { ComfyWorkflow, useWorkflowStore } from '@/stores/workflowStore'
+import { useWorkspaceStore } from '@/stores/workspaceStore'
+import { ComfyWorkflowJSON } from '@/types/comfyWorkflow'
+import { appendJsonExt } from '@/utils/formatUtil'
+
+import { useDialogService } from './dialogService'
 
 export const useWorkflowService = () => {
   const settingStore = useSettingStore()
diff --git a/src/stores/aboutPanelStore.ts b/src/stores/aboutPanelStore.ts
index 82658320f..cdb626095 100644
--- a/src/stores/aboutPanelStore.ts
+++ b/src/stores/aboutPanelStore.ts
@@ -1,10 +1,12 @@
-import { AboutPageBadge } from '@/types/comfy'
 import { defineStore } from 'pinia'
 import { computed } from 'vue'
-import { useSystemStatsStore } from './systemStatsStore'
-import { useExtensionStore } from './extensionStore'
+
+import { AboutPageBadge } from '@/types/comfy'
 import { electronAPI, isElectron } from '@/utils/envUtil'
 
+import { useExtensionStore } from './extensionStore'
+import { useSystemStatsStore } from './systemStatsStore'
+
 export const useAboutPanelStore = defineStore('aboutPanel', () => {
   const frontendVersion = __COMFYUI_FRONTEND_VERSION__
   const extensionStore = useExtensionStore()
diff --git a/src/stores/commandStore.ts b/src/stores/commandStore.ts
index 49835ed98..f498fa20d 100644
--- a/src/stores/commandStore.ts
+++ b/src/stores/commandStore.ts
@@ -1,7 +1,9 @@
 import { defineStore } from 'pinia'
 import { computed, ref } from 'vue'
-import type { ComfyExtension } from '@/types/comfy'
+
 import { useErrorHandling } from '@/hooks/errorHooks'
+import type { ComfyExtension } from '@/types/comfy'
+
 import { type KeybindingImpl, useKeybindingStore } from './keybindingStore'
 
 export interface ComfyCommand {
diff --git a/src/stores/dialogStore.ts b/src/stores/dialogStore.ts
index 4bb5477ab..bf80fa727 100644
--- a/src/stores/dialogStore.ts
+++ b/src/stores/dialogStore.ts
@@ -1,8 +1,7 @@
 // We should consider moving to https://primevue.org/dynamicdialog/ once everything is in Vue.
 // Currently we need to bridge between legacy app code and Vue app with a Pinia store.
-
 import { defineStore } from 'pinia'
-import { ref, type Component, markRaw } from 'vue'
+import { type Component, markRaw, ref } from 'vue'
 
 interface DialogComponentProps {
   maximizable?: boolean
diff --git a/src/stores/electronDownloadStore.ts b/src/stores/electronDownloadStore.ts
index 91ad70682..cd78716e9 100644
--- a/src/stores/electronDownloadStore.ts
+++ b/src/stores/electronDownloadStore.ts
@@ -1,10 +1,11 @@
-import { computed, ref } from 'vue'
-import { defineStore } from 'pinia'
-import { isElectron, electronAPI } from '@/utils/envUtil'
 import {
   type DownloadState,
   DownloadStatus
 } from '@comfyorg/comfyui-electron-types'
+import { defineStore } from 'pinia'
+import { computed, ref } from 'vue'
+
+import { electronAPI, isElectron } from '@/utils/envUtil'
 
 export interface ElectronDownload
   extends Pick<DownloadState, 'url' | 'filename'> {
diff --git a/src/stores/executionStore.ts b/src/stores/executionStore.ts
index c749d853f..0c0e9dfbb 100644
--- a/src/stores/executionStore.ts
+++ b/src/stores/executionStore.ts
@@ -1,8 +1,7 @@
-import { ref, computed } from 'vue'
 import { defineStore } from 'pinia'
+import { computed, ref } from 'vue'
+
 import { api } from '@/scripts/api'
-import { ComfyWorkflow } from './workflowStore'
-import type { ComfyNode, ComfyWorkflowJSON } from '@/types/comfyWorkflow'
 import type {
   ExecutedWsMessage,
   ExecutingWsMessage,
@@ -11,6 +10,9 @@ import type {
   ProgressWsMessage,
   StatusWsMessage
 } from '@/types/apiTypes'
+import type { ComfyNode, ComfyWorkflowJSON } from '@/types/comfyWorkflow'
+
+import { ComfyWorkflow } from './workflowStore'
 
 export interface QueuedPrompt {
   nodes: Record<string, boolean>
diff --git a/src/stores/extensionStore.ts b/src/stores/extensionStore.ts
index b2da14731..302110b10 100644
--- a/src/stores/extensionStore.ts
+++ b/src/stores/extensionStore.ts
@@ -1,5 +1,6 @@
-import { ref, computed, markRaw } from 'vue'
 import { defineStore } from 'pinia'
+import { computed, markRaw, ref } from 'vue'
+
 import type { ComfyExtension } from '@/types/comfy'
 
 /**
diff --git a/src/stores/graphStore.ts b/src/stores/graphStore.ts
index 268f82255..f58361e28 100644
--- a/src/stores/graphStore.ts
+++ b/src/stores/graphStore.ts
@@ -1,4 +1,4 @@
-import { LGraphNode, LGraphGroup, LGraphCanvas } from '@comfyorg/litegraph'
+import { LGraphCanvas, LGraphGroup, LGraphNode } from '@comfyorg/litegraph'
 import { defineStore } from 'pinia'
 import { shallowRef } from 'vue'
 
diff --git a/src/stores/keybindingStore.ts b/src/stores/keybindingStore.ts
index 7d909887a..5abfe1ab9 100644
--- a/src/stores/keybindingStore.ts
+++ b/src/stores/keybindingStore.ts
@@ -1,6 +1,7 @@
 import { defineStore } from 'pinia'
-import { computed, Ref, ref, toRaw } from 'vue'
-import { Keybinding, KeyCombo } from '@/types/keyBindingTypes'
+import { Ref, computed, ref, toRaw } from 'vue'
+
+import { KeyCombo, Keybinding } from '@/types/keyBindingTypes'
 
 export class KeybindingImpl implements Keybinding {
   commandId: string
diff --git a/src/stores/menuItemStore.ts b/src/stores/menuItemStore.ts
index 1c1badeb7..432976ec9 100644
--- a/src/stores/menuItemStore.ts
+++ b/src/stores/menuItemStore.ts
@@ -1,9 +1,11 @@
 import { defineStore } from 'pinia'
 import type { MenuItem } from 'primevue/menuitem'
 import { ref } from 'vue'
-import { useCommandStore } from './commandStore'
-import { ComfyExtension } from '@/types/comfy'
+
 import { CORE_MENU_COMMANDS } from '@/constants/coreMenuCommands'
+import { ComfyExtension } from '@/types/comfy'
+
+import { useCommandStore } from './commandStore'
 
 export const useMenuItemStore = defineStore('menuItem', () => {
   const commandStore = useCommandStore()
diff --git a/src/stores/modelStore.ts b/src/stores/modelStore.ts
index 004f3928e..dc03c6145 100644
--- a/src/stores/modelStore.ts
+++ b/src/stores/modelStore.ts
@@ -1,5 +1,6 @@
-import { computed, ref } from 'vue'
 import { defineStore } from 'pinia'
+import { computed, ref } from 'vue'
+
 import { api } from '@/scripts/api'
 
 /** (Internal helper) finds a value in a metadata object from any of a list of keys. */
diff --git a/src/stores/modelToNodeStore.ts b/src/stores/modelToNodeStore.ts
index 4c859f786..dd3d6ee6f 100644
--- a/src/stores/modelToNodeStore.ts
+++ b/src/stores/modelToNodeStore.ts
@@ -1,5 +1,6 @@
-import { ref } from 'vue'
 import { defineStore } from 'pinia'
+import { ref } from 'vue'
+
 import { ComfyNodeDefImpl, useNodeDefStore } from '@/stores/nodeDefStore'
 
 /** Helper class that defines how to construct a node from a model. */
diff --git a/src/stores/nodeBookmarkStore.ts b/src/stores/nodeBookmarkStore.ts
index 793ba022f..f29ea2aaf 100644
--- a/src/stores/nodeBookmarkStore.ts
+++ b/src/stores/nodeBookmarkStore.ts
@@ -1,12 +1,14 @@
+import _ from 'lodash'
 import { defineStore } from 'pinia'
+import type { TreeNode } from 'primevue/treenode'
 import { computed } from 'vue'
-import { useSettingStore } from './settingStore'
+
+import type { BookmarkCustomization } from '@/types/apiTypes'
+
 import { useNodeDefStore } from './nodeDefStore'
 import { ComfyNodeDefImpl, createDummyFolderNodeDef } from './nodeDefStore'
 import { buildNodeDefTree } from './nodeDefStore'
-import type { TreeNode } from 'primevue/treenode'
-import _ from 'lodash'
-import type { BookmarkCustomization } from '@/types/apiTypes'
+import { useSettingStore } from './settingStore'
 
 export const BOOKMARK_SETTING_ID = 'Comfy.NodeLibrary.Bookmarks.V2'
 
diff --git a/src/stores/nodeDefStore.ts b/src/stores/nodeDefStore.ts
index 96cd4a9b3..7091e916e 100644
--- a/src/stores/nodeDefStore.ts
+++ b/src/stores/nodeDefStore.ts
@@ -1,24 +1,25 @@
+import type { LGraphNode } from '@comfyorg/litegraph'
+import axios from 'axios'
+import { defineStore } from 'pinia'
+import type { TreeNode } from 'primevue/treenode'
+import { computed, ref } from 'vue'
+
 import {
   NodeSearchService,
   type SearchAuxScore
 } from '@/services/nodeSearchService'
 import {
-  type ComfyNodeDef,
   type ComfyInputsSpec as ComfyInputsSpecSchema,
+  type ComfyNodeDef,
   type ComfyOutputTypesSpec as ComfyOutputTypesSpecSchema,
   type InputSpec
 } from '@/types/apiTypes'
-import { defineStore } from 'pinia'
-import type { TreeNode } from 'primevue/treenode'
-import { buildTree } from '@/utils/treeUtil'
-import { computed, ref } from 'vue'
-import axios from 'axios'
 import {
   type NodeSource,
   NodeSourceType,
   getNodeSource
 } from '@/types/nodeSource'
-import type { LGraphNode } from '@comfyorg/litegraph'
+import { buildTree } from '@/utils/treeUtil'
 
 export interface BaseInputSpec<T = any> {
   name: string
diff --git a/src/stores/queueStore.ts b/src/stores/queueStore.ts
index 33701a103..2d42ab4d5 100644
--- a/src/stores/queueStore.ts
+++ b/src/stores/queueStore.ts
@@ -1,19 +1,20 @@
-import { api } from '@/scripts/api'
-import type { ComfyApp } from '@/scripts/app'
-import type {
-  TaskItem,
-  TaskType,
-  TaskPrompt,
-  TaskStatus,
-  StatusWsMessageStatus,
-  TaskOutput,
-  ResultItem
-} from '@/types/apiTypes'
-import type { ComfyWorkflowJSON, NodeId } from '@/types/comfyWorkflow'
 import _ from 'lodash'
 import { defineStore } from 'pinia'
 import { toRaw } from 'vue'
-import { ref, computed } from 'vue'
+import { computed, ref } from 'vue'
+
+import { api } from '@/scripts/api'
+import type { ComfyApp } from '@/scripts/app'
+import type {
+  ResultItem,
+  StatusWsMessageStatus,
+  TaskItem,
+  TaskOutput,
+  TaskPrompt,
+  TaskStatus,
+  TaskType
+} from '@/types/apiTypes'
+import type { ComfyWorkflowJSON, NodeId } from '@/types/comfyWorkflow'
 
 // Task type used in the API.
 export type APITaskType = 'queue' | 'history'
diff --git a/src/stores/serverConfigStore.ts b/src/stores/serverConfigStore.ts
index 980b3acb0..afb822cf7 100644
--- a/src/stores/serverConfigStore.ts
+++ b/src/stores/serverConfigStore.ts
@@ -1,7 +1,8 @@
-import { ServerConfig, ServerConfigValue } from '@/constants/serverConfig'
 import { defineStore } from 'pinia'
 import { computed, ref } from 'vue'
 
+import { ServerConfig, ServerConfigValue } from '@/constants/serverConfig'
+
 export type ServerConfigWithValue<T> = ServerConfig<T> & {
   /**
    * Current value.
diff --git a/src/stores/settingStore.ts b/src/stores/settingStore.ts
index 196764fb9..d4b211e66 100644
--- a/src/stores/settingStore.ts
+++ b/src/stores/settingStore.ts
@@ -1,11 +1,12 @@
-import { ref, computed } from 'vue'
 import { defineStore } from 'pinia'
-import type { Settings } from '@/types/apiTypes'
-import type { SettingParams } from '@/types/settingTypes'
 import type { TreeNode } from 'primevue/treenode'
-import { buildTree } from '@/utils/treeUtil'
+import { computed, ref } from 'vue'
+
 import { api } from '@/scripts/api'
 import { app } from '@/scripts/app'
+import type { Settings } from '@/types/apiTypes'
+import type { SettingParams } from '@/types/settingTypes'
+import { buildTree } from '@/utils/treeUtil'
 
 export const getSettingInfo = (setting: SettingParams) => {
   const parts = setting.category || setting.id.split('.')
diff --git a/src/stores/systemStatsStore.ts b/src/stores/systemStatsStore.ts
index 5b1014d8e..92d2b3759 100644
--- a/src/stores/systemStatsStore.ts
+++ b/src/stores/systemStatsStore.ts
@@ -1,5 +1,6 @@
 import { defineStore } from 'pinia'
 import { ref } from 'vue'
+
 import { api } from '@/scripts/api'
 import type { SystemStats } from '@/types/apiTypes'
 
diff --git a/src/stores/toastStore.ts b/src/stores/toastStore.ts
index 1ed57b0dc..80cc24338 100644
--- a/src/stores/toastStore.ts
+++ b/src/stores/toastStore.ts
@@ -2,8 +2,8 @@
 // instead of going through the store.
 // The store is useful when you need to call it from outside the Vue component context.
 import { defineStore } from 'pinia'
-import { ref } from 'vue'
 import type { ToastMessageOptions } from 'primevue/toast'
+import { ref } from 'vue'
 
 export const useToastStore = defineStore('toast', () => {
   const messagesToAdd = ref<ToastMessageOptions[]>([])
diff --git a/src/stores/userFileStore.ts b/src/stores/userFileStore.ts
index f0efb9978..5bcdb9580 100644
--- a/src/stores/userFileStore.ts
+++ b/src/stores/userFileStore.ts
@@ -1,11 +1,12 @@
 import { defineStore } from 'pinia'
-import { api } from '@/scripts/api'
-import { buildTree } from '@/utils/treeUtil'
 import { computed, ref } from 'vue'
-import { TreeExplorerNode } from '@/types/treeExplorerTypes'
+
+import { api } from '@/scripts/api'
 import { UserDataFullInfo } from '@/types/apiTypes'
-import { syncEntities } from '@/utils/syncUtil'
+import { TreeExplorerNode } from '@/types/treeExplorerTypes'
 import { getPathDetails } from '@/utils/formatUtil'
+import { syncEntities } from '@/utils/syncUtil'
+import { buildTree } from '@/utils/treeUtil'
 
 /**
  * Represents a file in the user's data directory.
diff --git a/src/stores/userStore.ts b/src/stores/userStore.ts
index 7a6109dde..c5970cfd3 100644
--- a/src/stores/userStore.ts
+++ b/src/stores/userStore.ts
@@ -1,6 +1,7 @@
-import { api } from '@/scripts/api'
 import { defineStore } from 'pinia'
 import { computed, ref, watchEffect } from 'vue'
+
+import { api } from '@/scripts/api'
 import type { User as UserConfig } from '@/types/apiTypes'
 
 export interface User {
diff --git a/src/stores/widgetStore.ts b/src/stores/widgetStore.ts
index 0257198ff..c5bdd47c2 100644
--- a/src/stores/widgetStore.ts
+++ b/src/stores/widgetStore.ts
@@ -1,6 +1,8 @@
-import { ComfyWidgets, ComfyWidgetConstructor } from '@/scripts/widgets'
 import { defineStore } from 'pinia'
-import { ref, computed } from 'vue'
+import { computed, ref } from 'vue'
+
+import { ComfyWidgetConstructor, ComfyWidgets } from '@/scripts/widgets'
+
 import type { BaseInputSpec } from './nodeDefStore'
 
 export const useWidgetStore = defineStore('widget', () => {
diff --git a/src/stores/workflowStore.ts b/src/stores/workflowStore.ts
index 874c215fc..244d5a2bb 100644
--- a/src/stores/workflowStore.ts
+++ b/src/stores/workflowStore.ts
@@ -1,13 +1,15 @@
 import { defineStore } from 'pinia'
 import { computed, markRaw, ref } from 'vue'
+
 import { api } from '@/scripts/api'
-import { UserFile } from './userFileStore'
 import { ChangeTracker } from '@/scripts/changeTracker'
+import { defaultGraphJSON } from '@/scripts/defaultGraph'
 import { ComfyWorkflowJSON } from '@/types/comfyWorkflow'
 import { getPathDetails } from '@/utils/formatUtil'
-import { defaultGraphJSON } from '@/scripts/defaultGraph'
 import { syncEntities } from '@/utils/syncUtil'
 
+import { UserFile } from './userFileStore'
+
 export class ComfyWorkflow extends UserFile {
   static readonly basePath = 'workflows/'
 
diff --git a/src/stores/workflowTemplatesStore.ts b/src/stores/workflowTemplatesStore.ts
index 1c5721642..1f617aed5 100644
--- a/src/stores/workflowTemplatesStore.ts
+++ b/src/stores/workflowTemplatesStore.ts
@@ -1,5 +1,6 @@
 import { defineStore } from 'pinia'
 import { ref } from 'vue'
+
 import { api } from '@/scripts/api'
 
 export const useWorkflowTemplatesStore = defineStore(
diff --git a/src/stores/workspace/bottomPanelStore.ts b/src/stores/workspace/bottomPanelStore.ts
index f7c815de2..eeb4eb0d6 100644
--- a/src/stores/workspace/bottomPanelStore.ts
+++ b/src/stores/workspace/bottomPanelStore.ts
@@ -1,12 +1,13 @@
-import type { BottomPanelExtension } from '@/types/extensionTypes'
 import { defineStore } from 'pinia'
 import { computed, ref } from 'vue'
-import { useCommandStore } from '@/stores/commandStore'
+
 import {
-  useLogsTerminalTab,
-  useCommandTerminalTab
+  useCommandTerminalTab,
+  useLogsTerminalTab
 } from '@/hooks/bottomPanelTabs/terminalTabs'
+import { useCommandStore } from '@/stores/commandStore'
 import { ComfyExtension } from '@/types/comfy'
+import type { BottomPanelExtension } from '@/types/extensionTypes'
 import { isElectron } from '@/utils/envUtil'
 
 export const useBottomPanelStore = defineStore('bottomPanel', () => {
diff --git a/src/stores/workspace/colorPaletteStore.ts b/src/stores/workspace/colorPaletteStore.ts
index 3060dc93a..ae09ddfad 100644
--- a/src/stores/workspace/colorPaletteStore.ts
+++ b/src/stores/workspace/colorPaletteStore.ts
@@ -1,14 +1,15 @@
 import { defineStore } from 'pinia'
-import { ref, computed } from 'vue'
+import { computed, ref } from 'vue'
+
+import {
+  CORE_COLOR_PALETTES,
+  DEFAULT_COLOR_PALETTE
+} from '@/constants/coreColorPalettes'
 import type {
   ColorPalettes,
   CompletedPalette,
   Palette
 } from '@/types/colorPaletteTypes'
-import {
-  CORE_COLOR_PALETTES,
-  DEFAULT_COLOR_PALETTE
-} from '@/constants/coreColorPalettes'
 
 export const useColorPaletteStore = defineStore('colorPalette', () => {
   const customPalettes = ref<ColorPalettes>({})
diff --git a/src/stores/workspace/sidebarTabStore.ts b/src/stores/workspace/sidebarTabStore.ts
index 2a6a3f632..9f7b2d9f6 100644
--- a/src/stores/workspace/sidebarTabStore.ts
+++ b/src/stores/workspace/sidebarTabStore.ts
@@ -1,11 +1,12 @@
+import { defineStore } from 'pinia'
+import { computed, ref } from 'vue'
+
 import { useModelLibrarySidebarTab } from '@/hooks/sidebarTabs/modelLibrarySidebarTab'
 import { useNodeLibrarySidebarTab } from '@/hooks/sidebarTabs/nodeLibrarySidebarTab'
 import { useQueueSidebarTab } from '@/hooks/sidebarTabs/queueSidebarTab'
 import { useWorkflowsSidebarTab } from '@/hooks/sidebarTabs/workflowsSidebarTab'
-import { SidebarTabExtension } from '@/types/extensionTypes'
-import { defineStore } from 'pinia'
-import { computed, ref } from 'vue'
 import { useCommandStore } from '@/stores/commandStore'
+import { SidebarTabExtension } from '@/types/extensionTypes'
 
 export const useSidebarTabStore = defineStore('sidebarTab', () => {
   const sidebarTabs = ref<SidebarTabExtension[]>([])
diff --git a/src/stores/workspaceStore.ts b/src/stores/workspaceStore.ts
index c3da55d8d..d139a7eb3 100644
--- a/src/stores/workspaceStore.ts
+++ b/src/stores/workspaceStore.ts
@@ -1,13 +1,15 @@
-import { ref, computed } from 'vue'
 import { defineStore } from 'pinia'
-import type { SidebarTabExtension, ToastManager } from '@/types/extensionTypes'
-import { useToastStore } from './toastStore'
-import { useQueueSettingsStore } from './queueStore'
-import { useCommandStore } from './commandStore'
-import { useSidebarTabStore } from './workspace/sidebarTabStore'
-import { useSettingStore } from './settingStore'
-import { useWorkflowStore } from './workflowStore'
+import { computed, ref } from 'vue'
+
 import { useColorPaletteService } from '@/services/colorPaletteService'
+import type { SidebarTabExtension, ToastManager } from '@/types/extensionTypes'
+
+import { useCommandStore } from './commandStore'
+import { useQueueSettingsStore } from './queueStore'
+import { useSettingStore } from './settingStore'
+import { useToastStore } from './toastStore'
+import { useWorkflowStore } from './workflowStore'
+import { useSidebarTabStore } from './workspace/sidebarTabStore'
 
 export const useWorkspaceStore = defineStore('workspace', () => {
   const spinner = ref(false)
diff --git a/src/types/apiTypes.ts b/src/types/apiTypes.ts
index 4bec33095..8da14329b 100644
--- a/src/types/apiTypes.ts
+++ b/src/types/apiTypes.ts
@@ -1,10 +1,11 @@
 import { ZodType, z } from 'zod'
-import { zComfyWorkflow, zNodeId } from './comfyWorkflow'
 import { fromZodError } from 'zod-validation-error'
+
 import { colorPalettesSchema } from './colorPaletteTypes'
-import { LinkReleaseTriggerAction } from './searchBoxTypes'
-import { NodeBadgeMode } from './nodeSource'
+import { zComfyWorkflow, zNodeId } from './comfyWorkflow'
 import { zKeybinding } from './keyBindingTypes'
+import { NodeBadgeMode } from './nodeSource'
+import { LinkReleaseTriggerAction } from './searchBoxTypes'
 
 const zNodeType = z.string()
 const zQueueIndex = z.number()
diff --git a/src/types/comfy.ts b/src/types/comfy.ts
index 024fbbe32..d021bf066 100644
--- a/src/types/comfy.ts
+++ b/src/types/comfy.ts
@@ -1,12 +1,13 @@
 import type { LGraphNode } from '@comfyorg/litegraph'
+
 import type { ComfyApp } from '@/scripts/app'
-import type { ComfyNodeDef } from '@/types/apiTypes'
-import type { Keybinding } from '@/types/keyBindingTypes'
-import type { ComfyCommand } from '@/stores/commandStore'
-import type { SettingParams } from '@/types/settingTypes'
-import type { BottomPanelExtension } from '@/types/extensionTypes'
 import type { ComfyWidgetConstructor } from '@/scripts/widgets'
+import type { ComfyCommand } from '@/stores/commandStore'
+import type { ComfyNodeDef } from '@/types/apiTypes'
 import type { ComfyWorkflowJSON } from '@/types/comfyWorkflow'
+import type { BottomPanelExtension } from '@/types/extensionTypes'
+import type { Keybinding } from '@/types/keyBindingTypes'
+import type { SettingParams } from '@/types/settingTypes'
 
 export type Widgets = Record<string, ComfyWidgetConstructor>
 
diff --git a/src/types/comfyWorkflow.ts b/src/types/comfyWorkflow.ts
index d4ecf13f0..4eade8dd8 100644
--- a/src/types/comfyWorkflow.ts
+++ b/src/types/comfyWorkflow.ts
@@ -1,4 +1,4 @@
-import { z, type SafeParseReturnType } from 'zod'
+import { type SafeParseReturnType, z } from 'zod'
 import { fromZodError } from 'zod-validation-error'
 
 // GroupNode is hacking node id to be a string, so we need to allow that.
diff --git a/src/types/extensionTypes.ts b/src/types/extensionTypes.ts
index b3a46eddb..8ffde93d4 100644
--- a/src/types/extensionTypes.ts
+++ b/src/types/extensionTypes.ts
@@ -1,6 +1,7 @@
-import type { ComfyCommand } from '@/stores/commandStore'
 import { Component } from 'vue'
 
+import type { ComfyCommand } from '@/stores/commandStore'
+
 export interface BaseSidebarTabExtension {
   id: string
   title: string
diff --git a/src/types/litegraph-augmentation.d.ts b/src/types/litegraph-augmentation.d.ts
index 7d10a3b2a..6cd421641 100644
--- a/src/types/litegraph-augmentation.d.ts
+++ b/src/types/litegraph-augmentation.d.ts
@@ -1,6 +1,8 @@
 import '@comfyorg/litegraph'
-import type { ComfyNodeDef } from '@/types/apiTypes'
 import type { LLink } from '@comfyorg/litegraph'
+
+import type { ComfyNodeDef } from '@/types/apiTypes'
+
 import type { NodeId } from './comfyWorkflow'
 
 /**
diff --git a/src/types/litegraphTypes.ts b/src/types/litegraphTypes.ts
index f9e7ab987..22d74fbd1 100644
--- a/src/types/litegraphTypes.ts
+++ b/src/types/litegraphTypes.ts
@@ -1,11 +1,11 @@
 import type {
   ConnectingLink,
-  LGraphNode,
-  Vector2,
   INodeInputSlot,
   INodeOutputSlot,
   INodeSlot,
-  ISlotType
+  ISlotType,
+  LGraphNode,
+  Vector2
 } from '@comfyorg/litegraph'
 import { LiteGraph } from '@comfyorg/litegraph'
 import { RerouteId } from '@comfyorg/litegraph/dist/Reroute'
diff --git a/src/views/DownloadGitView.vue b/src/views/DownloadGitView.vue
index 56b67ef38..1cb953e88 100644
--- a/src/views/DownloadGitView.vue
+++ b/src/views/DownloadGitView.vue
@@ -46,10 +46,11 @@
 </template>
 
 <script setup lang="ts">
-import BaseViewTemplate from '@/views/templates/BaseViewTemplate.vue'
 import Button from 'primevue/button'
 import { useRouter } from 'vue-router'
 
+import BaseViewTemplate from '@/views/templates/BaseViewTemplate.vue'
+
 const openGitDownloads = () => {
   window.open('https://git-scm.com/downloads/', '_blank')
 }
diff --git a/src/views/GraphView.vue b/src/views/GraphView.vue
index a109c375d..f0d0af5c8 100644
--- a/src/views/GraphView.vue
+++ b/src/views/GraphView.vue
@@ -10,39 +10,40 @@
 </template>
 
 <script setup lang="ts">
-import GraphCanvas from '@/components/graph/GraphCanvas.vue'
-import MenuHamburger from '@/components/MenuHamburger.vue'
-import { computed, onMounted, onBeforeUnmount, watch, watchEffect } from 'vue'
-import { app } from '@/scripts/app'
-import { useSettingStore } from '@/stores/settingStore'
+import { useEventListener } from '@vueuse/core'
+import type { ToastMessageOptions } from 'primevue/toast'
+import { useToast } from 'primevue/usetoast'
+import { computed, onBeforeUnmount, onMounted, watch, watchEffect } from 'vue'
 import { useI18n } from 'vue-i18n'
-import { useWorkspaceStore } from '@/stores/workspaceStore'
+
+import BrowserTabTitle from '@/components/BrowserTabTitle.vue'
+import MenuHamburger from '@/components/MenuHamburger.vue'
+import UnloadWindowConfirmDialog from '@/components/dialog/UnloadWindowConfirmDialog.vue'
+import GraphCanvas from '@/components/graph/GraphCanvas.vue'
+import GlobalToast from '@/components/toast/GlobalToast.vue'
+import TopMenubar from '@/components/topbar/TopMenubar.vue'
+import { SERVER_CONFIG_ITEMS } from '@/constants/serverConfig'
+import { useCoreCommands } from '@/hooks/coreCommandHooks'
+import { i18n } from '@/i18n'
 import { api } from '@/scripts/api'
-import { StatusWsMessageStatus } from '@/types/apiTypes'
+import { app } from '@/scripts/app'
+import { setupAutoQueueHandler } from '@/services/autoQueueService'
+import { useKeybindingService } from '@/services/keybindingService'
+import { useCommandStore } from '@/stores/commandStore'
+import { useExecutionStore } from '@/stores/executionStore'
+import { useMenuItemStore } from '@/stores/menuItemStore'
+import { useModelStore } from '@/stores/modelStore'
+import { useNodeDefStore, useNodeFrequencyStore } from '@/stores/nodeDefStore'
 import {
   useQueuePendingTaskCountStore,
   useQueueStore
 } from '@/stores/queueStore'
-import type { ToastMessageOptions } from 'primevue/toast'
-import { useToast } from 'primevue/usetoast'
-import { i18n } from '@/i18n'
-import { useExecutionStore } from '@/stores/executionStore'
-import GlobalToast from '@/components/toast/GlobalToast.vue'
-import UnloadWindowConfirmDialog from '@/components/dialog/UnloadWindowConfirmDialog.vue'
-import BrowserTabTitle from '@/components/BrowserTabTitle.vue'
-import TopMenubar from '@/components/topbar/TopMenubar.vue'
-import { setupAutoQueueHandler } from '@/services/autoQueueService'
-import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore'
-import { useNodeDefStore, useNodeFrequencyStore } from '@/stores/nodeDefStore'
-import { useBottomPanelStore } from '@/stores/workspace/bottomPanelStore'
-import { useModelStore } from '@/stores/modelStore'
 import { useServerConfigStore } from '@/stores/serverConfigStore'
-import { SERVER_CONFIG_ITEMS } from '@/constants/serverConfig'
-import { useMenuItemStore } from '@/stores/menuItemStore'
-import { useCommandStore } from '@/stores/commandStore'
-import { useCoreCommands } from '@/hooks/coreCommandHooks'
-import { useEventListener } from '@vueuse/core'
-import { useKeybindingService } from '@/services/keybindingService'
+import { useSettingStore } from '@/stores/settingStore'
+import { useBottomPanelStore } from '@/stores/workspace/bottomPanelStore'
+import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore'
+import { useWorkspaceStore } from '@/stores/workspaceStore'
+import { StatusWsMessageStatus } from '@/types/apiTypes'
 
 setupAutoQueueHandler()
 
diff --git a/src/views/InstallView.vue b/src/views/InstallView.vue
index 625296d92..5709f337f 100644
--- a/src/views/InstallView.vue
+++ b/src/views/InstallView.vue
@@ -97,23 +97,24 @@
 
 <script setup lang="ts">
 import Button from 'primevue/button'
-import Stepper from 'primevue/stepper'
-import StepList from 'primevue/steplist'
-import StepPanels from 'primevue/steppanels'
 import Step from 'primevue/step'
+import StepList from 'primevue/steplist'
 import StepPanel from 'primevue/steppanel'
-import BaseViewTemplate from '@/views/templates/BaseViewTemplate.vue'
+import StepPanels from 'primevue/steppanels'
+import Stepper from 'primevue/stepper'
+import { computed, onMounted, ref, toRaw } from 'vue'
+import { useRouter } from 'vue-router'
+
+import DesktopSettingsConfiguration from '@/components/install/DesktopSettingsConfiguration.vue'
+import GpuPicker from '@/components/install/GpuPicker.vue'
 import InstallLocationPicker from '@/components/install/InstallLocationPicker.vue'
 import MigrationPicker from '@/components/install/MigrationPicker.vue'
-import DesktopSettingsConfiguration from '@/components/install/DesktopSettingsConfiguration.vue'
 import {
-  electronAPI,
   type InstallOptions,
-  type TorchDeviceType
+  type TorchDeviceType,
+  electronAPI
 } from '@/utils/envUtil'
-import { ref, computed, toRaw, onMounted } from 'vue'
-import { useRouter } from 'vue-router'
-import GpuPicker from '@/components/install/GpuPicker.vue'
+import BaseViewTemplate from '@/views/templates/BaseViewTemplate.vue'
 
 const device = ref<TorchDeviceType>(null)
 
diff --git a/src/views/ManualConfigurationView.vue b/src/views/ManualConfigurationView.vue
index 0a6920174..fe9638c04 100644
--- a/src/views/ManualConfigurationView.vue
+++ b/src/views/ManualConfigurationView.vue
@@ -54,10 +54,11 @@
 import Button from 'primevue/button'
 import Panel from 'primevue/panel'
 import Tag from 'primevue/tag'
-import BaseViewTemplate from '@/views/templates/BaseViewTemplate.vue'
-import { electronAPI } from '@/utils/envUtil'
-import { useI18n } from 'vue-i18n'
 import { onMounted, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import { electronAPI } from '@/utils/envUtil'
+import BaseViewTemplate from '@/views/templates/BaseViewTemplate.vue'
 
 const { t } = useI18n()
 
diff --git a/src/views/NotSupportedView.vue b/src/views/NotSupportedView.vue
index be39e4d59..9a07e397a 100644
--- a/src/views/NotSupportedView.vue
+++ b/src/views/NotSupportedView.vue
@@ -58,6 +58,7 @@
 <script setup lang="ts">
 import Button from 'primevue/button'
 import { useRouter } from 'vue-router'
+
 import BaseViewTemplate from '@/views/templates/BaseViewTemplate.vue'
 
 const openDocs = () => {
diff --git a/src/views/ServerStartView.vue b/src/views/ServerStartView.vue
index 38203a0f8..069f9ab1a 100644
--- a/src/views/ServerStartView.vue
+++ b/src/views/ServerStartView.vue
@@ -42,14 +42,15 @@
 </template>
 
 <script setup lang="ts">
-import Button from 'primevue/button'
-import { ref, onMounted, Ref } from 'vue'
-import BaseTerminal from '@/components/bottomPanel/tabs/terminal/BaseTerminal.vue'
 import { ProgressStatus } from '@comfyorg/comfyui-electron-types'
-import { electronAPI } from '@/utils/envUtil'
-import type { useTerminal } from '@/hooks/bottomPanelTabs/useTerminal'
 import { Terminal } from '@xterm/xterm'
+import Button from 'primevue/button'
+import { Ref, onMounted, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
+
+import BaseTerminal from '@/components/bottomPanel/tabs/terminal/BaseTerminal.vue'
+import type { useTerminal } from '@/hooks/bottomPanelTabs/useTerminal'
+import { electronAPI } from '@/utils/envUtil'
 import BaseViewTemplate from '@/views/templates/BaseViewTemplate.vue'
 
 const electron = electronAPI()
diff --git a/src/views/UserSelectView.vue b/src/views/UserSelectView.vue
index a19719735..39478159f 100644
--- a/src/views/UserSelectView.vue
+++ b/src/views/UserSelectView.vue
@@ -43,11 +43,12 @@
 import Button from 'primevue/button'
 import Divider from 'primevue/divider'
 import InputText from 'primevue/inputtext'
-import Select from 'primevue/select'
 import Message from 'primevue/message'
-import { User, useUserStore } from '@/stores/userStore'
-import { useRouter } from 'vue-router'
+import Select from 'primevue/select'
 import { computed, onMounted, ref } from 'vue'
+import { useRouter } from 'vue-router'
+
+import { User, useUserStore } from '@/stores/userStore'
 import BaseViewTemplate from '@/views/templates/BaseViewTemplate.vue'
 
 const userStore = useUserStore()
diff --git a/src/views/WelcomeView.vue b/src/views/WelcomeView.vue
index 58f52e5b4..07502221f 100644
--- a/src/views/WelcomeView.vue
+++ b/src/views/WelcomeView.vue
@@ -23,6 +23,7 @@
 <script setup lang="ts">
 import Button from 'primevue/button'
 import { useRouter } from 'vue-router'
+
 import BaseViewTemplate from '@/views/templates/BaseViewTemplate.vue'
 
 const router = useRouter()
diff --git a/tests-ui/extractExamples.ts b/tests-ui/extractExamples.ts
index b9bdd5b22..cc430d17c 100644
--- a/tests-ui/extractExamples.ts
+++ b/tests-ui/extractExamples.ts
@@ -3,14 +3,15 @@
     Script to generate test API json from the ComfyUI_examples repo. 
     Requires the repo to be cloned to the tests-ui directory or specified via the EXAMPLE_REPO_PATH env var.
 */
-
 import chalk from 'chalk'
-import fs from 'fs'
-import path from 'path'
-import { fileURLToPath } from 'node:url'
-import { getFromPngBuffer } from '@/scripts/metadata/png'
-import { getFromFlacBuffer } from '@/scripts/metadata/flac'
 import dotenv from 'dotenv'
+import fs from 'fs'
+import { fileURLToPath } from 'node:url'
+import path from 'path'
+
+import { getFromFlacBuffer } from '@/scripts/metadata/flac'
+import { getFromPngBuffer } from '@/scripts/metadata/png'
+
 dotenv.config()
 
 const dirname = path.dirname(fileURLToPath(import.meta.url))
diff --git a/tests-ui/setup.ts b/tests-ui/setup.ts
index c8441d240..f96fd559e 100644
--- a/tests-ui/setup.ts
+++ b/tests-ui/setup.ts
@@ -1,6 +1,6 @@
-import { resolve } from 'path'
 import { existsSync, mkdirSync, writeFileSync } from 'fs'
 import http from 'http'
+import { resolve } from 'path'
 
 async function setup() {
   await new Promise<void>((res, rej) => {
diff --git a/tests-ui/tests/apiTypes.test.ts b/tests-ui/tests/apiTypes.test.ts
index 3b51b74d8..050142cc2 100644
--- a/tests-ui/tests/apiTypes.test.ts
+++ b/tests-ui/tests/apiTypes.test.ts
@@ -1,7 +1,8 @@
 // @ts-strict-ignore
+import fs from 'fs'
+import path from 'path'
+
 import { ComfyNodeDef, validateComfyNodeDef } from '@/types/apiTypes'
-const fs = require('fs')
-const path = require('path')
 
 const EXAMPLE_NODE_DEF: ComfyNodeDef = {
   input: {
@@ -76,7 +77,10 @@ describe('validateNodeDef', () => {
   it('Should accept all built-in node definitions', async () => {
     const nodeDefs = Object.values(
       JSON.parse(
-        fs.readFileSync(path.resolve('./tests-ui/data/object_info.json'))
+        fs.readFileSync(
+          path.resolve('./tests-ui/data/object_info.json'),
+          'utf8'
+        )
       )
     )
 
diff --git a/tests-ui/tests/comfyWorkflow.test.ts b/tests-ui/tests/comfyWorkflow.test.ts
index 8e27f3ff6..32db20d36 100644
--- a/tests-ui/tests/comfyWorkflow.test.ts
+++ b/tests-ui/tests/comfyWorkflow.test.ts
@@ -1,8 +1,9 @@
 // @ts-strict-ignore
-import { validateComfyWorkflow } from '@/types/comfyWorkflow'
-import { defaultGraph } from '@/scripts/defaultGraph'
 import fs from 'fs'
 
+import { defaultGraph } from '@/scripts/defaultGraph'
+import { validateComfyWorkflow } from '@/types/comfyWorkflow'
+
 const WORKFLOW_DIR = 'tests-ui/workflows'
 
 describe('parseComfyWorkflow', () => {
diff --git a/tests-ui/tests/nodeDef.test.ts b/tests-ui/tests/nodeDef.test.ts
index 0b7f55d75..0a1e70262 100644
--- a/tests-ui/tests/nodeDef.test.ts
+++ b/tests-ui/tests/nodeDef.test.ts
@@ -1,12 +1,14 @@
 // @ts-strict-ignore
 import {
-  ComfyInputsSpec,
-  IntInputSpec,
-  StringInputSpec,
   BooleanInputSpec,
+  ComfyInputsSpec,
+  ComfyNodeDefImpl,
   FloatInputSpec,
-  ComfyNodeDefImpl
-} from '@/stores/nodeDefStore' // Adjust the import path as needed
+  IntInputSpec,
+  StringInputSpec
+} from '@/stores/nodeDefStore'
+
+// Adjust the import path as needed
 
 describe('ComfyInputsSpec', () => {
   it('should transform a plain object to ComfyInputsSpec instance', () => {
diff --git a/tests-ui/tests/nodeSource.test.ts b/tests-ui/tests/nodeSource.test.ts
index a79aaeea3..4d0ea8017 100644
--- a/tests-ui/tests/nodeSource.test.ts
+++ b/tests-ui/tests/nodeSource.test.ts
@@ -1,4 +1,4 @@
-import { getNodeSource, NodeSourceType } from '@/types/nodeSource'
+import { NodeSourceType, getNodeSource } from '@/types/nodeSource'
 
 describe('getNodeSource', () => {
   it('should return UNKNOWN_NODE_SOURCE when python_module is undefined', () => {
diff --git a/tests-ui/tests/store/keybindingStore.test.ts b/tests-ui/tests/store/keybindingStore.test.ts
index 35aee13fe..66cb90408 100644
--- a/tests-ui/tests/store/keybindingStore.test.ts
+++ b/tests-ui/tests/store/keybindingStore.test.ts
@@ -1,5 +1,6 @@
-import { setActivePinia, createPinia } from 'pinia'
-import { useKeybindingStore, KeybindingImpl } from '@/stores/keybindingStore'
+import { createPinia, setActivePinia } from 'pinia'
+
+import { KeybindingImpl, useKeybindingStore } from '@/stores/keybindingStore'
 
 describe('useKeybindingStore', () => {
   beforeEach(() => {
diff --git a/tests-ui/tests/store/modelStore.test.ts b/tests-ui/tests/store/modelStore.test.ts
index c45754ceb..2070f4808 100644
--- a/tests-ui/tests/store/modelStore.test.ts
+++ b/tests-ui/tests/store/modelStore.test.ts
@@ -1,6 +1,7 @@
-import { setActivePinia, createPinia } from 'pinia'
-import { useModelStore } from '@/stores/modelStore'
+import { createPinia, setActivePinia } from 'pinia'
+
 import { api } from '@/scripts/api'
+import { useModelStore } from '@/stores/modelStore'
 
 // Mock the api
 jest.mock('@/scripts/api', () => ({
diff --git a/tests-ui/tests/store/serverConfigStore.test.ts b/tests-ui/tests/store/serverConfigStore.test.ts
index d5d4a5dea..f477396dc 100644
--- a/tests-ui/tests/store/serverConfigStore.test.ts
+++ b/tests-ui/tests/store/serverConfigStore.test.ts
@@ -1,6 +1,7 @@
-import { setActivePinia, createPinia } from 'pinia'
-import { useServerConfigStore } from '@/stores/serverConfigStore'
+import { createPinia, setActivePinia } from 'pinia'
+
 import { ServerConfig } from '@/constants/serverConfig'
+import { useServerConfigStore } from '@/stores/serverConfigStore'
 import type { FormItem } from '@/types/settingTypes'
 
 const dummyFormItem: FormItem = {
diff --git a/tests-ui/tests/store/settingStore.test.ts b/tests-ui/tests/store/settingStore.test.ts
index 41ffe3e91..9308e5f47 100644
--- a/tests-ui/tests/store/settingStore.test.ts
+++ b/tests-ui/tests/store/settingStore.test.ts
@@ -1,6 +1,7 @@
-import { setActivePinia, createPinia } from 'pinia'
-import { useSettingStore } from '@/stores/settingStore'
+import { createPinia, setActivePinia } from 'pinia'
+
 import { api } from '@/scripts/api'
+import { useSettingStore } from '@/stores/settingStore'
 import type { SettingParams } from '@/types/settingTypes'
 
 // Mock the api
diff --git a/tests-ui/tests/store/userFileStore.test.ts b/tests-ui/tests/store/userFileStore.test.ts
index 9829d143b..e17ba6834 100644
--- a/tests-ui/tests/store/userFileStore.test.ts
+++ b/tests-ui/tests/store/userFileStore.test.ts
@@ -1,6 +1,7 @@
-import { setActivePinia, createPinia } from 'pinia'
-import { UserFile, useUserFileStore } from '@/stores/userFileStore'
+import { createPinia, setActivePinia } from 'pinia'
+
 import { api } from '@/scripts/api'
+import { UserFile, useUserFileStore } from '@/stores/userFileStore'
 
 // Mock the api
 jest.mock('@/scripts/api', () => ({
diff --git a/tests-ui/tests/store/workflowStore.test.ts b/tests-ui/tests/store/workflowStore.test.ts
index ec30456b8..6c81f1225 100644
--- a/tests-ui/tests/store/workflowStore.test.ts
+++ b/tests-ui/tests/store/workflowStore.test.ts
@@ -1,11 +1,12 @@
-import { setActivePinia, createPinia } from 'pinia'
+import { createPinia, setActivePinia } from 'pinia'
+
+import { api } from '@/scripts/api'
+import { defaultGraph, defaultGraphJSON } from '@/scripts/defaultGraph'
 import {
   LoadedComfyWorkflow,
   useWorkflowBookmarkStore,
   useWorkflowStore
 } from '@/stores/workflowStore'
-import { api } from '@/scripts/api'
-import { defaultGraph, defaultGraphJSON } from '@/scripts/defaultGraph'
 
 // Add mock for api at the top of the file
 jest.mock('@/scripts/api', () => ({
diff --git a/tests-ui/tests/utils/treeUtilTest.test.ts b/tests-ui/tests/utils/treeUtilTest.test.ts
index 28c322b5d..791475208 100644
--- a/tests-ui/tests/utils/treeUtilTest.test.ts
+++ b/tests-ui/tests/utils/treeUtilTest.test.ts
@@ -1,6 +1,7 @@
-import { buildTree, sortedTree } from '@/utils/treeUtil'
 import { TreeNode } from 'primevue/treenode'
 
+import { buildTree, sortedTree } from '@/utils/treeUtil'
+
 describe('buildTree', () => {
   it('should handle empty folder items correctly', () => {
     const items = [
diff --git a/vite.config.mts b/vite.config.mts
index c6bda643d..845ea56c0 100644
--- a/vite.config.mts
+++ b/vite.config.mts
@@ -1,11 +1,11 @@
-import { defineConfig, Plugin } from 'vite'
-import type { UserConfigExport } from 'vitest/config'
 import vue from '@vitejs/plugin-vue'
-import path from 'path'
 import dotenv from 'dotenv'
-import Icons from 'unplugin-icons/vite'
+import path from 'path'
 import IconsResolver from 'unplugin-icons/resolver'
+import Icons from 'unplugin-icons/vite'
 import Components from 'unplugin-vue-components/vite'
+import { Plugin, defineConfig } from 'vite'
+import type { UserConfigExport } from 'vitest/config'
 
 dotenv.config()
 
diff --git a/vite.electron.config.mts b/vite.electron.config.mts
index a2ec411b1..53d9f6305 100644
--- a/vite.electron.config.mts
+++ b/vite.electron.config.mts
@@ -1,6 +1,7 @@
-import { defineConfig, Plugin } from 'vite'
+import { Plugin, defineConfig } from 'vite'
 import { mergeConfig } from 'vite'
 import type { UserConfig } from 'vitest/config'
+
 import baseConfig from './vite.config.mts'
 
 const mockElectronAPI: Plugin = {
@@ -64,4 +65,4 @@ export default mergeConfig(
   defineConfig({
     plugins: [mockElectronAPI]
   })
-)
\ No newline at end of file
+)
diff --git a/vite.types.config.mts b/vite.types.config.mts
index a8389e81a..e21fd6cd6 100644
--- a/vite.types.config.mts
+++ b/vite.types.config.mts
@@ -1,6 +1,6 @@
+import { resolve } from 'path'
 import { defineConfig } from 'vite'
 import dts from 'vite-plugin-dts'
-import { resolve } from 'path'
 
 export default defineConfig({
   build: {
diff --git a/vitest.config.ts b/vitest.config.ts
index cfa1e18cd..c923263d6 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -1,5 +1,5 @@
-import { defineConfig } from 'vitest/config'
 import vue from '@vitejs/plugin-vue'
+import { defineConfig } from 'vitest/config'
 
 export default defineConfig({
   plugins: [vue()],