diff --git a/examples/svelte/src/routes/examples/edges/ButtonEdge.svelte b/examples/svelte/src/routes/examples/edges/ButtonEdge.svelte
index e02f25a4..0c858af7 100644
--- a/examples/svelte/src/routes/examples/edges/ButtonEdge.svelte
+++ b/examples/svelte/src/routes/examples/edges/ButtonEdge.svelte
@@ -3,10 +3,10 @@
 		getBezierPath,
 		BaseEdge,
 		type EdgeProps,
-		EdgeLabelRenderer,
 		useSvelteFlow,
 		MarkerType,
-		EdgeReconnectAnchor
+		EdgeReconnectAnchor,
+		EdgeLabel
 	} from '@xyflow/svelte';
 
 	let {
@@ -39,39 +39,34 @@
 
 {#if !reconnecting}
 	<BaseEdge path={edgePath} {markerEnd} {style} />
-	<EdgeLabelRenderer>
-		<div
-			class="edgeButtonContainer nodrag nopan"
-			style:transform="translate(-50%, -50%) translate({labelX}px,{labelY}px)"
+	<EdgeLabel x={labelX} y={labelY}>
+		<button
+			class="edgeButton"
+			onclick={(event) => {
+				event.stopPropagation();
+				updateEdge('e5-6', {
+					markerEnd: {
+						type: MarkerType.Arrow,
+						color: '#FFCC00',
+						markerUnits: 'userSpaceOnUse',
+						width: 20,
+						height: 20,
+						strokeWidth: 2
+					},
+					markerStart: {
+						type: MarkerType.ArrowClosed,
+						color: '#FFCC00',
+						orient: 'auto-start-reverse',
+						markerUnits: 'userSpaceOnUse',
+						width: 20,
+						height: 20
+					}
+				});
+			}}
 		>
-			<button
-				class="edgeButton"
-				onclick={(event) => {
-					event.stopPropagation();
-					updateEdge('e5-6', {
-						markerEnd: {
-							type: MarkerType.Arrow,
-							color: '#FFCC00',
-							markerUnits: 'userSpaceOnUse',
-							width: 20,
-							height: 20,
-							strokeWidth: 2
-						},
-						markerStart: {
-							type: MarkerType.ArrowClosed,
-							color: '#FFCC00',
-							orient: 'auto-start-reverse',
-							markerUnits: 'userSpaceOnUse',
-							width: 20,
-							height: 20
-						}
-					});
-				}}
-			>
-				×
-			</button>
-		</div>
-	</EdgeLabelRenderer>
+			×
+		</button>
+	</EdgeLabel>
 {/if}
 
 {#if selected}
@@ -80,14 +75,6 @@
 {/if}
 
 <style>
-	.edgeButtonContainer {
-		position: absolute;
-		font-size: 12pt;
-		/* everything inside EdgeLabelRenderer has no pointer events by default */
-		/* if you have an interactive element, set pointer-events: all */
-		pointer-events: all;
-	}
-
 	.edgeButton {
 		width: 20px;
 		height: 20px;
@@ -95,8 +82,7 @@
 		border: 1px solid #fff;
 		cursor: pointer;
 		border-radius: 50%;
-		font-size: 12px;
-		line-height: 1;
+		font-size: 10px;
 	}
 
 	.edgeButton:hover {
diff --git a/examples/svelte/src/routes/examples/overview/CustomEdge.svelte b/examples/svelte/src/routes/examples/overview/CustomEdge.svelte
index 51201726..96be0b03 100644
--- a/examples/svelte/src/routes/examples/overview/CustomEdge.svelte
+++ b/examples/svelte/src/routes/examples/overview/CustomEdge.svelte
@@ -1,11 +1,5 @@
 <script lang="ts">
-	import {
-		BaseEdge,
-		EdgeLabelRenderer,
-		useEdges,
-		getBezierPath,
-		type EdgeProps
-	} from '@xyflow/svelte';
+	import { BaseEdge, useEdges, getBezierPath, type EdgeProps, EdgeLabel } from '@xyflow/svelte';
 
 	let { ...props }: EdgeProps = $props();
 
@@ -29,20 +23,13 @@
 
 <BaseEdge {path} {labelX} {labelY} {...props} />
 
-<EdgeLabelRenderer>
-	<button
-		style:transform={`translate(-50%,-50%) translate(${labelX}px,${labelY}px)`}
-		class="edge-button"
-		onclick={onClick}
-	>
-		✕
-	</button>
-</EdgeLabelRenderer>
+<EdgeLabel x={labelX} y={labelY} selectEdgeOnClick>
+	<button class="edge-button" onclick={onClick}> ✕ </button>
+</EdgeLabel>
 
 <style>
 	.edge-button {
 		border-radius: 50%;
-		position: absolute;
 		border: none;
 		width: 1rem;
 		height: 1rem;
@@ -50,7 +37,6 @@
 		justify-content: center;
 		align-items: center;
 		font-size: 8px;
-		pointer-events: all;
 		cursor: pointer;
 		background-color: #eee;
 	}
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 7e709868..1e1da4b1 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@xyflow/svelte",
-  "version": "1.0.0-next.8",
+  "version": "1.0.0-next.9",
   "description": "Svelte Flow - A highly customizable Svelte library for building node-based editors, workflow systems, diagrams and more.",
   "keywords": [
     "svelte",
diff --git a/packages/svelte/src/lib/components/EdgeLabel/EdgeLabel.svelte b/packages/svelte/src/lib/components/EdgeLabel/EdgeLabel.svelte
index d85f41c7..3ed73653 100644
--- a/packages/svelte/src/lib/components/EdgeLabel/EdgeLabel.svelte
+++ b/packages/svelte/src/lib/components/EdgeLabel/EdgeLabel.svelte
@@ -1,41 +1,45 @@
 <script lang="ts">
-  import { getContext, type Snippet } from 'svelte';
-  import type { ClassValue } from 'svelte/elements';
+  import { getContext } from 'svelte';
+  import { portal } from '$lib/actions/portal';
 
-  import { EdgeLabelRenderer } from '$lib/components/EdgeLabelRenderer';
   import { useStore } from '$lib/store';
+  import type { EdgeLabelProps } from './types';
 
   let {
     x,
     y,
+    selectEdgeOnClick = false,
+    transparent = false,
     style,
     class: className,
-    children
-  }: {
-    x?: number;
-    y?: number;
-    style?: string;
-    class?: ClassValue;
-    children?: Snippet;
-  } = $props();
+    children,
+    ...rest
+  }: EdgeLabelProps = $props();
 
   const store = useStore();
 
   const id = getContext<string>('svelteflow__edge_id');
 </script>
 
-<EdgeLabelRenderer>
-  <div
-    class={['svelte-flow__edge-label', className]}
-    style:transform="translate(-50%, -50%) translate({x}px,{y}px)"
-    style={'pointer-events: all;' + style}
-    role="button"
-    tabindex="-1"
-    onkeyup={() => {}}
-    onclick={() => {
-      if (id) store.handleEdgeSelection(id);
-    }}
-  >
-    {@render children?.()}
-  </div>
-</EdgeLabelRenderer>
+<div
+  use:portal={'edgelabel'}
+  class={['svelte-flow__edge-label', { transparent }, className]}
+  style:cursor={selectEdgeOnClick ? 'pointer' : undefined}
+  style:transform="translate(-50%, -50%) translate({x}px,{y}px)"
+  style:pointer-events="all"
+  {style}
+  role="button"
+  tabindex="-1"
+  onclick={() => {
+    if (selectEdgeOnClick && id) store.handleEdgeSelection(id);
+  }}
+  {...rest}
+>
+  {@render children?.()}
+</div>
+
+<style>
+  .transparent {
+    background: transparent;
+  }
+</style>
diff --git a/packages/svelte/src/lib/components/EdgeLabel/index.ts b/packages/svelte/src/lib/components/EdgeLabel/index.ts
index 2e0a457c..bd3bb47f 100644
--- a/packages/svelte/src/lib/components/EdgeLabel/index.ts
+++ b/packages/svelte/src/lib/components/EdgeLabel/index.ts
@@ -1 +1,2 @@
 export { default as EdgeLabel } from './EdgeLabel.svelte';
+export * from './types';
diff --git a/packages/svelte/src/lib/components/EdgeLabel/types.ts b/packages/svelte/src/lib/components/EdgeLabel/types.ts
new file mode 100644
index 00000000..a7473d9a
--- /dev/null
+++ b/packages/svelte/src/lib/components/EdgeLabel/types.ts
@@ -0,0 +1,12 @@
+import type { Snippet } from 'svelte';
+import type { ClassValue, HTMLAttributes } from 'svelte/elements';
+
+export type EdgeLabelProps = {
+  x?: number;
+  y?: number;
+  selectEdgeOnClick?: boolean;
+  transparent?: boolean;
+  style?: string;
+  class?: ClassValue;
+  children?: Snippet;
+} & HTMLAttributes<HTMLDivElement>;
diff --git a/packages/svelte/src/lib/components/EdgeReconnectAnchor/EdgeReconnectAnchor.svelte b/packages/svelte/src/lib/components/EdgeReconnectAnchor/EdgeReconnectAnchor.svelte
index 7ea58db5..7fc410d6 100644
--- a/packages/svelte/src/lib/components/EdgeReconnectAnchor/EdgeReconnectAnchor.svelte
+++ b/packages/svelte/src/lib/components/EdgeReconnectAnchor/EdgeReconnectAnchor.svelte
@@ -4,7 +4,8 @@
   import { XYHandle, type HandleType, type XYPosition } from '@xyflow/system';
   import { getContext, type Snippet } from 'svelte';
   import type { ClassValue } from 'svelte/elements';
-  import { portal } from '$lib/actions/portal';
+  import EdgeLabel from '../EdgeLabel/EdgeLabel.svelte';
+  import type { EdgeReconnectAnchorProps } from './types';
 
   let {
     type,
@@ -13,16 +14,9 @@
     class: className,
     size = 25,
     style,
-    children
-  }: {
-    type: HandleType;
-    reconnecting?: boolean;
-    style?: string;
-    class?: ClassValue;
-    position?: XYPosition;
-    size?: number;
-    children?: Snippet;
-  } = $props();
+    children,
+    ...rest
+  }: EdgeReconnectAnchorProps = $props();
 
   const store = useStore();
 
@@ -110,17 +104,16 @@
   };
 </script>
 
-<div
-  use:portal={'edgelabel'}
+<EdgeLabel
+  x={position?.x}
+  y={position?.y}
   class={['svelte-flow__edgeupdater nopan', `svelte-flow__edgeupdater-${type}`, className]}
-  style:position="absolute"
-  style:width={`${size}px`}
-  style:height={`${size}px`}
-  style:transform={`translate(-50%, -50%) ${position ? `translate(${position.x}px, ${position.y}px` : ''}`}
-  {style}
+  style={`width:${size}px; height:${size}px;` + style}
   onpointerdown={onPointerDown}
+  transparent
+  {...rest}
 >
   {#if !reconnecting && children}
     {@render children()}
   {/if}
-</div>
+</EdgeLabel>
diff --git a/packages/svelte/src/lib/components/EdgeReconnectAnchor/index.ts b/packages/svelte/src/lib/components/EdgeReconnectAnchor/index.ts
index ca115963..5c3ad2c7 100644
--- a/packages/svelte/src/lib/components/EdgeReconnectAnchor/index.ts
+++ b/packages/svelte/src/lib/components/EdgeReconnectAnchor/index.ts
@@ -1 +1,2 @@
 export { default as EdgeReconnectAnchor } from './EdgeReconnectAnchor.svelte';
+export * from './types';
diff --git a/packages/svelte/src/lib/components/EdgeReconnectAnchor/types.ts b/packages/svelte/src/lib/components/EdgeReconnectAnchor/types.ts
new file mode 100644
index 00000000..74ed6d6d
--- /dev/null
+++ b/packages/svelte/src/lib/components/EdgeReconnectAnchor/types.ts
@@ -0,0 +1,13 @@
+import type { HandleType, XYPosition } from '@xyflow/system';
+import type { Snippet } from 'svelte';
+import type { ClassValue, HTMLAttributes } from 'svelte/elements';
+
+export type EdgeReconnectAnchorProps = {
+  type: HandleType;
+  reconnecting?: boolean;
+  style?: string;
+  class?: ClassValue;
+  position?: XYPosition;
+  size?: number;
+  children?: Snippet;
+} & HTMLAttributes<HTMLDivElement>;
diff --git a/packages/svelte/src/lib/components/Handle/Handle.svelte b/packages/svelte/src/lib/components/Handle/Handle.svelte
index be39857c..5c4a4cd4 100644
--- a/packages/svelte/src/lib/components/Handle/Handle.svelte
+++ b/packages/svelte/src/lib/components/Handle/Handle.svelte
@@ -4,19 +4,20 @@
     Position,
     XYHandle,
     isMouseEvent,
-    type HandleConnection,
     areConnectionMapsEqual,
     handleConnectionChange,
     ConnectionMode,
     getHostForElement,
+    type HandleConnection,
     type Optional,
     type ConnectionState,
     type Connection
   } from '@xyflow/system';
 
   import { useStore } from '$lib/store';
-  import type { HandleProps } from '$lib/types';
+
   import type { ConnectableContext } from '../NodeWrapper/types';
+  import type { HandleProps } from './types';
 
   let {
     id: handleId = null,
@@ -30,7 +31,8 @@
     isValidConnection,
     onconnect,
     ondisconnect,
-    children
+    children,
+    ...rest
   }: HandleProps = $props();
 
   const nodeId = getContext<string>('svelteflow__node_id');
@@ -226,6 +228,7 @@ The Handle component is the part of a node that can be used to connect nodes.
   {style}
   role="button"
   tabindex="-1"
+  {...rest}
 >
   {@render children?.()}
 </div>
diff --git a/packages/svelte/src/lib/components/Handle/index.ts b/packages/svelte/src/lib/components/Handle/index.ts
index 162ffba0..76ec4741 100644
--- a/packages/svelte/src/lib/components/Handle/index.ts
+++ b/packages/svelte/src/lib/components/Handle/index.ts
@@ -1 +1,2 @@
 export { default as Handle } from './Handle.svelte';
+export * from './types';
diff --git a/packages/svelte/src/lib/components/Handle/types.ts b/packages/svelte/src/lib/components/Handle/types.ts
new file mode 100644
index 00000000..ac85ec1f
--- /dev/null
+++ b/packages/svelte/src/lib/components/Handle/types.ts
@@ -0,0 +1,10 @@
+import type { Connection, HandleProps as HandlePropsSystem } from '@xyflow/system';
+import type { Snippet } from 'svelte';
+import type { ClassValue, HTMLAttributes } from 'svelte/elements';
+
+export type HandleProps = HandlePropsSystem & {
+  class?: ClassValue;
+  onconnect?: (connections: Connection[]) => void;
+  ondisconnect?: (connections: Connection[]) => void;
+  children?: Snippet;
+} & HTMLAttributes<HTMLDivElement>;
diff --git a/packages/svelte/src/lib/components/ViewportPortal/ViewportPortal.svelte b/packages/svelte/src/lib/components/ViewportPortal/ViewportPortal.svelte
index e86cb51c..45adcffd 100644
--- a/packages/svelte/src/lib/components/ViewportPortal/ViewportPortal.svelte
+++ b/packages/svelte/src/lib/components/ViewportPortal/ViewportPortal.svelte
@@ -1,11 +1,10 @@
 <script lang="ts">
-  import type { Snippet } from 'svelte';
-
   import { portal } from '$lib/actions/portal';
+  import type { ViewportPortalProps } from './types';
 
-  let { children }: { children?: Snippet } = $props();
+  let { children, ...rest }: ViewportPortalProps = $props();
 </script>
 
-<div use:portal={'viewport'}>
+<div use:portal={'viewport'} {...rest}>
   {@render children?.()}
 </div>
diff --git a/packages/svelte/src/lib/components/ViewportPortal/index.ts b/packages/svelte/src/lib/components/ViewportPortal/index.ts
index 12da71c8..ccc3ba6f 100644
--- a/packages/svelte/src/lib/components/ViewportPortal/index.ts
+++ b/packages/svelte/src/lib/components/ViewportPortal/index.ts
@@ -1 +1,2 @@
 export { default as ViewportPortal } from './ViewportPortal.svelte';
+export * from './types';
diff --git a/packages/svelte/src/lib/components/ViewportPortal/types.ts b/packages/svelte/src/lib/components/ViewportPortal/types.ts
new file mode 100644
index 00000000..14b3e817
--- /dev/null
+++ b/packages/svelte/src/lib/components/ViewportPortal/types.ts
@@ -0,0 +1,6 @@
+import type { Snippet } from 'svelte';
+import type { HTMLAttributes } from 'svelte/elements';
+
+export type ViewportPortalProps = {
+  children?: Snippet;
+} & HTMLAttributes<HTMLDivElement>;
diff --git a/packages/svelte/src/lib/components/edges/BaseEdge.svelte b/packages/svelte/src/lib/components/edges/BaseEdge.svelte
index 3e17e7cb..3c843925 100644
--- a/packages/svelte/src/lib/components/edges/BaseEdge.svelte
+++ b/packages/svelte/src/lib/components/edges/BaseEdge.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-  import type { HTMLAttributes } from 'svelte/elements';
   import type { BaseEdgeProps } from '../../types';
   import EdgeLabel from '../EdgeLabel/EdgeLabel.svelte';
 
@@ -16,7 +15,7 @@
     interactionWidth = 20,
     class: className,
     ...rest
-  }: BaseEdgeProps & HTMLAttributes<SVGPathElement> = $props();
+  }: BaseEdgeProps = $props();
 </script>
 
 <path
@@ -41,7 +40,7 @@
 {/if}
 
 {#if label}
-  <EdgeLabel x={labelX} y={labelY} style={labelStyle}>
+  <EdgeLabel x={labelX} y={labelY} style={labelStyle} selectEdgeOnClick>
     {label}
   </EdgeLabel>
 {/if}
diff --git a/packages/svelte/src/lib/container/Pane/Pane.svelte b/packages/svelte/src/lib/container/Pane/Pane.svelte
index 51d85e8c..d7a6fa14 100644
--- a/packages/svelte/src/lib/container/Pane/Pane.svelte
+++ b/packages/svelte/src/lib/container/Pane/Pane.svelte
@@ -218,7 +218,7 @@
 <!-- svelte-ignore a11y_click_events_have_key_events -->
 <div
   bind:this={container}
-  class="svelte-flow__pane"
+  class="svelte-flow__pane svelte-flow__container"
   class:draggable={panOnDrag === true || (Array.isArray(panOnDrag) && panOnDrag.includes(0))}
   class:dragging={store.dragging}
   class:selection={isSelecting}
@@ -230,13 +230,3 @@
 >
   {@render children()}
 </div>
-
-<style>
-  .svelte-flow__pane {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-  }
-</style>
diff --git a/packages/svelte/src/lib/container/Pane/index.ts b/packages/svelte/src/lib/container/Pane/index.ts
index 2161528c..ddbb36e5 100644
--- a/packages/svelte/src/lib/container/Pane/index.ts
+++ b/packages/svelte/src/lib/container/Pane/index.ts
@@ -1 +1,2 @@
 export { default as Pane } from './Pane.svelte';
+export * from './types';
diff --git a/packages/svelte/src/lib/container/Panel/Panel.svelte b/packages/svelte/src/lib/container/Panel/Panel.svelte
index bbdc4b9b..81a3796d 100644
--- a/packages/svelte/src/lib/container/Panel/Panel.svelte
+++ b/packages/svelte/src/lib/container/Panel/Panel.svelte
@@ -2,13 +2,7 @@
   import type { PanelProps } from './types';
   import { useStore } from '$lib/store';
 
-  let {
-    position = 'top-right',
-    style,
-    class: className,
-    children,
-    ...restProps
-  }: PanelProps = $props();
+  let { position = 'top-right', style, class: className, children, ...rest }: PanelProps = $props();
 
   const store = useStore();
 
@@ -19,7 +13,7 @@
   class={['svelte-flow__panel', className, ...positionClasses]}
   {style}
   style:pointer-events={store.selectionRectMode ? 'none' : ''}
-  {...restProps}
+  {...rest}
 >
   {@render children?.()}
 </div>
diff --git a/packages/svelte/src/lib/container/Panel/index.ts b/packages/svelte/src/lib/container/Panel/index.ts
index aa07206d..bc926449 100644
--- a/packages/svelte/src/lib/container/Panel/index.ts
+++ b/packages/svelte/src/lib/container/Panel/index.ts
@@ -1,2 +1,2 @@
 export { default as Panel } from './Panel.svelte';
-export type { PanelProps } from './types';
+export * from './types';
diff --git a/packages/svelte/src/lib/container/Viewport/Viewport.svelte b/packages/svelte/src/lib/container/Viewport/Viewport.svelte
index d04e84eb..e9570f7f 100644
--- a/packages/svelte/src/lib/container/Viewport/Viewport.svelte
+++ b/packages/svelte/src/lib/container/Viewport/Viewport.svelte
@@ -6,19 +6,9 @@
 </script>
 
 <div
-  class="svelte-flow__viewport xyflow__viewport"
+  class="svelte-flow__viewport xyflow__viewport svelte-flow__container"
   style="transform: translate({store.viewport.x}px, {store.viewport.y}px) scale({store.viewport
     .zoom})"
 >
   {@render children()}
 </div>
