integrate input extension too

53 files changed, 212 insertions, 174 deletions

diff --git a/bin/gen-input-inx b/bin/gen-input-inx
index 918adfb9..5f21ce84 100755
--- a/bin/gen-input-inx
+++ b/bin/gen-input-inx
@@ -37,7 +37,7 @@ def main():
     for format, description in libembroidery_input_formats():
         inx = template.render(format=format, description=description)
 
-        with open("inx/embroider_input_%s.inx" % format.upper(), 'w') as inx_file:
+        with open("inx/inkstitch_input_%s.inx" % format.upper(), 'w') as inx_file:
             inx_file.write(inx)
 
 
diff --git a/embroider_input.py b/embroider_input.py
deleted file mode 100644
index 04d79d4f..00000000
--- a/embroider_input.py
+++ /dev/null
@@ -1,61 +0,0 @@
-import sys
-import os
-from libembroidery import *
-from inkex import etree
-import inkex
-from inkstitch import PIXELS_PER_MM, INKSCAPE_LABEL, _
-from inkstitch.stitch_plan import StitchPlan
-from inkstitch.svg import render_stitch_plan
-
-
-def pattern_stitches(pattern):
-    stitch_pointer = pattern.stitchList
-    while stitch_pointer:
-        yield stitch_pointer.stitch
-        stitch_pointer = stitch_pointer.next
-
-
-def main(embroidery_file):
-    pattern = embPattern_create()
-    embPattern_read(pattern, embroidery_file)
-    embPattern_flipVertical(pattern)
-
-    stitch_plan = StitchPlan()
-    color_block = None
-    current_color = None
-
-    for stitch in pattern_stitches(pattern):
-        if stitch.color != current_color:
-            thread = embThreadList_getAt(pattern.threadList, stitch.color)
-            color = thread.color
-            color_block = stitch_plan.new_color_block((color.r, color.g, color.b))
-            current_color = stitch.color
-
-        if not stitch.flags & END:
-            color_block.add_stitch(stitch.xx * PIXELS_PER_MM, stitch.yy * PIXELS_PER_MM,
-                                   jump=stitch.flags & JUMP,
-                                   stop=stitch.flags & STOP,
-                                   trim=stitch.flags & TRIM)
-
-    extents = stitch_plan.extents
-    svg = etree.Element("svg", nsmap=inkex.NSS, attrib=
-                        {
-                            "width": str(extents[0] * 2),
-                            "height": str(extents[1] * 2),
-                            "viewBox": "0 0 %s %s" % (extents[0] * 2, extents[1] * 2),
-                        })
-    render_stitch_plan(svg, stitch_plan)
-
-    # rename the Stitch Plan layer so that it doesn't get overwritten by Embroider
-    layer = svg.find(".//*[@id='__inkstitch_stitch_plan__']")
-    layer.set(INKSCAPE_LABEL, os.path.basename(embroidery_file))
-    layer.attrib.pop('id')
-
-    # Shift the design so that its origin is at the center of the canvas
-    # Note: this is NOT the same as centering the design in the canvas!
-    layer.set('transform', 'translate(%s,%s)' % (extents[0], extents[1]))
-
-    print etree.tostring(svg)
-
-if __name__ == '__main__':
-    sys.exit(main(*sys.argv[1:]))
diff --git a/inkstitch/extensions/__init__.py b/inkstitch/extensions/__init__.py
index 4c8317d0..ebdd2fc9 100644
--- a/inkstitch/extensions/__init__.py
+++ b/inkstitch/extensions/__init__.py
@@ -3,3 +3,4 @@ from palettes import Palettes
 from params import Params
 from print_pdf import Print
 from simulate import Simulate
