1 files changed, 10 insertions, 13 deletions
diff --git a/lib/elements/utils.py b/lib/elements/utils.py
index 99df7002..dafde759 100644
--- a/lib/elements/utils.py
+++ b/lib/elements/utils.py
@@ -4,36 +4,36 @@
 # Licensed under the GNU GPL version 3.0 or later.  See the file LICENSE for details.
 
 from ..commands import is_command
-from ..patterns import is_pattern
+from ..marker import has_marker
 from ..svg.tags import (EMBROIDERABLE_TAGS, SVG_IMAGE_TAG, SVG_PATH_TAG,
                         SVG_POLYLINE_TAG, SVG_TEXT_TAG)
-from .auto_fill import AutoFill
+from .fill_stitch import FillStitch
 from .clone import Clone, is_clone
 from .element import EmbroideryElement
 from .empty_d_object import EmptyDObject
-from .fill import Fill
 from .image import ImageObject
-from .pattern import PatternObject
+from .marker import MarkerObject
 from .polyline import Polyline
 from .satin_column import SatinColumn
 from .stroke import Stroke
 from .text import TextObject
 
 
-def node_to_elements(node):  # noqa: C901
+def node_to_elements(node, clone_to_element=False):  # noqa: C901
     if node.tag == SVG_POLYLINE_TAG:
         return [Polyline(node)]
 
-    elif is_clone(node):
+    elif is_clone(node) and not clone_to_element:
+        # clone_to_element: get an actual embroiderable element once a clone has been defined as a clone
         return [Clone(node)]
 
     elif node.tag == SVG_PATH_TAG and not node.get('d', ''):
         return [EmptyDObject(node)]
 
-    elif is_pattern(node):
-        return [PatternObject(node)]
+    elif has_marker(node):
+        return [MarkerObject(node)]
 
-    elif node.tag in EMBROIDERABLE_TAGS:
+    elif node.tag in EMBROIDERABLE_TAGS or is_clone(node):
         element = EmbroideryElement(node)
 
         if element.get_boolean_param("satin_column") and element.get_style("stroke"):
@@ -41,10 +41,7 @@ def node_to_elements(node):  # noqa: C901
         else:
             elements = []
             if element.get_style("fill", "black") and not element.get_style('fill-opacity', 1) == "0":
-                if element.get_boolean_param("auto_fill", True):
-                    elements.append(AutoFill(node))
-                else:
-                    elements.append(Fill(node))
+                elements.append(FillStitch(node))
             if element.get_style("stroke"):
                 if not is_command(element.node):
                     elements.append(Stroke(node))