-
-<style>
-  .svelte-flow__viewport {
-    width: 100%;
-    height: 100%;
-    position: absolute;
-    top: 0;
-    left: 0;
-  }
-</style>
diff --git a/packages/svelte/src/lib/container/Zoom/Zoom.svelte b/packages/svelte/src/lib/container/Zoom/Zoom.svelte
index 37014040..23619cf6 100644
--- a/packages/svelte/src/lib/container/Zoom/Zoom.svelte
+++ b/packages/svelte/src/lib/container/Zoom/Zoom.svelte
@@ -37,7 +37,7 @@
 </script>
 
 <div
-  class="svelte-flow__zoom"
+  class="svelte-flow__zoom svelte-flow__container"
   use:zoom={{
     viewport: store.viewport,
     minZoom: store.minZoom,
@@ -74,14 +74,3 @@
 >
   {@render children()}
 </div>
-
-<style>
-  .svelte-flow__zoom {
-    width: 100%;
-    height: 100%;
-    position: absolute;
-    top: 0;
-    left: 0;
-    z-index: 4;
-  }
-</style>
diff --git a/packages/svelte/src/lib/index.ts b/packages/svelte/src/lib/index.ts
index a2683fee..7462661f 100644
--- a/packages/svelte/src/lib/index.ts
+++ b/packages/svelte/src/lib/index.ts
@@ -55,7 +55,7 @@ export type {
   EdgeTypes,
   DefaultEdgeOptions
 } from '$lib/types/edges';
-export type { HandleProps, FitViewOptions, OnBeforeDelete } from '$lib/types/general';
+export type { FitViewOptions, OnBeforeDelete } from '$lib/types/general';
 export type { Node, NodeTypes, BuiltInNode, NodeProps, InternalNode } from '$lib/types/nodes';
 export type { SvelteFlowStore } from '$lib/store/types';
 export * from '$lib/types/events';
diff --git a/packages/svelte/src/lib/plugins/Background/Background.svelte b/packages/svelte/src/lib/plugins/Background/Background.svelte
index e24fa669..9d6aa38a 100644
--- a/packages/svelte/src/lib/plugins/Background/Background.svelte
+++ b/packages/svelte/src/lib/plugins/Background/Background.svelte
@@ -47,7 +47,7 @@
 </script>
 
 <svg
-  class={['svelte-flow__background', className]}
+  class={['svelte-flow__background', 'svelte-flow__container', className]}
   data-testid="svelte-flow__background"
   style:--xy-background-color-props={bgColor}
   style:--xy-background-pattern-color-props={patternColor}
@@ -69,13 +69,3 @@
   </pattern>
   <rect x="0" y="0" width="100%" height="100%" fill={`url(#${patternId})`} />
 </svg>
-
-<style>
-  .svelte-flow__background {
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    top: 0;
-    left: 0;
-  }
-</style>
diff --git a/packages/svelte/src/lib/plugins/Controls/Controls.svelte b/packages/svelte/src/lib/plugins/Controls/Controls.svelte
index bd332c63..035fc93c 100644
--- a/packages/svelte/src/lib/plugins/Controls/Controls.svelte
+++ b/packages/svelte/src/lib/plugins/Controls/Controls.svelte
@@ -27,7 +27,8 @@
     fitViewOptions,
     children,
     before,
-    after
+    after,
+    ...rest
   }: ControlsProps = $props();
 
   const store = useStore();
@@ -74,6 +75,7 @@
   data-testid="svelte-flow__controls"
   aria-label={ariaLabel ?? 'Svelte Flow controls'}
   {style}
+  {...rest}
 >
   {#if before}
     {@render before()}
diff --git a/packages/svelte/src/lib/plugins/Controls/types.ts b/packages/svelte/src/lib/plugins/Controls/types.ts
index 2ee4b055..7b011a22 100644
--- a/packages/svelte/src/lib/plugins/Controls/types.ts
+++ b/packages/svelte/src/lib/plugins/Controls/types.ts
@@ -1,5 +1,5 @@
 import type { Snippet } from 'svelte';
-import type { ClassValue, HTMLButtonAttributes } from 'svelte/elements';
+import type { ClassValue, HTMLAttributes, HTMLButtonAttributes } from 'svelte/elements';
 import type { PanelPosition } from '@xyflow/system';
 
 import type { FitViewOptions } from '$lib/types';
@@ -29,7 +29,7 @@ export type ControlsProps = {
   before?: Snippet;
   after?: Snippet;
   fitViewOptions?: FitViewOptions;
-};
+} & HTMLAttributes<HTMLDivElement>;
 
 export type ControlButtonProps = HTMLButtonAttributes & {
   class?: ClassValue;
diff --git a/packages/svelte/src/lib/plugins/Minimap/Minimap.svelte b/packages/svelte/src/lib/plugins/Minimap/Minimap.svelte
index 7aac953c..37283e55 100644
--- a/packages/svelte/src/lib/plugins/Minimap/Minimap.svelte
+++ b/packages/svelte/src/lib/plugins/Minimap/Minimap.svelte
@@ -43,8 +43,6 @@
 
   let store = useStore();
 
-  // let nodes = $derived(store.nodes);
-
   const nodeColorFunc = nodeColor === undefined ? undefined : getAttrFunction(nodeColor);
   const nodeStrokeColorFunc = getAttrFunction(nodeStrokeColor);
   const nodeClassFunc = getAttrFunction(nodeClass);
diff --git a/packages/svelte/src/lib/plugins/NodeToolbar/NodeToolbar.svelte b/packages/svelte/src/lib/plugins/NodeToolbar/NodeToolbar.svelte
index 64acaeab..65a5c2d3 100644
--- a/packages/svelte/src/lib/plugins/NodeToolbar/NodeToolbar.svelte
+++ b/packages/svelte/src/lib/plugins/NodeToolbar/NodeToolbar.svelte
@@ -15,7 +15,8 @@
     align = 'center',
     offset = 10,
     isVisible,
-    children
+    children,
+    ...rest
   }: NodeToolbarProps = $props();
 
   const store = useStore();
@@ -66,12 +67,13 @@
 
 {#if store.domNode && isActive && toolbarNodes}
   <div
-    data-id={toolbarNodes.reduce((acc, node) => `${acc}${node.id} `, '').trim()}
-    class="svelte-flow__node-toolbar"
     use:portal={'root'}
+    class="svelte-flow__node-toolbar"
+    data-id={toolbarNodes.reduce((acc, node) => `${acc}${node.id} `, '').trim()}
     style:position="absolute"
     style:transform
     style:z-index={zIndex}
+    {...rest}
   >
     {@render children?.()}
   </div>
diff --git a/packages/svelte/src/lib/plugins/NodeToolbar/types.ts b/packages/svelte/src/lib/plugins/NodeToolbar/types.ts
index 0f192d4b..704a0d83 100644
--- a/packages/svelte/src/lib/plugins/NodeToolbar/types.ts
+++ b/packages/svelte/src/lib/plugins/NodeToolbar/types.ts
@@ -1,5 +1,6 @@
 import type { Position, Align } from '@xyflow/system';
 import type { Snippet } from 'svelte';
+import type { HTMLAttributes } from 'svelte/elements';
 
 export type NodeToolbarProps = {
   /** The id of the node, or array of ids the toolbar should be displayed at */
@@ -18,4 +19,4 @@ export type NodeToolbarProps = {
   /** If true, node toolbar is visible even if node is not selected */
   isVisible?: boolean;
   children?: Snippet;
-};
+} & HTMLAttributes<HTMLDivElement>;
diff --git a/packages/svelte/src/lib/types/edges.ts b/packages/svelte/src/lib/types/edges.ts
index 4994c948..941a16e1 100644
--- a/packages/svelte/src/lib/types/edges.ts
+++ b/packages/svelte/src/lib/types/edges.ts
@@ -9,7 +9,7 @@ import type {
 } from '@xyflow/system';
 
 import type { Node } from '$lib/types';
-import type { ClassValue } from 'svelte/elements';
+import type { ClassValue, HTMLAttributes } from 'svelte/elements';
 
 /**
  * An `Edge` is the complete description with everything Svelte Flow needs to know in order to
@@ -46,7 +46,7 @@ export type BaseEdgeProps = Pick<
    */
   markerEnd?: string;
   class?: ClassValue;
-};
+} & HTMLAttributes<SVGPathElement>;
 
 type SmoothStepEdge<EdgeData extends Record<string, unknown> = Record<string, unknown>> = Edge<
   EdgeData,