+from input import Input
diff --git a/inkstitch/extensions/input.py b/inkstitch/extensions/input.py
new file mode 100644
index 00000000..bd3db0ed
--- /dev/null
+++ b/inkstitch/extensions/input.py
@@ -0,0 +1,66 @@
+import os
+from os.path import realpath, dirname, join as path_join
+import sys
+
+# help python find libembroidery when running in a local repo clone
+if getattr(sys, 'frozen', None) is None:
+    sys.path.append(realpath(path_join(dirname(__file__), '..', '..')))
+
+from libembroidery import *
+from inkex import etree
+import inkex
+from .. import PIXELS_PER_MM, INKSCAPE_LABEL, _
+from ..stitch_plan import StitchPlan
+from ..svg import render_stitch_plan
+
+
+class Input(object):
+    def pattern_stitches(self, pattern):
+        stitch_pointer = pattern.stitchList
+        while stitch_pointer:
+            yield stitch_pointer.stitch
+            stitch_pointer = stitch_pointer.next
+
+
+    def affect(self, args):
+        embroidery_file = args[0]
+        pattern = embPattern_create()
+        embPattern_read(pattern, embroidery_file)
+        embPattern_flipVertical(pattern)
+
+        stitch_plan = StitchPlan()
+        color_block = None
+        current_color = None
+
+        for stitch in self.pattern_stitches(pattern):
+            if stitch.color != current_color:
+                thread = embThreadList_getAt(pattern.threadList, stitch.color)
+                color = thread.color
+                color_block = stitch_plan.new_color_block((color.r, color.g, color.b))
+                current_color = stitch.color
+
+            if not stitch.flags & END:
+                color_block.add_stitch(stitch.xx * PIXELS_PER_MM, stitch.yy * PIXELS_PER_MM,
+                                       jump=stitch.flags & JUMP,
+                                       stop=stitch.flags & STOP,
+                                       trim=stitch.flags & TRIM)
+
+        extents = stitch_plan.extents
+        svg = etree.Element("svg", nsmap=inkex.NSS, attrib=
+                            {
+                                "width": str(extents[0] * 2),
+                                "height": str(extents[1] * 2),
+                                "viewBox": "0 0 %s %s" % (extents[0] * 2, extents[1] * 2),
+                            })
+        render_stitch_plan(svg, stitch_plan)
+
+        # rename the Stitch Plan layer so that it doesn't get overwritten by Embroider
+        layer = svg.find(".//*[@id='__inkstitch_stitch_plan__']")
+        layer.set(INKSCAPE_LABEL, os.path.basename(embroidery_file))
+        layer.attrib.pop('id')
+
+        # Shift the design so that its origin is at the center of the canvas
+        # Note: this is NOT the same as centering the design in the canvas!
+        layer.set('transform', 'translate(%s,%s)' % (extents[0], extents[1]))
+
+        print etree.tostring(svg)
diff --git a/inx/embroider_input_T01.inx b/inx/embroider_input_T01.inx
deleted file mode 100644
index 5090310e..00000000
--- a/inx/embroider_input_T01.inx
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>T01 file input</_name>
-    <id>org.inkstitch.input.t01</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <input>
-        <extension>.t01</extension>
-        <mimetype>application/x-embroidery-t01</mimetype>
-        <_filetypename>Ink/Stitch: Pfaff Embroidery Format (.t01)</_filetypename>
-        <_filetypetooltip>convert T01 file to Ink/Stitch manual-stitch paths</_filetypetooltip>
-    </input>
-    <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
-    </script>
-</inkscape-extension>
diff --git a/inx/embroider_input_100.inx b/inx/inkstitch_input_100.inx
index 9bbad780..def2011d 100644
--- a/inx/embroider_input_100.inx
+++ b/inx/inkstitch_input_100.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>100 file input</_name>
     <id>org.inkstitch.input.100</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.100</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Toyota Embroidery Format (.100)</_filetypename>
         <_filetypetooltip>convert 100 file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_10O.inx b/inx/inkstitch_input_10O.inx
