From 43ebcc344ffd0e5b84aee0c6dfd05cb2ea8962f2 Mon Sep 17 00:00:00 2001
From: Windell Oskay <windell@oskay.net>
Date: Fri, 9 Dec 2022 11:51:10 -0800
Subject: [PATCH 1/2] Update inx for current standards

---
 inkscape_driver/eggbot.inx             | 220 ++++++++++++-------------
 inkscape_driver/eggbot_hatch.inx       |  59 +++----
 inkscape_driver/eggbot_presethatch.inx |  23 +--
 3 files changed, 149 insertions(+), 153 deletions(-)

diff --git a/inkscape_driver/eggbot.inx b/inkscape_driver/eggbot.inx
index 2b4d84c..a1e0437 100755
--- a/inkscape_driver/eggbot.inx
+++ b/inkscape_driver/eggbot.inx
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-  <_name>EggBot Control</_name>
+  <name>EggBot Control</name>
   <id>command.evilmadscientist.eggbot.rev280b1</id>
   <dependency type="extension">org.inkscape.output.svg.inkscape</dependency>
   <dependency type="executable" location="extensions">eggbot.py</dependency>
   <param name="tab" type="notebook">
   
-    <page name="splash" _gui-text="Plot">
-<_param indent="1" name="splashpage" type="description" appearance="header">
+    <page name="splash" gui-text="Plot">
+<label indent="1" appearance="header">
 Welcome to the EggBot interface!
-</_param>
-<_param indent="2" name="splashpage2" type="description" xml:space="preserve" >
+</label>
+<label indent="2" xml:space="preserve" >
 Press 'Apply' to begin plotting.
 
 Or, look in the other tabs to adjust your settings
@@ -19,157 +19,151 @@ and use additional EggBot functions.
 Need help? 
 Visit http://wiki.evilmadscientist.com/eggbot
 
-</_param>
+</label>
 </page>
 
-    <page name='setup' _gui-text='Setup'>
+<page name='setup' gui-text='Setup'>
 
-      <_param name="instructions_setup" type="description" appearance="header">
+<label appearance="header">
 EggBot: Basic Setup
-</_param>
-      <param indent="1" name="penUpPosition" type="int" min="0" max="100"
-	     _gui-text="Pen up position, 0-100%:">55</param>
-      <param indent="1" name="penDownPosition" type="int" min="0" max="100"
-	     _gui-text="Pen down position, 0-100%:">50</param>
+</label>
+  <param indent="1" name="penUpPosition" type="int" min="0" max="100"
+     gui-text="Pen up position, 0-100%:">55</param>
+  <param indent="1" name="penDownPosition" type="int" min="0" max="100"
+     gui-text="Pen down position, 0-100%:">50</param>
 
-  <param name="setupType" type="optiongroup"  _gui-text="
-  Action on 'Apply': ">
-	<_option value="toggle-pen"     >Toggle pen up/down</_option>
-	<_option value="align-mode"     >Raise pen, turn off motors</_option>	
+  <param name="setupType" type="optiongroup" appearance="radio"
+     gui-text="Action on 'Apply': ">
+	<option value="toggle-pen"     >Toggle pen up/down</option>
+	<option value="align-mode"     >Raise pen, turn off motors</option>	
       </param>
-      <_param indent="1" name="instructions_setup3" type="description"
-	      xml:space="preserve">
+      <label indent="1" xml:space="preserve">
 - Raise and lower pen to check the
   pen-up and pen-down positions.
 
 - Raise pen and turn off stepper motors
   for aligning objects in the EggBot.
-</_param>
-    </page>
-
-
-    <page name='timing' _gui-text='Timing'>
-
-<_param name="instructions_timing1" type="description" appearance="header">Movement speeds:</_param>
-
-
-      <param indent="1" name="penDownSpeed" type="int" min="1" max="10000"
-	   _gui-text="Speed when pen is down (steps/s):">300</param>	
-      <param indent="1" name="penUpSpeed" type="int" min="1" max="10000"
-	   _gui-text="Speed when pen is up (step/s):">400</param>
-
-<_param name="instructions_timing3" type="description" appearance="header">Pen lift and lowering speeds:</_param>
-
-      <param indent="1" name="ServoUpSpeed" type="int" min="1" max="1600"
-	   _gui-text="Pen raising speed (%/s):">50</param>
-      <param indent="1" name="penUpDelay" type="int" min="1" max="5000"
-	   _gui-text="Delay after raising pen (ms):">200</param>
-      <param indent="1" name="ServoDownSpeed" type="int" min="1" max="1600"
-	   _gui-text="Pen lowering speed (%/s):">20</param>
-      <param indent="1" name="penDownDelay" type="int" min="1" max="5000"
-	   _gui-text="Delay after lowering pen (ms):">400</param>
-<_param indent="2" name="instructions_timing4" type="description" xml:space="preserve">
-
-(Press 'Apply' to save settings.)</_param>
+</label>
 </page>
 
