diff --git a/src/container/EdgeRenderer/Marker.vue b/src/container/EdgeRenderer/Marker.vue
index 3a61b686..a5bedc5d 100644
--- a/src/container/EdgeRenderer/Marker.vue
+++ b/src/container/EdgeRenderer/Marker.vue
@@ -1,9 +1,14 @@
 <script lang="ts" setup>
-interface MarkerProps {
-  id: string
-}
+import type { MarkerProps } from '../../types/edge'
 
-const props = defineProps<MarkerProps>()
+const props = withDefaults(defineProps<MarkerProps>(), {
+  width: 12.5,
+  height: 12.5,
+  markerUnits: 'strokeWidth',
+  orient: 'auto',
+  strokeWidth: 1,
+  color: 'none',
+})
 </script>
 <script lang="ts">
 export default {
@@ -14,13 +19,31 @@ export default {
   <marker
     :id="props.id"
     class="vue-flow__arrowhead"
-    markerWidth="12.5"
-    markerHeight="12.5"
     viewBox="-10 -10 20 20"
-    orient="auto"
     refX="0"
     refY="0"
+    :marker-width="`${props.width}`"
+    :marker-height="`${props.height}`"
+    :marker-units="props.markerUnits"
+    :orient="props.orient"
   >
-    <slot></slot>
+    <polyline
+      v-if="props.type === 'arrowclosed'"
+      :stroke="props.color"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      :stroke-width="props.strokeWidth"
+      :fill="props.color"
+      points="-5,-4 0,0 -5,4 -5,-4"
+    />
+    <polyline
+      v-if="props.type === 'arrow'"
+      :stroke="props.color"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      :stroke-width="props.strokeWidth"
+      fill="none"
+      points="-5,-4 0,0 -5,4"
+    />
   </marker>
 </template>
diff --git a/src/container/EdgeRenderer/MarkerDefinitions.vue b/src/container/EdgeRenderer/MarkerDefinitions.vue
index c5cd2b5d..b375e82e 100644
--- a/src/container/EdgeRenderer/MarkerDefinitions.vue
+++ b/src/container/EdgeRenderer/MarkerDefinitions.vue
@@ -1,12 +1,33 @@
 <script lang="ts" setup>
+import { useStore } from '../../composables'
+import type { MarkerProps } from '../../types/edge'
 import Marker from './Marker.vue'
+import { getMarkerId } from '~/utils'
 
 interface MarkerDefinitionsProps {
-  color: string
+  defaultColor: string
 }
 
 const props = withDefaults(defineProps<MarkerDefinitionsProps>(), {
-  color: '',
+  defaultColor: '',
+})
+const store = useStore()
+
+const markers = computed(() => {
+  const ids: string[] = []
+
+  return store.edges.reduce<MarkerProps[]>((markers, edge) => {
+    ;[edge.markerStart, edge.markerEnd].forEach((marker) => {
+      if (marker && typeof marker === 'object') {
+        const markerId = getMarkerId(marker)
+        if (!ids.includes(markerId)) {
+          markers.push({ id: markerId, color: marker.color || props.defaultColor, ...marker })
+          ids.push(markerId)
+        }
+      }
+    })
+    return markers.sort((a, b) => a.id.localeCompare(b.id))
+  }, [])
 })
 </script>
 <script lang="ts">
@@ -16,25 +37,17 @@ export default {
 </script>
 <template>
   <defs>
-    <Marker id="vue-flow__arrowclosed">
-      <polyline
-        :stroke="props.color"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-        stroke-width="1"
-        :fill="props.color"
-        points="-5,-4 0,0 -5,4 -5,-4"
-      />
-    </Marker>
-    <Marker id="vue-flow__arrow">
-      <polyline
-        :stroke="props.color"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-        stroke-width="1.5"
-        fill="none"
-        points="-5,-4 0,0 -5,4"
-      />
-    </Marker>
+    <Marker
+      v-for="marker of markers"
+      :id="marker.id"
+      :key="marker.id"
+      :type="marker.type"
+      :color="marker.color"
+      :width="marker.width"
+      :height="marker.height"
+      :markerUnits="marker.markerUnits"
+      :stroke-width="marker.strokeWidth"
+      :orient="marker.orient"
+    />
   </defs>
 </template>