index 42f1850e..29b14397 100644
--- a/inx/embroider_input_10O.inx
+++ b/inx/inkstitch_input_10O.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>10O file input</_name>
     <id>org.inkstitch.input.10o</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.10o</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Toyota Embroidery Format (.10o)</_filetypename>
         <_filetypetooltip>convert 10O file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_BRO.inx b/inx/inkstitch_input_BRO.inx
index 0dc576bf..928195a6 100644
--- a/inx/embroider_input_BRO.inx
+++ b/inx/inkstitch_input_BRO.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>BRO file input</_name>
     <id>org.inkstitch.input.bro</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.bro</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Bits &amp; Volts Embroidery Format (.bro)</_filetypename>
         <_filetypetooltip>convert BRO file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_COL.inx b/inx/inkstitch_input_COL.inx
index 81002dd7..38ebe7bd 100644
--- a/inx/embroider_input_COL.inx
+++ b/inx/inkstitch_input_COL.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>COL file input</_name>
     <id>org.inkstitch.input.col</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.col</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Embroidery Thread Color Format (.col)</_filetypename>
         <_filetypetooltip>convert COL file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_CSD.inx b/inx/inkstitch_input_CSD.inx
index 8ebb94b9..444270f0 100644
--- a/inx/embroider_input_CSD.inx
+++ b/inx/inkstitch_input_CSD.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>CSD file input</_name>
     <id>org.inkstitch.input.csd</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.csd</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Singer Embroidery Format (.csd)</_filetypename>
         <_filetypetooltip>convert CSD file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_CSV.inx b/inx/inkstitch_input_CSV.inx
index c3f972d9..0c3e2096 100644
--- a/inx/embroider_input_CSV.inx
+++ b/inx/inkstitch_input_CSV.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>CSV file input</_name>
     <id>org.inkstitch.input.csv</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.csv</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Comma Separated Values Format (.csv)</_filetypename>
         <_filetypetooltip>convert CSV file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_DAT.inx b/inx/inkstitch_input_DAT.inx
index 1045153a..e82694b8 100644
--- a/inx/embroider_input_DAT.inx
+++ b/inx/inkstitch_input_DAT.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>DAT file input</_name>
     <id>org.inkstitch.input.dat</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.dat</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Barudan Embroidery Format (.dat)</_filetypename>
         <_filetypetooltip>convert DAT file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_DSB.inx b/inx/inkstitch_input_DSB.inx
index f81c7ca2..8b7c6b02 100644
--- a/inx/embroider_input_DSB.inx
+++ b/inx/inkstitch_input_DSB.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>DSB file input</_name>
     <id>org.inkstitch.input.dsb</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.dsb</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Barudan Embroidery Format (.dsb)</_filetypename>
         <_filetypetooltip>convert DSB file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_DST.inx b/inx/inkstitch_input_DST.inx
index 414b7470..b3eee601 100644
--- a/inx/embroider_input_DST.inx
+++ b/inx/inkstitch_input_DST.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>DST file input</_name>
     <id>org.inkstitch.input.dst</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.dst</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Tajima Embroidery Format (.dst)</_filetypename>
         <_filetypetooltip>convert DST file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_DSZ.inx b/inx/inkstitch_input_DSZ.inx
index 9c81a0ad..388aeda0 100644
--- a/inx/embroider_input_DSZ.inx
+++ b/inx/inkstitch_input_DSZ.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>DSZ file input</_name>
     <id>org.inkstitch.input.dsz</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.dsz</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: ZSK USA Embroidery Format (.dsz)</_filetypename>
         <_filetypetooltip>convert DSZ file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_EDR.inx b/inx/inkstitch_input_EDR.inx
index 9276fd17..92cf7d14 100644
--- a/inx/embroider_input_EDR.inx
+++ b/inx/inkstitch_input_EDR.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>EDR file input</_name>
     <id>org.inkstitch.input.edr</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.edr</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Embird Embroidery Format (.edr)</_filetypename>
         <_filetypetooltip>convert EDR file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_EMD.inx b/inx/inkstitch_input_EMD.inx