-<page name='options' _gui-text='Options'>
-<_param name="instructions_options6" type="description" appearance="header">Advanced Options:</_param>
 
-<param indent="1" name="revPenMotor" type="boolean"
-_gui-text="Reverse motion of Motor 1 (pen)">true</param>	
-<param indent="1" name="revEggMotor" type="boolean"
-_gui-text="Reverse motion of Motor 2 (egg)">true</param> 
-<param indent="1" name="wraparound" type="boolean"
-_gui-text="Egg (x) axis wraps around">true</param>
-<param indent="1" name="returnToHome" type="boolean"
-_gui-text="Return home when done">true</param> 
-<param indent="1" name="engraving" type="boolean"
-_gui-text="Enable engraver, if attached">false</param>	
+<page name='timing' gui-text='Timing'>
+<label appearance="header">Movement speeds:</label>
+
+      <param indent="1" name="penDownSpeed" type="int" min="1" max="10000"
+	   gui-text="Speed when pen is down (steps/s):">300</param>	
+      <param indent="1" name="penUpSpeed" type="int" min="1" max="10000"
+	   gui-text="Speed when pen is up (step/s):">400</param>
+
+<label appearance="header">Pen lift and lowering speeds:</label>
+
+      <param indent="1" name="ServoUpSpeed" type="int" min="1" max="1600"
+	   gui-text="Pen raising speed (%/s):">50</param>
+      <param indent="1" name="penUpDelay" type="int" min="1" max="5000"
+	   gui-text="Delay after raising pen (ms):">200</param>
+      <param indent="1" name="ServoDownSpeed" type="int" min="1" max="1600"
+	   gui-text="Pen lowering speed (%/s):">20</param>
+      <param indent="1" name="penDownDelay" type="int" min="1" max="5000"
+	   gui-text="Delay after lowering pen (ms):">400</param>
+</page>
+
+
+<page name='options' gui-text='Options'>
+<label appearance="header">Advanced Options:</label>
+
+<param indent="1" name="revPenMotor" type="bool"
+gui-text="Reverse motion of Motor 1 (pen)">true</param>	
+<param indent="1" name="revEggMotor" type="bool"
+gui-text="Reverse motion of Motor 2 (egg)">true</param> 
+<param indent="1" name="wraparound" type="bool"
+gui-text="Egg (x) axis wraps around">true</param>
+<param indent="1" name="returnToHome" type="bool"
+gui-text="Return home when done">true</param> 
+<param indent="1" name="engraving" type="bool"
+gui-text="Enable engraver, if attached">false</param>	
 <param indent="1" name="smoothness" type="float"
-_gui-text="Curve smoothing (lower for more):">.2</param>
-<_param indent="2"  name="instructions_options3" type="description" xml:space="preserve">
-
-(Press 'Apply' to save settings.)</_param>
-    </page>
+gui-text="Curve smoothing (lower for more):">.2</param>
+<label indent="2" xml:space="preserve"></label>
+</page>
 
 
-	
-    <page name="manual" _gui-text="Manual">
-<_param name="instructions_manual" type="description" appearance="header">EggBot Manual Control</_param>
-<_param indent="1" name="instructions_manual" type="description"  >
+<page name="manual" gui-text="Manual">
+
+<label appearance="header">EggBot Manual Control</label>
+<label indent="1">
 You can use this tab to send "manual" commands
 to the EggBot: Walk the stepper motors, raise or
 lower the pen, enable or disable the motors, or 
 check the circuit board (EBB) firmware version.
-</_param>
+</label>
 
