From e84a86d4ac0caf29d6074728376ff0a594243fec Mon Sep 17 00:00:00 2001
From: Kaalleen <36401965+kaalleen@users.noreply.github.com>
Date: Thu, 4 Mar 2021 18:40:53 +0100
Subject: Update for Inkscape 1.0 (#880)

* update for inkscape 1.0
* add about extension
* Build improvements for the inkscape1.0 branch (#985)
* zip: export real svg not stitch plan
* #411 and #726
* Tools for Font Creators (#1018)
* ignore very small holes in fills
* remove embroider (#1026)
* auto_fill: ignore shrink_or_grow if result is empty (#589)
* break apart: do not ignore small fills

Co-authored-by: Hagen Fritsch <rumpeltux-github@irgendwo.org>
Co-authored-by: Lex Neva <github.com@lexneva.name>
---
 templates/about.xml                      | 28 +++++++++++++++++++
 templates/auto_satin.inx                 | 19 -------------
 templates/auto_satin.xml                 | 19 +++++++++++++
 templates/break_apart.inx                | 24 -----------------
 templates/break_apart.xml                | 24 +++++++++++++++++
 templates/cleanup.inx                    | 24 -----------------
 templates/cleanup.xml                    | 24 +++++++++++++++++
 templates/convert_to_satin.inx           | 17 ------------
 templates/convert_to_satin.xml           | 17 ++++++++++++
 templates/cut_satin.inx                  | 17 ------------
 templates/cut_satin.xml                  | 17 ++++++++++++
 templates/embroider.inx                  | 28 -------------------
 templates/embroider.xml                  | 18 +++++++++++++
 templates/embroider_settings.xml         | 21 +++++++++++++++
 templates/flip.inx                       | 17 ------------
 templates/flip.xml                       | 17 ++++++++++++
 templates/global_commands.inx            | 22 ---------------
 templates/global_commands.xml            | 22 +++++++++++++++
 templates/import_threadlist.inx          | 27 -------------------
 templates/import_threadlist.xml          | 25 +++++++++++++++++
 templates/input.inx                      | 15 -----------
 templates/input.xml                      | 15 +++++++++++
 templates/install.inx                    | 15 -----------
 templates/install.xml                    | 15 +++++++++++
 templates/layer_commands.inx             | 21 ---------------
 templates/layer_commands.xml             | 21 +++++++++++++++
 templates/lettering.inx                  | 15 -----------
 templates/lettering.xml                  | 15 +++++++++++
 templates/lettering_custom_font_dir.xml  | 26 ++++++++++++++++++
 templates/lettering_generate_json.xml    | 46 ++++++++++++++++++++++++++++++++
 templates/lettering_remove_kerning.xml   | 28 +++++++++++++++++++
 templates/object_commands.inx            | 20 --------------
 templates/object_commands.xml            | 20 ++++++++++++++
 templates/output.inx                     | 19 -------------
 templates/output.xml                     | 19 +++++++++++++
 templates/output_params_txt.xml          |  2 +-
 templates/params.inx                     | 15 -----------
 templates/params.xml                     | 15 +++++++++++
 templates/print.inx                      | 17 ------------
 templates/print.xml                      | 17 ++++++++++++
 templates/remove_embroidery_settings.inx | 23 ----------------
 templates/remove_embroidery_settings.xml | 23 ++++++++++++++++
 templates/reorder.xml                    | 15 +++++++++++
 templates/simulator.inx                  | 17 ------------
 templates/simulator.xml                  | 17 ++++++++++++
 templates/stitch_plan_preview.inx        | 17 ------------
 templates/stitch_plan_preview.xml        | 17 ++++++++++++
 templates/troubleshoot.inx               | 17 ------------
 templates/troubleshoot.xml               | 17 ++++++++++++
 templates/zip.inx                        | 21 ---------------
 templates/zip.xml                        | 23 ++++++++++++++++
 51 files changed, 582 insertions(+), 428 deletions(-)
 create mode 100644 templates/about.xml
 delete mode 100644 templates/auto_satin.inx
 create mode 100644 templates/auto_satin.xml
 delete mode 100644 templates/break_apart.inx
 create mode 100644 templates/break_apart.xml
 delete mode 100644 templates/cleanup.inx
 create mode 100644 templates/cleanup.xml
 delete mode 100644 templates/convert_to_satin.inx
 create mode 100644 templates/convert_to_satin.xml
 delete mode 100644 templates/cut_satin.inx
 create mode 100644 templates/cut_satin.xml
 delete mode 100644 templates/embroider.inx
 create mode 100644 templates/embroider.xml
 create mode 100644 templates/embroider_settings.xml
 delete mode 100644 templates/flip.inx
 create mode 100644 templates/flip.xml
 delete mode 100644 templates/global_commands.inx
 create mode 100644 templates/global_commands.xml
 delete mode 100644 templates/import_threadlist.inx
 create mode 100644 templates/import_threadlist.xml
 delete mode 100644 templates/input.inx
 create mode 100644 templates/input.xml
 delete mode 100644 templates/install.inx
 create mode 100644 templates/install.xml
 delete mode 100644 templates/layer_commands.inx
 create mode 100644 templates/layer_commands.xml
 delete mode 100644 templates/lettering.inx
 create mode 100644 templates/lettering.xml
 create mode 100644 templates/lettering_custom_font_dir.xml
 create mode 100644 templates/lettering_generate_json.xml
 create mode 100644 templates/lettering_remove_kerning.xml
 delete mode 100644 templates/object_commands.inx
 create mode 100644 templates/object_commands.xml
 delete mode 100644 templates/output.inx
 create mode 100644 templates/output.xml
 delete mode 100644 templates/params.inx
 create mode 100644 templates/params.xml
 delete mode 100644 templates/print.inx
 create mode 100644 templates/print.xml
 delete mode 100644 templates/remove_embroidery_settings.inx
 create mode 100644 templates/remove_embroidery_settings.xml
 create mode 100644 templates/reorder.xml
 delete mode 100644 templates/simulator.inx
 create mode 100644 templates/simulator.xml
 delete mode 100644 templates/stitch_plan_preview.inx
 create mode 100644 templates/stitch_plan_preview.xml
 delete mode 100644 templates/troubleshoot.inx
 create mode 100644 templates/troubleshoot.xml
 delete mode 100644 templates/zip.inx
 create mode 100644 templates/zip.xml

(limited to 'templates')

diff --git a/templates/about.xml b/templates/about.xml
new file mode 100644
index 00000000..68609d95
--- /dev/null
+++ b/templates/about.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <name>{% trans %}About{% endtrans %}</name>
+    <id>org.inkstitch.about.{{ locale }}</id>
+    <param type="notebook" name="about-tabs" indent="1">
+      <page name="about" gui-text="{% trans %}About{% endtrans %}">
+          <image>{{ image_path }}inkstitch_colour_logo.svg</image>
+          <label indent="1" appearance="header">Ink/Stitch - {{ inkstitch_version }}</label>
+          <separator/>
+          <label indent="1">{% trans %}An open-source machine embroidery design platform based on Inkscape.{% endtrans %}</label>
+          <separator/>
+          <spacer/>
+          <label indent="1" appearance="url">https://inkstitch.org</label>
+      </page>
+      <page name="license" gui-text="{%trans %}License{% endtrans %}">
+          <param name="license-text" type="description" xml:space="preserve">
+{{ inkstitch_license }}
+          </param>
+      </page>
+    </param>
+    <effect needs-live-preview="false" needs-document="false">
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu name="Ink/Stitch">
+            </submenu>
+        </effects-menu>
+    </effect>
+</inkscape-extension>
diff --git a/templates/auto_satin.inx b/templates/auto_satin.inx
deleted file mode 100644
index 673ac51e..00000000
--- a/templates/auto_satin.inx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Auto-Route Satin Columns{% endtrans %}</name>
-    <id>org.inkstitch.auto_satin.{{ locale }}</id>
-    <param name="trim" type="boolean" _gui-text="{% trans %}Trim jump stitches{% endtrans %}">true</param>
-    <param name="preserve_order" type="boolean" _gui-text="{% trans %}Preserve order of satin columns{% endtrans %}">false</param>
-    <param name="extension" type="string" gui-hidden="true">auto_satin</param>
-    <effect>
-        <object-type>all</object-type>
-        <effects-menu>
-            <submenu name="Ink/Stitch">
-                <submenu name="{% trans %}Satin Tools{% endtrans %}" />
-            </submenu>
-        </effects-menu>
-    </effect>
-    <script>
-        {{ command_tag | safe }}
-    </script>
-</inkscape-extension>
diff --git a/templates/auto_satin.xml b/templates/auto_satin.xml
new file mode 100644
index 00000000..673ac51e
--- /dev/null
+++ b/templates/auto_satin.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <name>{% trans %}Auto-Route Satin Columns{% endtrans %}</name>
+    <id>org.inkstitch.auto_satin.{{ locale }}</id>
+    <param name="trim" type="boolean" _gui-text="{% trans %}Trim jump stitches{% endtrans %}">true</param>
+    <param name="preserve_order" type="boolean" _gui-text="{% trans %}Preserve order of satin columns{% endtrans %}">false</param>
+    <param name="extension" type="string" gui-hidden="true">auto_satin</param>
+    <effect>
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu name="Ink/Stitch">
+                <submenu name="{% trans %}Satin Tools{% endtrans %}" />
+            </submenu>
+        </effects-menu>
+    </effect>
+    <script>
+        {{ command_tag | safe }}
+    </script>
+</inkscape-extension>
diff --git a/templates/break_apart.inx b/templates/break_apart.inx
deleted file mode 100644
index 83333ad1..00000000
--- a/templates/break_apart.inx
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Break Apart Fill Objects{% endtrans %}</name>
-    <id>org.inkstitch.break_apart.{{ locale }}</id>
-    <param name="extension" type="string" gui-hidden="true">break_apart</param>
-    <effect>
-        <object-type>all</object-type>
-        <effects-menu>
-            <submenu name="Ink/Stitch">
-                <submenu name="{% trans %}Fill Tools{% endtrans %}" />
-            </submenu>
-        </effects-menu>
-    </effect>
-    <param name="description" type="description">
-        {% trans %}This extension will try to repair fill shapes and break them apart if necessary. Holes will be retained. Use on simple or overlapping shapes.{% endtrans %}
-    </param>
-    <param name="method" type="optiongroup" _gui-text="Method">
-       <option value="0">Simple</option>
-       <option value="1">Complex</option>
-    </param>
-    <script>
-        {{ command_tag | safe }}
-    </script>
-</inkscape-extension>
diff --git a/templates/break_apart.xml b/templates/break_apart.xml
new file mode 100644
index 00000000..83333ad1
--- /dev/null
+++ b/templates/break_apart.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <name>{% trans %}Break Apart Fill Objects{% endtrans %}</name>
+    <id>org.inkstitch.break_apart.{{ locale }}</id>
+    <param name="extension" type="string" gui-hidden="true">break_apart</param>
+    <effect>
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu name="Ink/Stitch">
+                <submenu name="{% trans %}Fill Tools{% endtrans %}" />
+            </submenu>
+        </effects-menu>
+    </effect>
+    <param name="description" type="description">
+        {% trans %}This extension will try to repair fill shapes and break them apart if necessary. Holes will be retained. Use on simple or overlapping shapes.{% endtrans %}
+    </param>
+    <param name="method" type="optiongroup" _gui-text="Method">
+       <option value="0">Simple</option>
+       <option value="1">Complex</option>
+    </param>
+    <script>
+        {{ command_tag | safe }}
+    </script>
+</inkscape-extension>
diff --git a/templates/cleanup.inx b/templates/cleanup.inx
deleted file mode 100644
index 4cf11ce1..00000000
--- a/templates/cleanup.inx
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Cleanup Document{% endtrans %}</name>
-    <id>org.inkstitch.cleanup.{{ locale }}</id>
-    <param name="description" type="description">{% trans %}Use this extension to remove small objects from the document.{% endtrans %}</param>
-    <param name="rm_fill" type="boolean" _gui-text="{% trans %}Remove Small Fill Areas{% endtrans %}"
-           _gui-description="{% trans %}Removes areas smaller than dedined by threshold.{% endtrans %}">true</param>
-    <param name="fill_threshold" type="int" _gui-text="{% trans %}Fill area threshold{% endtrans %}" min="1" max="800">20</param>
-    <param name="rm_stroke" type="boolean" _gui-text="Remove Small strokes"
-           _gui-description="{% trans %}Removes small strokes shorter than defined by threshold.{% endtrans %}">true</param>
-    <param name="stroke_threshold" type="int" _gui-text="{% trans %}Stroke threshold{% endtrans %}" min="2" max="800">5</param>
-    <param name="extension" type="string" gui-hidden="true">cleanup</param>
-    <effect>
-        <object-type>all</object-type>
-        <effects-menu>
-            <submenu name="Ink/Stitch">
-                <submenu name="{% trans %}Troubleshoot{% endtrans %}" />
-            </submenu>
-        </effects-menu>
-    </effect>
-    <script>
-        {{ command_tag | safe }}
-    </script>
-</inkscape-extension>
diff --git a/templates/cleanup.xml b/templates/cleanup.xml
new file mode 100644
index 00000000..4cf11ce1
--- /dev/null
+++ b/templates/cleanup.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <name>{% trans %}Cleanup Document{% endtrans %}</name>
+    <id>org.inkstitch.cleanup.{{ locale }}</id>
+    <param name="description" type="description">{% trans %}Use this extension to remove small objects from the document.{% endtrans %}</param>
+    <param name="rm_fill" type="boolean" _gui-text="{% trans %}Remove Small Fill Areas{% endtrans %}"
+           _gui-description="{% trans %}Removes areas smaller than dedined by threshold.{% endtrans %}">true</param>
+    <param name="fill_threshold" type="int" _gui-text="{% trans %}Fill area threshold{% endtrans %}" min="1" max="800">20</param>
+    <param name="rm_stroke" type="boolean" _gui-text="Remove Small strokes"
+           _gui-description="{% trans %}Removes small strokes shorter than defined by threshold.{% endtrans %}">true</param>
+    <param name="stroke_threshold" type="int" _gui-text="{% trans %}Stroke threshold{% endtrans %}" min="2" max="800">5</param>
+    <param name="extension" type="string" gui-hidden="true">cleanup</param>
+    <effect>
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu name="Ink/Stitch">
+                <submenu name="{% trans %}Troubleshoot{% endtrans %}" />
+            </submenu>
+        </effects-menu>
+    </effect>
+    <script>
+        {{ command_tag | safe }}
+    </script>
+</inkscape-extension>
diff --git a/templates/convert_to_satin.inx b/templates/convert_to_satin.inx
deleted file mode 100644
index 80f0b678..00000000
--- a/templates/convert_to_satin.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Convert Line to Satin{% endtrans %}</name>
-    <id>org.inkstitch.convert_to_satin.{{ locale }}</id>
-    <param name="extension" type="string" gui-hidden="true">convert_to_satin</param>
-    <effect>
-        <object-type>all</object-type>
-        <effects-menu>
-            <submenu name="Ink/Stitch">
-                <submenu name="{% trans %}Satin Tools{% endtrans %}" />
-            </submenu>
-        </effects-menu>
-    </effect>
-    <script>
-        {{ command_tag | safe }}
-    </script>
-</inkscape-extension>
diff --git a/templates/convert_to_satin.xml b/templates/convert_to_satin.xml
new file mode 100644
index 00000000..80f0b678
--- /dev/null
+++ b/templates/convert_to_satin.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <name>{% trans %}Convert Line to Satin{% endtrans %}</name>
+    <id>org.inkstitch.convert_to_satin.{{ locale }}</id>
+    <param name="extension" type="string" gui-hidden="true">convert_to_satin</param>
+    <effect>
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu name="Ink/Stitch">
+                <submenu name="{% trans %}Satin Tools{% endtrans %}" />
+            </submenu>
+        </effects-menu>
+    </effect>
+    <script>
+        {{ command_tag | safe }}
+    </script>
+</inkscape-extension>
diff --git a/templates/cut_satin.inx b/templates/cut_satin.inx
deleted file mode 100644
index b780543a..00000000
--- a/templates/cut_satin.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Cut Satin Column{% endtrans %}</name>
-    <id>org.inkstitch.cut_satin.{{ locale }}</id>
-    <param name="extension" type="string" gui-hidden="true">cut_satin</param>
-    <effect>
-        <object-type>all</object-type>
-        <effects-menu>
-            <submenu name="Ink/Stitch">
-                <submenu name="{% trans %}Satin Tools{% endtrans %}" />
-            </submenu>
-        </effects-menu>
-    </effect>
-    <script>
-        {{ command_tag | safe }}
-    </script>
-</inkscape-extension>
diff --git a/templates/cut_satin.xml b/templates/cut_satin.xml
new file mode 100644
index 00000000..b780543a
--- /dev/null
+++ b/templates/cut_satin.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <name>{% trans %}Cut Satin Column{% endtrans %}</name>
+    <id>org.inkstitch.cut_satin.{{ locale }}</id>
+    <param name="extension" type="string" gui-hidden="true">cut_satin</param>
+    <effect>
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu name="Ink/Stitch">
+                <submenu name="{% trans %}Satin Tools{% endtrans %}" />
+            </submenu>
+        </effects-menu>
+    </effect>
+    <script>
+        {{ command_tag | safe }}
+    </script>
+</inkscape-extension>
diff --git a/templates/embroider.inx b/templates/embroider.inx
deleted file mode 100644
index b79c2f5f..00000000
--- a/templates/embroider.inx
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Embroider{% endtrans %}</name>
-    <id>org.inkstitch.embroider.{{ locale }}</id>
-    <param name="collapse_len_mm" type="float" min="0.0" max="10.0" _gui-text="{% trans %}Collapse length (mm){% endtrans %}" _gui-description="{% trans %}Jump stitches smaller than this will be treated as normal stitches.{% endtrans %}">3.0</param>
-    <param name="hide_layers" type="boolean" _gui-text="{% trans %}Hide other layers{% endtrans %}" _gui-description="{% trans %}Hide all other top-level layers when the embroidery layer is generated, in order to make stitching discernible.{% endtrans %}">true</param>
-    <param name="output_format" type="optiongroup" _gui-text="{% trans %}Output file format{% endtrans %}" appearance="minimal">
-        {% for format, description in formats %}
-        <_option value="{{ format }}">{{ _(description) }} ({{ format | upper }})</_option>
-        {% endfor %}
-        {% for format, description in debug_formats %}
-        <_option value="{{ format }}">{{ _(description) }} ({{ format | upper }}) [{{ _("DEBUG") }}]</_option>
-        {% endfor %}
-    </param>
-    <param name="path" type="string" _gui-text="{% trans %}Directory{% endtrans %}" _gui-description="{% trans %}Leave empty to save the output in Inkscape's extension directory.{% endtrans %}"></param>
-    <param name="extension" type="string" gui-hidden="true">embroider</param>
-    <effect>
-        <object-type>all</object-type>
-        <effects-menu>
-            <submenu name="Ink/Stitch">
-                <submenu name="{% trans %}Visualise and Export{% endtrans %}" />
-            </submenu>
-        </effects-menu>
-    </effect>
-    <script>
-        {{ command_tag | safe }}
-    </script>
-</inkscape-extension>
diff --git a/templates/embroider.xml b/templates/embroider.xml
new file mode 100644
index 00000000..ff56ac7d
--- /dev/null
+++ b/templates/embroider.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <name>{% trans %}Embroider{% endtrans %}</name>
+    <id>org.inkstitch.embroider.{{ locale }}</id>
+    <param name="title" type="description" appearance="header">{% trans %}Create a stitch file{% endtrans %}</param>
+    <param name="howto" type="description">{% trans %}Save your embroidery file through | File > Save a Copy ... |{% endtrans %}</param>
+    <param name="howto_detail" type="description">{% trans %}Choose from listed embroidery file formats and save.{% endtrans %}</param>
+    <spacer />
+    <param name="info_zip" type="description">{% trans %}Multiple file formats can be saved by choosing the zip file format.{% endtrans %}</param>
+    <effect needs-live-preview="false" needs-document="false">
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu name="Ink/Stitch">
+                <submenu name="{% trans %}Visualise and Export{% endtrans %}" />
+            </submenu>
+        </effects-menu>
+    </effect>
+</inkscape-extension>
diff --git a/templates/embroider_settings.xml b/templates/embroider_settings.xml
new file mode 100644
index 00000000..51ce9d16
--- /dev/null
+++ b/templates/embroider_settings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <name>{% trans %}Settings{% endtrans %}</name>
+    <id>org.inkstitch.embroider_settings.{{ locale }}</id>
+    <param name="extension" type="string" gui-hidden="true">embroider_settings</param>
+    <effect>
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu name="Ink/Stitch" />
+        </effects-menu>
+    </effect>
+    <param name="output_settings" type="description" appearance="header">
+        {% trans %}Output Settings{% endtrans %}
+    </param>
+    <param name="collapse_len_mm" type="float" precision="1" min="0" max="10" 
+           _gui-text="{% trans %}Collapse length (mm){% endtrans %}" 
+           _gui-description="{% trans %}Jump stitches smaller than this will be treated as normal stitches.{% endtrans %}">3</param>
+    <script>
+        {{ command_tag | safe }}
+    </script>
+</inkscape-extension>
diff --git a/templates/flip.inx b/templates/flip.inx
deleted file mode 100644
index 29b11457..00000000
--- a/templates/flip.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Flip Satin Column Rails{% endtrans %}</name>
-    <id>org.inkstitch.flip_satins.{{ locale }}</id>
-    <param name="extension" type="string" gui-hidden="true">flip</param>
-    <effect>
-        <object-type>all</object-type>
-        <effects-menu>
-            <submenu name="Ink/Stitch">
-                <submenu name="{% trans %}Satin Tools{% endtrans %}" />
-            </submenu>
-        </effects-menu>
-    </effect>
-    <script>
-        {{ command_tag | safe }}
-    </script>
-</inkscape-extension>
diff --git a/templates/flip.xml b/templates/flip.xml
new file mode 100644
index 00000000..29b11457
--- /dev/null
+++ b/templates/flip.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <name>{% trans %}Flip Satin Column Rails{% endtrans %}</name>
+    <id>org.inkstitch.flip_satins.{{ locale }}</id>
+    <param name="extension" type="string" gui-hidden="true">flip</param>
+    <effect>
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu name="Ink/Stitch">
+                <submenu name="{% trans %}Satin Tools{% endtrans %}" />
+            </submenu>
+        </effects-menu>
+    </effect>
+    <script>
+        {{ command_tag | safe }}
+    </script>
+</inkscape-extension>
diff --git a/templates/global_commands.inx b/templates/global_commands.inx
deleted file mode 100644
index d37e2e41..00000000
--- a/templates/global_commands.inx
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Add Commands{% endtrans %}</name>
-    <id>org.inkstitch.global_commands.{{ locale }}</id>
-    <param name="description" type="description">{% trans %}These commands affect the entire embroidery design.{% endtrans %}</param>
-    {% for command, description in global_commands %}
-    <param name="{{ command }}" type="boolean" _gui-text="{{ _(description) }}">false</param>
-    {% endfor %}
-    <param name="extension" type="string" gui-hidden="true">global_commands</param>
-    <effect>
-        <object-type>all</object-type>
-        <effects-menu>
-            <submenu name="Ink/Stitch">
-                {# L10N Inkscape submenu under Extensions -> Ink/Stitch #}
-                <submenu name="{% trans %}Commands{% endtrans %}" />
-            </submenu>
-        </effects-menu>
-    </effect>
-    <script>
-        {{ command_tag | safe }}
-    </script>
-</inkscape-extension>
diff --git a/templates/global_commands.xml b/templates/global_commands.xml
new file mode 100644
index 00000000..d37e2e41
--- /dev/null
+++ b/templates/global_commands.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <name>{% trans %}Add Commands{% endtrans %}</name>
+    <id>org.inkstitch.global_commands.{{ locale }}</id>
+    <param name="description" type="description">{% trans %}These commands affect the entire embroidery design.{% endtrans %}</param>
+    {% for command, description in global_commands %}
+    <param name="{{ command }}" type="boolean" _gui-text="{{ _(description) }}">false</param>
+    {% endfor %}
+    <param name="extension" type="string" gui-hidden="true">global_commands</param>
+    <effect>
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu name="Ink/Stitch">
+                {# L10N Inkscape submenu under Extensions -> Ink/Stitch #}
+                <submenu name="{% trans %}Commands{% endtrans %}" />
+            </submenu>
+        </effects-menu>
+    </effect>
+    <script>
+        {{ command_tag | safe }}
+    </script>
+</inkscape-extension>
diff --git a/templates/import_threadlist.inx b/templates/import_threadlist.inx
deleted file mode 100644
index 081a881a..00000000
--- a/templates/import_threadlist.inx
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Import Threadlist{% endtrans %}</name>
-    <id>org.inkstitch.import_threadlist.{{ locale }}</id>
-    <param name="extension" type="string" gui-hidden="true">import_threadlist</param>
-    <!-- This doesn't work at the moment. It's an Inkstitch 1.0 feature, but would be desireable.
-    <param type="path" name="filepath" gui-text="{{ _('Choose file') }}" mode="file" filetypes="txt"/> -->
-    <param name="filepath" type="string" _gui-text="{{ _('File Path') }}">{{ _("Enter path to file") }}</param>
-    <param name="method" type="optiongroup" _gui-text="Choose method">
-       <option value="1">Import Ink/Stitch threadlist</option>
-       <option value="2">Import other threadlist*</option>
-    </param>
-    <param name="palette" type="enum" _gui-text="*Choose color palette">
-    {%- for item in threadcatalog %}
-       <item value="{{ item }}">{{ item }}</item>
-    {%- endfor %}
-    </param>
-    <effect>
-        <object-type>all</object-type>
-        <effects-menu>
-            <submenu name="Ink/Stitch" />
-        </effects-menu>
-    </effect>
-    <script>
-        {{ command_tag | safe }}
-    </script>
-</inkscape-extension>
diff --git a/templates/import_threadlist.xml b/templates/import_threadlist.xml
new file mode 100644
index 00000000..5db963b6
--- /dev/null
+++ b/templates/import_threadlist.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <name>{% trans %}Import Threadlist{% endtrans %}</name>
+    <id>org.inkstitch.import_threadlist.{{ locale }}</id>
+    <param name="extension" type="string" gui-hidden="true">import_threadlist</param>
+    <param name="filepath" type="path" gui-text="{{ _('Choose file') }}" mode="file" filetypes="txt"/>
+    <param name="method" type="optiongroup" _gui-text="Choose method">
+       <option value="1">Import Ink/Stitch threadlist</option>
+       <option value="2">Import other threadlist*</option>
+    </param>
+    <param name="palette" type="enum" _gui-text="*Choose color palette">
+    {%- for item in threadcatalog %}
+       <item value="{{ item }}">{{ item }}</item>
+    {%- endfor %}
+    </param>
+    <effect>
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu name="Ink/Stitch" />
+        </effects-menu>
+    </effect>
+    <script>
+        {{ command_tag | safe }}
+    </script>
+</inkscape-extension>
diff --git a/templates/input.inx b/templates/input.inx
deleted file mode 100644
index 5f4a4610..00000000
--- a/templates/input.inx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{{ format | upper }} file input</name>
-    <id>org.inkstitch.input.{{ format }}.{{ locale }}</id>
-    <input>
-        <extension>.{{ format }}</extension>
-        <mimetype>application/x-embroidery-{{ format }}</mimetype>
-        <_filetypename>Ink/Stitch: {{ _(description) }} (.{{ format }})</_filetypename>
-        <_filetypetooltip>{{ _("convert %(file_extension)s file to Ink/Stitch manual-stitch paths") % dict(file_extension=format.upper()) }}</_filetypetooltip>
-    </input>
-    <param name="extension" type="string" gui-hidden="true">input</param>
-    <script>
-        {{ command_tag | safe }}
-    </script>
-</inkscape-extension>
diff --git a/templates/input.xml b/templates/input.xml
new file mode 100644
index 00000000..5f4a4610
--- /dev/null
+++ b/templates/input.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <name>{{ format | upper }} file input</name>
+    <id>org.inkstitch.input.{{ format }}.{{ locale }}</id>
+    <input>
+        <extension>.{{ format }}</extension>
+        <mimetype>application/x-embroidery-{{ format }}</mimetype>
+        <_filetypename>Ink/Stitch: {{ _(description) }} (.{{ format }})</_filetypename>
+        <_filetypetooltip>{{ _("convert %(file_extension)s file to Ink/Stitch manual-stitch paths") % dict(file_extension=format.upper()) }}</_filetypetooltip>
+    </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
+    <script>
+        {{ command_tag | safe }}
+    </script>
+</inkscape-extension>
diff --git a/templates/install.inx b/templates/install.inx
deleted file mode 100644
index ffcb9b7b..00000000
--- a/templates/install.inx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Install thread color palettes for Inkscape{% endtrans %}</name>
-    <id>org.inkstitch.install.{{ locale }}</id>
-    <param name="extension" type="string" gui-hidden="true">install</param>
-    <effect>
-        <object-type>all</object-type>
-        <effects-menu>
-            <submenu name="Ink/Stitch" />
-        </effects-menu>
-    </effect>
-    <script>
-        {{ command_tag | safe }}
-    </script>
-</inkscape-extension>
diff --git a/templates/install.xml b/templates/install.xml
new file mode 100644
index 00000000..764027b8
--- /dev/null
+++ b/templates/install.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <name>{% trans %}Install thread color palettes for Inkscape{% endtrans %}</name>
+    <id>org.inkstitch.install.{{ locale }}</id>
+    <param name="extension" type="string" gui-hidden="true">install</param>
+    <effect implements-custom-gui="true">
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu name="Ink/Stitch" />
+        </effects-menu>
+    </effect>
+    <script>
+        {{ command_tag | safe }}
+    </script>
+</inkscape-extension>
diff --git a/templates/layer_commands.inx b/templates/layer_commands.inx
deleted file mode 100644
index 249d536e..00000000
--- a/templates/layer_commands.inx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Add Layer Commands{% endtrans %}</name>
-    <id>org.inkstitch.layer_commands.{{ locale }}</id>
-    <param name="description" type="description">{% trans %}Commands will be added to the currently-selected layer.{% endtrans %}</param>
-    {% for command, description in layer_commands %}
-    <param name="{{ command }}" type="boolean" _gui-text="{{ _(description) }}">false</param>
-    {% endfor %}
-    <param name="extension" type="string" gui-hidden="true">layer_commands</param>
-    <effect>
-        <object-type>all</object-type>
-        <effects-menu>
-            <submenu name="Ink/Stitch">
-                <submenu name="{% trans %}Commands{% endtrans %}" />
-            </submenu>
-        </effects-menu>
-    </effect>
-    <script>
-        {{ command_tag | safe }}
-    </script>
-</inkscape-extension>
diff --git a/templates/layer_commands.xml b/templates/layer_commands.xml
new file mode 100644
index 00000000..249d536e
--- /dev/null
+++ b/templates/layer_commands.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <name>{% trans %}Add Layer Commands{% endtrans %}</name>
+    <id>org.inkstitch.layer_commands.{{ locale }}</id>
+    <param name="description" type="description">{% trans %}Commands will be added to the currently-selected layer.{% endtrans %}</param>
+    {% for command, description in layer_commands %}
+    <param name="{{ command }}" type="boolean" _gui-text="{{ _(description) }}">false</param>
+    {% endfor %}
+    <param name="extension" type="string" gui-hidden="true">layer_commands</param>
+    <effect>
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu name="Ink/Stitch">
+                <submenu name="{% trans %}Commands{% endtrans %}" />
+            </submenu>
+        </effects-menu>
+    </effect>
+    <script>
+        {{ command_tag | safe }}
+    </script>
+</inkscape-extension>
diff --git a/templates/lettering.inx b/templates/lettering.inx
deleted file mode 100644
index 65eee8a1..00000000
--- a/templates/lettering.inx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Lettering{% endtrans %}</name>
-    <id>org.inkstitch.lettering.{{ locale }}</id>
-    <param name="extension" type="string" gui-hidden="true">lettering</param>
-    <effect>
-        <object-type>all</object-type>
-        <effects-menu>
-            <submenu name="Ink/Stitch" />
-        </effects-menu>
-    </effect>
-    <script>
-        {{ command_tag | safe }}
-    </script>
-</inkscape-extension>
diff --git a/templates/lettering.xml b/templates/lettering.xml
new file mode 100644
index 00000000..6dea9e93
--- /dev/null
+++ b/templates/lettering.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <name>{% trans %}Lettering{% endtrans %}</name>
+    <id>org.inkstitch.lettering.{{ locale }}</id>
+    <param name="extension" type="string" gui-hidden="true">lettering</param>
+    <effect implements-custom-gui="true">
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu name="Ink/Stitch" />
+        </effects-menu>
+    </effect>
+    <script>
+        {{ command_tag | safe }}
+    </script>
+</inkscape-extension>
diff --git a/templates/lettering_custom_font_dir.xml b/templates/lettering_custom_font_dir.xml
new file mode 100644
index 00000000..b08c37d6
--- /dev/null
+++ b/templates/lettering_custom_font_dir.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <name>{% trans %}Custom font directory{% endtrans %}</name>
+    <id>org.inkstitch.lettering_custom_font_dir.{{ locale }}</id>
+    <param name="extension" type="string" gui-hidden="true">lettering_custom_font_dir</param>
+    <effect needs-live-preview="false">
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu name="Ink/Stitch">
+                <submenu name="{% trans %}Font Tools{% endtrans %}" />
+            </submenu>
+        </effects-menu>
+    </effect>
+    <param name="file-description" type="description" indent="1" >
+        {% trans %}Set a custom directory for additional fonts to be used with the lettering tool.{% endtrans %}
+    </param>
+    <spacer />
+    <param name="path" type="path" mode="folder" gui-text="{% trans %}Custom font directory{% endtrans %}"  indent="1"></param>
+    <spacer />
+    <param name="file-description" type="description" indent="1" >
+        {% trans %}Usage: Create a subdirectory for each font you add.{% endtrans %}
+    </param>
+    <script>
+        {{ command_tag | safe }}
+    </script>
+</inkscape-extension>
diff --git a/templates/lettering_generate_json.xml b/templates/lettering_generate_json.xml
new file mode 100644
index 00000000..5f4907f7
--- /dev/null
+++ b/templates/lettering_generate_json.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <name>{% trans %}Generate JSON{% endtrans %}</name>
+    <id>org.inkstitch.lettering_generate_json.{{ locale }}</id>
+    <param name="extension" type="string" gui-hidden="true">lettering_generate_json</param>
+    <effect needs-live-preview="false">
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu name="Ink/Stitch">
+                <submenu name="{% trans %}Font Tools{% endtrans %}" />
+            </submenu>
+        </effects-menu>
+    </effect>
+    <param name="header" type="description" appearance="header" indent="1" >
+        {% trans %}Generates font.json which can be used by the lettering tool.{% endtrans %}
+    </param>
+    <spacer />
+    <separator indent="1"/>
+    <param type="string" name="font-name" gui-text="{% trans %}Name{% endtrans %}" indent="1" />
+    <param type="string" name="font-description" gui-text="{% trans %}Description{% endtrans %}" indent="1" />
+    <separator indent="1"/>
+        <spacer />
+    <param name="file-description" type="description" indent="1" >
+        {% trans %}Insert a font SVG file with kerning information.{% endtrans %}
+    </param>
+    <param type="path" name="font-file" gui-text="{% trans %}Font File{% endtrans %}" indent="1" mode="file" filetypes="svg"/>
+    <spacer />
+    <separator indent="1"/>
+    <param type="bool" name="auto-satin" gui-text="{% trans %}Autoroute Satin{% endtrans %}"
+           gui-description="{% trans %}Disable if you defined manual routing in your font.{% endtrans %}" indent="1">true</param>
+    <param type="bool" name="reversible" gui-text="{% trans %}Reversible{% endtrans %}"
+          gui-description="{% trans %}If disabled back and forth stitching will not be possile for this font.{% endtrans %}" indent="1">true</param>
+    <separator indent="1"/>
+    <param type="string" name="default-glyph" gui-text="{% trans %}Default Glyph{% endtrans %}" indent="1">&#65533;</param>
+    <separator indent="1"/>
+    <spacer />
+    <param name="min-scale" type="float" precision="1" min="0.1" max="1" gui-text="{% trans %}Min Scale{% endtrans %}" indent="1">1</param>
+    <param name="max-scale" type="float" precision="1" min="1" max="10" gui-text="{% trans %}Max Scale{% endtrans %}" indent="1">1</param>
+    <separator indent="1"/>
+    <param name="leading" type="int" precision="1" min="-100" max="100" gui-text="{% trans %}Leading (px){% endtrans %}" gui-description="{% trans %}If 0, the value will be calculated or defaults to 100{% endtrans %}" indent="1"></param>
+     <spacer />
+    <separator indent="1"/>
+    <script>
+        {{ command_tag | safe }}
+    </script>
+</inkscape-extension>
diff --git a/templates/lettering_remove_kerning.xml b/templates/lettering_remove_kerning.xml
new file mode 100644
index 00000000..5657e003
--- /dev/null
+++ b/templates/lettering_remove_kerning.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <name>{% trans %}Remove Kerning{% endtrans %}</name>
+    <id>org.inkstitch.lettering_remove_kerning.{{ locale }}</id>
+    <param name="extension" type="string" gui-hidden="true">lettering_remove_kerning</param>
+    <effect needs-live-preview="false">
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu name="Ink/Stitch">
+                <submenu name="{% trans %}Font Tools{% endtrans %}" />
+            </submenu>
+        </effects-menu>
+    </effect>
+    <param name="header" type="description" appearance="header" indent="1" >
+        {% trans %}Removes Kerning information from given SVG files{% endtrans %}
+    </param>
+    <separator />
+    <param name="file-description" type="description" indent="1" >
+        &#9888; {% trans %}Make sure you keep a copy of the original file. After running this extension kerning information will be lost unrevertably from these files.{% endtrans %}
+    </param>
+    <separator />
+    <spacer />
+    <param type="path" name="font-files" gui-text="{% trans %}Select Font Files{% endtrans %}" indent="1" mode="files" filetypes="svg"/>
+    <spacer />
+    <script>
+        {{ command_tag | safe }}
+    </script>
+</inkscape-extension>
diff --git a/templates/object_commands.inx b/templates/object_commands.inx
deleted file mode 100644
index affe7584..00000000
--- a/templates/object_commands.inx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Attach Commands to Selected Objects{% endtrans %}</name>
-    <id>org.inkstitch.commands.{{ locale }}</id>
-    {% for command, description in object_commands %}
-    <param name="{{ command }}" type="boolean" _gui-text="{{ _(description ) }}">false</param>
-    {% endfor %}
-    <param name="extension" type="string" gui-hidden="true">object_commands</param>
-    <effect>
-        <object-type>all</object-type>
-        <effects-menu>
-            <submenu name="Ink/Stitch">
-                <submenu name="{% trans %}Commands{% endtrans %}" />
-            </submenu>
-        </effects-menu>
-    </effect>
-    <script>
-        {{ command_tag | safe }}
-    </script>
-</inkscape-extension>
diff --git a/templates/object_commands.xml b/templates/object_commands.xml
new file mode 100644
index 00000000..affe7584
--- /dev/null
+++ b/templates/object_commands.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <name>{% trans %}Attach Commands to Selected Objects{% endtrans %}</name>
+    <id>org.inkstitch.commands.{{ locale }}</id>
+    {% for command, description in object_commands %}
+    <param name="{{ command }}" type="boolean" _gui-text="{{ _(description ) }}">false</param>
+    {% endfor %}
+    <param name="extension" type="string" gui-hidden="true">object_commands</param>
+    <effect>
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu name="Ink/Stitch">
+                <submenu name="{% trans %}Commands{% endtrans %}" />
+            </submenu>
+        </effects-menu>
+    </effect>
+    <script>
+        {{ command_tag | safe }}
+    </script>
+</inkscape-extension>
diff --git a/templates/output.inx b/templates/output.inx
deleted file mode 100644
index ffff4be9..00000000
--- a/templates/output.inx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{{ format | upper }} file output</name>
-    <id>org.inkstitch.output.{{ format }}.{{ locale }}</id>
-    <output>
-        <extension>.{{ format }}</extension>
-        <mimetype>application/x-embroidery-{{ format }}</mimetype>
-        <_filetypename>Ink/Stitch: {{ _(description) }} (.{{ format }})</_filetypename>
-        <_filetypetooltip>{{ _("Save design in %(file_extension)s format using Ink/Stitch") % dict(file_extension=format.upper()) }}</_filetypetooltip>
-        <dataloss>true</dataloss>
-    </output>
-    <param name="extension" type="string" gui-hidden="true">output</param>
-    <param name="format" type="string" gui-hidden="true">{{ format }}</param>
-    {% set params = "output_params_" + format + ".xml" %}
-    {% include params ignore missing %}
-    <script>
-        {{ command_tag | safe }}
-    </script>
-</inkscape-extension>
diff --git a/templates/output.xml b/templates/output.xml
new file mode 100644
index 00000000..545c3d28
--- /dev/null
+++ b/templates/output.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <name>{{ format | upper }} file output</name>
+    <id>org.inkstitch.output.{{ format }}.{{ locale }}</id>
+    <output>
+        <extension>.{{ format }}</extension>
+        <mimetype>{{ mimetype }}</mimetype>
+        <_filetypename>Ink/Stitch: {{ _(description) }} (.{{ format }})</_filetypename>
+        <_filetypetooltip>{{ _("Save design in %(file_extension)s format using Ink/Stitch") % dict(file_extension=format.upper()) }}</_filetypetooltip>
+        <dataloss>true</dataloss>
+    </output>
+    <param name="extension" type="string" gui-hidden="true">output</param>
+    <param name="format" type="string" gui-hidden="true">{{ format }}</param>
+    {% set params = "output_params_" + format + ".xml" %}
+    {% include params ignore missing %}
+    <script>
+        {{ command_tag | safe }}
+    </script>
+</inkscape-extension>
diff --git a/templates/output_params_txt.xml b/templates/output_params_txt.xml
index c8ca35ee..8b7f66f5 100644
--- a/templates/output_params_txt.xml
+++ b/templates/output_params_txt.xml
@@ -36,6 +36,6 @@
             gui-description="{{ _("minimum spindle speed value (grbl $31 setting)") }}" min="-1" max="1000000000">-1</param>
         <param name="max_spindle_speed" type="int" gui-text="{{ _("max spindle speed") }}"
             gui-description="{{ _("minimum spindle speed value (grbl $30 setting)") }}" min="-1" max="1000000000">-1</param>
-        <param name="feed_rate" type="int" gui-description="{{ _("feed rate (in mm/min, set to -1 to omit)")}}" min="-1" max="1000000000">-1</param>
+        <param name="feed_rate" type="int" gui-text="{{ _("feed rate (in mm/min, set to -1 to omit)")}}" min="-1" max="1000000000">-1</param>
     </page>
 </param>
diff --git a/templates/params.inx b/templates/params.inx
deleted file mode 100644
index a2dc89a3..00000000
--- a/templates/params.inx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Params{% endtrans %}</name>
-    <id>org.inkstitch.params.{{ locale }}</id>
-    <param name="extension" type="string" gui-hidden="true">params</param>
-    <effect>
-        <object-type>all</object-type>
-        <effects-menu>
-            <submenu name="Ink/Stitch" />
-        </effects-menu>
-    </effect>
-    <script>
-        {{ command_tag | safe }}
-    </script>
-</inkscape-extension>
diff --git a/templates/params.xml b/templates/params.xml
new file mode 100644
index 00000000..4ceb9020
--- /dev/null
+++ b/templates/params.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <name>{% trans %}Params{% endtrans %}</name>
+    <id>org.inkstitch.params.{{ locale }}</id>
+    <param name="extension" type="string" gui-hidden="true">params</param>
+    <effect implements-custom-gui="true">
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu name="Ink/Stitch" />
+        </effects-menu>
+    </effect>
+    <script>
+        {{ command_tag | safe }}
+    </script>
+</inkscape-extension>
diff --git a/templates/print.inx b/templates/print.inx
deleted file mode 100644
index 33d8b25c..00000000
--- a/templates/print.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}PDF Export{% endtrans %}</name>
-    <id>org.inkstitch.print.{{ locale }}</id>
-    <param name="extension" type="string" gui-hidden="true">print</param>
-    <effect>
-        <object-type>all</object-type>
-        <effects-menu>
-            <submenu name="Ink/Stitch">
-                <submenu name="{% trans %}Visualise and Export{% endtrans %}" />
-            </submenu>
-        </effects-menu>
-    </effect>
-    <script>
-        {{ command_tag | safe }}
-    </script>
-</inkscape-extension>
diff --git a/templates/print.xml b/templates/print.xml
new file mode 100644
index 00000000..410f9b54
--- /dev/null
+++ b/templates/print.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <name>{% trans %}PDF Export{% endtrans %}</name>
+    <id>org.inkstitch.print.{{ locale }}</id>
+    <param name="extension" type="string" gui-hidden="true">print</param>
+    <effect implements-custom-gui="true">
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu name="Ink/Stitch">
+                <submenu name="{% trans %}Visualise and Export{% endtrans %}" />
+            </submenu>
+        </effects-menu>
+    </effect>
+    <script>
+        {{ command_tag | safe }}
+    </script>
+</inkscape-extension>
diff --git a/templates/remove_embroidery_settings.inx b/templates/remove_embroidery_settings.inx
deleted file mode 100644
index c83cc1b8..00000000
--- a/templates/remove_embroidery_settings.inx
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Remove embroidery settings{% endtrans %}</name>
-    <id>org.inkstitch.remove_embroidery_settings.{{ locale }}</id>
-    <param name="description" type="description">{% trans %}Use this extension to remove the information Ink/Stitch has stored in your document.  This can be especially useful if you copy and paste objects from an embroidery design into another document.{% endtrans %}</param>
-    <param name="del_params" type="boolean" _gui-text="{% trans %}Remove Params{% endtrans %}"
-           _gui-description="{% trans %}Removes params from selected objects or all objects if nothing is selected.{% endtrans %}">true</param>
-    <param name="del_commands" type="boolean" _gui-text="{% trans %}Remove Commands{% endtrans %}"
-           _gui-description="{% trans %}Removes visual commands from selected objects or all objects if nothing is selected.{% endtrans %}">false</param>
-    <param name="del_print" type="boolean" _gui-text="{% trans %}Remove Print Settings from SVG metadata{% endtrans %}">false</param>
-    <param name="extension" type="string" gui-hidden="true">remove_embroidery_settings</param>
-    <effect>
-        <object-type>all</object-type>
-        <effects-menu>
-            <submenu name="Ink/Stitch">
-                <submenu name="{% trans %}Troubleshoot{% endtrans %}" />
-            </submenu>
-        </effects-menu>
-    </effect>
-    <script>
-        {{ command_tag | safe }}
-    </script>
-</inkscape-extension>
diff --git a/templates/remove_embroidery_settings.xml b/templates/remove_embroidery_settings.xml
new file mode 100644
index 00000000..c83cc1b8
--- /dev/null
+++ b/templates/remove_embroidery_settings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <name>{% trans %}Remove embroidery settings{% endtrans %}</name>
+    <id>org.inkstitch.remove_embroidery_settings.{{ locale }}</id>
+    <param name="description" type="description">{% trans %}Use this extension to remove the information Ink/Stitch has stored in your document.  This can be especially useful if you copy and paste objects from an embroidery design into another document.{% endtrans %}</param>
+    <param name="del_params" type="boolean" _gui-text="{% trans %}Remove Params{% endtrans %}"
+           _gui-description="{% trans %}Removes params from selected objects or all objects if nothing is selected.{% endtrans %}">true</param>
+    <param name="del_commands" type="boolean" _gui-text="{% trans %}Remove Commands{% endtrans %}"
+           _gui-description="{% trans %}Removes visual commands from selected objects or all objects if nothing is selected.{% endtrans %}">false</param>
+    <param name="del_print" type="boolean" _gui-text="{% trans %}Remove Print Settings from SVG metadata{% endtrans %}">false</param>
+    <param name="extension" type="string" gui-hidden="true">remove_embroidery_settings</param>
+    <effect>
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu name="Ink/Stitch">
+                <submenu name="{% trans %}Troubleshoot{% endtrans %}" />
+            </submenu>
+        </effects-menu>
+    </effect>
+    <script>
+        {{ command_tag | safe }}
+    </script>
+</inkscape-extension>
diff --git a/templates/reorder.xml b/templates/reorder.xml
new file mode 100644
index 00000000..7e002616
--- /dev/null
+++ b/templates/reorder.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <name>{% trans %}Reorder{% endtrans %}</name>
+    <id>org.inkstitch.reorder.{{ locale }}</id>
+    <param name="extension" type="string" gui-hidden="true">reorder</param>
+    <effect>
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu name="Ink/Stitch" />
+        </effects-menu>
+    </effect>
+    <script>
+        {{ command_tag | safe }}
+    </script>
+</inkscape-extension>
diff --git a/templates/simulator.inx b/templates/simulator.inx
deleted file mode 100644
index dfa6b34a..00000000
--- a/templates/simulator.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Simulator / Realistic Preview{% endtrans %}</name>
-    <id>org.inkstitch.simulator.{{ locale }}</id>
-    <param name="extension" type="string" gui-hidden="true">simulator</param>
-    <effect>
-        <object-type>all</object-type>
-        <effects-menu>
-            <submenu name="Ink/Stitch">
-                <submenu name="{% trans %}Visualise and Export{% endtrans %}" />
-            </submenu>
-        </effects-menu>
-    </effect>
-    <script>
-        {{ command_tag | safe }}
-    </script>
-</inkscape-extension>
diff --git a/templates/simulator.xml b/templates/simulator.xml
new file mode 100644
index 00000000..029d8b37
--- /dev/null
+++ b/templates/simulator.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <name>{% trans %}Simulator / Realistic Preview{% endtrans %}</name>
+    <id>org.inkstitch.simulator.{{ locale }}</id>
+    <param name="extension" type="string" gui-hidden="true">simulator</param>
+    <effect implements-custom-gui="true">
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu name="Ink/Stitch">
+                <submenu name="{% trans %}Visualise and Export{% endtrans %}" />
+            </submenu>
+        </effects-menu>
+    </effect>
+    <script>
+        {{ command_tag | safe }}
+    </script>
+</inkscape-extension>
diff --git a/templates/stitch_plan_preview.inx b/templates/stitch_plan_preview.inx
deleted file mode 100644
index 72ea7f04..00000000
--- a/templates/stitch_plan_preview.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Stitch Plan Preview{% endtrans %}</name>
-    <id>org.inkstitch.stitch_plan_preview.{{ locale }}</id>
-    <param name="extension" type="string" gui-hidden="true">stitch_plan_preview</param>
-    <effect>
-        <object-type>all</object-type>
-        <effects-menu>
-            <submenu name="Ink/Stitch">
-                <submenu name="{% trans %}Visualise and Export{% endtrans %}" />
-            </submenu>
-        </effects-menu>
-    </effect>
-    <script>
-        {{ command_tag | safe }}
-    </script>
-</inkscape-extension>
diff --git a/templates/stitch_plan_preview.xml b/templates/stitch_plan_preview.xml
new file mode 100644
index 00000000..72ea7f04
--- /dev/null
+++ b/templates/stitch_plan_preview.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <name>{% trans %}Stitch Plan Preview{% endtrans %}</name>
+    <id>org.inkstitch.stitch_plan_preview.{{ locale }}</id>
+    <param name="extension" type="string" gui-hidden="true">stitch_plan_preview</param>
+    <effect>
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu name="Ink/Stitch">
+                <submenu name="{% trans %}Visualise and Export{% endtrans %}" />
+            </submenu>
+        </effects-menu>
+    </effect>
+    <script>
+        {{ command_tag | safe }}
+    </script>
+</inkscape-extension>
diff --git a/templates/troubleshoot.inx b/templates/troubleshoot.inx
deleted file mode 100644
index 02df8ddc..00000000
--- a/templates/troubleshoot.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Troubleshoot Objects{% endtrans %}</name>
-    <id>org.inkstitch.troubleshoot.{{ locale }}</id>
-    <param name="extension" type="string" gui-hidden="true">troubleshoot</param>
-    <effect>
-        <object-type>all</object-type>
-        <effects-menu>
-            <submenu name="Ink/Stitch">
-                <submenu name="{% trans %}Troubleshoot{% endtrans %}" />
-            </submenu>
-        </effects-menu>
-    </effect>
-    <script>
-        {{ command_tag | safe }}
-    </script>
-</inkscape-extension>
diff --git a/templates/troubleshoot.xml b/templates/troubleshoot.xml
new file mode 100644
index 00000000..02df8ddc
--- /dev/null
+++ b/templates/troubleshoot.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <name>{% trans %}Troubleshoot Objects{% endtrans %}</name>
+    <id>org.inkstitch.troubleshoot.{{ locale }}</id>
+    <param name="extension" type="string" gui-hidden="true">troubleshoot</param>
+    <effect>
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu name="Ink/Stitch">
+                <submenu name="{% trans %}Troubleshoot{% endtrans %}" />
+            </submenu>
+        </effects-menu>
+    </effect>
+    <script>
+        {{ command_tag | safe }}
+    </script>
+</inkscape-extension>
diff --git a/templates/zip.inx b/templates/zip.inx
deleted file mode 100644
index 42623019..00000000
--- a/templates/zip.inx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>embroidery ZIP file output</name>
-    <id>org.inkstitch.output.zip.{{ locale }}</id>
-    <output>
-        <extension>.zip</extension>
-        <mimetype>application/zip</mimetype>
-        <_filetypename>{{ _("Ink/Stitch: ZIP export multiple formats (.zip)") }}</_filetypename>
-        <_filetypetooltip>{{ _("Create a ZIP with multiple embroidery file formats using Ink/Stitch") }}</_filetypetooltip>
-        <dataloss>true</dataloss>
-    </output>
-    {%- for format, description in formats %}
-    <param name="format-{{ format }}" type="boolean" _gui-text=".{{ format | upper }}: {{ _(description) }}">false</param>
-    {%- endfor %}
-    <param name="format-svg" type="boolean" _gui-text=".SVG: {{ _("Scalable Vector Graphic") }}">false</param>
-    <param name="format-threadlist" type="boolean" _gui-text=".TXT: {{ _("Threadlist") }}">false</param>
-    <param name="extension" type="string" gui-hidden="true">zip</param>
-    <script>
-        {{ command_tag | safe }}
-    </script>
-</inkscape-extension>
diff --git a/templates/zip.xml b/templates/zip.xml
new file mode 100644
index 00000000..4d620424
--- /dev/null
+++ b/templates/zip.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <name>embroidery ZIP file output</name>
+    <id>org.inkstitch.output.zip.{{ locale }}</id>
+    <output>
+        <extension>.zip</extension>
+        <mimetype>application/zip</mimetype>
+        <_filetypename>{{ _("Ink/Stitch: ZIP export multiple formats (.zip)") }}</_filetypename>
+        <_filetypetooltip>{{ _("Create a ZIP with multiple embroidery file formats using Ink/Stitch") }}</_filetypetooltip>
+        <dataloss>true</dataloss>
+    </output>
+    {%- for format, description, mimetype, category in formats %}
+    {%- if category == "embroidery" %}
+    <param name="format-{{ format }}" type="boolean" _gui-text=".{{ format | upper }}: {{ _(description) }}">false</param>
+    {%- endif %}
+    {%- endfor %}
+    <param name="format-svg" type="boolean" _gui-text=".SVG: {{ _("Scalable Vector Graphic") }}">false</param>
+    <param name="format-threadlist" type="boolean" _gui-text=".TXT: {{ _("Threadlist") }}">false</param>
+    <param name="extension" type="string" gui-hidden="true">zip</param>
+    <script>
+        {{ command_tag | safe }}
+    </script>
+</inkscape-extension>
-- 
cgit v1.3.1