index bb20f977..c05da24f 100644
--- a/inx/embroider_input_EMD.inx
+++ b/inx/inkstitch_input_EMD.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>EMD file input</_name>
     <id>org.inkstitch.input.emd</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.emd</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Elna Embroidery Format (.emd)</_filetypename>
         <_filetypetooltip>convert EMD file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_EXP.inx b/inx/inkstitch_input_EXP.inx
index 41bae8ce..2c5997d5 100644
--- a/inx/embroider_input_EXP.inx
+++ b/inx/inkstitch_input_EXP.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>EXP file input</_name>
     <id>org.inkstitch.input.exp</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.exp</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Melco Embroidery Format (.exp)</_filetypename>
         <_filetypetooltip>convert EXP file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_EXY.inx b/inx/inkstitch_input_EXY.inx
index a2e792c4..78de68d8 100644
--- a/inx/embroider_input_EXY.inx
+++ b/inx/inkstitch_input_EXY.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>EXY file input</_name>
     <id>org.inkstitch.input.exy</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.exy</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Eltac Embroidery Format (.exy)</_filetypename>
         <_filetypetooltip>convert EXY file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_FXY.inx b/inx/inkstitch_input_FXY.inx
index 4d77022e..c2be8c60 100644
--- a/inx/embroider_input_FXY.inx
+++ b/inx/inkstitch_input_FXY.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>FXY file input</_name>
     <id>org.inkstitch.input.fxy</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.fxy</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Fortron Embroidery Format (.fxy)</_filetypename>
         <_filetypetooltip>convert FXY file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_GT.inx b/inx/inkstitch_input_GT.inx
index 3b482244..20a9fda0 100644
--- a/inx/embroider_input_GT.inx
+++ b/inx/inkstitch_input_GT.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>GT file input</_name>
     <id>org.inkstitch.input.gt</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.gt</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Gold Thread Embroidery Format (.gt)</_filetypename>
         <_filetypetooltip>convert GT file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_HUS.inx b/inx/inkstitch_input_HUS.inx
index 3b19ee87..bbac96a2 100644
--- a/inx/embroider_input_HUS.inx
+++ b/inx/inkstitch_input_HUS.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>HUS file input</_name>
     <id>org.inkstitch.input.hus</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.hus</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Husqvarna Viking Embroidery Format (.hus)</_filetypename>
         <_filetypetooltip>convert HUS file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_INB.inx b/inx/inkstitch_input_INB.inx
index 24c6535d..7409a853 100644
--- a/inx/embroider_input_INB.inx
+++ b/inx/inkstitch_input_INB.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>INB file input</_name>
     <id>org.inkstitch.input.inb</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.inb</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Inbro Embroidery Format (.inb)</_filetypename>
         <_filetypetooltip>convert INB file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_INF.inx b/inx/inkstitch_input_INF.inx
index db7e5d57..9c07ed7f 100644
--- a/inx/embroider_input_INF.inx
+++ b/inx/inkstitch_input_INF.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>INF file input</_name>
     <id>org.inkstitch.input.inf</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.inf</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Embroidery Color Format (.inf)</_filetypename>
         <_filetypetooltip>convert INF file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_JEF.inx b/inx/inkstitch_input_JEF.inx
index c2030622..364e969f 100644
--- a/inx/embroider_input_JEF.inx
+++ b/inx/inkstitch_input_JEF.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>JEF file input</_name>
     <id>org.inkstitch.input.jef</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.jef</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Janome Embroidery Format (.jef)</_filetypename>
         <_filetypetooltip>convert JEF file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_KSM.inx b/inx/inkstitch_input_KSM.inx