-<param name="manualType" type="optiongroup" appearance="minimal"
-	     _gui-text="               Command: ">
-	<_option value="none"           >- Select -</_option>
-	<_option value="raise-pen"      >Raise the Pen</_option>
-	<_option value="lower-pen"      >Lower the Pen</_option>
-	<_option value="walk-egg-motor" >Walk Motor 2 (egg)</_option>
-	<_option value="walk-pen-motor" >Walk Motor 1 (pen)</_option>
-	<_option value="enable-motors"  >Enable Motors</_option>
-	<_option value="disable-motors" >Disable Motors</_option>
-	<_option value="enable-engraver"  >Engraver On</_option>
-	<_option value="disable-engraver" >Engraver Off</_option>
-	<_option value="version-check"  >Check EBB Version</_option>
-	<_option value="strip-data"     >Strip plotter data from file</_option>
+<param name="manualType" type="optiongroup" appearance="combo"
+	     gui-text="               Command: ">
+	<option value="none"           >- Select -</option>
+	<option value="raise-pen"      >Raise the Pen</option>
+	<option value="lower-pen"      >Lower the Pen</option>
+	<option value="walk-egg-motor" >Walk Motor 2 (egg)</option>
+	<option value="walk-pen-motor" >Walk Motor 1 (pen)</option>
+	<option value="enable-motors"  >Enable Motors</option>
+	<option value="disable-motors" >Disable Motors</option>
+	<option value="enable-engraver"  >Engraver On</option>
+	<option value="disable-engraver" >Engraver Off</option>
+	<option value="version-check"  >Check EBB Version</option>
+	<option value="strip-data"     >Strip plotter data from file</option>
       </param>
 
       <param name="WalkDistance" type="int" min="-32000" max="32000" 
-             _gui-text="               Walk distance (steps):">5</param>
-      <_param indent="3" name="instructions_manual2" type="description"
-	      xml:space="preserve">Walk distances may be positive or negative.
+             gui-text="               Walk distance (steps):">5</param>
+<label indent="3" xml:space="preserve">Walk distances may be positive or negative.
 
 Press 'Apply' to execute the command.
-</_param>
-    </page>
+</label>
+</page>
 
-    <page name="resume" _gui-text="Resume">
-<_param name="instructions_resume1" type="description"  appearance="header">Pause and Resume</_param>
-<_param indent="1" name="instructions_resume2" type="description"> 
+
+<page name="resume" gui-text="Resume">
+<label appearance="header">Pause and Resume</label>
+<label indent="1"> 
 To pause a plot in progress, press the pause button
 (marked "PRG") on the EggBot's "EBB" controller
 board. After pausing, you can change settings or
 perform any manual adjustments that are needed.
 
-To resume printing, or to simply cancel and 
-return the pen home, press 'Apply' below.   
+To resume printing, or to simply cancel and
+return the pen home, press 'Apply' below.
 
 Plot progress is stored in the Inkscape file itself.
-If you plan to quit Inkscape and resume later, 
+If you plan to quit Inkscape and resume later,
 remember to save the document before quitting.
 
 You can resume directly where you paused, or
 after using the Return to Home Corner command.
-</_param>
-      <param name="cancelOnly" type="boolean"
-	     _gui-text="Cancel and return home only">false</param> 
-    </page>		
+</label>
+<spacer />
+      <param name="cancelOnly" type="bool"
+	     gui-text="Cancel and return home only">false</param> 
+    </page>
 
-    <page name="layers" _gui-text="Layers">
-<_param name="instructions_layer" type="description"  appearance="header">Print individual layer(s) </_param>
-<_param  indent="1" name="instructions_layer2" type="description" >
-Normally, we plot paths from all layers.  
+    <page name="layers" gui-text="Layers">
+<label appearance="header">Print individual layer(s) </label>
+<label indent="1">
+Normally, we plot paths from all layers.
 
-You can also choose to plot a single layer 
+You can also choose to plot a single layer
 or group of layers, for example to change
 pens between plotting layers.
 
 Pressing 'Apply' from this frame will plot
 only layers whose names begin with the 
 selected number, which can be up to 100.
-</_param>
-      <param name="layernumber" type="int" min="0" max="100"
-	     _gui-text="   Plot only layers beginning with: ">1</param>
-    </page>			
+</label>
+    <param name="layernumber" type="int" min="0" max="100"
+     gui-text="   Plot only layers beginning with: ">1</param>
+</page>
 
-    <page name="Help" _gui-text="*">
-      <_param name="instructions_general" type="description"
-	      xml:space="preserve">
+
+<page name="Help" gui-text="*">
+      <label xml:space="preserve">
 EggBot Control Inkscape extension 
 Release 2.8.5, dated 2021-08-09
 
