diff --git a/browser_tests/actionbar.spec.ts b/browser_tests/actionbar.spec.ts
index 690d4be76..3b2c59ce9 100644
--- a/browser_tests/actionbar.spec.ts
+++ b/browser_tests/actionbar.spec.ts
@@ -1,7 +1,7 @@
 import type { Response } from '@playwright/test'
 import { expect, mergeTests } from '@playwright/test'
 
-import type { StatusWsMessage } from '../src/types/apiTypes.ts'
+import type { StatusWsMessage } from '../src/schemas/apiSchema.ts'
 import { comfyPageFixture } from './fixtures/ComfyPage'
 import { webSocketFixture } from './fixtures/ws.ts'
 
diff --git a/browser_tests/colorPalette.spec.ts b/browser_tests/colorPalette.spec.ts
index a8e1e6094..2daf0326b 100644
--- a/browser_tests/colorPalette.spec.ts
+++ b/browser_tests/colorPalette.spec.ts
@@ -1,6 +1,6 @@
 import { expect } from '@playwright/test'
 
-import type { Palette } from '../src/types/colorPaletteTypes'
+import type { Palette } from '../src/schemas/colorPaletteSchema'
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 const customColorPalettes: Record<string, Palette> = {
diff --git a/browser_tests/dialog.spec.ts b/browser_tests/dialog.spec.ts
index fc9ebb64f..edf656679 100644
--- a/browser_tests/dialog.spec.ts
+++ b/browser_tests/dialog.spec.ts
@@ -1,6 +1,6 @@
 import { Locator, expect } from '@playwright/test'
 
-import { Keybinding } from '../src/types/keyBindingTypes'
+import type { Keybinding } from '../src/schemas/keyBindingSchema'
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Load workflow warning', () => {
diff --git a/browser_tests/fixtures/ComfyPage.ts b/browser_tests/fixtures/ComfyPage.ts
index 301bc3348..0cb047990 100644
--- a/browser_tests/fixtures/ComfyPage.ts
+++ b/browser_tests/fixtures/ComfyPage.ts
@@ -5,9 +5,9 @@ import { test as base } from '@playwright/test'
 import dotenv from 'dotenv'
 import * as fs from 'fs'
 
+import type { NodeId } from '../../src/schemas/comfyWorkflowSchema'
+import type { KeyCombo } from '../../src/schemas/keyBindingSchema'
 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'
diff --git a/browser_tests/fixtures/utils/taskHistory.ts b/browser_tests/fixtures/utils/taskHistory.ts
index 33c0ba626..93d5b9b07 100644
--- a/browser_tests/fixtures/utils/taskHistory.ts
+++ b/browser_tests/fixtures/utils/taskHistory.ts
@@ -8,7 +8,7 @@ import type {
   HistoryTaskItem,
   TaskItem,
   TaskOutput
-} from '../../../src/types/apiTypes'
+} from '../../../src/schemas/apiSchema'
 import type { ComfyPage } from '../ComfyPage'
 
 /** keyof TaskOutput[string] */
diff --git a/src/components/bottomPanel/tabs/terminal/LogsTerminal.vue b/src/components/bottomPanel/tabs/terminal/LogsTerminal.vue
index ab1c5516a..f8fe342c2 100644
--- a/src/components/bottomPanel/tabs/terminal/LogsTerminal.vue
+++ b/src/components/bottomPanel/tabs/terminal/LogsTerminal.vue
@@ -16,9 +16,9 @@ import ProgressSpinner from 'primevue/progressspinner'
 import { Ref, onMounted, onUnmounted, ref } from 'vue'
 
 import type { useTerminal } from '@/composables/bottomPanelTabs/useTerminal'
+import { LogEntry, LogsWsMessage, TerminalSize } from '@/schemas/apiSchema'
 import { api } from '@/scripts/api'
 import { useExecutionStore } from '@/stores/executionStore'
-import { LogEntry, LogsWsMessage, TerminalSize } from '@/types/apiTypes'
 
 import BaseTerminal from './BaseTerminal.vue'
 
