diff --git a/packages/core/src/components/Edges/EdgeLabelRenderer.vue b/packages/core/src/components/Edges/EdgeLabelRenderer.vue
index 16334eb6..ca6a38d8 100644
--- a/packages/core/src/components/Edges/EdgeLabelRenderer.vue
+++ b/packages/core/src/components/Edges/EdgeLabelRenderer.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { toRef } from '@vueuse/core'
+import { toRef } from 'vue'
 import type { TeleportProps } from 'vue'
 import { useVueFlow } from '../../composables'
 
diff --git a/packages/core/src/components/Handle/Handle.vue b/packages/core/src/components/Handle/Handle.vue
index f3088b9a..5c567bcd 100644
--- a/packages/core/src/components/Handle/Handle.vue
+++ b/packages/core/src/components/Handle/Handle.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
-import { toRef, until } from '@vueuse/core'
-import { computed, onUnmounted, ref } from 'vue'
+import { until } from '@vueuse/core'
+import { computed, onUnmounted, ref, toRef } from 'vue'
 import type { HandleProps } from '../../types/handle'
 import { Position } from '../../types'
 import { useHandle, useNode, useVueFlow } from '../../composables'
diff --git a/packages/core/src/components/Nodes/NodeWrapper.ts b/packages/core/src/components/Nodes/NodeWrapper.ts
index f0cf5a87..529569cc 100644
--- a/packages/core/src/components/Nodes/NodeWrapper.ts
+++ b/packages/core/src/components/Nodes/NodeWrapper.ts
@@ -1,5 +1,5 @@
-import { computed, defineComponent, h, nextTick, onBeforeUnmount, onMounted, provide, ref, watch } from 'vue'
-import { toRef, until, useVModel } from '@vueuse/core'
+import { computed, defineComponent, h, nextTick, onBeforeUnmount, onMounted, provide, ref, toRef, watch } from 'vue'
+import { until, useVModel } from '@vueuse/core'
 import {
   ARIA_NODE_DESC_KEY,
   arrowKeyDiffs,
diff --git a/packages/core/src/composables/useDrag.ts b/packages/core/src/composables/useDrag.ts
index 9db6bc4a..7a6c6947 100644
--- a/packages/core/src/composables/useDrag.ts
+++ b/packages/core/src/composables/useDrag.ts
@@ -1,10 +1,8 @@
 import type { D3DragEvent, DragBehavior, SubjectPosition } from 'd3-drag'
 import { drag } from 'd3-drag'
 import { select } from 'd3-selection'
-import type { Ref } from 'vue'
-import { ref, watch } from 'vue'
-import type { MaybeRefOrGetter } from '@vueuse/core'
-import { toValue } from '@vueuse/core'
+import type { MaybeRefOrGetter, Ref } from 'vue'
+import { ref, toValue, watch } from 'vue'
 import type { NodeDragEvent, NodeDragItem, XYPosition } from '../types'
 import {
   calcAutoPan,
diff --git a/packages/core/src/composables/useHandle.ts b/packages/core/src/composables/useHandle.ts
index b95da1bb..26f8671a 100644
--- a/packages/core/src/composables/useHandle.ts
+++ b/packages/core/src/composables/useHandle.ts
@@ -1,5 +1,5 @@
-import type { MaybeRefOrGetter } from '@vueuse/core'
-import { toValue } from '@vueuse/core'
+import type { MaybeRefOrGetter } from 'vue'
+import { toValue } from 'vue'
 import type { Connection, ConnectionHandle, HandleType, MouseTouchEvent, ValidConnectionFunc } from '../types'
 import {
   calcAutoPan,
diff --git a/packages/core/src/composables/useHandleConnections.ts b/packages/core/src/composables/useHandleConnections.ts
index f10cdfa5..13e86408 100644
--- a/packages/core/src/composables/useHandleConnections.ts
+++ b/packages/core/src/composables/useHandleConnections.ts
@@ -1,7 +1,5 @@
-import type { ComputedRef } from 'vue'
-import { computed, ref, watch } from 'vue'
-import type { MaybeRefOrGetter } from '@vueuse/core'
-import { toRef, toValue } from '@vueuse/core'
+import type { ComputedRef, MaybeRefOrGetter } from 'vue'
+import { computed, ref, toRef, toValue, watch } from 'vue'
 import type { Connection, HandleType } from '../types'
 import { areConnectionMapsEqual, handleConnectionChange } from '../utils'
 import { useNodeId } from './useNodeId'
diff --git a/packages/core/src/composables/useKeyPress.ts b/packages/core/src/composables/useKeyPress.ts
index 4cdac948..4b11ade9 100644
--- a/packages/core/src/composables/useKeyPress.ts
+++ b/packages/core/src/composables/useKeyPress.ts
@@ -1,6 +1,7 @@
-import { ref, watch } from 'vue'
-import type { KeyFilter, KeyPredicate, MaybeRefOrGetter } from '@vueuse/core'
-import { onKeyStroke, toValue, useEventListener } from '@vueuse/core'
+import type { MaybeRefOrGetter } from 'vue'
+import { ref, toValue, watch } from 'vue'
+import type { KeyFilter, KeyPredicate } from '@vueuse/core'
+import { onKeyStroke, useEventListener } from '@vueuse/core'
 import { useWindow } from './useWindow'
 
 export function isInputDOMNode(event: KeyboardEvent): boolean {
diff --git a/packages/core/src/composables/useNodesData.ts b/packages/core/src/composables/useNodesData.ts
index affade0f..d3dc6002 100644
--- a/packages/core/src/composables/useNodesData.ts
+++ b/packages/core/src/composables/useNodesData.ts
@@ -1,7 +1,5 @@
-import type { ComputedRef } from 'vue'
-import { computed } from 'vue'
-import type { MaybeRefOrGetter } from '@vueuse/core'
-import { toValue } from '@vueuse/core'
+import type { ComputedRef, MaybeRefOrGetter } from 'vue'
+import { computed, toValue } from 'vue'
 import type { GraphNode, Node } from '../types'
 import { useVueFlow } from './useVueFlow'
 
diff --git a/packages/core/src/composables/useWatchProps.ts b/packages/core/src/composables/useWatchProps.ts
index bf95e8e6..a83b35b3 100644
--- a/packages/core/src/composables/useWatchProps.ts
+++ b/packages/core/src/composables/useWatchProps.ts
@@ -1,7 +1,7 @@
 import type { ToRefs } from 'vue'
-import { effectScope, isRef, nextTick, onScopeDispose, watch } from 'vue'
+import { effectScope, isRef, nextTick, onScopeDispose, toRef, watch } from 'vue'
 import type { WatchPausableReturn } from '@vueuse/core'
-import { toRef, watchPausable } from '@vueuse/core'
+import { watchPausable } from '@vueuse/core'
 import type { Connection, FlowProps, VueFlowStore } from '../types'
 import { isDef } from '../utils'
 
diff --git a/packages/core/src/container/Pane/Pane.vue b/packages/core/src/container/Pane/Pane.vue
index 204a29ca..d85b5c35 100644
--- a/packages/core/src/container/Pane/Pane.vue
+++ b/packages/core/src/container/Pane/Pane.vue
@@ -1,6 +1,5 @@
 <script lang="ts" setup>
-import { ref } from 'vue'
-import { toRef } from '@vueuse/core'
+import { ref, toRef } from 'vue'
 import UserSelection from '../../components/UserSelection/UserSelection.vue'
 import NodesSelection from '../../components/NodesSelection/NodesSelection.vue'
 import type { GraphNode } from '../../types'
diff --git a/packages/core/src/container/Viewport/Viewport.vue b/packages/core/src/container/Viewport/Viewport.vue
index 4175ffe4..e61a7272 100644
--- a/packages/core/src/container/Viewport/Viewport.vue
+++ b/packages/core/src/container/Viewport/Viewport.vue
@@ -2,8 +2,7 @@
 import type { D3ZoomEvent, ZoomTransform } from 'd3-zoom'
 import { zoom, zoomIdentity } from 'd3-zoom'
 import { pointer, select } from 'd3-selection'
-import { onMounted, ref, watch } from 'vue'
-import { toRef } from '@vueuse/core'
+import { onMounted, ref, toRef, watch } from 'vue'
 import type { CoordinateExtent, D3ZoomHandler, ViewportTransform } from '../../types'
 import { PanOnScrollMode } from '../../types'
 import { useKeyPress } from '../../composables/useKeyPress'