@@ -180,24 +174,24 @@ Known issues:
   (This is due to a known bug in Inkscape; the
    "cancel" button does not work with any
    Inkscape extension, including this one.)
-   
+
 Latest version and issue tracker available at:
 https://github.com/evil-mad/EggBot/
 
 
-</_param>
+</label>
     </page>
   </param>
 
-  <effect needs-live-preview="false" needs-document="no">
+  <effect needs-live-preview="false" needs-document="true">
     <object-type>all</object-type>
     <effects-menu>
-      <submenu _name="EggBot"/>
+      <submenu name="EggBot"/>
     </effects-menu>
   </effect>
 
   <script>
-    <command reldir="extensions" interpreter="python">eggbot.py</command>
+    <command location="extensions" interpreter="python">eggbot.py</command>
   </script>
 
 </inkscape-extension>
diff --git a/inkscape_driver/eggbot_hatch.inx b/inkscape_driver/eggbot_hatch.inx
index d6ba73e..f3fbd0f 100755
--- a/inkscape_driver/eggbot_hatch.inx
+++ b/inkscape_driver/eggbot_hatch.inx
@@ -1,80 +1,81 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-  <_name>Hatch fill</_name>
+  <name>Hatch fill</name>
   <id>command.evilmadscientist.eggbot_hatch</id>
   <dependency type="extension">org.inkscape.output.svg.inkscape</dependency>
   <dependency type="executable" location="extensions">eggbot_hatch.py</dependency>
 
 <param name="tab" type="notebook">
-  <page name="splash" _gui-text="Hatch Fill">
-  <_param name="Header" type="description">
+  <page name="splash" gui-text="Hatch Fill">
+
+  <label>
 An extension to fill all (or selected) closed figures in your
 drawing with paths consisting of back-and-forth hatch lines.
-</_param>
+  </label>
 
 <param name="hatchSpacing" type="float" min="0.001" max="1000" indent="2"
-    precision="3" _gui-text="Hatch Spacing">3.0</param>
+    precision="3" gui-text="Hatch Spacing">3.0</param>
 
-<param name="units" type="optiongroup" appearance="minimal"
-    indent="4" _gui-text="Spacing Units :">
-    <_option value="2">px</_option>
-    <_option value="3">mm</_option>
-    <_option value="4">inch</_option>
+<param name="units" type="optiongroup" appearance="combo"
+    indent="4" gui-text="Spacing Units :">
+    <option value="2">px</option>
+    <option value="3">mm</option>
+    <option value="4">inch</option>
 </param>
 
 <param name="hatchAngle" type="float" min="-360" max="360" indent="4"
-_gui-text="Hatch Angle (degrees)">45</param>
-<param name="crossHatch" type="boolean" indent="4" _gui-text="Crosshatch">false</param>
+gui-text="Hatch Angle (degrees)">45</param>
+<param name="crossHatch" type="bool" indent="4" gui-text="Crosshatch">false</param>
 
 <separator />
 
-<param name="connect_bool" type="boolean"  indent="2" _gui-text="Connect Nearby Ends">true</param>
+<param name="connect_bool" type="bool"  indent="2" gui-text="Connect Nearby Ends">true</param>
 <param name="hatchScope" type="float" min="1.1" max="5.0"  indent="2"
-_gui-text="Range of end connections (default: 3)">3.0</param>
+gui-text="Range of end connections (default: 3)">3.0</param>
 
 <separator />
-<param name="inset_bool" type="boolean"  indent="2" _gui-text="Inset Fill from Edges">true</param>
+<param name="inset_bool" type="bool"  indent="2" gui-text="Inset Fill from Edges">true</param>
 <param name="inset_dist" type="float"  min="0.001" max="1000" precision="3"  indent="2"
-    _gui-text="Inset Distance, in selected units">0.5</param>
+    gui-text="Inset Distance, in selected units">0.5</param>
 
 <separator />
 <param name="tolerance" type="float" min="0.1" max="100"  indent="2"
-    _gui-text="Tolerance (default: 2.0)">2.0</param>
+    gui-text="Tolerance (default: 2.0)">2.0</param>
 
 </page>
-<page name="info" _gui-text="Help">
-<param name="aboutpage_1" type="description">
+<page name="info" gui-text="Help">
+<label>
 Hatch spacing is the distance between hatch lines, measured in selected units. Hatch angle is in
 degrees from horizontal; e.g., 90 for vertical.