index 2869ea07..b01eb195 100644
--- a/inx/embroider_input_KSM.inx
+++ b/inx/inkstitch_input_KSM.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>KSM file input</_name>
     <id>org.inkstitch.input.ksm</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.ksm</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Pfaff Embroidery Format (.ksm)</_filetypename>
         <_filetypetooltip>convert KSM file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_MAX.inx b/inx/inkstitch_input_MAX.inx
index 2dbbe2cc..0f5ed952 100644
--- a/inx/embroider_input_MAX.inx
+++ b/inx/inkstitch_input_MAX.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>MAX file input</_name>
     <id>org.inkstitch.input.max</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.max</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Pfaff Embroidery Format (.max)</_filetypename>
         <_filetypetooltip>convert MAX file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_MIT.inx b/inx/inkstitch_input_MIT.inx
index 10f5dfd3..a0181182 100644
--- a/inx/embroider_input_MIT.inx
+++ b/inx/inkstitch_input_MIT.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>MIT file input</_name>
     <id>org.inkstitch.input.mit</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.mit</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Mitsubishi Embroidery Format (.mit)</_filetypename>
         <_filetypetooltip>convert MIT file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_NEW.inx b/inx/inkstitch_input_NEW.inx
index f13a7009..15d877d8 100644
--- a/inx/embroider_input_NEW.inx
+++ b/inx/inkstitch_input_NEW.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>NEW file input</_name>
     <id>org.inkstitch.input.new</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.new</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Ameco Embroidery Format (.new)</_filetypename>
         <_filetypetooltip>convert NEW file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_OFM.inx b/inx/inkstitch_input_OFM.inx
index 9086900d..3e162355 100644
--- a/inx/embroider_input_OFM.inx
+++ b/inx/inkstitch_input_OFM.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>OFM file input</_name>
     <id>org.inkstitch.input.ofm</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.ofm</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Melco Embroidery Format (.ofm)</_filetypename>
         <_filetypetooltip>convert OFM file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_PCD.inx b/inx/inkstitch_input_PCD.inx
index fc9c7362..eff3c2f7 100644
--- a/inx/embroider_input_PCD.inx
+++ b/inx/inkstitch_input_PCD.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>PCD file input</_name>
     <id>org.inkstitch.input.pcd</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.pcd</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Pfaff Embroidery Format (.pcd)</_filetypename>
         <_filetypetooltip>convert PCD file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_PCM.inx b/inx/inkstitch_input_PCM.inx
index fe6c3e22..684b7e20 100644
--- a/inx/embroider_input_PCM.inx
+++ b/inx/inkstitch_input_PCM.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>PCM file input</_name>
     <id>org.inkstitch.input.pcm</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.pcm</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Pfaff Embroidery Format (.pcm)</_filetypename>
         <_filetypetooltip>convert PCM file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_PCQ.inx b/inx/inkstitch_input_PCQ.inx
index 932a9568..44d2d6df 100644
--- a/inx/embroider_input_PCQ.inx
+++ b/inx/inkstitch_input_PCQ.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>PCQ file input</_name>
     <id>org.inkstitch.input.pcq</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.pcq</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Pfaff Embroidery Format (.pcq)</_filetypename>
         <_filetypetooltip>convert PCQ file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_PCS.inx b/inx/inkstitch_input_PCS.inx
index d9d058c0..1a030e53 100644
--- a/inx/embroider_input_PCS.inx
+++ b/inx/inkstitch_input_PCS.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>PCS file input</_name>
     <id>org.inkstitch.input.pcs</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.pcs</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Pfaff Embroidery Format (.pcs)</_filetypename>
         <_filetypetooltip>convert PCS file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_PEC.inx b/inx/inkstitch_input_PEC.inx
index 382dedff..885c0125 100644
--- a/inx/embroider_input_PEC.inx
+++ b/inx/inkstitch_input_PEC.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>PEC file input</_name>
     <id>org.inkstitch.input.pec</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.pec</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Brother Embroidery Format (.pec)</_filetypename>
         <_filetypetooltip>convert PEC file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_PES.inx b/inx/inkstitch_input_PES.inx
