diff --git a/eslint.config.js b/eslint.config.js
index df4682b61..2b8b77f3c 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -52,7 +52,8 @@ export default [
       '@typescript-eslint/no-explicit-any': 'off',
       '@typescript-eslint/no-unused-vars': 'off',
       '@typescript-eslint/prefer-as-const': 'off',
-      'unused-imports/no-unused-imports': 'error'
+      'unused-imports/no-unused-imports': 'error',
+      'vue/no-v-html': 'off'
     }
   }
 ]
diff --git a/src/components/bottomPanel/BottomPanel.vue b/src/components/bottomPanel/BottomPanel.vue
index 205e4f405..a49268753 100644
--- a/src/components/bottomPanel/BottomPanel.vue
+++ b/src/components/bottomPanel/BottomPanel.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="flex flex-col h-full">
     <Tabs v-model:value="bottomPanelStore.activeBottomPanelTabId">
-      <TabList pt:tabList="border-none">
+      <TabList pt:tab-list="border-none">
         <div class="w-full flex justify-between">
           <div class="tabs-container">
             <Tab
diff --git a/src/components/sidebar/SidebarIcon.vue b/src/components/sidebar/SidebarIcon.vue
index 36cf59c83..3a3761704 100644
--- a/src/components/sidebar/SidebarIcon.vue
+++ b/src/components/sidebar/SidebarIcon.vue
@@ -1,25 +1,24 @@
 <template>
   <Button
-    v-tooltip="{ value: props.tooltip, showDelay: 300, hideDelay: 300 }"
-    :class="props.class"
+    v-tooltip="{ value: tooltip, showDelay: 300, hideDelay: 300 }"
     text
     :pt="{
       root: {
         class: `side-bar-button ${
-          props.selected
+          selected
             ? 'p-button-primary side-bar-button-selected'
             : 'p-button-secondary'
         }`,
-        'aria-label': props.tooltip
+        'aria-label': tooltip
       }
     }"
     @click="emit('click', $event)"
   >
     <template #icon>
       <OverlayBadge v-if="shouldShowBadge" :value="overlayValue">
-        <i :class="props.icon + ' side-bar-button-icon'" />
+        <i :class="icon + ' side-bar-button-icon'" />
       </OverlayBadge>
-      <i v-else :class="props.icon + ' side-bar-button-icon'" />
+      <i v-else :class="icon + ' side-bar-button-icon'" />
     </template>
   </Button>
 </template>
@@ -27,32 +26,25 @@
 <script setup lang="ts">
 import Button from 'primevue/button'
 import OverlayBadge from 'primevue/overlaybadge'
-import { PropType, computed } from 'vue'
+import { computed } from 'vue'
 
-// Add this line to import PropsType
+const {
+  icon = '',
+  selected = false,
+  tooltip = '',
+  iconBadge = ''
+} = defineProps<{
+  icon?: string
+  selected?: boolean
+  tooltip?: string
+  iconBadge?: string | (() => string | null)
+}>()
 
-const props = defineProps({
-  icon: String,
-  selected: Boolean,
-  tooltip: {
-    type: String,
-    default: ''
-  },
-  class: {
-    type: String,
-    default: ''
-  },
-  iconBadge: {
-    type: [String, Function] as PropType<string | (() => string | null)>,
-    default: ''
-  }
-})
-
-const emit = defineEmits(['click'])
+const emit = defineEmits<{
+  (e: 'click', event: MouseEvent): void
+}>()
 const overlayValue = computed(() =>
-  typeof props.iconBadge === 'function'
-    ? props.iconBadge() || ''
-    : props.iconBadge
+  typeof iconBadge === 'function' ? iconBadge() ?? '' : iconBadge
 )
 const shouldShowBadge = computed(() => !!overlayValue.value)
 </script>
diff --git a/src/components/sidebar/tabs/WorkflowsSidebarTab.vue b/src/components/sidebar/tabs/WorkflowsSidebarTab.vue
index e720b5ebe..bd27e77b4 100644
--- a/src/components/sidebar/tabs/WorkflowsSidebarTab.vue
+++ b/src/components/sidebar/tabs/WorkflowsSidebarTab.vue
@@ -38,12 +38,15 @@
           >
             <template #node="{ node }">
               <TreeExplorerTreeNode :node="node">
-                <template #before-label="{ node }">
-                  <span v-if="node.data.isModified || !node.data.isPersisted"
+                <template #before-label="{ node: treeNode }">
+                  <span
+                    v-if="
+                      treeNode.data?.isModified || !treeNode.data?.isPersisted
+                    "
                     >*</span
                   >
                 </template>
-                <template #actions="{ node }">
+                <template #actions="{ node: treeNode }">
                   <Button
                     class="close-workflow-button"
                     icon="pi pi-times"
@@ -52,7 +55,9 @@
                       workspaceStore.shiftDown ? 'danger' : 'secondary'
                     "
                     size="small"
-                    @click.stop="handleCloseWorkflow(node.data)"
+                    @click.stop="
+                      handleCloseWorkflow(treeNode.data as ComfyWorkflow)
+                    "
                   />
                 </template>
               </TreeExplorerTreeNode>
diff --git a/src/components/sidebar/tabs/workflows/WorkflowTreeLeaf.vue b/src/components/sidebar/tabs/workflows/WorkflowTreeLeaf.vue
index 94e3af32e..306834039 100644
--- a/src/components/sidebar/tabs/workflows/WorkflowTreeLeaf.vue
+++ b/src/components/sidebar/tabs/workflows/WorkflowTreeLeaf.vue
@@ -1,12 +1,12 @@
 <template>
   <TreeExplorerTreeNode :node="node">
-    <template #actions="{ node }">
+    <template #actions>
       <Button
         :icon="isBookmarked ? 'pi pi-bookmark-fill' : 'pi pi-bookmark'"
         text
         severity="secondary"
         size="small"
-        @click.stop="workflowBookmarkStore.toggleBookmarked(node.data.path)"
+        @click.stop="handleBookmarkClick"
       />
     </template>
   </TreeExplorerTreeNode>
@@ -28,4 +28,10 @@ const workflowBookmarkStore = useWorkflowBookmarkStore()
 const isBookmarked = computed(
   () => node.data && workflowBookmarkStore.isBookmarked(node.data.path)
 )
+
+const handleBookmarkClick = async () => {
+  if (node.data) {
+    await workflowBookmarkStore.toggleBookmarked(node.data.path)
+  }
+}
 </script>
diff --git a/src/components/topbar/WorkflowTabs.vue b/src/components/topbar/WorkflowTabs.vue
index 9137ac12b..e71f20b93 100644
--- a/src/components/topbar/WorkflowTabs.vue
+++ b/src/components/topbar/WorkflowTabs.vue
@@ -7,7 +7,7 @@
         class: 'p-0 w-full',
         onwheel: handleWheel
       }"
-      pt:barX="h-1"
+      pt:bar-x="h-1"
     >
       <SelectButton
         class="workflow-tabs bg-transparent"