-</param><param name="aboutpage_2" type="description">
+</label><label>
 The Crosshatch option will add a second set of hatches, perpendicular to the first.
-</param><param name="aboutpage_3" type="description">
+</label><label>
 The Connect Nearby Ends option will join nearby line ends with a smooth curve, giving a different
 appearance and reducing the number of pen lifts when using robotic tools like pen plotters. The
 Range parameter sets the distance (in hatch spacing) over which end connections may be made. Large
 values may result in hatches where you don't want them.
-</param><param name="aboutpage_4" type="description">
+</label><label>
 The Inset Fill from Edges option allows you to hold back the hatches away from the edge of your
 original object. This can allow you to more reliably "color inside the lines".
-</param><param name="aboutpage_5" type="description">
+</label><label>
 The Tolerance parameter affects how precisely the hatches try to fill the input paths.
-</param><param name="aboutpage_6" type="description">
+</label><label>
 Hatches will have the same stroke color and width as the original object. When filling more than one
 object, the hatches will be grouped with their original (filled) objects.
-</param>
+</label>
 <separator />
-<param name="aboutpage_7" type="description"  indent="2">
-v2.4.3. Copyright 2022, Evil Mad Scientist</_param>
+<label indent="2">
+v2.4.3. Copyright 2022, Evil Mad Scientist</label>
  
   </page>
   </param>
   <effect needs-live-preview="true">
     <object-type>all</object-type>
     <effects-menu>
-    <submenu _name="EggBot"/>
+    <submenu name="EggBot"/>
     </effects-menu>
   </effect>
   <script>
-    <command reldir="extensions" interpreter="python">eggbot_hatch.py</command>
+    <command location="extensions" interpreter="python">eggbot_hatch.py</command>
   </script>
 </inkscape-extension>
diff --git a/inkscape_driver/eggbot_presethatch.inx b/inkscape_driver/eggbot_presethatch.inx
index 16e0fc2..95bfdc8 100755
--- a/inkscape_driver/eggbot_presethatch.inx
+++ b/inkscape_driver/eggbot_presethatch.inx
@@ -1,29 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-   <_name>Preset hatch for fills</_name>
+   <name>Preset hatch for fills</name>
    <id>command.evilmadscience.hatch.eggbot</id>
        <dependency type="executable" location="extensions">eggbot_presethatch.py</dependency>
-       <_param name="title" type="description" xml:space="preserve">
+
+<label indent="1">
 This extension applies a set of eggbot-friendly
 default presets to the live path effect called
 "Hatch (rough)."
-
+</label><spacer /><label indent="1">
 It affects all objects in your document that
 already have the live hatch effect applied.
-
-After using this tool to apply presets, use
+</label><spacer /><label indent="1">
+After using this tool to apply presets, you can use
 the "Edit paths by node" tool to change the
 frequency, direction, and/or bending of the
 hatching, by dragging the diamond control
 points.
-</_param>
+</label>
    <effect>
-               <object-type>path</object-type>
-                <effects-menu>
-      <submenu _name="EggBot"/>
-                </effects-menu>
+       <object-type>path</object-type>
+        <effects-menu>
+        <submenu name="EggBot"/>
+        </effects-menu>
    </effect>
    <script>
-       <command reldir="extensions" interpreter="python">eggbot_presethatch.py</command>
+       <command location="extensions" interpreter="python">eggbot_presethatch.py</command>
    </script>
 </inkscape-extension>

From 18380f409400ef723799fe00fe622c9077385a04 Mon Sep 17 00:00:00 2001
From: Windell Oskay <windell@oskay.net>
Date: Wed, 14 Dec 2022 14:03:40 -0800
Subject: [PATCH 2/2] INX updates for current Inkscape version

---
 inkscape_driver/eggbot_reorder.inx | 28 ++++++++++++++--------------
 inkscape_driver/eggbot_stretch.inx | 14 +++++++-------
 inkscape_driver/hershey_eggbot.inx |  4 ++--
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/inkscape_driver/eggbot_reorder.inx b/inkscape_driver/eggbot_reorder.inx
index f454a09..463cab2 100755
--- a/inkscape_driver/eggbot_reorder.inx
+++ b/inkscape_driver/eggbot_reorder.inx
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-  <_name>Reorder Paths for Speed</_name>
+  <name>Reorder Paths for Speed</name>
   <id>command.evilmadscientist.eggbot.reorder</id>
   <dependency type="executable" location="extensions">axidraw_svg_reorder.py</dependency>
 