diff --git a/packages/svelte/src/lib/types/general.ts b/packages/svelte/src/lib/types/general.ts
index 9d1141fa..27129228 100644
--- a/packages/svelte/src/lib/types/general.ts
+++ b/packages/svelte/src/lib/types/general.ts
@@ -1,13 +1,10 @@
-import type { Snippet } from 'svelte';
-import type { ClassValue } from 'svelte/elements';
 import type { ShortcutModifierDefinition } from '@svelte-put/shortcut';
 import type {
   FitViewOptionsBase,
   XYPosition,
   Handle,
   Connection,
-  OnBeforeDeleteBase,
-  HandleProps as HandlePropsSystem
+  OnBeforeDeleteBase
 } from '@xyflow/system';
 
 import type { Node } from './nodes';
@@ -24,14 +21,6 @@ export type ConnectionData = {
   connectionStatus: string | null;
 };
 
-export type HandleProps = HandlePropsSystem & {
-  class?: ClassValue;
-  style?: string;
-  onconnect?: (connections: Connection[]) => void;
-  ondisconnect?: (connections: Connection[]) => void;
-  children?: Snippet;
-};
-
 export type FitViewOptions<NodeType extends Node = Node> = FitViewOptionsBase<NodeType>;
 
 export type OnDelete = (params: { nodes: Node[]; edges: Edge[] }) => void;