index 451a4da6..6faa06be 100644
--- a/inx/embroider_input_PES.inx
+++ b/inx/inkstitch_input_PES.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>PES file input</_name>
     <id>org.inkstitch.input.pes</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.pes</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Brother Embroidery Format (.pes)</_filetypename>
         <_filetypetooltip>convert PES file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_PHB.inx b/inx/inkstitch_input_PHB.inx
index ab4daf67..0e14f097 100644
--- a/inx/embroider_input_PHB.inx
+++ b/inx/inkstitch_input_PHB.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>PHB file input</_name>
     <id>org.inkstitch.input.phb</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.phb</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Brother Embroidery Format (.phb)</_filetypename>
         <_filetypetooltip>convert PHB file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_PHC.inx b/inx/inkstitch_input_PHC.inx
index e36739af..3c2d10f5 100644
--- a/inx/embroider_input_PHC.inx
+++ b/inx/inkstitch_input_PHC.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>PHC file input</_name>
     <id>org.inkstitch.input.phc</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.phc</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Brother Embroidery Format (.phc)</_filetypename>
         <_filetypetooltip>convert PHC file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_PLT.inx b/inx/inkstitch_input_PLT.inx
index ec2374da..d811ff02 100644
--- a/inx/embroider_input_PLT.inx
+++ b/inx/inkstitch_input_PLT.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>PLT file input</_name>
     <id>org.inkstitch.input.plt</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.plt</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: AutoCAD Plot Drawing Format (.plt)</_filetypename>
         <_filetypetooltip>convert PLT file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_RGB.inx b/inx/inkstitch_input_RGB.inx
index a73955c1..b64e285b 100644
--- a/inx/embroider_input_RGB.inx
+++ b/inx/inkstitch_input_RGB.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>RGB file input</_name>
     <id>org.inkstitch.input.rgb</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.rgb</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: RGB Embroidery Format (.rgb)</_filetypename>
         <_filetypetooltip>convert RGB file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_SEW.inx b/inx/inkstitch_input_SEW.inx
index 8cb41136..a7661c97 100644
--- a/inx/embroider_input_SEW.inx
+++ b/inx/inkstitch_input_SEW.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>SEW file input</_name>
     <id>org.inkstitch.input.sew</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.sew</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Janome Embroidery Format (.sew)</_filetypename>
         <_filetypetooltip>convert SEW file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_SHV.inx b/inx/inkstitch_input_SHV.inx
index 20735cc8..7aad470c 100644
--- a/inx/embroider_input_SHV.inx
+++ b/inx/inkstitch_input_SHV.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>SHV file input</_name>
     <id>org.inkstitch.input.shv</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.shv</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Husqvarna Viking Embroidery Format (.shv)</_filetypename>
         <_filetypetooltip>convert SHV file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_SST.inx b/inx/inkstitch_input_SST.inx
index 61f7c782..85533659 100644
--- a/inx/embroider_input_SST.inx
+++ b/inx/inkstitch_input_SST.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>SST file input</_name>
     <id>org.inkstitch.input.sst</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.sst</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Sunstar Embroidery Format (.sst)</_filetypename>
         <_filetypetooltip>convert SST file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_STX.inx b/inx/inkstitch_input_STX.inx
index 5043d6f2..3f1a3065 100644
--- a/inx/embroider_input_STX.inx
+++ b/inx/inkstitch_input_STX.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>STX file input</_name>
     <id>org.inkstitch.input.stx</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.stx</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Data Stitch Embroidery Format (.stx)</_filetypename>
         <_filetypetooltip>convert STX file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_T09.inx b/inx/inkstitch_input_T09.inx
index 5c64541d..eb6ab6d9 100644
--- a/inx/embroider_input_T09.inx
+++ b/inx/inkstitch_input_T09.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>T09 file input</_name>
     <id>org.inkstitch.input.t09</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.t09</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Pfaff Embroidery Format (.t09)</_filetypename>
         <_filetypetooltip>convert T09 file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_TAP.inx b/inx/inkstitch_input_TAP.inx