-<_param indent="5" name="splashpage" type="description" 
-appearance="header">EggBot Plot Optimization Tool</_param>
+<label indent="5"
+appearance="header">EggBot Plot Optimization Tool</label>
 
-<_param name="Header" type="description" xml:space="preserve">
+<label xml:space="preserve">
 This utility will re-order objects within each layer of your
 document, to reduce pen-up travel distance and time.
-</_param>
+</label>
 
-<param name="reordering" _gui-text="Group Handling" type="optiongroup" indent="2" >
-<_option value="2">Reorder within groups</_option>
-<_option value="1">Preserve groups</_option>
-<_option value="3">Break apart groups</_option>
+<param name="reordering" gui-text="Group Handling" type="optiongroup" 
+    appearance="radio" indent="2" >
+<option value="2">Reorder within groups</option>
+<option value="1">Preserve groups</option>
+<option value="3">Break apart groups</option>
 </param>
 
-<_param name="Footer" type="description" indent="3" xml:space="preserve">
-v 2.5. Copyright 2019, Evil Mad Scientist</_param>
-
+<label indent="3" xml:space="preserve">
+v 2.5. Copyright 2022, Evil Mad Scientist</label>
 
 <effect needs-live-preview="false">
     <object-type>all</object-type>
     <effects-menu>
-      <submenu _name="EggBot"/>
+      <submenu name="EggBot"/>
     </effects-menu>
   </effect>
   <script>
-    <command reldir="extensions" interpreter="python">axidraw_svg_reorder.py</command>
+    <command location="extensions" interpreter="python">axidraw_svg_reorder.py</command>
   </script>
 </inkscape-extension>
diff --git a/inkscape_driver/eggbot_stretch.inx b/inkscape_driver/eggbot_stretch.inx
index 8d0bff4..a758d06 100755
--- a/inkscape_driver/eggbot_stretch.inx
+++ b/inkscape_driver/eggbot_stretch.inx
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-  <_name>Stretch</_name>
+  <name>Stretch</name>
   <id>command.eggbot.contributed.stretch</id>
   <dependency type="executable" location="extensions">eggbot_stretch.py</dependency>
 
-  <_param name="Header" type="description" xml:space="preserve">
+  <label xml:space="preserve">
 This extension will horizontally stretch your drawing.  The
 amount of stretch increases towards the poles of your egg
 (i.e., increases with distance away from the equator).  The
@@ -35,20 +35,20 @@ The curve smoothing value is the same control as in the
 Eggbot Control extension.  It needs to be applied here
 before plotting as all curves will be rendered to straight
 line segments by this extension.
-  </_param>
+  </label>
 
   <param name="maxDy" type="float" min="0.0001" max="999.0"
-	 _gui-text="Vertical smoothing (lower for more)">5.0</param>
+	 gui-text="Vertical smoothing (lower for more)">5.0</param>
   <param name="smoothness" type="float" min="0.0001" max="5"
-	 _gui-text="   Curve smoothing (lower for more)">0.2</param>
+	 gui-text="   Curve smoothing (lower for more)">0.2</param>
 
   <effect needs-live-preview="false">
     <object-type>all</object-type>
     <effects-menu>
-      <submenu _name="EggBot"/>
+      <submenu name="EggBot"/>
     </effects-menu>
   </effect>
   <script>
-    <command reldir="extensions" interpreter="python">eggbot_stretch.py</command>
+    <command location="extensions" interpreter="python">eggbot_stretch.py</command>
   </script>
 </inkscape-extension>
diff --git a/inkscape_driver/hershey_eggbot.inx b/inkscape_driver/hershey_eggbot.inx
index 68621f2..0bce229 100755
--- a/inkscape_driver/hershey_eggbot.inx
+++ b/inkscape_driver/hershey_eggbot.inx
@@ -125,10 +125,10 @@ distribution.
   <effect needs-live-preview="true">
     <object-type>all</object-type>
     <effects-menu>
-    <submenu _name="EggBot"/>
+    <submenu name="EggBot"/>
     </effects-menu>
   </effect>
     <script>
-      <command reldir="extensions" interpreter="python">hershey.py</command>
+      <command location="extensions" interpreter="python">hershey.py</command>
     </script>
 </inkscape-extension>