diff --git a/src/components/common/DeviceInfo.vue b/src/components/common/DeviceInfo.vue
index 8fbb57e45..5f81cefaf 100644
--- a/src/components/common/DeviceInfo.vue
+++ b/src/components/common/DeviceInfo.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script setup lang="ts">
-import type { DeviceStats } from '@/types/apiTypes'
+import type { DeviceStats } from '@/schemas/apiSchema'
 import { formatSize } from '@/utils/formatUtil'
 
 const props = defineProps<{
diff --git a/src/components/common/SystemStatsPanel.vue b/src/components/common/SystemStatsPanel.vue
index 486ad1432..2973dc940 100644
--- a/src/components/common/SystemStatsPanel.vue
+++ b/src/components/common/SystemStatsPanel.vue
@@ -36,7 +36,7 @@ import TabView from 'primevue/tabview'
 import { computed } from 'vue'
 
 import DeviceInfo from '@/components/common/DeviceInfo.vue'
-import type { SystemStats } from '@/types/apiTypes'
+import type { SystemStats } from '@/schemas/apiSchema'
 import { formatSize } from '@/utils/formatUtil'
 
 const props = defineProps<{
diff --git a/src/components/dialog/content/ExecutionErrorDialogContent.vue b/src/components/dialog/content/ExecutionErrorDialogContent.vue
index 31eeb6fdb..3b1b4d8b8 100644
--- a/src/components/dialog/content/ExecutionErrorDialogContent.vue
+++ b/src/components/dialog/content/ExecutionErrorDialogContent.vue
@@ -63,9 +63,9 @@ import { useI18n } from 'vue-i18n'
 import NoResultsPlaceholder from '@/components/common/NoResultsPlaceholder.vue'
 import FindIssueButton from '@/components/dialog/content/error/FindIssueButton.vue'
 import { useCopyToClipboard } from '@/composables/useCopyToClipboard'
+import type { ExecutionErrorWsMessage, SystemStats } from '@/schemas/apiSchema'
 import { api } from '@/scripts/api'
 import { app } from '@/scripts/app'
-import type { ExecutionErrorWsMessage, SystemStats } from '@/types/apiTypes'
 import type { ReportField } from '@/types/issueReportTypes'
 
 import ReportIssuePanel from './error/ReportIssuePanel.vue'
diff --git a/src/components/dialog/content/error/ReportIssuePanel.vue b/src/components/dialog/content/error/ReportIssuePanel.vue
index 2537eecac..b32c94f55 100644
--- a/src/components/dialog/content/error/ReportIssuePanel.vue
+++ b/src/components/dialog/content/error/ReportIssuePanel.vue
@@ -117,16 +117,16 @@ import { useToast } from 'primevue/usetoast'
 import { computed, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
-import { api } from '@/scripts/api'
-import { app } from '@/scripts/app'
 import {
   type IssueReportFormData,
-  type ReportField,
   issueReportSchema
-} from '@/types/issueReportTypes'
+} from '@/schemas/issueReportSchema'
+import { api } from '@/scripts/api'
+import { app } from '@/scripts/app'
 import type {
   DefaultField,
-  IssueReportPanelProps
+  IssueReportPanelProps,
+  ReportField
 } from '@/types/issueReportTypes'
 import { isElectron } from '@/utils/envUtil'
 
diff --git a/src/components/sidebar/tabs/QueueSidebarTab.vue b/src/components/sidebar/tabs/QueueSidebarTab.vue
index 8e59c06cc..22f2f7381 100644
--- a/src/components/sidebar/tabs/QueueSidebarTab.vue
+++ b/src/components/sidebar/tabs/QueueSidebarTab.vue
@@ -104,6 +104,7 @@ import { useI18n } from 'vue-i18n'
 
 import NoResultsPlaceholder from '@/components/common/NoResultsPlaceholder.vue'
 import VirtualGrid from '@/components/common/VirtualGrid.vue'
+import { ComfyNode } from '@/schemas/comfyWorkflowSchema'
 import { api } from '@/scripts/api'
 import { app } from '@/scripts/app'
 import { useLitegraphService } from '@/services/litegraphService'
@@ -114,7 +115,6 @@ import {
   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'
diff --git a/src/components/sidebar/tabs/nodeLibrary/NodeTreeFolder.vue b/src/components/sidebar/tabs/nodeLibrary/NodeTreeFolder.vue
index 3d38e112f..74b43f1d4 100644
--- a/src/components/sidebar/tabs/nodeLibrary/NodeTreeFolder.vue
+++ b/src/components/sidebar/tabs/nodeLibrary/NodeTreeFolder.vue
@@ -11,9 +11,9 @@
 import { Ref, computed, inject, onMounted, onUnmounted, ref, watch } from 'vue'
 
 import TreeExplorerTreeNode from '@/components/common/TreeExplorerTreeNode.vue'
+import type { BookmarkCustomization } from '@/schemas/apiSchema'
 import { useNodeBookmarkStore } from '@/stores/nodeBookmarkStore'
 import { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
-import type { BookmarkCustomization } from '@/types/apiTypes'
 import { RenderedTreeExplorerNode } from '@/types/treeExplorerTypes'
 
 const props = defineProps<{
diff --git a/src/components/sidebar/tabs/queue/TaskItem.vue b/src/components/sidebar/tabs/queue/TaskItem.vue
index 55b52cb78..91d496b00 100644
--- a/src/components/sidebar/tabs/queue/TaskItem.vue
+++ b/src/components/sidebar/tabs/queue/TaskItem.vue
@@ -73,10 +73,10 @@ import Button from 'primevue/button'
 import Tag from 'primevue/tag'
 import { computed, onMounted, onUnmounted, ref } from 'vue'
 
+import { ComfyNode } from '@/schemas/comfyWorkflowSchema'
 import { api } from '@/scripts/api'
 import { useLitegraphService } from '@/services/litegraphService'
 import { TaskItemDisplayStatus, type TaskItemImpl } from '@/stores/queueStore'
-import { ComfyNode } from '@/types/comfyWorkflow'
 
 import ResultItem from './ResultItem.vue'
 
diff --git a/src/composables/usePaste.ts b/src/composables/usePaste.ts
index a1260d259..ff7f2554d 100644
--- a/src/composables/usePaste.ts
+++ b/src/composables/usePaste.ts
@@ -2,10 +2,10 @@ import { LiteGraph } from '@comfyorg/litegraph'
 import type { LGraphNode } from '@comfyorg/litegraph'
 import { useEventListener } from '@vueuse/core'
 
+import { ComfyWorkflowJSON } from '@/schemas/comfyWorkflowSchema'
 import { app } from '@/scripts/app'
 import { useCanvasStore } from '@/stores/graphStore'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
-import { ComfyWorkflowJSON } from '@/types/comfyWorkflow'
 import { isAudioNode, isImageNode, isVideoNode } from '@/utils/litegraphUtil'
 
 /**
diff --git a/src/composables/widgets/useBooleanWidget.ts b/src/composables/widgets/useBooleanWidget.ts
index 4a5f526dc..0dd8ecac8 100644
--- a/src/composables/widgets/useBooleanWidget.ts
+++ b/src/composables/widgets/useBooleanWidget.ts
@@ -1,7 +1,7 @@
 import type { LGraphNode } from '@comfyorg/litegraph'
 
+import type { InputSpec } from '@/schemas/apiSchema'
 import type { ComfyWidgetConstructor } from '@/scripts/widgets'
-import type { InputSpec } from '@/types/apiTypes'
 
 export const useBooleanWidget = () => {
   const widgetConstructor: ComfyWidgetConstructor = (
diff --git a/src/composables/widgets/useComboWidget.ts b/src/composables/widgets/useComboWidget.ts
index ffd399342..764a457e0 100644
--- a/src/composables/widgets/useComboWidget.ts
+++ b/src/composables/widgets/useComboWidget.ts
@@ -1,10 +1,10 @@
 import type { LGraphNode } from '@comfyorg/litegraph'
 import type { IComboWidget } from '@comfyorg/litegraph/dist/types/widgets'
 
+import type { InputSpec } from '@/schemas/apiSchema'
 import { addValueControlWidgets } from '@/scripts/widgets'
 import type { ComfyWidgetConstructor } from '@/scripts/widgets'
 import { useWidgetStore } from '@/stores/widgetStore'
-import type { InputSpec } from '@/types/apiTypes'
 
 import { useRemoteWidget } from './useRemoteWidget'
 
diff --git a/src/composables/widgets/useFloatWidget.ts b/src/composables/widgets/useFloatWidget.ts
index d8350494b..6333670bc 100644
--- a/src/composables/widgets/useFloatWidget.ts
+++ b/src/composables/widgets/useFloatWidget.ts
@@ -1,9 +1,9 @@
 import type { LGraphNode } from '@comfyorg/litegraph'
 import type { INumericWidget } from '@comfyorg/litegraph/dist/types/widgets'
 
+import type { InputSpec } from '@/schemas/apiSchema'
 import type { ComfyWidgetConstructor } from '@/scripts/widgets'
 import { useSettingStore } from '@/stores/settingStore'
-import type { InputSpec } from '@/types/apiTypes'
 import { getNumberDefaults } from '@/utils/mathUtil'
 
 export const useFloatWidget = () => {
diff --git a/src/composables/widgets/useImageUploadWidget.ts b/src/composables/widgets/useImageUploadWidget.ts
index 00d3da9c0..ccab4d77d 100644
--- a/src/composables/widgets/useImageUploadWidget.ts
+++ b/src/composables/widgets/useImageUploadWidget.ts
@@ -5,10 +5,10 @@ import { useNodeImage, useNodeVideo } from '@/composables/node/useNodeImage'
 import { useNodeImageUpload } from '@/composables/node/useNodeImageUpload'
 import { useValueTransform } from '@/composables/useValueTransform'
 import { t } from '@/i18n'
+import type { InputSpec, ResultItem } from '@/schemas/apiSchema'
 import type { ComfyWidgetConstructor } from '@/scripts/widgets'
 import { useNodeOutputStore } from '@/stores/imagePreviewStore'
 import type { ComfyApp } from '@/types'
-import type { InputSpec, ResultItem } from '@/types/apiTypes'
 import { createAnnotatedPath } from '@/utils/formatUtil'
 import { addToComboValues } from '@/utils/litegraphUtil'
 
diff --git a/src/composables/widgets/useIntWidget.ts b/src/composables/widgets/useIntWidget.ts
index ee6714411..ee36cfb52 100644
--- a/src/composables/widgets/useIntWidget.ts
+++ b/src/composables/widgets/useIntWidget.ts
@@ -1,13 +1,13 @@
 import type { LGraphNode } from '@comfyorg/litegraph'
 import type { INumericWidget } from '@comfyorg/litegraph/dist/types/widgets'
 
+import { InputSpec } from '@/schemas/apiSchema'
 import type { ComfyApp } from '@/scripts/app'
 import {
   type ComfyWidgetConstructor,
   addValueControlWidget
 } from '@/scripts/widgets'
 import { useSettingStore } from '@/stores/settingStore'
-import { InputSpec } from '@/types/apiTypes'
 import { getNumberDefaults } from '@/utils/mathUtil'
 
 export const useIntWidget = () => {
diff --git a/src/composables/widgets/useMarkdownWidget.ts b/src/composables/widgets/useMarkdownWidget.ts
index cd234e2b4..d16aa97c0 100644
--- a/src/composables/widgets/useMarkdownWidget.ts
+++ b/src/composables/widgets/useMarkdownWidget.ts
@@ -8,9 +8,9 @@ import TiptapTableRow from '@tiptap/extension-table-row'
 import TiptapStarterKit from '@tiptap/starter-kit'
 import { Markdown as TiptapMarkdown } from 'tiptap-markdown'
 
+import type { InputSpec } from '@/schemas/apiSchema'
 import type { ComfyWidgetConstructor } from '@/scripts/widgets'
 import type { ComfyApp } from '@/types'
-import type { InputSpec } from '@/types/apiTypes'
 
 function addMarkdownWidget(
   node: LGraphNode,
diff --git a/src/composables/widgets/useRemoteWidget.ts b/src/composables/widgets/useRemoteWidget.ts
index dd9b25459..490486282 100644
--- a/src/composables/widgets/useRemoteWidget.ts
+++ b/src/composables/widgets/useRemoteWidget.ts
@@ -2,7 +2,7 @@ import { LGraphNode } from '@comfyorg/litegraph'
 import { IWidget } from '@comfyorg/litegraph'
 import axios from 'axios'
 
-import type { InputSpec, RemoteWidgetConfig } from '@/types/apiTypes'
+import type { InputSpec, RemoteWidgetConfig } from '@/schemas/apiSchema'
 
 const MAX_RETRIES = 5
 const TIMEOUT = 4096
diff --git a/src/composables/widgets/useSeedWidget.ts b/src/composables/widgets/useSeedWidget.ts
index ed9c77c01..4f8ca1dc4 100644
--- a/src/composables/widgets/useSeedWidget.ts
+++ b/src/composables/widgets/useSeedWidget.ts
@@ -1,8 +1,8 @@
 import type { LGraphNode } from '@comfyorg/litegraph'
 
+import type { InputSpec } from '@/schemas/apiSchema'
 import type { ComfyWidgetConstructor } from '@/scripts/widgets'
 import type { ComfyApp } from '@/types'
-import type { InputSpec } from '@/types/apiTypes'
 
 import { useIntWidget } from './useIntWidget'
 
diff --git a/src/composables/widgets/useStringWidget.ts b/src/composables/widgets/useStringWidget.ts
index 3abbdc120..dd79c0c09 100644
--- a/src/composables/widgets/useStringWidget.ts
+++ b/src/composables/widgets/useStringWidget.ts
@@ -1,9 +1,9 @@
 import type { IWidget, LGraphNode } from '@comfyorg/litegraph'
 
+import type { InputSpec } from '@/schemas/apiSchema'
 import type { ComfyWidgetConstructor } from '@/scripts/widgets'
 import { useSettingStore } from '@/stores/settingStore'
 import type { ComfyApp } from '@/types'
-import type { InputSpec } from '@/types/apiTypes'
 
 function addMultilineWidget(
   node: LGraphNode,
diff --git a/src/constants/coreColorPalettes.ts b/src/constants/coreColorPalettes.ts
index e65c68de9..58c7f1522 100644
--- a/src/constants/coreColorPalettes.ts
+++ b/src/constants/coreColorPalettes.ts
@@ -4,7 +4,10 @@ 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, CompletedPalette } from '@/types/colorPaletteTypes'
+import type {
+  ColorPalettes,
+  CompletedPalette
+} from '@/schemas/colorPaletteSchema'
 
 export const CORE_COLOR_PALETTES: ColorPalettes = {
   dark,
diff --git a/src/constants/coreKeybindings.ts b/src/constants/coreKeybindings.ts
index f5c1cfd8c..0d59173aa 100644
--- a/src/constants/coreKeybindings.ts
+++ b/src/constants/coreKeybindings.ts
@@ -1,4 +1,4 @@
-import type { Keybinding } from '@/types/keyBindingTypes'
+import type { Keybinding } from '@/schemas/keyBindingSchema'
 
 export const CORE_KEYBINDINGS: Keybinding[] = [
   {
diff --git a/src/constants/coreSettings.ts b/src/constants/coreSettings.ts
index 0a66a1674..cd27c197f 100644
--- a/src/constants/coreSettings.ts
+++ b/src/constants/coreSettings.ts
@@ -1,8 +1,8 @@
 import { LinkMarkerShape } from '@comfyorg/litegraph'
 import { LiteGraph } from '@comfyorg/litegraph'
 
-import type { ColorPalettes } from '@/types/colorPaletteTypes'
-import type { Keybinding } from '@/types/keyBindingTypes'
+import type { ColorPalettes } from '@/schemas/colorPaletteSchema'
+import type { Keybinding } from '@/schemas/keyBindingSchema'
 import { NodeBadgeMode } from '@/types/nodeSource'
 import { LinkReleaseTriggerAction } from '@/types/searchBoxTypes'
 import type { SettingParams } from '@/types/settingTypes'
diff --git a/src/extensions/core/groupNode.ts b/src/extensions/core/groupNode.ts
index 436009028..8113d6cc5 100644
--- a/src/extensions/core/groupNode.ts
+++ b/src/extensions/core/groupNode.ts
@@ -3,12 +3,16 @@ import { type LGraph, LGraphCanvas, LiteGraph } from '@comfyorg/litegraph'
 import { LGraphNode, type NodeId } from '@comfyorg/litegraph/dist/LGraphNode'
 
 import { t } from '@/i18n'
+import type { ComfyNodeDef } from '@/schemas/apiSchema'
+import {
+  ComfyLink,
+  ComfyNode,
+  ComfyWorkflowJSON
+} from '@/schemas/comfyWorkflowSchema'
 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'
diff --git a/src/extensions/core/uploadAudio.ts b/src/extensions/core/uploadAudio.ts
index 256ab384c..46e155739 100644
--- a/src/extensions/core/uploadAudio.ts
+++ b/src/extensions/core/uploadAudio.ts
@@ -6,9 +6,9 @@ import { useNodeDragAndDrop } from '@/composables/node/useNodeDragAndDrop'
 import { useNodeFileInput } from '@/composables/node/useNodeFileInput'
 import { useNodePaste } from '@/composables/node/useNodePaste'
 import { t } from '@/i18n'
+import { ComfyNodeDef } from '@/schemas/apiSchema'
 import type { DOMWidget } from '@/scripts/domWidget'
 import { useToastStore } from '@/stores/toastStore'
-import { ComfyNodeDef } from '@/types/apiTypes'
 
 import { api } from '../../scripts/api'
 import { app } from '../../scripts/app'
diff --git a/src/extensions/core/uploadImage.ts b/src/extensions/core/uploadImage.ts
index 3b6ab441c..c36ceeca1 100644
--- a/src/extensions/core/uploadImage.ts
+++ b/src/extensions/core/uploadImage.ts
@@ -1,4 +1,8 @@
-import { ComfyNodeDef, InputSpec, isComboInputSpecV1 } from '@/types/apiTypes'
+import {
+  ComfyNodeDef,
+  InputSpec,
+  isComboInputSpecV1
+} from '@/schemas/apiSchema'
 
 import { app } from '../../scripts/app'
 
diff --git a/src/extensions/core/widgetInputs.ts b/src/extensions/core/widgetInputs.ts
index dd8d434ec..4b5e912eb 100644
--- a/src/extensions/core/widgetInputs.ts
+++ b/src/extensions/core/widgetInputs.ts
@@ -12,12 +12,12 @@ import type {
 } from '@comfyorg/litegraph'
 import type { CanvasMouseEvent } from '@comfyorg/litegraph/dist/types/events'
 
+import type { InputSpec } from '@/schemas/apiSchema'
 import { app } from '@/scripts/app'
 import { applyTextReplacements, clone } from '@/scripts/utils'
 import { ComfyWidgets, addValueControlWidgets } from '@/scripts/widgets'
 import { useNodeDefStore } from '@/stores/nodeDefStore'
 import { useSettingStore } from '@/stores/settingStore'
-import type { InputSpec } from '@/types/apiTypes'
 import { isPrimitiveNode } from '@/utils/typeGuardUtil'
 
 const CONVERTED_TYPE = 'converted-widget'
diff --git a/src/types/apiTypes.ts b/src/schemas/apiSchema.ts
similarity index 98%
rename from src/types/apiTypes.ts
rename to src/schemas/apiSchema.ts
index 46f8ac1bc..24d12e4fe 100644
--- a/src/types/apiTypes.ts
+++ b/src/schemas/apiSchema.ts
@@ -2,11 +2,11 @@ import { LinkMarkerShape } from '@comfyorg/litegraph'
 import { ZodType, z } from 'zod'
 import { fromZodError } from 'zod-validation-error'
 
-import { colorPalettesSchema } from './colorPaletteTypes'
-import { zComfyWorkflow, zNodeId } from './comfyWorkflow'
-import { zKeybinding } from './keyBindingTypes'
-import { NodeBadgeMode } from './nodeSource'
-import { LinkReleaseTriggerAction } from './searchBoxTypes'
+import { colorPalettesSchema } from '@/schemas/colorPaletteSchema'
+import { zComfyWorkflow, zNodeId } from '@/schemas/comfyWorkflowSchema'
+import { zKeybinding } from '@/schemas/keyBindingSchema'
+import { NodeBadgeMode } from '@/types/nodeSource'
+import { LinkReleaseTriggerAction } from '@/types/searchBoxTypes'
 
 const zNodeType = z.string()
 const zQueueIndex = z.number()
diff --git a/src/types/colorPaletteTypes.ts b/src/schemas/colorPaletteSchema.ts
similarity index 100%
rename from src/types/colorPaletteTypes.ts
rename to src/schemas/colorPaletteSchema.ts
diff --git a/src/types/comfyWorkflow.ts b/src/schemas/comfyWorkflowSchema.ts
similarity index 100%
rename from src/types/comfyWorkflow.ts
rename to src/schemas/comfyWorkflowSchema.ts
diff --git a/src/schemas/issueReportSchema.ts b/src/schemas/issueReportSchema.ts
new file mode 100644
index 000000000..62c7d5b41
--- /dev/null
+++ b/src/schemas/issueReportSchema.ts
@@ -0,0 +1,13 @@
+import { z } from 'zod'
+
+const checkboxField = z.boolean().optional()
+export const issueReportSchema = z
+  .object({
+    contactInfo: z.string().email().max(320).optional().or(z.literal('')),
+    details: z.string().max(5_000).optional()
+  })
+  .catchall(checkboxField)
+  .refine((data) => Object.values(data).some((value) => value), {
+    path: ['details']
+  })
+export type IssueReportFormData = z.infer<typeof issueReportSchema>
diff --git a/src/types/keyBindingTypes.ts b/src/schemas/keyBindingSchema.ts
similarity index 100%
rename from src/types/keyBindingTypes.ts
rename to src/schemas/keyBindingSchema.ts
diff --git a/src/scripts/api.ts b/src/scripts/api.ts
index deae6133c..d96687697 100644
--- a/src/scripts/api.ts
+++ b/src/scripts/api.ts
@@ -24,9 +24,9 @@ import type {
   SystemStats,
   User,
   UserDataFullInfo
-} from '@/types/apiTypes'
-import { validateComfyNodeDef } from '@/types/apiTypes'
-import type { ComfyWorkflowJSON, NodeId } from '@/types/comfyWorkflow'
+} from '@/schemas/apiSchema'
+import { validateComfyNodeDef } from '@/schemas/apiSchema'
+import type { ComfyWorkflowJSON, NodeId } from '@/schemas/comfyWorkflowSchema'
 
 interface QueuePromptRequestBody {
   client_id: string
diff --git a/src/scripts/app.ts b/src/scripts/app.ts
index 2386f47b6..91863ef13 100644
--- a/src/scripts/app.ts
+++ b/src/scripts/app.ts
@@ -13,6 +13,12 @@ import type { ToastMessageOptions } from 'primevue/toast'
 import { reactive } from 'vue'
 
 import { st } from '@/i18n'
+import type { ComfyNodeDef } from '@/schemas/apiSchema'
+import {
+  type ComfyWorkflowJSON,
+  type NodeId,
+  validateComfyWorkflow
+} from '@/schemas/comfyWorkflowSchema'
 import { useDialogService } from '@/services/dialogService'
 import { useExtensionService } from '@/services/extensionService'
 import { useLitegraphService } from '@/services/litegraphService'
@@ -29,13 +35,7 @@ import { useWidgetStore } from '@/stores/widgetStore'
 import { ComfyWorkflow } from '@/stores/workflowStore'
 import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
 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 { ExtensionManager } from '@/types/extensionTypes'
 import { ColorAdjustOptions, adjustColor } from '@/utils/colorUtil'
 import { graphToPrompt } from '@/utils/executionUtil'
diff --git a/src/scripts/changeTracker.ts b/src/scripts/changeTracker.ts
index 494068d4b..3d7a47574 100644
--- a/src/scripts/changeTracker.ts
+++ b/src/scripts/changeTracker.ts
@@ -4,10 +4,10 @@ import * as jsondiffpatch from 'jsondiffpatch'
 import _ from 'lodash'
 import log from 'loglevel'
 
+import type { ExecutedWsMessage } from '@/schemas/apiSchema'
+import type { ComfyWorkflowJSON } from '@/schemas/comfyWorkflowSchema'
 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'
diff --git a/src/scripts/defaultGraph.ts b/src/scripts/defaultGraph.ts
index 9f1a1e0be..904cc26f9 100644
--- a/src/scripts/defaultGraph.ts
+++ b/src/scripts/defaultGraph.ts
@@ -1,4 +1,4 @@
-import type { ComfyWorkflowJSON } from '@/types/comfyWorkflow'
+import type { ComfyWorkflowJSON } from '@/schemas/comfyWorkflowSchema'
 
 export const defaultGraph: ComfyWorkflowJSON = {
   last_node_id: 9,
diff --git a/src/scripts/ui.ts b/src/scripts/ui.ts
index cdfb52db7..49d7af833 100644
--- a/src/scripts/ui.ts
+++ b/src/scripts/ui.ts
@@ -1,10 +1,10 @@
 // @ts-strict-ignore
+import { type StatusWsMessageStatus, TaskItem } from '@/schemas/apiSchema'
 import { useDialogService } from '@/services/dialogService'
 import { useLitegraphService } from '@/services/litegraphService'
 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'
diff --git a/src/scripts/ui/components/button.ts b/src/scripts/ui/components/button.ts
index cb9f590b4..1a6ead78d 100644
--- a/src/scripts/ui/components/button.ts
+++ b/src/scripts/ui/components/button.ts
@@ -1,6 +1,6 @@
 // @ts-strict-ignore
+import { Settings } from '@/schemas/apiSchema'
 import type { ComfyApp } from '@/scripts/app'
-import { Settings } from '@/types/apiTypes'
 
 import type { ComfyComponent } from '.'
 import { $el } from '../../ui'
diff --git a/src/scripts/ui/settings.ts b/src/scripts/ui/settings.ts
index 968b7ce18..dde192f88 100644
--- a/src/scripts/ui/settings.ts
+++ b/src/scripts/ui/settings.ts
@@ -1,7 +1,7 @@
+import type { Settings } from '@/schemas/apiSchema'
 import type { ComfyApp } from '@/scripts/app'
 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'
diff --git a/src/scripts/widgets.ts b/src/scripts/widgets.ts
index 863988f9d..7385ea7de 100644
--- a/src/scripts/widgets.ts
+++ b/src/scripts/widgets.ts
@@ -14,8 +14,8 @@ import { useMarkdownWidget } from '@/composables/widgets/useMarkdownWidget'
 import { useSeedWidget } from '@/composables/widgets/useSeedWidget'
 import { useStringWidget } from '@/composables/widgets/useStringWidget'
 import { t } from '@/i18n'
+import type { InputSpec } from '@/schemas/apiSchema'
 import { useSettingStore } from '@/stores/settingStore'
-import type { InputSpec } from '@/types/apiTypes'
 
 import type { ComfyApp } from './app'
 import './domWidget'
diff --git a/src/services/colorPaletteService.ts b/src/services/colorPaletteService.ts
index 9531d12f5..70002ed42 100644
--- a/src/services/colorPaletteService.ts
+++ b/src/services/colorPaletteService.ts
@@ -4,12 +4,16 @@ import { toRaw } from 'vue'
 import { fromZodError } from 'zod-validation-error'
 
 import { useErrorHandling } from '@/composables/useErrorHandling'
+import {
+  Colors,
+  type Palette,
+  paletteSchema
+} from '@/schemas/colorPaletteSchema'
 import { app } from '@/scripts/app'
 import { downloadBlob, uploadFile } from '@/scripts/utils'
 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/litegraphService.ts b/src/services/litegraphService.ts
index 8b28b2452..169c3b1ea 100644
--- a/src/services/litegraphService.ts
+++ b/src/services/litegraphService.ts
@@ -12,14 +12,14 @@ import { IBaseWidget, IWidget } from '@comfyorg/litegraph/dist/types/widgets'
 
 import { useNodeImage, useNodeVideo } from '@/composables/node/useNodeImage'
 import { st } from '@/i18n'
+import { ComfyNodeDef } from '@/schemas/apiSchema'
+import type { NodeId } from '@/schemas/comfyWorkflowSchema'
 import { ANIM_PREVIEW_WIDGET, ComfyApp, app } from '@/scripts/app'
 import { $el } from '@/scripts/ui'
 import { calculateImageGrid, createImageHost } from '@/scripts/ui/imagePreview'
 import { useCanvasStore } from '@/stores/graphStore'
 import { useNodeOutputStore } from '@/stores/imagePreviewStore'
 import { useToastStore } from '@/stores/toastStore'
-import { ComfyNodeDef } from '@/types/apiTypes'
-import type { NodeId } from '@/types/comfyWorkflow'
 import { normalizeI18nKey } from '@/utils/formatUtil'
 import { is_all_same_aspect_ratio } from '@/utils/imageUtil'
 import { getImageTop, isImageNode, isVideoNode } from '@/utils/litegraphUtil'
diff --git a/src/services/workflowService.ts b/src/services/workflowService.ts
index 057b05ee0..16f794ac2 100644
--- a/src/services/workflowService.ts
+++ b/src/services/workflowService.ts
@@ -3,6 +3,7 @@ import type { Vector2 } from '@comfyorg/litegraph'
 import { toRaw } from 'vue'
 
 import { t } from '@/i18n'
+import { ComfyWorkflowJSON } from '@/schemas/comfyWorkflowSchema'
 import { api } from '@/scripts/api'
 import { app } from '@/scripts/app'
 import { blankGraph, defaultGraph } from '@/scripts/defaultGraph'
@@ -11,7 +12,6 @@ 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'
diff --git a/src/stores/executionStore.ts b/src/stores/executionStore.ts
index 0c0e9dfbb..2ab4b3fa1 100644
--- a/src/stores/executionStore.ts
+++ b/src/stores/executionStore.ts
@@ -1,7 +1,6 @@
 import { defineStore } from 'pinia'
 import { computed, ref } from 'vue'
 
-import { api } from '@/scripts/api'
 import type {
   ExecutedWsMessage,
   ExecutingWsMessage,
@@ -9,8 +8,12 @@ import type {
   ExecutionStartWsMessage,
   ProgressWsMessage,
   StatusWsMessage
-} from '@/types/apiTypes'
-import type { ComfyNode, ComfyWorkflowJSON } from '@/types/comfyWorkflow'
+} from '@/schemas/apiSchema'
+import type {
+  ComfyNode,
+  ComfyWorkflowJSON
+} from '@/schemas/comfyWorkflowSchema'
+import { api } from '@/scripts/api'
 
 import { ComfyWorkflow } from './workflowStore'
 
diff --git a/src/stores/imagePreviewStore.ts b/src/stores/imagePreviewStore.ts
index 3a8e56131..880cc1f7f 100644
--- a/src/stores/imagePreviewStore.ts
+++ b/src/stores/imagePreviewStore.ts
@@ -1,8 +1,8 @@
 import { LGraphNode } from '@comfyorg/litegraph'
 import { defineStore } from 'pinia'
 
+import { ExecutedWsMessage, ResultItem } from '@/schemas/apiSchema'
 import { api } from '@/scripts/api'
-import { ExecutedWsMessage, ResultItem } from '@/types/apiTypes'
 import { parseFilePath } from '@/utils/formatUtil'
 import { isVideoNode } from '@/utils/litegraphUtil'
 
diff --git a/src/stores/keybindingStore.ts b/src/stores/keybindingStore.ts
index 8c9401018..7e5e8e5c9 100644
--- a/src/stores/keybindingStore.ts
+++ b/src/stores/keybindingStore.ts
@@ -3,7 +3,7 @@ import { defineStore } from 'pinia'
 import { Ref, computed, ref, toRaw } from 'vue'
 
 import { RESERVED_BY_TEXT_INPUT } from '@/constants/reservedKeyCombos'
-import { KeyCombo, Keybinding } from '@/types/keyBindingTypes'
+import { KeyCombo, Keybinding } from '@/schemas/keyBindingSchema'
 
 export class KeybindingImpl implements Keybinding {
   commandId: string
diff --git a/src/stores/nodeBookmarkStore.ts b/src/stores/nodeBookmarkStore.ts
index f29ea2aaf..14a7469b9 100644
--- a/src/stores/nodeBookmarkStore.ts
+++ b/src/stores/nodeBookmarkStore.ts
@@ -3,7 +3,7 @@ import { defineStore } from 'pinia'
 import type { TreeNode } from 'primevue/treenode'
 import { computed } from 'vue'
 
-import type { BookmarkCustomization } from '@/types/apiTypes'
+import type { BookmarkCustomization } from '@/schemas/apiSchema'
 
 import { useNodeDefStore } from './nodeDefStore'
 import { ComfyNodeDefImpl, createDummyFolderNodeDef } from './nodeDefStore'
diff --git a/src/stores/nodeDefStore.ts b/src/stores/nodeDefStore.ts
index f6acc7322..1a5df265f 100644
--- a/src/stores/nodeDefStore.ts
+++ b/src/stores/nodeDefStore.ts
@@ -4,16 +4,16 @@ import { defineStore } from 'pinia'
 import type { TreeNode } from 'primevue/treenode'
 import { computed, ref } from 'vue'
 
-import {
-  NodeSearchService,
-  type SearchAuxScore
-} from '@/services/nodeSearchService'
 import {
   type ComfyInputsSpec as ComfyInputsSpecSchema,
   type ComfyNodeDef,
   type ComfyOutputTypesSpec as ComfyOutputTypesSpecSchema,
   type InputSpec
-} from '@/types/apiTypes'
+} from '@/schemas/apiSchema'
+import {
+  NodeSearchService,
+  type SearchAuxScore
+} from '@/services/nodeSearchService'
 import {
   type NodeSource,
   NodeSourceType,
diff --git a/src/stores/queueStore.ts b/src/stores/queueStore.ts
index c2173fe13..ef5ca057b 100644
--- a/src/stores/queueStore.ts
+++ b/src/stores/queueStore.ts
@@ -3,8 +3,6 @@ import { defineStore } from 'pinia'
 import { toRaw } from 'vue'
 import { computed, ref } from 'vue'
 
-import { api } from '@/scripts/api'
-import type { ComfyApp } from '@/scripts/app'
 import type {
   ResultItem,
   StatusWsMessageStatus,
@@ -13,8 +11,10 @@ import type {
   TaskPrompt,
   TaskStatus,
   TaskType
-} from '@/types/apiTypes'
-import type { ComfyWorkflowJSON, NodeId } from '@/types/comfyWorkflow'
+} from '@/schemas/apiSchema'
+import type { ComfyWorkflowJSON, NodeId } from '@/schemas/comfyWorkflowSchema'
+import { api } from '@/scripts/api'
+import type { ComfyApp } from '@/scripts/app'
 
 // Task type used in the API.
 export type APITaskType = 'queue' | 'history'
diff --git a/src/stores/settingStore.ts b/src/stores/settingStore.ts
index 7995de14c..de4e810fa 100644
--- a/src/stores/settingStore.ts
+++ b/src/stores/settingStore.ts
@@ -3,9 +3,9 @@ import { defineStore } from 'pinia'
 import type { TreeNode } from 'primevue/treenode'
 import { computed, ref } from 'vue'
 
+import type { Settings } from '@/schemas/apiSchema'
 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'
 
diff --git a/src/stores/systemStatsStore.ts b/src/stores/systemStatsStore.ts
index 92d2b3759..cbac56260 100644
--- a/src/stores/systemStatsStore.ts
+++ b/src/stores/systemStatsStore.ts
@@ -1,8 +1,8 @@
 import { defineStore } from 'pinia'
 import { ref } from 'vue'
 
+import type { SystemStats } from '@/schemas/apiSchema'
 import { api } from '@/scripts/api'
-import type { SystemStats } from '@/types/apiTypes'
 
 export const useSystemStatsStore = defineStore('systemStats', () => {
   const systemStats = ref<SystemStats | null>(null)
diff --git a/src/stores/userFileStore.ts b/src/stores/userFileStore.ts
index 5bcdb9580..e7c8728f0 100644
--- a/src/stores/userFileStore.ts
+++ b/src/stores/userFileStore.ts
@@ -1,8 +1,8 @@
 import { defineStore } from 'pinia'
 import { computed, ref } from 'vue'
 
+import { UserDataFullInfo } from '@/schemas/apiSchema'
 import { api } from '@/scripts/api'
-import { UserDataFullInfo } from '@/types/apiTypes'
 import { TreeExplorerNode } from '@/types/treeExplorerTypes'
 import { getPathDetails } from '@/utils/formatUtil'
 import { syncEntities } from '@/utils/syncUtil'
diff --git a/src/stores/userStore.ts b/src/stores/userStore.ts
index c5970cfd3..e9e34e7cb 100644
--- a/src/stores/userStore.ts
+++ b/src/stores/userStore.ts
@@ -1,8 +1,8 @@
 import { defineStore } from 'pinia'
 import { computed, ref, watchEffect } from 'vue'
 
+import type { User as UserConfig } from '@/schemas/apiSchema'
 import { api } from '@/scripts/api'
-import type { User as UserConfig } from '@/types/apiTypes'
 
 export interface User {
   userId: string
diff --git a/src/stores/widgetStore.ts b/src/stores/widgetStore.ts
index 5d3ac6b51..82b29d472 100644
--- a/src/stores/widgetStore.ts
+++ b/src/stores/widgetStore.ts
@@ -1,12 +1,12 @@
 import { defineStore } from 'pinia'
 import { computed, ref } from 'vue'
 
-import { ComfyWidgetConstructor, ComfyWidgets } from '@/scripts/widgets'
 import {
   ComboInputSpecV2,
   InputSpec,
   isComboInputSpecV1
-} from '@/types/apiTypes'
+} from '@/schemas/apiSchema'
+import { ComfyWidgetConstructor, ComfyWidgets } from '@/scripts/widgets'
 
 import type { BaseInputSpec } from './nodeDefStore'
 
diff --git a/src/stores/workflowStore.ts b/src/stores/workflowStore.ts
index d1699dc1a..64747d446 100644
--- a/src/stores/workflowStore.ts
+++ b/src/stores/workflowStore.ts
@@ -2,10 +2,10 @@ import _ from 'lodash'
 import { defineStore } from 'pinia'
 import { computed, markRaw, ref } from 'vue'
 
+import { ComfyWorkflowJSON } from '@/schemas/comfyWorkflowSchema'
 import { api } from '@/scripts/api'
 import { ChangeTracker } from '@/scripts/changeTracker'
 import { defaultGraphJSON } from '@/scripts/defaultGraph'
-import { ComfyWorkflowJSON } from '@/types/comfyWorkflow'
 import { getPathDetails } from '@/utils/formatUtil'
 import { syncEntities } from '@/utils/syncUtil'
 
diff --git a/src/stores/workspace/colorPaletteStore.ts b/src/stores/workspace/colorPaletteStore.ts
index 3157b7cc9..7c0577ea7 100644
--- a/src/stores/workspace/colorPaletteStore.ts
+++ b/src/stores/workspace/colorPaletteStore.ts
@@ -11,7 +11,7 @@ import type {
   ColorPalettes,
   CompletedPalette,
   Palette
-} from '@/types/colorPaletteTypes'
+} from '@/schemas/colorPaletteSchema'
 
 export const useColorPaletteStore = defineStore('colorPalette', () => {
   const customPalettes = ref<ColorPalettes>({})
diff --git a/src/types/comfy.ts b/src/types/comfy.ts
index 7fc63fc34..b865d5e18 100644
--- a/src/types/comfy.ts
+++ b/src/types/comfy.ts
@@ -1,13 +1,13 @@
 import type { LGraphNode } from '@comfyorg/litegraph'
 import { Positionable } from '@comfyorg/litegraph/dist/interfaces'
 
+import type { ComfyNodeDef } from '@/schemas/apiSchema'
+import type { ComfyWorkflowJSON } from '@/schemas/comfyWorkflowSchema'
+import type { Keybinding } from '@/schemas/keyBindingSchema'
 import type { ComfyApp } from '@/scripts/app'
 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/issueReportTypes.ts b/src/types/issueReportTypes.ts
index 920eb5d0d..5b9c28abd 100644
--- a/src/types/issueReportTypes.ts
+++ b/src/types/issueReportTypes.ts
@@ -1,5 +1,3 @@
-import { z } from 'zod'
-
 export type DefaultField = 'Workflow' | 'Logs' | 'SystemStats' | 'Settings'
 
 export interface ReportField {
@@ -51,15 +49,3 @@ export interface IssueReportPanelProps {
    */
   title?: string
 }
-
-const checkboxField = z.boolean().optional()
-export const issueReportSchema = z
-  .object({
-    contactInfo: z.string().email().max(320).optional().or(z.literal('')),
-    details: z.string().max(5_000).optional()
-  })
-  .catchall(checkboxField)
-  .refine((data) => Object.values(data).some((value) => value), {
-    path: ['details']
-  })
-export type IssueReportFormData = z.infer<typeof issueReportSchema>
diff --git a/src/types/litegraph-augmentation.d.ts b/src/types/litegraph-augmentation.d.ts
index 34b9e42f0..471016504 100644
--- a/src/types/litegraph-augmentation.d.ts
+++ b/src/types/litegraph-augmentation.d.ts
@@ -1,10 +1,10 @@
 import '@comfyorg/litegraph'
 import type { LLink, Size } from '@comfyorg/litegraph'
 
+import type { ComfyNodeDef } from '@/schemas/apiSchema'
 import type { DOMWidget, DOMWidgetOptions } from '@/scripts/domWidget'
-import type { ComfyNodeDef } from '@/types/apiTypes'
 
-import type { NodeId } from './comfyWorkflow'
+import type { NodeId } from '../schemas/comfyWorkflowSchema'
 
 /** ComfyUI extensions of litegraph */
 declare module '@comfyorg/litegraph/dist/types/widgets' {
diff --git a/src/types/settingTypes.ts b/src/types/settingTypes.ts
index 6b27b8a0e..dc6a8c469 100644
--- a/src/types/settingTypes.ts
+++ b/src/types/settingTypes.ts
@@ -1,4 +1,4 @@
-import { Settings } from './apiTypes'
+import type { Settings } from '@/schemas/apiSchema'
 
 export type SettingInputType =
   | 'boolean'
diff --git a/src/utils/executionUtil.ts b/src/utils/executionUtil.ts
index 1f44c9018..c8eaa3631 100644
--- a/src/utils/executionUtil.ts
+++ b/src/utils/executionUtil.ts
@@ -1,7 +1,10 @@
 import type { LGraph } from '@comfyorg/litegraph'
 import { LGraphEventMode } from '@comfyorg/litegraph'
 
-import type { ComfyApiWorkflow, ComfyWorkflowJSON } from '@/types/comfyWorkflow'
+import type {
+  ComfyApiWorkflow,
+  ComfyWorkflowJSON
+} from '@/schemas/comfyWorkflowSchema'
 
 /**
  * Converts the current graph workflow for sending to the API.
diff --git a/src/utils/formatUtil.ts b/src/utils/formatUtil.ts
index 71344fed4..779afb8a1 100644
--- a/src/utils/formatUtil.ts
+++ b/src/utils/formatUtil.ts
@@ -1,4 +1,4 @@
-import { ResultItem } from '@/types/apiTypes'
+import { ResultItem } from '@/schemas/apiSchema'
 
 export function formatCamelCase(str: string): string {
   // Check if the string is camel case
diff --git a/src/utils/mathUtil.ts b/src/utils/mathUtil.ts
index 16903562f..1c3782e80 100644
--- a/src/utils/mathUtil.ts
+++ b/src/utils/mathUtil.ts
@@ -1,4 +1,4 @@
-import type { InputSpec } from '@/types/apiTypes'
+import type { InputSpec } from '@/schemas/apiSchema'
 
 export function getNumberDefaults(
   inputOptions: InputSpec[1],
diff --git a/src/views/GraphView.vue b/src/views/GraphView.vue
index 5d1b8c2f4..cf08c2bee 100644
--- a/src/views/GraphView.vue
+++ b/src/views/GraphView.vue
@@ -36,6 +36,7 @@ import { useCoreCommands } from '@/composables/useCoreCommands'
 import { useErrorHandling } from '@/composables/useErrorHandling'
 import { SERVER_CONFIG_ITEMS } from '@/constants/serverConfig'
 import { i18n } from '@/i18n'
+import { StatusWsMessageStatus } from '@/schemas/apiSchema'
 import { api } from '@/scripts/api'
 import { app } from '@/scripts/app'
 import { setupAutoQueueHandler } from '@/services/autoQueueService'
@@ -55,7 +56,6 @@ import { useBottomPanelStore } from '@/stores/workspace/bottomPanelStore'
 import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
 import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
-import { StatusWsMessageStatus } from '@/types/apiTypes'
 import { electronAPI, isElectron } from '@/utils/envUtil'
 
 setupAutoQueueHandler()
diff --git a/tests-ui/tests/apiTypes.test.ts b/tests-ui/tests/apiTypes.test.ts
index 050142cc2..fb7d33232 100644
--- a/tests-ui/tests/apiTypes.test.ts
+++ b/tests-ui/tests/apiTypes.test.ts
@@ -2,7 +2,7 @@
 import fs from 'fs'
 import path from 'path'
 
-import { ComfyNodeDef, validateComfyNodeDef } from '@/types/apiTypes'
+import { ComfyNodeDef, validateComfyNodeDef } from '@/schemas/apiSchema'
 
 const EXAMPLE_NODE_DEF: ComfyNodeDef = {
   input: {
diff --git a/tests-ui/tests/comfyWorkflow.test.ts b/tests-ui/tests/comfyWorkflow.test.ts
index 86176b60a..84c81511a 100644
--- a/tests-ui/tests/comfyWorkflow.test.ts
+++ b/tests-ui/tests/comfyWorkflow.test.ts
@@ -1,8 +1,8 @@
 // @ts-strict-ignore
 import fs from 'fs'
 
+import { validateComfyWorkflow } from '@/schemas/comfyWorkflowSchema'
 import { defaultGraph } from '@/scripts/defaultGraph'
-import { validateComfyWorkflow } from '@/types/comfyWorkflow'
 
 const WORKFLOW_DIR = 'tests-ui/workflows'
 
diff --git a/tests-ui/tests/composables/widgets/useComboWidget.test.ts b/tests-ui/tests/composables/widgets/useComboWidget.test.ts
index 1c952c98a..f29b05e23 100644
--- a/tests-ui/tests/composables/widgets/useComboWidget.test.ts
+++ b/tests-ui/tests/composables/widgets/useComboWidget.test.ts
@@ -1,7 +1,7 @@
 import { createPinia, setActivePinia } from 'pinia'
 
 import { useComboWidget } from '@/composables/widgets/useComboWidget'
-import type { InputSpec } from '@/types/apiTypes'
+import type { InputSpec } from '@/schemas/apiSchema'
 
 jest.mock('@/scripts/widgets', () => ({
   addValueControlWidgets: jest.fn()
diff --git a/tests-ui/tests/composables/widgets/useRemoteWidget.test.ts b/tests-ui/tests/composables/widgets/useRemoteWidget.test.ts
index 06895bc31..0a202970e 100644
--- a/tests-ui/tests/composables/widgets/useRemoteWidget.test.ts
+++ b/tests-ui/tests/composables/widgets/useRemoteWidget.test.ts
@@ -1,7 +1,7 @@
 import axios from 'axios'
 
 import { useRemoteWidget } from '@/composables/widgets/useRemoteWidget'
-import type { ComboInputSpecV2 } from '@/types/apiTypes'
+import type { ComboInputSpecV2 } from '@/schemas/apiSchema'
 
 jest.mock('axios', () => ({
   get: jest.fn()