index 496105e2..bf299130 100644
--- a/inx/embroider_input_TAP.inx
+++ b/inx/inkstitch_input_TAP.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>TAP file input</_name>
     <id>org.inkstitch.input.tap</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.tap</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Happy Embroidery Format (.tap)</_filetypename>
         <_filetypetooltip>convert TAP file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_THR.inx b/inx/inkstitch_input_THR.inx
index d01d6184..e6a6e09e 100644
--- a/inx/embroider_input_THR.inx
+++ b/inx/inkstitch_input_THR.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>THR file input</_name>
     <id>org.inkstitch.input.thr</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.thr</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: ThredWorks Embroidery Format (.thr)</_filetypename>
         <_filetypetooltip>convert THR file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_U00.inx b/inx/inkstitch_input_U00.inx
index a98ddaa1..b28da66d 100644
--- a/inx/embroider_input_U00.inx
+++ b/inx/inkstitch_input_U00.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>U00 file input</_name>
     <id>org.inkstitch.input.u00</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.u00</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Barudan Embroidery Format (.u00)</_filetypename>
         <_filetypetooltip>convert U00 file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_VIP.inx b/inx/inkstitch_input_VIP.inx
index f607bfd7..3723285c 100644
--- a/inx/embroider_input_VIP.inx
+++ b/inx/inkstitch_input_VIP.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>VIP file input</_name>
     <id>org.inkstitch.input.vip</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.vip</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Pfaff Embroidery Format (.vip)</_filetypename>
         <_filetypetooltip>convert VIP file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_VP3.inx b/inx/inkstitch_input_VP3.inx
index cb24f60a..b39f630a 100644
--- a/inx/embroider_input_VP3.inx
+++ b/inx/inkstitch_input_VP3.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>VP3 file input</_name>
     <id>org.inkstitch.input.vp3</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.vp3</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Pfaff Embroidery Format (.vp3)</_filetypename>
         <_filetypetooltip>convert VP3 file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_XXX.inx b/inx/inkstitch_input_XXX.inx
index 64093628..6e8e501e 100644
--- a/inx/embroider_input_XXX.inx
+++ b/inx/inkstitch_input_XXX.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>XXX file input</_name>
     <id>org.inkstitch.input.xxx</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.xxx</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: Singer Embroidery Format (.xxx)</_filetypename>
         <_filetypetooltip>convert XXX file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/inx/embroider_input_ZSK.inx b/inx/inkstitch_input_ZSK.inx
index badb36da..4178126f 100644
--- a/inx/embroider_input_ZSK.inx
+++ b/inx/inkstitch_input_ZSK.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>ZSK file input</_name>
     <id>org.inkstitch.input.zsk</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.zsk</extension>
@@ -10,7 +10,8 @@
         <_filetypename>Ink/Stitch: ZSK USA Embroidery Format (.zsk)</_filetypename>
         <_filetypetooltip>convert ZSK file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>
diff --git a/templates/embroider_input.inx b/templates/embroider_input.inx
index 3af8f79e..24bba7e4 100644
--- a/templates/embroider_input.inx
+++ b/templates/embroider_input.inx
@@ -2,7 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>{{ format | upper }} file input</_name>
     <id>org.inkstitch.input.{{ format }}</id>
-    <dependency type="executable" location="extensions">embroider_input.py</dependency>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.{{ format }}</extension>
@@ -10,8 +10,9 @@
         <_filetypename>Ink/Stitch: {{ description }} (.{{ format }})</_filetypename>
         <_filetypetooltip>convert {{ format | upper }} file to Ink/Stitch manual-stitch paths</_filetypetooltip>
     </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
-        <command reldir="extensions" interpreter="python">embroider_input.py</command>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
     </script>
 </inkscape-extension>