diff --git a/packages/svelte/src/styles/base.css b/packages/svelte/src/styles/base.css
index a0cf3040..9886d598 100644
--- a/packages/svelte/src/styles/base.css
+++ b/packages/svelte/src/styles/base.css
@@ -7,3 +7,15 @@
   text-align: center;
   position: absolute;
 }
+
+.svelte-flow__nodes {
+  z-index: 0;
+}
+
+.svelte-flow__edgelabel-renderer {
+  z-index: 0;
+}
+
+.svelte-flow__zoom {
+  z-index: 4;
+}
diff --git a/packages/svelte/src/styles/style.css b/packages/svelte/src/styles/style.css
index 981bc92e..9dd0a652 100644
--- a/packages/svelte/src/styles/style.css
+++ b/packages/svelte/src/styles/style.css
@@ -8,7 +8,6 @@
   position: absolute;
   padding: 2px;
   font-size: 10px;
-  cursor: pointer;
   color: var(--xy-edge-label-color, var(--xy-edge-label-color-default));
   background: var(--xy-edge-label-background-color, var(--xy-edge-label-background-color-default));
 }
@@ -20,3 +19,7 @@
 .svelte-flow__edgelabel-renderer {
   z-index: 0;
 }
+
+.svelte-flow__zoom {
+  z-index: 4;
+}