Replaced old selection containers

(bzr r14954.1.6)

75 files changed, 1048 insertions, 766 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a758691af..393ffa5ab 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,6 +10,7 @@ set(sp_SRC
 	attribute-rel-css.cpp
 	attribute-rel-svg.cpp
 	attribute-rel-util.cpp
+	attribute-sort-util.cpp
 	sp-anchor.cpp
 	sp-clippath.cpp
 	sp-conn-end-pair.cpp
@@ -92,6 +93,7 @@ set(sp_SRC
 	attribute-rel-css.h
 	attribute-rel-svg.h
 	attribute-rel-util.h
+	attribute-sort-util.h
 	sp-anchor.h
 	sp-clippath.h
 	sp-conn-end-pair.h
diff --git a/src/Makefile_insert b/src/Makefile_insert
index b9723ac42..55fde4dd2 100644
--- a/src/Makefile_insert
+++ b/src/Makefile_insert
@@ -8,6 +8,7 @@ ink_common_sources +=	\
 	attribute-rel-svg.cpp attribute-rel-svg.h			\
 	attribute-rel-css.cpp attribute-rel-css.h			\
 	attribute-rel-util.cpp attribute-rel-util.h			\
+	attribute-sort-util.cpp attribute-sort-util.h			\
 	axis-manip.cpp axis-manip.h					\
 	bad-uri-exception.h						\
 	box3d.cpp box3d.h						\
diff --git a/src/attribute-sort-util.cpp b/src/attribute-sort-util.cpp
new file mode 100644
index 000000000..d0f45c418
--- /dev/null
+++ b/src/attribute-sort-util.cpp
@@ -0,0 +1,208 @@
+/*
+ * attribute-sort-util.cpp
+ *
+ *  Created on: Jun 10, 2016
+ *      Author: Tavmjong Bah
+ */
+
+/**
+ * Utility functions for sorting attributes by name.
+ */
+
+#include <fstream>
+#include <sstream>
+#include <string>
+#include <iostream>
+#include <vector>
+#include <utility>      // std::pair
+#include <algorithm>    // std::sort
+
+#include "attribute-sort-util.h"
+
+#include "xml/repr.h"
+#include "xml/attribute-record.h"
+#include "xml/sp-css-attr.h"
+
+#include "attributes.h"
+
+using Inkscape::XML::Node;
+using Inkscape::XML::AttributeRecord;
+using Inkscape::Util::List;
+
+/**
+ * Sort attributes by name.
+ */
+void sp_attribute_sort_tree(Node *repr) {
+
+  g_return_if_fail (repr != NULL);
+
+  sp_attribute_sort_recursive( repr );
+}
+
+/**
+ * Sort recursively over all elements.
+ */
+void sp_attribute_sort_recursive(Node *repr) {
+
+  g_return_if_fail (repr != NULL);
+
+  if( repr->type() == Inkscape::XML::ELEMENT_NODE ) {
+    Glib::ustring element = repr->name();
+
+    // Only sort elements in svg namespace
+    if( element.substr(0,4) == "svg:" ) {
+      sp_attribute_sort_element( repr );
+    }
+  }
+  
+  for(Node *child=repr->firstChild() ; child ; child = child->next()) {
+    sp_attribute_sort_recursive( child );
+  }
+}
+
+/**
+ * Compare function
+ */
+bool cmp(std::pair< Glib::ustring, Glib::ustring > const &a,
+         std::pair< Glib::ustring, Glib::ustring > const &b) {
+    unsigned val_a = sp_attribute_lookup(a.first.c_str());
+    unsigned val_b = sp_attribute_lookup(b.first.c_str());
+    if (val_a == 0) return false; // Unknown attributes at end.
+    if (val_b == 0) return true;  // Unknown attributes at end.
+    return val_a < val_b;
+}
+
+/**
+ * Sort attributes on an element
+ */
+void sp_attribute_sort_element(Node *repr) {
+
+  g_return_if_fail (repr != NULL);
+  g_return_if_fail (repr->type() == Inkscape::XML::ELEMENT_NODE);
+
+  // Glib::ustring element = repr->name();
+  // Glib::ustring id = (repr->attribute( "id" )==NULL ? "" : repr->attribute( "id" ));
+
+  sp_attribute_sort_style(repr);
+
+  // Sort attributes:
+
+  // It doesn't seem possible to sort a List directly so we dump the list into
+  // a std::list and sort that. Not very efficient. Sad.
+  List<AttributeRecord const> attributes = repr->attributeList();
+
+  std::vector<std::pair< Glib::ustring, Glib::ustring > > my_list;
+  for ( List<AttributeRecord const> iter = attributes ; iter ; ++iter ) {
+
+      Glib::ustring attribute = g_quark_to_string(iter->key);
+      Glib::ustring value = (const char*)iter->value;
+
+      // C++11 my_list.emlace_back(attribute, value);
+      my_list.push_back(std::make_pair(attribute,value));
+  }
+  std::sort(my_list.begin(), my_list.end(), cmp);
+  // Delete all attributes.
+  //for (auto it: my_list) {
+  for (std::vector<std::pair< Glib::ustring, Glib::ustring > >::iterator it = my_list.begin();
+                              it != my_list.end(); ++it) {
+       repr->setAttribute( it->first.c_str(), NULL, false );
+  }
+  // Insert all attributes in proper order
+  for (std::vector<std::pair< Glib::ustring, Glib::ustring > >::iterator it = my_list.begin();
+                              it != my_list.end(); ++it) {
+      repr->setAttribute( it->first.c_str(), it->second.c_str(), false );
+  } 
+}
+
+
+/**
+ * Sort CSS style on an element.
+ */
+void sp_attribute_sort_style(Node *repr) {
+
+  g_return_if_fail (repr != NULL);
+  g_return_if_fail (repr->type() == Inkscape::XML::ELEMENT_NODE);
+
+  // Find element's style
+  SPCSSAttr *css = sp_repr_css_attr( repr, "style" );
+  sp_attribute_sort_style(repr, css);
+
+  // Convert css node's properties data to string and set repr node's attribute "style" to that string.
+  // sp_repr_css_set( repr, css, "style"); // Don't use as it will cause loop.
+  Glib::ustring value;
+  sp_repr_css_write_string(css, value);
+  if( value.empty() ) {
+      repr->setAttribute("style", NULL );
+  } else {
+      repr->setAttribute("style", value.c_str());
+  }
+
+  sp_repr_css_attr_unref( css );
+}
+
+
+/**
+ * Sort CSS style on an element.
+ */
+Glib::ustring sp_attribute_sort_style(Node *repr, gchar const *string) {
+
+  g_return_val_if_fail (repr != NULL, NULL);
+  g_return_val_if_fail (repr->type() == Inkscape::XML::ELEMENT_NODE, NULL);
+
+  SPCSSAttr *css = sp_repr_css_attr_new();
+  sp_repr_css_attr_add_from_string( css, string );
+  sp_attribute_sort_style(repr, css);
+  Glib::ustring string_cleaned;
+  sp_repr_css_write_string (css, string_cleaned);
+
+  sp_repr_css_attr_unref( css );
+
+  return string_cleaned;
+}
+
+
+/**
+ * Sort CSS style on an element.
+ */
+void sp_attribute_sort_style(Node* repr, SPCSSAttr *css) {
+
+  g_return_if_fail (repr != NULL);
+  g_return_if_fail (css != NULL);
+
+  Glib::ustring element = repr->name();
+  Glib::ustring id = (repr->attribute( "id" )==NULL ? "" : repr->attribute( "id" ));
+
+  // Loop over all properties in "style" node.
+  std::vector<std::pair< Glib::ustring, Glib::ustring > > my_list;
+  for ( List<AttributeRecord const> iter = css->attributeList() ; iter ; ++iter ) {
+
+    Glib::ustring property = g_quark_to_string(iter->key);
+    Glib::ustring value = (const char*)iter->value;
+
+    // C++11 my_list.emlace_back(property, value);
+    my_list.push_back(std::make_pair(property,value));
+  }
+  std::sort(my_list.begin(), my_list.end(), cmp);
+  // Delete all attributes.
+  //for (auto it: my_list) {
+  for (std::vector<std::pair< Glib::ustring, Glib::ustring > >::iterator it = my_list.begin();
+                              it != my_list.end(); ++it) {
+      sp_repr_css_set_property( css, it->first.c_str(), NULL );
+  }
+  // Insert all attributes in proper order
+  for (std::vector<std::pair< Glib::ustring, Glib::ustring > >::iterator it = my_list.begin();
+                              it != my_list.end(); ++it) {
+      sp_repr_css_set_property( css, it->first.c_str(), it->second.c_str() );
+  } 
+}
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
diff --git a/src/attribute-sort-util.h b/src/attribute-sort-util.h
new file mode 100644
index 000000000..0b2f81ed9
--- /dev/null
+++ b/src/attribute-sort-util.h
@@ -0,0 +1,62 @@
+#ifndef __SP_ATTRIBUTE_SORT_UTIL_H__
+#define __SP_ATTRIBUTE_SORT_UTIL_H__
+
+/*
+ * attribute-sort-util.h
+ *
+ *  Created on: Jun 10, 2016
+ *      Author: Tavmjong Bah
+ */
+
+#include <glibmm/ustring.h>
+#include "xml/sp-css-attr.h"
+
+using Inkscape::XML::Node;
+
+/**
+ * Utility functions for sorting attributes.
+ */
+
+/**
+ * Sort attributes by name.
+ */
+void sp_attribute_sort_tree(Node *repr);
+
+/**
+ * Recursively sort.
+ * repr: the root node in a document or any other node.
+ */
+void sp_attribute_sort_recursive(Node *repr);
+
+/**
+ * Sort one element (attributes).
+ */
+void sp_attribute_sort_element(Node *repr);
+
+/**
+ * Sort style properties for one element.
+ */
+void sp_attribute_sort_style(Node *repr);
+
+/**
+ * Sort style_property for a style string
+ */
+Glib::ustring sp_attribute_sort_style(Node *repr, gchar const *string);
+
+/**
+ * Sort style properties for one CSS.
+ */
+void sp_attribute_sort_style(Node* repr, SPCSSAttr *css);
+
+#endif /* __SP_ATTRIBUTE_SORT_UTIL_H__ */
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/attributes-test.h b/src/attributes-test.h
index b8d5d98a5..bfb67064b 100644
--- a/src/attributes-test.h
+++ b/src/attributes-test.h
@@ -104,21 +104,6 @@ struct {char const *attr; bool supported;} const all_attrs[] = {
     {"end", true},
     {"exponent", true},
     {"externalResourcesRequired", false},
-    {"feBlend", false},
-    {"feColorMatrix", false},
-    {"feComponentTransfer", false},
-    {"feComposite", false},
-    {"feConvolveMatrix", false},
-    {"feDiffuseLighting", false},
-    {"feDisplacementMap", false},
-    {"feFlood", false},
-    {"feGaussianBlur", false},
-    {"feImage", false},
-    {"feMerge", false},
-    {"feMorphology", false},
-    {"feOffset", false},
-    {"feSpecularLighting", false},
-    {"feTile", false},
     {"fill", true},
     {"fill-opacity", true},
     {"fill-rule", true},
@@ -361,55 +346,33 @@ struct {char const *attr; bool supported;} const all_attrs[] = {
 
     /* Extra attributes. */
     {"id", true},
+    {"sodipodi:docname", true},
+    {"sodipodi:insensitive", true},
+    {"sodipodi:type", true},
     {"inkscape:collect", true},
     {"inkscape:document-units", true},
     {"inkscape:label", true},
-    {"sodipodi:insensitive", true},
-    {"sodipodi:nonprintable", true},
     {"inkscape:groupmode", true},
-    {"sodipodi:version", false},
     {"inkscape:version", true},
     {"inkscape:object-paths", true},
-    {"inkscape:snap-perpendicular", true},
-    {"inkscape:snap-tangential", true},
-    {"inkscape:snap-path-clip", true},
-    {"inkscape:snap-path-mask", true},
-    {"inkscape:object-nodes", true},
-    {"inkscape:bbox-paths", true},
-    {"inkscape:bbox-nodes", true},
-    {"inkscape:snap-page", true},
-    {"inkscape:snap-global", true},
-    {"inkscape:snap-bbox", true},
-    {"inkscape:snap-nodes", true},
-    {"inkscape:snap-others", true},
-    {"inkscape:snap-center", true},
-    {"inkscape:snap-smooth-nodes", true},
-    {"inkscape:snap-midpoints", true},
-    {"inkscape:snap-object-midpoints", true},
-    {"inkscape:snap-text-baseline", true},
-    {"inkscape:snap-bbox-edge-midpoints", true},
-    {"inkscape:snap-bbox-midpoints", true},
-    {"inkscape:snap-grids", true},
-    {"inkscape:snap-to-guides", true},
-    {"inkscape:snap-intersection-paths", true},
+
     {"inkscape:original-d", true},
     {"inkscape:pageopacity", true},
     {"inkscape:pageshadow", true},
     {"inkscape:path-effect", true},
+
     // SPItem
     {"inkscape:transform-center-x", true},
     {"inkscape:transform-center-y", true},
     {"inkscape:highlight-color", true},
-    // Namedview
-    {"inkscape:zoom", true},
-    {"inkscape:cx", true},
-    {"inkscape:cy", true},
-    {"inkscape:window-width", true},
-    {"inkscape:window-height", true},
-    {"inkscape:window-x", true},
-    {"inkscape:window-y", true},
-    {"inkscape:window-maximized", true},
-    {"inkscape:current-layer", true},
+
+    // Measure tool
+    {"inkscape:measure-start", true},
+    {"inkscape:measure-end", true},
+
+    // Spray tool
+    {"inkscape:spray-origin", true},
+
     // Connector tool
     {"inkscape:connector-type", true},
     {"inkscape:connection-start", true},
@@ -420,11 +383,13 @@ struct {char const *attr; bool supported;} const all_attrs[] = {
     {"inkscape:connector-curvature", true},
     {"inkscape:connector-avoid", true},
     {"inkscape:connector-spacing", true},
+
     // Ellipse, Spiral, Star
     {"sodipodi:cx", true},
     {"sodipodi:cy", true},
     {"sodipodi:rx", true},
     {"sodipodi:ry", true},
+
     // Box tool
     {"inkscape:perspectiveID", true},
     {"inkscape:corner0", true},
@@ -435,6 +400,7 @@ struct {char const *attr; bool supported;} const all_attrs[] = {
     {"inkscape:vp_y", true},
     {"inkscape:vp_z", true},
     {"inkscape:persp3d-origin", true},
+
     // Star tool
     {"sodipodi:start", true},
     {"sodipodi:end", true},
@@ -517,8 +483,47 @@ struct {char const *attr; bool supported;} const all_attrs[] = {
     {"borderopacity", true},
     {"pagecolor", true},
 
+    {"inkscape:zoom", true},
+    {"inkscape:cx", true},
+    {"inkscape:cy", true},
+    {"inkscape:window-width", true},
+    {"inkscape:window-height", true},
+    {"inkscape:window-x", true},
+    {"inkscape:window-y", true},
+    {"inkscape:window-maximized", true},
+    {"inkscape:current-layer", true},
+    {"inkscape:pagecheckerboard", true},
+
     /* SPGuide */
     {"position", true},
+    {"inkscape:color", true},
+    {"inkscape:lockguides", true},
+    {"inkscape:locked", true},
+
+    /* Snapping */
+    {"inkscape:snap-perpendicular", true},
+    {"inkscape:snap-tangential", true},
+    {"inkscape:snap-path-clip", true},
+    {"inkscape:snap-path-mask", true},
+    {"inkscape:object-nodes", true},
+    {"inkscape:bbox-paths", true},
+    {"inkscape:bbox-nodes", true},
+    {"inkscape:snap-page", true},
+    {"inkscape:snap-global", true},
+    {"inkscape:snap-bbox", true},
+    {"inkscape:snap-nodes", true},
+    {"inkscape:snap-others", true},
+    {"inkscape:snap-from-guide", true},
+    {"inkscape:snap-center", true},
+    {"inkscape:snap-smooth-nodes", true},
+    {"inkscape:snap-midpoints", true},
+    {"inkscape:snap-object-midpoints", true},
+    {"inkscape:snap-text-baseline", true},
+    {"inkscape:snap-bbox-edge-midpoints", true},
+    {"inkscape:snap-bbox-midpoints", true},
+    {"inkscape:snap-grids", true},
+    {"inkscape:snap-to-guides", true},
+    {"inkscape:snap-intersection-paths", true},
 
     /* SPTag */
     {"inkscape:expanded", true}
diff --git a/src/attributes.cpp b/src/attributes.cpp
index 646c2ab0c..e281dad65 100644
--- a/src/attributes.cpp
+++ b/src/attributes.cpp
@@ -14,6 +14,7 @@
 
 #include <glib.h> // g_assert()
 #include "attributes.h"
+#include <iostream>
 
 typedef struct {
     gint code;
@@ -28,15 +29,24 @@ static SPStyleProp const props[] = {
     {SP_ATTR_INVALID, NULL},
     /* SPObject */
     {SP_ATTR_ID, "id"},
+    {SP_ATTR_STYLE, "style"},
     {SP_ATTR_INKSCAPE_COLLECT, "inkscape:collect"},
     {SP_ATTR_INKSCAPE_LABEL, "inkscape:label"},
+    /* SPRoot */
+    {SP_ATTR_VERSION, "version"},
+    {SP_ATTR_INKSCAPE_VERSION, "inkscape:version"},
+    {SP_ATTR_WIDTH, "width"},
+    {SP_ATTR_HEIGHT, "height"},
+    {SP_ATTR_VIEWBOX, "viewBox"},
+    {SP_ATTR_PRESERVEASPECTRATIO, "preserveAspectRatio"},
+    {SP_ATTR_ONLOAD, "onload"},
+    {SP_ATTR_SODIPODI_DOCNAME, "sodipodi:docname"},
     /* SPItem */
     {SP_ATTR_TRANSFORM, "transform"},
+    {SP_ATTR_SODIPODI_TYPE, "sodipodi:type"},
     {SP_ATTR_SODIPODI_INSENSITIVE, "sodipodi:insensitive"},
-    {SP_ATTR_SODIPODI_NONPRINTABLE, "sodipodi:nonprintable"},
     {SP_ATTR_CONNECTOR_AVOID, "inkscape:connector-avoid"},
     {SP_ATTR_CONNECTION_POINTS, "inkscape:connection-points"},
-    {SP_ATTR_STYLE, "style"},
     {SP_ATTR_TRANSFORM_CENTER_X, "inkscape:transform-center-x"},
     {SP_ATTR_TRANSFORM_CENTER_Y, "inkscape:transform-center-y"},
     {SP_ATTR_INKSCAPE_PATH_EFFECT, "inkscape:path-effect"},
@@ -53,14 +63,6 @@ static SPStyleProp const props[] = {
     {SP_ATTR_TARGET, "target"},
     {SP_ATTR_INKSCAPE_GROUPMODE, "inkscape:groupmode"},
     {SP_ATTR_INKSCAPE_EXPANDED, "inkscape:expanded"},
-    /* SPRoot */
-    {SP_ATTR_VERSION, "version"},
-    {SP_ATTR_WIDTH, "width"},
-    {SP_ATTR_HEIGHT, "height"},
-    {SP_ATTR_VIEWBOX, "viewBox"},
-    {SP_ATTR_PRESERVEASPECTRATIO, "preserveAspectRatio"},
-    {SP_ATTR_INKSCAPE_VERSION, "inkscape:version"},
-    {SP_ATTR_ONLOAD, "onload"},
     /* SPNamedView */
     {SP_ATTR_VIEWONLY, "viewonly"},
     {SP_ATTR_SHOWGUIDES, "showguides"},
@@ -99,6 +101,7 @@ static SPStyleProp const props[] = {
     {SP_ATTR_INKSCAPE_SNAP_BBOX, "inkscape:snap-bbox"},
     {SP_ATTR_INKSCAPE_SNAP_NODE, "inkscape:snap-nodes"},
     {SP_ATTR_INKSCAPE_SNAP_OTHERS, "inkscape:snap-others"},
+    {SP_ATTR_INKSCAPE_SNAP_FROM_GUIDE, "inkscape:snap-from-guide"},
     {SP_ATTR_INKSCAPE_SNAP_ROTATION_CENTER, "inkscape:snap-center"},
     {SP_ATTR_INKSCAPE_SNAP_GRID, "inkscape:snap-grids"},
     {SP_ATTR_INKSCAPE_SNAP_GUIDE, "inkscape:snap-to-guides"},
@@ -120,7 +123,6 @@ static SPStyleProp const props[] = {
     {SP_ATTR_INKSCAPE_DOCUMENT_UNITS, "inkscape:document-units"},  // This setting sets the Display units, *not* the units used in SVG
     {SP_ATTR_INKSCAPE_LOCKGUIDES, "inkscape:lockguides"},
     {SP_ATTR_UNITS, "units"},
-    {SP_ATTR_INKSCAPE_CONNECTOR_SPACING, "inkscape:connector-spacing"},
     /* SPColorProfile */
     {SP_ATTR_LOCAL, "local"},
     {SP_ATTR_NAME, "name"},
@@ -130,6 +132,9 @@ static SPStyleProp const props[] = {
     {SP_ATTR_POSITION, "position"},
     {SP_ATTR_INKSCAPE_COLOR, "inkscape:color"},
     {SP_ATTR_INKSCAPE_LOCKED, "inkscape:locked"},
+    /* Measure tool */
+    {SP_ATTR_INKSCAPE_MEASURE_START, "inkscape:measure-start"},
+    {SP_ATTR_INKSCAPE_MEASURE_END,   "inkscape:measure-end"},
     /* SPImage */
     {SP_ATTR_X, "x"},
     {SP_ATTR_Y, "y"},
@@ -139,6 +144,7 @@ static SPStyleProp const props[] = {
     /* (Note: XML representation of connectors may change in future.) */
     {SP_ATTR_CONNECTOR_TYPE, "inkscape:connector-type"},
     {SP_ATTR_CONNECTOR_CURVATURE, "inkscape:connector-curvature"},
+    {SP_ATTR_INKSCAPE_CONNECTOR_SPACING, "inkscape:connector-spacing"},
     {SP_ATTR_CONNECTION_START, "inkscape:connection-start"},
     {SP_ATTR_CONNECTION_END, "inkscape:connection-end"},
     {SP_ATTR_CONNECTION_START_POINT, "inkscape:connection-start-point"},
@@ -414,11 +420,49 @@ static SPStyleProp const props[] = {
     {SP_ATTR_TEXT_EXCLUDE,"inkscape:excludeShape"},
     {SP_ATTR_LAYOUT_OPTIONS,"inkscape:layoutOptions"},
 
-    /* CSS2 */
-    {SP_PROP_INKSCAPE_FONT_SPEC, "-inkscape-font-specification"},
+    /* CSS & SVG Properites */
+
+    /* Paint */
+    {SP_PROP_COLOR, "color"},
+    {SP_PROP_OPACITY, "opacity"},
+    {SP_PROP_FILL, "fill"},
+    {SP_PROP_FILL_OPACITY, "fill-opacity"},
+    {SP_PROP_FILL_RULE, "fill-rule"},
+    {SP_PROP_STROKE, "stroke"},
+    {SP_PROP_STROKE_OPACITY, "stroke-opacity"},
+    {SP_PROP_STROKE_WIDTH, "stroke-width"},
+    {SP_PROP_STROKE_LINECAP, "stroke-linecap"},
+    {SP_PROP_STROKE_LINEJOIN, "stroke-linejoin"},
+    {SP_PROP_STROKE_MITERLIMIT, "stroke-miterlimit"},
+    {SP_PROP_STROKE_DASHARRAY, "stroke-dasharray"},
+    {SP_PROP_STROKE_DASHOFFSET, "stroke-dashoffset"},
+    {SP_PROP_MARKER, "marker"},
+    {SP_PROP_MARKER_END, "marker-end"},
+    {SP_PROP_MARKER_MID, "marker-mid"},
+    {SP_PROP_MARKER_START, "marker-start"},
+    {SP_PROP_PAINT_ORDER, "paint-order" },
+    {SP_PROP_SOLID_COLOR, "solid-color"},
+    {SP_PROP_SOLID_OPACITY, "solid-opacity"},
+
+    /* CSS Blending/Compositing */
+    {SP_PROP_MIX_BLEND_MODE, "mix-blend-mode"},
+    {SP_PROP_ISOLATION, "isolation"},
+
+    /* Misc. Display */
+    {SP_PROP_DISPLAY, "display"},
+    {SP_PROP_OVERFLOW, "overflow"},
+    {SP_PROP_VISIBILITY, "visibility"},
+
+    /* Clip/Mask */
+    {SP_PROP_CLIP, "clip"},
+    {SP_PROP_CLIP_PATH, "clip-path"},
+    {SP_PROP_CLIP_RULE, "clip-rule"},
+    {SP_PROP_MASK, "mask"},
+
     /* Font */
     {SP_PROP_FONT, "font"},
     {SP_PROP_FONT_FAMILY, "font-family"},
+    {SP_PROP_INKSCAPE_FONT_SPEC, "-inkscape-font-specification"},
     {SP_PROP_FONT_SIZE, "font-size"},
     {SP_PROP_FONT_SIZE_ADJUST, "font-size-adjust"},
     {SP_PROP_FONT_STRETCH, "font-stretch"},
@@ -443,7 +487,7 @@ static SPStyleProp const props[] = {
     {SP_PROP_WORD_SPACING, "word-spacing"},
     {SP_PROP_TEXT_TRANSFORM, "text-transform"},
 
-    /* Text (css3) */
+    /* Text (CSS3) */
     {SP_PROP_DIRECTION, "direction"},
     {SP_PROP_WRITING_MODE, "writing-mode"},
     {SP_PROP_TEXT_ORIENTATION, "text-orientation"},
@@ -464,70 +508,43 @@ static SPStyleProp const props[] = {
     {SP_PROP_SHAPE_MARGIN,  "shape-margin"},
 
     /* Text Decoration */
-    {SP_PROP_TEXT_DECORATION,       "text-decoration"},
+    {SP_PROP_TEXT_DECORATION,       "text-decoration"},  // CSS 2/CSS3-Shorthand
     {SP_PROP_TEXT_DECORATION_LINE,  "text-decoration-line"},
     {SP_PROP_TEXT_DECORATION_STYLE, "text-decoration-style"},
     {SP_PROP_TEXT_DECORATION_COLOR, "text-decoration-color"},
     {SP_PROP_TEXT_DECORATION_FILL,  "text-decoration-fill"},
     {SP_PROP_TEXT_DECORATION_STROKE,"text-decoration-stroke"},
 
-    /* Misc */
-    {SP_PROP_CLIP, "clip"},
-    {SP_PROP_COLOR, "color"},
-    {SP_PROP_CURSOR, "cursor"},
-    {SP_PROP_DISPLAY, "display"},
-    {SP_PROP_OVERFLOW, "overflow"},
-    {SP_PROP_VISIBILITY, "visibility"},
-    {SP_PROP_MIX_BLEND_MODE, "mix-blend-mode"}, // CSS Blending and Compositing
-    {SP_PROP_ISOLATION, "isolation"},
-    /* SVG */
-    /* Clip/Mask */
-    {SP_PROP_CLIP_PATH, "clip-path"},
-    {SP_PROP_CLIP_RULE, "clip-rule"},
-    {SP_PROP_MASK, "mask"},
-    {SP_PROP_OPACITY, "opacity"},
     /* Filter */
     {SP_PROP_ENABLE_BACKGROUND, "enable-background"},
     {SP_PROP_FILTER, "filter"},
     {SP_PROP_FLOOD_COLOR, "flood-color"},
     {SP_PROP_FLOOD_OPACITY, "flood-opacity"},
     {SP_PROP_LIGHTING_COLOR, "lighting-color"},
+
     /* Gradient */
     {SP_PROP_STOP_COLOR, "stop-color"},
     {SP_PROP_STOP_OPACITY, "stop-opacity"},
     {SP_PROP_STOP_PATH, "path"},
-    /* Interactivity */
-    {SP_PROP_POINTER_EVENTS, "pointer-events"},
-    /* Paint */
+
+    /* Rendering */
     {SP_PROP_COLOR_INTERPOLATION, "color-interpolation"},
     {SP_PROP_COLOR_INTERPOLATION_FILTERS, "color-interpolation-filters"},
     {SP_PROP_COLOR_PROFILE, "color-profile"},
     {SP_PROP_COLOR_RENDERING, "color-rendering"},
-    {SP_PROP_FILL, "fill"},
-    {SP_PROP_FILL_OPACITY, "fill-opacity"},
-    {SP_PROP_FILL_RULE, "fill-rule"},
     {SP_PROP_IMAGE_RENDERING, "image-rendering"},
-    {SP_PROP_MARKER, "marker"},
-    {SP_PROP_MARKER_END, "marker-end"},
-    {SP_PROP_MARKER_MID, "marker-mid"},
-    {SP_PROP_MARKER_START, "marker-start"},
-    {SP_PROP_PAINT_ORDER, "paint-order" },
     {SP_PROP_SHAPE_RENDERING, "shape-rendering"},
-    {SP_PROP_SOLID_COLOR, "solid-color"},
-    {SP_PROP_SOLID_OPACITY, "solid-opacity"},
-    {SP_PROP_STROKE, "stroke"},
-    {SP_PROP_STROKE_DASHARRAY, "stroke-dasharray"},
-    {SP_PROP_STROKE_DASHOFFSET, "stroke-dashoffset"},
-    {SP_PROP_STROKE_LINECAP, "stroke-linecap"},
-    {SP_PROP_STROKE_LINEJOIN, "stroke-linejoin"},
-    {SP_PROP_STROKE_MITERLIMIT, "stroke-miterlimit"},
-    {SP_PROP_STROKE_OPACITY, "stroke-opacity"},
-    {SP_PROP_STROKE_WIDTH, "stroke-width"},
     {SP_PROP_TEXT_RENDERING, "text-rendering"},
+
+    /* Interactivity */
+    {SP_PROP_POINTER_EVENTS, "pointer-events"},
+    {SP_PROP_CURSOR, "cursor"},
+
     /* Conditional */
     {SP_PROP_SYSTEM_LANGUAGE, "systemLanguage"},
     {SP_PROP_REQUIRED_FEATURES, "requiredFeatures"},
     {SP_PROP_REQUIRED_EXTENSIONS, "requiredExtensions"},
+
     /* LivePathEffect */
     {SP_PROP_PATH_EFFECT, "effect"},
 };
@@ -544,6 +561,8 @@ sp_attribute_lookup(gchar const *key)
         if(g_str_equal(const_cast<void *>(static_cast<void const *>(props[i].name)), key))
             return GPOINTER_TO_UINT(GINT_TO_POINTER(props[i].code));
     }
+    // std::cerr << "sp_attribute_lookup: invalid attribute: "
+    //           << (key?key:"Null") << std::endl;
     return SP_ATTR_INVALID;
 }
 
diff --git a/src/attributes.h b/src/attributes.h
index f5544d0a1..ff426e8cf 100644
--- a/src/attributes.h
+++ b/src/attributes.h
@@ -24,19 +24,35 @@ unsigned char const *sp_attribute_name(unsigned int id);
  */
 #define SP_ATTRIBUTE_IS_CSS(k) (((k) >= SP_PROP_INKSCAPE_FONT_SPEC) && ((k) <= SP_PROP_TEXT_RENDERING))
 
+/*
+ * Do not change order of attributes and properties. Attribute and
+ * order in an SVG file is  (optionally) determined by the order here.
+ * This makes comparing different versions of a drawing easier using
+ * line-by-line comparison. Also, inorder for proper parsing, some
+ * properites must be before others (e.g. 'font' before 'font-family').
+ */
 enum SPAttributeEnum {
     SP_ATTR_INVALID,  ///< Must have value 0.
     /* SPObject */
     SP_ATTR_ID,
+    SP_ATTR_STYLE,
     SP_ATTR_INKSCAPE_COLLECT,
     SP_ATTR_INKSCAPE_LABEL,
+    /* SPRoot  Put these near top as the apply to the entire SVG */
+    SP_ATTR_VERSION,
+    SP_ATTR_INKSCAPE_VERSION,
+    SP_ATTR_WIDTH,
+    SP_ATTR_HEIGHT,
+    SP_ATTR_VIEWBOX,
+    SP_ATTR_PRESERVEASPECTRATIO,
+    SP_ATTR_ONLOAD,
+    SP_ATTR_SODIPODI_DOCNAME,
     /* SPItem */
     SP_ATTR_TRANSFORM,
+    SP_ATTR_SODIPODI_TYPE,
     SP_ATTR_SODIPODI_INSENSITIVE,
-    SP_ATTR_SODIPODI_NONPRINTABLE,
     SP_ATTR_CONNECTOR_AVOID,
     SP_ATTR_CONNECTION_POINTS,
-    SP_ATTR_STYLE,
     SP_ATTR_TRANSFORM_CENTER_X,
     SP_ATTR_TRANSFORM_CENTER_Y,
     SP_ATTR_INKSCAPE_PATH_EFFECT,
@@ -54,14 +70,6 @@ enum SPAttributeEnum {
     /* SPGroup */
     SP_ATTR_INKSCAPE_GROUPMODE,
     SP_ATTR_INKSCAPE_EXPANDED,
-    /* SPRoot */
-    SP_ATTR_VERSION,
-    SP_ATTR_WIDTH,
-    SP_ATTR_HEIGHT,
-    SP_ATTR_VIEWBOX,
-    SP_ATTR_PRESERVEASPECTRATIO,
-    SP_ATTR_INKSCAPE_VERSION,
-    SP_ATTR_ONLOAD,
     /* SPNamedView */
     SP_ATTR_VIEWONLY,
     SP_ATTR_SHOWGUIDES,
@@ -100,7 +108,7 @@ enum SPAttributeEnum {
     SP_ATTR_INKSCAPE_SNAP_BBOX,
     SP_ATTR_INKSCAPE_SNAP_NODE,
     SP_ATTR_INKSCAPE_SNAP_OTHERS,
-    //SP_ATTR_INKSCAPE_SNAP_FROM_GUIDE,
+    SP_ATTR_INKSCAPE_SNAP_FROM_GUIDE,
     SP_ATTR_INKSCAPE_SNAP_ROTATION_CENTER,
     SP_ATTR_INKSCAPE_SNAP_GRID,
     SP_ATTR_INKSCAPE_SNAP_GUIDE,
@@ -122,7 +130,6 @@ enum SPAttributeEnum {
     SP_ATTR_INKSCAPE_DOCUMENT_UNITS,
     SP_ATTR_INKSCAPE_LOCKGUIDES,
     SP_ATTR_UNITS,
-    SP_ATTR_INKSCAPE_CONNECTOR_SPACING,
     /* SPColorProfile */
     SP_ATTR_LOCAL,
     SP_ATTR_NAME,
@@ -132,7 +139,10 @@ enum SPAttributeEnum {
     SP_ATTR_POSITION,
     SP_ATTR_INKSCAPE_COLOR,
     SP_ATTR_INKSCAPE_LOCKED,
-    /* SPImage */
+    /* Measure tool */
+    SP_ATTR_INKSCAPE_MEASURE_START,
+    SP_ATTR_INKSCAPE_MEASURE_END,
+    /* SPImage, SPRect, etc. */
     SP_ATTR_X,
     SP_ATTR_Y,
     /* SPPath */
@@ -140,6 +150,7 @@ enum SPAttributeEnum {
     SP_ATTR_INKSCAPE_ORIGINAL_D,
     SP_ATTR_CONNECTOR_TYPE,
     SP_ATTR_CONNECTOR_CURVATURE,
+    SP_ATTR_INKSCAPE_CONNECTOR_SPACING,
     SP_ATTR_CONNECTION_START,
     SP_ATTR_CONNECTION_END,
     SP_ATTR_CONNECTION_START_POINT,
@@ -334,6 +345,7 @@ enum SPAttributeEnum {
     SP_ATTR_RESTART,
     SP_ATTR_REPEATCOUNT,
     SP_ATTR_REPEATDUR,
+
     /* Interpolating animations */
     SP_ATTR_CALCMODE,
     //SP_ATTR_VALUES,
@@ -415,14 +427,49 @@ enum SPAttributeEnum {
     SP_ATTR_TEXT_EXCLUDE,
     SP_ATTR_LAYOUT_OPTIONS,
 
-    /* CSS & SVG Properties */
+    /* CSS & SVG Properties   KEEP ORDER */
 
-    /* Custom full font name because Font stuff below is inadequate REMOVE ME */
-    SP_PROP_INKSCAPE_FONT_SPEC,
+    /* Paint */
+    SP_PROP_COLOR,
+    SP_PROP_OPACITY,
+    SP_PROP_FILL,
+    SP_PROP_FILL_OPACITY,
+    SP_PROP_FILL_RULE,
+    SP_PROP_STROKE,
+    SP_PROP_STROKE_OPACITY,
+    SP_PROP_STROKE_WIDTH,
+    SP_PROP_STROKE_LINECAP,
+    SP_PROP_STROKE_LINEJOIN,
+    SP_PROP_STROKE_MITERLIMIT,
+    SP_PROP_STROKE_DASHARRAY,
+    SP_PROP_STROKE_DASHOFFSET,
+    SP_PROP_MARKER,
+    SP_PROP_MARKER_END,
+    SP_PROP_MARKER_MID,
+    SP_PROP_MARKER_START,
+    SP_PROP_PAINT_ORDER, /* SVG2 */
+    SP_PROP_SOLID_COLOR,
+    SP_PROP_SOLID_OPACITY,
+
+    /* CSS Blending/Compositing */
+    SP_PROP_MIX_BLEND_MODE,
+    SP_PROP_ISOLATION,
+
+    /* Misc. Display */
+    SP_PROP_DISPLAY,
+    SP_PROP_OVERFLOW,
+    SP_PROP_VISIBILITY,
 
-    /* Font */
+    /* Clip/Mask */
+    SP_PROP_CLIP,
+    SP_PROP_CLIP_PATH,
+    SP_PROP_CLIP_RULE,
+    SP_PROP_MASK,
+
+    /* Font: Order is important! */
     SP_PROP_FONT,
     SP_PROP_FONT_FAMILY,
+    SP_PROP_INKSCAPE_FONT_SPEC,  // Remove me
     SP_PROP_FONT_SIZE,
     SP_PROP_FONT_SIZE_ADJUST,
     SP_PROP_FONT_STRETCH,
@@ -442,12 +489,12 @@ enum SPAttributeEnum {
     /* Text Layout */
     SP_PROP_TEXT_INDENT,
     SP_PROP_TEXT_ALIGN,
-
     SP_PROP_LINE_HEIGHT,
     SP_PROP_LETTER_SPACING,
     SP_PROP_WORD_SPACING,
     SP_PROP_TEXT_TRANSFORM,
 
+    /* Text (CSS3) */
     SP_PROP_DIRECTION,
     SP_PROP_WRITING_MODE,
     SP_PROP_TEXT_ORIENTATION,
@@ -467,32 +514,14 @@ enum SPAttributeEnum {
     SP_PROP_SHAPE_PADDING,
     SP_PROP_SHAPE_MARGIN,
     
-    /* Text Decoration CSS 2/CSS 3 Shorthand */
-    SP_PROP_TEXT_DECORATION,
-    /* Text Decoration CSS 3/SVG 2 */
+    /* Text Decoration */
+    SP_PROP_TEXT_DECORATION,  // CSS 2/CSS3-Shorthand
     SP_PROP_TEXT_DECORATION_LINE,
     SP_PROP_TEXT_DECORATION_STYLE,
     SP_PROP_TEXT_DECORATION_COLOR,
     SP_PROP_TEXT_DECORATION_FILL,
     SP_PROP_TEXT_DECORATION_STROKE,
 
-    /* Misc */
-    SP_PROP_CLIP,
-    SP_PROP_COLOR,
-    SP_PROP_CURSOR,
-    SP_PROP_DISPLAY,
-    SP_PROP_OVERFLOW,
-    SP_PROP_VISIBILITY,
-    SP_PROP_MIX_BLEND_MODE,
-    SP_PROP_ISOLATION,
-
-    /* SVG */
-    /* Clip/Mask */
-    SP_PROP_CLIP_PATH,
-    SP_PROP_CLIP_RULE,
-    SP_PROP_MASK,
-    SP_PROP_OPACITY,
-
     /* Filter */
     SP_PROP_ENABLE_BACKGROUND,
     SP_PROP_FILTER,
@@ -505,36 +534,19 @@ enum SPAttributeEnum {
     SP_PROP_STOP_OPACITY,
     SP_PROP_STOP_PATH,
 
-    /* Interactivity */
-    SP_PROP_POINTER_EVENTS,
-
-    /* Paint */
+    /* Rendering */
     SP_PROP_COLOR_INTERPOLATION,
     SP_PROP_COLOR_INTERPOLATION_FILTERS,
     SP_PROP_COLOR_PROFILE,
     SP_PROP_COLOR_RENDERING,
-    SP_PROP_FILL,
-    SP_PROP_FILL_OPACITY,
-    SP_PROP_FILL_RULE,
     SP_PROP_IMAGE_RENDERING,
-    SP_PROP_MARKER,
-    SP_PROP_MARKER_END,
-    SP_PROP_MARKER_MID,
-    SP_PROP_MARKER_START,
-    SP_PROP_PAINT_ORDER, /* SVG2 */
     SP_PROP_SHAPE_RENDERING,
-    SP_PROP_SOLID_COLOR,
-    SP_PROP_SOLID_OPACITY,
-    SP_PROP_STROKE,
-    SP_PROP_STROKE_DASHARRAY,
-    SP_PROP_STROKE_DASHOFFSET,
-    SP_PROP_STROKE_LINECAP,
-    SP_PROP_STROKE_LINEJOIN,
-    SP_PROP_STROKE_MITERLIMIT,
-    SP_PROP_STROKE_OPACITY,
-    SP_PROP_STROKE_WIDTH,
     SP_PROP_TEXT_RENDERING,
 
+    /* Interactivity */
+    SP_PROP_POINTER_EVENTS,
+    SP_PROP_CURSOR,
+
     /* Conditional */
     SP_PROP_SYSTEM_LANGUAGE,
     SP_PROP_REQUIRED_FEATURES,
diff --git a/src/extension/internal/bitmap/adaptiveThreshold.cpp b/src/extension/internal/bitmap/adaptiveThreshold.cpp
index 9c9d6796b..3d7475cb3 100644
--- a/src/extension/internal/bitmap/adaptiveThreshold.cpp
+++ b/src/extension/internal/bitmap/adaptiveThreshold.cpp
@@ -38,9 +38,9 @@ AdaptiveThreshold::init(void)
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
 			"<name>" N_("Adaptive Threshold") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.adaptiveThreshold</id>\n"
-			"<param name=\"width\" gui-text=\"" N_("Width:") "\" type=\"int\" min=\"-100\" max=\"100\">5</param>\n"
-			"<param name=\"height\" gui-text=\"" N_("Height:") "\" type=\"int\" min=\"-100\" max=\"100\">5</param>\n"
-			"<param name=\"offset\" gui-text=\"" N_("Offset:") "\" type=\"int\" min=\"0\" max=\"100\">0</param>\n"
+			"<param name=\"width\" _gui-text=\"" N_("Width:") "\" type=\"int\" min=\"-100\" max=\"100\">5</param>\n"
+			"<param name=\"height\" _gui-text=\"" N_("Height:") "\" type=\"int\" min=\"-100\" max=\"100\">5</param>\n"
+			"<param name=\"offset\" _gui-text=\"" N_("Offset:") "\" type=\"int\" min=\"0\" max=\"100\">0</param>\n"
 			"<effect>\n"
 				"<object-type>all</object-type>\n"
 				"<effects-menu>\n"
diff --git a/src/extension/internal/bitmap/addNoise.cpp b/src/extension/internal/bitmap/addNoise.cpp
index 0322dec0c..02bb877b7 100644
--- a/src/extension/internal/bitmap/addNoise.cpp
+++ b/src/extension/internal/bitmap/addNoise.cpp
@@ -44,7 +44,7 @@ AddNoise::init(void)
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
 			"<name>" N_("Add Noise") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.addNoise</id>\n"
-			"<param name=\"noiseType\" gui-text=\"" N_("Type:") "\" type=\"enum\" >\n"
+			"<param name=\"noiseType\" _gui-text=\"" N_("Type:") "\" type=\"enum\" >\n"
 				"<_item value='Uniform Noise'>" N_("Uniform Noise") "</_item>\n"
 				"<_item value='Gaussian Noise'>" N_("Gaussian Noise") "</_item>\n"
 				"<_item value='Multiplicative Gaussian Noise'>" N_("Multiplicative Gaussian Noise") "</_item>\n"
diff --git a/src/extension/internal/bitmap/blur.cpp b/src/extension/internal/bitmap/blur.cpp
index cc44994ec..37a56b8a9 100644
--- a/src/extension/internal/bitmap/blur.cpp
+++ b/src/extension/internal/bitmap/blur.cpp
@@ -37,8 +37,8 @@ Blur::init(void)
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
 			"<name>" N_("Blur") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.blur</id>\n"
-			"<param name=\"radius\" gui-text=\"" N_("Radius:") "\" type=\"float\" min=\"0\" max=\"100\">1</param>\n"
-			"<param name=\"sigma\"  gui-text=\"" N_("Sigma:") "\"  type=\"float\" min=\"0\" max=\"100\">0.5</param>\n"
+			"<param name=\"radius\" _gui-text=\"" N_("Radius:") "\" type=\"float\" min=\"0\" max=\"100\">1</param>\n"
+			"<param name=\"sigma\"  _gui-text=\"" N_("Sigma:") "\"  type=\"float\" min=\"0\" max=\"100\">0.5</param>\n"
 			"<effect>\n"
 				"<object-type>all</object-type>\n"
 				"<effects-menu>\n"
diff --git a/src/extension/internal/bitmap/channel.cpp b/src/extension/internal/bitmap/channel.cpp
index 372e7456b..57ef0421b 100644
--- a/src/extension/internal/bitmap/channel.cpp
+++ b/src/extension/internal/bitmap/channel.cpp
@@ -47,7 +47,7 @@ Channel::init(void)
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
 			"<name>" N_("Channel") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.channel</id>\n"
-			"<param name=\"layer\" gui-text=\"" N_("Layer:") "\" type=\"enum\" >\n"
+			"<param name=\"layer\" _gui-text=\"" N_("Layer:") "\" type=\"enum\" >\n"
 				"<_item value='Red Channel'>" N_("Red Channel") "</_item>\n"
 				"<_item value='Green Channel'>" N_("Green Channel") "</_item>\n"
 				"<_item value='Blue Channel'>" N_("Blue Channel") "</_item>\n"
diff --git a/src/extension/internal/bitmap/charcoal.cpp b/src/extension/internal/bitmap/charcoal.cpp
index f647f8711..2cfd741d1 100644
--- a/src/extension/internal/bitmap/charcoal.cpp
+++ b/src/extension/internal/bitmap/charcoal.cpp
@@ -37,8 +37,8 @@ Charcoal::init(void)
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
 			"<name>" N_("Charcoal") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.charcoal</id>\n"
-			"<param name=\"radius\" gui-text=\"" N_("Radius:") "\" type=\"float\" min=\"0\" max=\"100\">1</param>\n"
-			"<param name=\"sigma\" gui-text=\"" N_("Sigma:") "\" type=\"float\" min=\"0\" max=\"100\">0.5</param>\n"
+			"<param name=\"radius\" _gui-text=\"" N_("Radius:") "\" type=\"float\" min=\"0\" max=\"100\">1</param>\n"
+			"<param name=\"sigma\" _gui-text=\"" N_("Sigma:") "\" type=\"float\" min=\"0\" max=\"100\">0.5</param>\n"
 			"<effect>\n"
 				"<object-type>all</object-type>\n"
 				"<effects-menu>\n"
diff --git a/src/extension/internal/bitmap/colorize.cpp b/src/extension/internal/bitmap/colorize.cpp
index 0b3b95420..1c4b8a696 100644
--- a/src/extension/internal/bitmap/colorize.cpp
+++ b/src/extension/internal/bitmap/colorize.cpp
@@ -49,7 +49,7 @@ Colorize::init(void)
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
 			"<name>" N_("Colorize") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.colorize</id>\n"
-			"<param name=\"color\" gui-text=\"" N_("Color") "\" type=\"color\">0</param>\n"
+			"<param name=\"color\" _gui-text=\"" N_("Color") "\" type=\"color\">0</param>\n"
 			"<effect>\n"
 				"<object-type>all</object-type>\n"
 				"<effects-menu>\n"
diff --git a/src/extension/internal/bitmap/contrast.cpp b/src/extension/internal/bitmap/contrast.cpp
index c527536d9..a3be77808 100644
--- a/src/extension/internal/bitmap/contrast.cpp
+++ b/src/extension/internal/bitmap/contrast.cpp
@@ -39,7 +39,7 @@ Contrast::init(void)
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
 			"<name>" N_("Contrast") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.contrast</id>\n"
-			"<param name=\"sharpen\" gui-text=\"" N_("Adjust:") "\" type=\"int\" min=\"0\" max=\"10\">0</param>\n"
+			"<param name=\"sharpen\" _gui-text=\"" N_("Adjust:") "\" type=\"int\" min=\"0\" max=\"10\">0</param>\n"
 			"<effect>\n"
 				"<object-type>all</object-type>\n"
 				"<effects-menu>\n"
diff --git a/src/extension/internal/bitmap/crop.cpp b/src/extension/internal/bitmap/crop.cpp
index 02d92668b..8f6c503ca 100644
--- a/src/extension/internal/bitmap/crop.cpp
+++ b/src/extension/internal/bitmap/crop.cpp
@@ -65,10 +65,10 @@ Crop::init(void)
         "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
           "<name>" N_("Crop") "</name>\n"
           "<id>org.inkscape.effect.bitmap.crop</id>\n"
-          "<param name=\"top\" gui-text=\"" N_("Top (px):") "\" type=\"int\" min=\"0\" max=\"100000\">0</param>\n"
-          "<param name=\"bottom\" gui-text=\"" N_("Bottom (px):") "\" type=\"int\" min=\"0\" max=\"100000\">0</param>\n"
-          "<param name=\"left\" gui-text=\"" N_("Left (px):") "\" type=\"int\" min=\"0\" max=\"100000\">0</param>\n"
-          "<param name=\"right\" gui-text=\"" N_("Right (px):") "\" type=\"int\" min=\"0\" max=\"100000\">0</param>\n"
+          "<param name=\"top\" _gui-text=\"" N_("Top (px):") "\" type=\"int\" min=\"0\" max=\"100000\">0</param>\n"
+          "<param name=\"bottom\" _gui-text=\"" N_("Bottom (px):") "\" type=\"int\" min=\"0\" max=\"100000\">0</param>\n"
+          "<param name=\"left\" _gui-text=\"" N_("Left (px):") "\" type=\"int\" min=\"0\" max=\"100000\">0</param>\n"
+          "<param name=\"right\" _gui-text=\"" N_("Right (px):") "\" type=\"int\" min=\"0\" max=\"100000\">0</param>\n"
           "<effect>\n"
             "<object-type>all</object-type>\n"
             "<effects-menu>\n"
diff --git a/src/extension/internal/bitmap/cycleColormap.cpp b/src/extension/internal/bitmap/cycleColormap.cpp
index 349b6d9f5..8d55087a6 100644
--- a/src/extension/internal/bitmap/cycleColormap.cpp
+++ b/src/extension/internal/bitmap/cycleColormap.cpp
@@ -36,7 +36,7 @@ CycleColormap::init(void)
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
 			"<name>" N_("Cycle Colormap") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.cycleColormap</id>\n"
-			"<param name=\"amount\" gui-text=\"" N_("Amount:") "\" type=\"int\" min=\"0\" max=\"360\">180</param>\n"
+			"<param name=\"amount\" _gui-text=\"" N_("Amount:") "\" type=\"int\" min=\"0\" max=\"360\">180</param>\n"
 			"<effect>\n"
 				"<object-type>all</object-type>\n"
 				"<effects-menu>\n"
diff --git a/src/extension/internal/bitmap/edge.cpp b/src/extension/internal/bitmap/edge.cpp
index 2d165331f..486ce0e4e 100644
--- a/src/extension/internal/bitmap/edge.cpp
+++ b/src/extension/internal/bitmap/edge.cpp
@@ -36,7 +36,7 @@ Edge::init(void)
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
 			"<name>" N_("Edge") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.edge</id>\n"
-			"<param name=\"radius\" gui-text=\"" N_("Radius:") "\" type=\"int\" min=\"0\" max=\"100\">0</param>\n"
+			"<param name=\"radius\" _gui-text=\"" N_("Radius:") "\" type=\"int\" min=\"0\" max=\"100\">0</param>\n"
 			"<effect>\n"
 				"<object-type>all</object-type>\n"
 				"<effects-menu>\n"
diff --git a/src/extension/internal/bitmap/emboss.cpp b/src/extension/internal/bitmap/emboss.cpp
index 634c71a98..9518cf320 100644
--- a/src/extension/internal/bitmap/emboss.cpp
+++ b/src/extension/internal/bitmap/emboss.cpp
@@ -37,8 +37,8 @@ Emboss::init(void)
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
 			"<name>" N_("Emboss") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.emboss</id>\n"
-			"<param name=\"radius\" gui-text=\"" N_("Radius:") "\" type=\"float\" min=\"0\" max=\"100\">1.0</param>\n"
-			"<param name=\"sigma\" gui-text=\"" N_("Sigma:") "\" type=\"float\" min=\"-50\" max=\"50\">0.5</param>\n"
+			"<param name=\"radius\" _gui-text=\"" N_("Radius:") "\" type=\"float\" min=\"0\" max=\"100\">1.0</param>\n"
+			"<param name=\"sigma\" _gui-text=\"" N_("Sigma:") "\" type=\"float\" min=\"-50\" max=\"50\">0.5</param>\n"
 			"<effect>\n"
 				"<object-type>all</object-type>\n"
 				"<effects-menu>\n"
diff --git a/src/extension/internal/bitmap/gaussianBlur.cpp b/src/extension/internal/bitmap/gaussianBlur.cpp
index 7d93ef66a..d68cd59bc 100644
--- a/src/extension/internal/bitmap/gaussianBlur.cpp
+++ b/src/extension/internal/bitmap/gaussianBlur.cpp
@@ -37,8 +37,8 @@ GaussianBlur::init(void)
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
 			"<name>" N_("Gaussian Blur") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.gaussianBlur</id>\n"
-			"<param name=\"width\" gui-text=\"" N_("Factor:") "\" type=\"float\" min=\"0\" max=\"100\">5.0</param>\n"
-			"<param name=\"sigma\" gui-text=\"" N_("Sigma:") "\" type=\"float\" min=\"0\" max=\"100\">5.0</param>\n"
+			"<param name=\"width\" _gui-text=\"" N_("Factor:") "\" type=\"float\" min=\"0\" max=\"100\">5.0</param>\n"
+			"<param name=\"sigma\" _gui-text=\"" N_("Sigma:") "\" type=\"float\" min=\"0\" max=\"100\">5.0</param>\n"
 			"<effect>\n"
 				"<object-type>all</object-type>\n"
 				"<effects-menu>\n"
diff --git a/src/extension/internal/bitmap/implode.cpp b/src/extension/internal/bitmap/implode.cpp
index 15f92f5f6..c24fb7bf5 100644
--- a/src/extension/internal/bitmap/implode.cpp
+++ b/src/extension/internal/bitmap/implode.cpp
@@ -36,7 +36,7 @@ Implode::init(void)
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
 			"<name>" N_("Implode") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.implode</id>\n"
-			"<param name=\"factor\" gui-text=\"" N_("Factor:") "\" type=\"float\" min=\"0\" max=\"100\">10</param>\n"
+			"<param name=\"factor\" _gui-text=\"" N_("Factor:") "\" type=\"float\" min=\"0\" max=\"100\">10</param>\n"
 			"<effect>\n"
 				"<object-type>all</object-type>\n"
 				"<effects-menu>\n"
diff --git a/src/extension/internal/bitmap/level.cpp b/src/extension/internal/bitmap/level.cpp
index 9c266eb11..168328e8f 100644
--- a/src/extension/internal/bitmap/level.cpp
+++ b/src/extension/internal/bitmap/level.cpp
@@ -40,9 +40,9 @@ Level::init(void)
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
 			"<name>" N_("Level") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.level</id>\n"
-			"<param name=\"blackPoint\" gui-text=\"" N_("Black Point:") "\" type=\"float\" min=\"0\" max=\"100\">0</param>\n"			
-			"<param name=\"whitePoint\" gui-text=\"" N_("White Point:") "\" type=\"float\" min=\"0\" max=\"100\">100</param>\n"			
-			"<param name=\"midPoint\" gui-text=\"" N_("Gamma Correction:") "\" type=\"float\" min=\"0\" max=\"10\">1</param>\n"
+			"<param name=\"blackPoint\" _gui-text=\"" N_("Black Point:") "\" type=\"float\" min=\"0\" max=\"100\">0</param>\n"			
+			"<param name=\"whitePoint\" _gui-text=\"" N_("White Point:") "\" type=\"float\" min=\"0\" max=\"100\">100</param>\n"			
+			"<param name=\"midPoint\" _gui-text=\"" N_("Gamma Correction:") "\" type=\"float\" min=\"0\" max=\"10\">1</param>\n"
 			"<effect>\n"
 				"<object-type>all</object-type>\n"
 				"<effects-menu>\n"
diff --git a/src/extension/internal/bitmap/levelChannel.cpp b/src/extension/internal/bitmap/levelChannel.cpp
index 3e39657c3..d5c636059 100644
--- a/src/extension/internal/bitmap/levelChannel.cpp
+++ b/src/extension/internal/bitmap/levelChannel.cpp
@@ -51,7 +51,7 @@ LevelChannel::init(void)
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
 			"<name>" N_("Level (with Channel)") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.levelChannel</id>\n"
-			"<param name=\"channel\" gui-text=\"" N_("Channel:") "\" type=\"enum\" >\n"
+			"<param name=\"channel\" _gui-text=\"" N_("Channel:") "\" type=\"enum\" >\n"
 				"<_item value='Red Channel'>" N_("Red Channel") "</_item>\n"
 				"<_item value='Green Channel'>" N_("Green Channel") "</_item>\n"
 				"<_item value='Blue Channel'>" N_("Blue Channel") "</_item>\n"
@@ -62,9 +62,9 @@ LevelChannel::init(void)
 				"<_item value='Opacity Channel'>" N_("Opacity Channel") "</_item>\n"
 				"<_item value='Matte Channel'>" N_("Matte Channel") "</_item>\n"
 			"</param>\n"
-			"<param name=\"blackPoint\" gui-text=\"" N_("Black Point:") "\" type=\"float\" min=\"0.0\" max=\"100.0\">0.0</param>\n"			
-			"<param name=\"whitePoint\" gui-text=\"" N_("White Point:") "\" type=\"float\" min=\"0.0\" max=\"100.0\">100.0</param>\n"			
-			"<param name=\"midPoint\" gui-text=\"" N_("Gamma Correction:") "\" type=\"float\" min=\"0.0\" max=\"10.0\">1.0</param>\n"
+			"<param name=\"blackPoint\" _gui-text=\"" N_("Black Point:") "\" type=\"float\" min=\"0.0\" max=\"100.0\">0.0</param>\n"			
+			"<param name=\"whitePoint\" _gui-text=\"" N_("White Point:") "\" type=\"float\" min=\"0.0\" max=\"100.0\">100.0</param>\n"			
+			"<param name=\"midPoint\" _gui-text=\"" N_("Gamma Correction:") "\" type=\"float\" min=\"0.0\" max=\"10.0\">1.0</param>\n"
 			"<effect>\n"
 				"<object-type>all</object-type>\n"
 				"<effects-menu>\n"
diff --git a/src/extension/internal/bitmap/medianFilter.cpp b/src/extension/internal/bitmap/medianFilter.cpp
index 44ff9e543..64837850d 100644
--- a/src/extension/internal/bitmap/medianFilter.cpp
+++ b/src/extension/internal/bitmap/medianFilter.cpp
@@ -36,7 +36,7 @@ MedianFilter::init(void)
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
 			"<name>" N_("Median") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.medianFilter</id>\n"
-			"<param name=\"radius\" gui-text=\"" N_("Radius:") "\" type=\"float\" min=\"0\" max=\"100\">0</param>\n"			
+			"<param name=\"radius\" _gui-text=\"" N_("Radius:") "\" type=\"float\" min=\"0\" max=\"100\">0</param>\n"			
 			"<effect>\n"
 				"<object-type>all</object-type>\n"
 				"<effects-menu>\n"
diff --git a/src/extension/internal/bitmap/modulate.cpp b/src/extension/internal/bitmap/modulate.cpp
index d123a5c15..3b3a2495c 100644
--- a/src/extension/internal/bitmap/modulate.cpp
+++ b/src/extension/internal/bitmap/modulate.cpp
@@ -39,9 +39,9 @@ Modulate::init(void)
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
 			"<name>" N_("HSB Adjust") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.modulate</id>\n"			
-			"<param name=\"hue\" gui-text=\"" N_("Hue:") "\" type=\"float\" min=\"-360\" max=\"360\">0</param>\n"
-			"<param name=\"saturation\" gui-text=\"" N_("Saturation:") "\" type=\"float\" min=\"-200\" max=\"200\">0</param>\n"
-			"<param name=\"brightness\" gui-text=\"" N_("Brightness:") "\" type=\"float\" min=\"-200\" max=\"200\">0</param>\n"
+			"<param name=\"hue\" _gui-text=\"" N_("Hue:") "\" type=\"float\" min=\"-360\" max=\"360\">0</param>\n"
+			"<param name=\"saturation\" _gui-text=\"" N_("Saturation:") "\" type=\"float\" min=\"-200\" max=\"200\">0</param>\n"
+			"<param name=\"brightness\" _gui-text=\"" N_("Brightness:") "\" type=\"float\" min=\"-200\" max=\"200\">0</param>\n"
 			"<effect>\n"
 				"<object-type>all</object-type>\n"
 				"<effects-menu>\n"
diff --git a/src/extension/internal/bitmap/oilPaint.cpp b/src/extension/internal/bitmap/oilPaint.cpp
index 5377ab2b1..88c85a590 100644
--- a/src/extension/internal/bitmap/oilPaint.cpp
+++ b/src/extension/internal/bitmap/oilPaint.cpp
@@ -36,7 +36,7 @@ OilPaint::init(void)
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
 			"<name>" N_("Oil Paint") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.oilPaint</id>\n"
-			"<param name=\"radius\" gui-text=\"" N_("Radius:") "\" type=\"int\" min=\"0\" max=\"50\">3</param>\n"			
+			"<param name=\"radius\" _gui-text=\"" N_("Radius:") "\" type=\"int\" min=\"0\" max=\"50\">3</param>\n"			
 			"<effect>\n"
 				"<object-type>all</object-type>\n"
 				"<effects-menu>\n"
diff --git a/src/extension/internal/bitmap/opacity.cpp b/src/extension/internal/bitmap/opacity.cpp
index f9b4bbc27..a25e99543 100644
--- a/src/extension/internal/bitmap/opacity.cpp
+++ b/src/extension/internal/bitmap/opacity.cpp
@@ -37,7 +37,7 @@ Opacity::init(void)
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
 			"<name>" N_("Opacity") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.opacity</id>\n"
-			"<param name=\"opacity\" gui-text=\"" N_("Opacity:") "\" type=\"float\" min=\"0.0\" max=\"100.0\">80.0</param>\n"
+			"<param name=\"opacity\" _gui-text=\"" N_("Opacity:") "\" type=\"float\" min=\"0.0\" max=\"100.0\">80.0</param>\n"
 			"<effect>\n"
 				"<object-type>all</object-type>\n"
 				"<effects-menu>\n"
diff --git a/src/extension/internal/bitmap/raise.cpp b/src/extension/internal/bitmap/raise.cpp
index 9ca832c30..e85cc747a 100644
--- a/src/extension/internal/bitmap/raise.cpp
+++ b/src/extension/internal/bitmap/raise.cpp
@@ -39,9 +39,9 @@ Raise::init(void)
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
 			"<name>" N_("Raise") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.raise</id>\n"
-			"<param name=\"width\" gui-text=\"" N_("Width:") "\" type=\"int\" min=\"0\" max=\"800\">6</param>\n"
-			"<param name=\"height\" gui-text=\"" N_("Height:") "\" type=\"int\" min=\"0\" max=\"800\">6</param>\n"
-			"<param name=\"raisedFlag\" gui-text=\"" N_("Raised") "\" type=\"boolean\">0</param>\n"
+			"<param name=\"width\" _gui-text=\"" N_("Width:") "\" type=\"int\" min=\"0\" max=\"800\">6</param>\n"
+			"<param name=\"height\" _gui-text=\"" N_("Height:") "\" type=\"int\" min=\"0\" max=\"800\">6</param>\n"
+			"<param name=\"raisedFlag\" _gui-text=\"" N_("Raised") "\" type=\"boolean\">0</param>\n"
 			"<effect>\n"
 				"<object-type>all</object-type>\n"
 				"<effects-menu>\n"
diff --git a/src/extension/internal/bitmap/reduceNoise.cpp b/src/extension/internal/bitmap/reduceNoise.cpp
index db227ec41..b0d8b9c2d 100644
--- a/src/extension/internal/bitmap/reduceNoise.cpp
+++ b/src/extension/internal/bitmap/reduceNoise.cpp
@@ -39,7 +39,7 @@ ReduceNoise::init(void)
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
 			"<name>" N_("Reduce Noise") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.reduceNoise</id>\n"
-			"<param name=\"order\" gui-text=\"" N_("Order:") "\" type=\"int\" min=\"-1\" max=\"100\">-1</param>\n"
+			"<param name=\"order\" _gui-text=\"" N_("Order:") "\" type=\"int\" min=\"-1\" max=\"100\">-1</param>\n"
 			"<effect>\n"
 				"<object-type>all</object-type>\n"
 				"<effects-menu>\n"
diff --git a/src/extension/internal/bitmap/sample.cpp b/src/extension/internal/bitmap/sample.cpp
index 706ae1d5b..081303b73 100644
--- a/src/extension/internal/bitmap/sample.cpp
+++ b/src/extension/internal/bitmap/sample.cpp
@@ -38,8 +38,8 @@ Sample::init(void)
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
 			"<name>" N_("Resample") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.sample</id>\n"
-			"<param name=\"width\" gui-text=\"" N_("Width:") "\" type=\"int\" min=\"0\" max=\"6400\">100</param>\n"
-			"<param name=\"height\" gui-text=\"" N_("Height:") "\" type=\"int\" min=\"0\" max=\"6400\">100</param>\n"
+			"<param name=\"width\" _gui-text=\"" N_("Width:") "\" type=\"int\" min=\"0\" max=\"6400\">100</param>\n"
+			"<param name=\"height\" _gui-text=\"" N_("Height:") "\" type=\"int\" min=\"0\" max=\"6400\">100</param>\n"
 			"<effect>\n"
 				"<object-type>all</object-type>\n"
 				"<effects-menu>\n"
diff --git a/src/extension/internal/bitmap/shade.cpp b/src/extension/internal/bitmap/shade.cpp
index de7c9d669..927a3a578 100644
--- a/src/extension/internal/bitmap/shade.cpp
+++ b/src/extension/internal/bitmap/shade.cpp
@@ -39,9 +39,9 @@ Shade::init(void)
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
 			"<name>" N_("Shade") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.shade</id>\n"
-			"<param name=\"azimuth\" gui-text=\"" N_("Azimuth:") "\" type=\"float\" min=\"-180\" max=\"180\">30</param>\n"
-			"<param name=\"elevation\" gui-text=\"" N_("Elevation:") "\" type=\"float\" min=\"-180\" max=\"180\">30</param>\n"
-			"<param name=\"colorShading\" gui-text=\"" N_("Colored Shading") "\" type=\"boolean\">false</param>\n"
+			"<param name=\"azimuth\" _gui-text=\"" N_("Azimuth:") "\" type=\"float\" min=\"-180\" max=\"180\">30</param>\n"
+			"<param name=\"elevation\" _gui-text=\"" N_("Elevation:") "\" type=\"float\" min=\"-180\" max=\"180\">30</param>\n"
+			"<param name=\"colorShading\" _gui-text=\"" N_("Colored Shading") "\" type=\"boolean\">false</param>\n"
 			"<effect>\n"
 				"<object-type>all</object-type>\n"
 				"<effects-menu>\n"
diff --git a/src/extension/internal/bitmap/sharpen.cpp b/src/extension/internal/bitmap/sharpen.cpp
index 89181abad..d397d46c8 100644
--- a/src/extension/internal/bitmap/sharpen.cpp
+++ b/src/extension/internal/bitmap/sharpen.cpp
@@ -37,8 +37,8 @@ Sharpen::init(void)
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
 			"<name>" N_("Sharpen") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.sharpen</id>\n"
-			"<param name=\"radius\" gui-text=\"" N_("Radius:") "\" type=\"float\" min=\"0\" max=\"50\">1.0</param>\n"
-			"<param name=\"sigma\" gui-text=\"" N_("Sigma:") "\" type=\"float\" min=\"0\" max=\"10\">0.5</param>\n"			
+			"<param name=\"radius\" _gui-text=\"" N_("Radius:") "\" type=\"float\" min=\"0\" max=\"50\">1.0</param>\n"
+			"<param name=\"sigma\" _gui-text=\"" N_("Sigma:") "\" type=\"float\" min=\"0\" max=\"10\">0.5</param>\n"			
 			"<effect>\n"
 				"<object-type>all</object-type>\n"
 				"<effects-menu>\n"
diff --git a/src/extension/internal/bitmap/solarize.cpp b/src/extension/internal/bitmap/solarize.cpp
index d333d2ae8..5f8cdd17c 100644
--- a/src/extension/internal/bitmap/solarize.cpp
+++ b/src/extension/internal/bitmap/solarize.cpp
@@ -38,7 +38,7 @@ Solarize::init(void)
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
 			"<name>" N_("Solarize") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.solarize</id>\n"
-			"<param name=\"factor\" gui-text=\"" N_("Factor:") "\" type=\"float\" min=\"0\" max=\"100\">50</param>\n"
+			"<param name=\"factor\" _gui-text=\"" N_("Factor:") "\" type=\"float\" min=\"0\" max=\"100\">50</param>\n"
 			"<effect>\n"
 				"<object-type>all</object-type>\n"
 				"<effects-menu>\n"
diff --git a/src/extension/internal/bitmap/spread.cpp b/src/extension/internal/bitmap/spread.cpp
index 3e9110dd7..e38e2a927 100644
--- a/src/extension/internal/bitmap/spread.cpp
+++ b/src/extension/internal/bitmap/spread.cpp
@@ -36,7 +36,7 @@ Spread::init(void)
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
 			"<name>" N_("Dither") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.spread</id>\n"
-			"<param name=\"amount\" gui-text=\"" N_("Amount:") "\" type=\"int\" min=\"0\" max=\"100\">3</param>\n"
+			"<param name=\"amount\" _gui-text=\"" N_("Amount:") "\" type=\"int\" min=\"0\" max=\"100\">3</param>\n"
 			"<effect>\n"
 				"<object-type>all</object-type>\n"
 				"<effects-menu>\n"
diff --git a/src/extension/internal/bitmap/swirl.cpp b/src/extension/internal/bitmap/swirl.cpp
index 1f2776031..98efa6238 100644
--- a/src/extension/internal/bitmap/swirl.cpp
+++ b/src/extension/internal/bitmap/swirl.cpp
@@ -36,7 +36,7 @@ Swirl::init(void)
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
 			"<name>" N_("Swirl") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.swirl</id>\n"
-			"<param name=\"degrees\" gui-text=\"" N_("Degrees:") "\" type=\"int\" min=\"-360\" max=\"360\">30</param>\n"
+			"<param name=\"degrees\" _gui-text=\"" N_("Degrees:") "\" type=\"int\" min=\"-360\" max=\"360\">30</param>\n"
 			"<effect>\n"
 				"<object-type>all</object-type>\n"
 				"<effects-menu>\n"
diff --git a/src/extension/internal/bitmap/threshold.cpp b/src/extension/internal/bitmap/threshold.cpp
index 0db0f7749..9f10b2c42 100644
--- a/src/extension/internal/bitmap/threshold.cpp
+++ b/src/extension/internal/bitmap/threshold.cpp
@@ -37,7 +37,7 @@ Threshold::init(void)
 // TRANSLATORS: see http://docs.gimp.org/en/gimp-tool-threshold.html
 			"<name>" N_("Threshold") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.threshold</id>\n"
-			"<param name=\"threshold\" gui-text=\"" N_("Threshold:") "\" type=\"float\" min=\"-100.0\" max=\"100.0\"></param>\n"
+			"<param name=\"threshold\" _gui-text=\"" N_("Threshold:") "\" type=\"float\" min=\"-100.0\" max=\"100.0\"></param>\n"
 			"<effect>\n"
 				"<object-type>all</object-type>\n"
 				"<effects-menu>\n"
diff --git a/src/extension/internal/bitmap/unsharpmask.cpp b/src/extension/internal/bitmap/unsharpmask.cpp
index 222feae8d..c5a7e9291 100644
--- a/src/extension/internal/bitmap/unsharpmask.cpp
+++ b/src/extension/internal/bitmap/unsharpmask.cpp
@@ -40,10 +40,10 @@ Unsharpmask::init(void)
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
 			"<name>" N_("Unsharp Mask") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.unsharpmask</id>\n"
-			"<param name=\"radius\" gui-text=\"" N_("Radius:") "\" type=\"float\" min=\"0.0\" max=\"50.0\">5.0</param>\n"
-			"<param name=\"sigma\" gui-text=\"" N_("Sigma:") "\" type=\"float\" min=\"0.0\" max=\"50.0\">5.0</param>\n"
-			"<param name=\"amount\" gui-text=\"" N_("Amount:") "\" type=\"float\" min=\"0.0\" max=\"100.0\">50.0</param>\n"
-			"<param name=\"threshold\" gui-text=\"" N_("Threshold:") "\" type=\"float\" min=\"0.0\" max=\"50.0\">5.0</param>\n"
+			"<param name=\"radius\" _gui-text=\"" N_("Radius:") "\" type=\"float\" min=\"0.0\" max=\"50.0\">5.0</param>\n"
+			"<param name=\"sigma\" _gui-text=\"" N_("Sigma:") "\" type=\"float\" min=\"0.0\" max=\"50.0\">5.0</param>\n"
+			"<param name=\"amount\" _gui-text=\"" N_("Amount:") "\" type=\"float\" min=\"0.0\" max=\"100.0\">50.0</param>\n"
+			"<param name=\"threshold\" _gui-text=\"" N_("Threshold:") "\" type=\"float\" min=\"0.0\" max=\"50.0\">5.0</param>\n"
 			"<effect>\n"
 				"<object-type>all</object-type>\n"
 				"<effects-menu>\n"
diff --git a/src/extension/internal/bitmap/wave.cpp b/src/extension/internal/bitmap/wave.cpp
index 158ae7e64..1ccaa1d5e 100644
--- a/src/extension/internal/bitmap/wave.cpp
+++ b/src/extension/internal/bitmap/wave.cpp
@@ -37,8 +37,8 @@ Wave::init(void)
 		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
 			"<name>" N_("Wave") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.wave</id>\n"
-			"<param name=\"amplitude\" gui-text=\"" N_("Amplitude:") "\" type=\"float\" min=\"-720.0\" max=\"720.0\">25</param>\n"			
-			"<param name=\"wavelength\" gui-text=\"" N_("Wavelength:") "\" type=\"float\" min=\"-720.0\" max=\"720.0\">150</param>\n"			
+			"<param name=\"amplitude\" _gui-text=\"" N_("Amplitude:") "\" type=\"float\" min=\"-720.0\" max=\"720.0\">25</param>\n"			
+			"<param name=\"wavelength\" _gui-text=\"" N_("Wavelength:") "\" type=\"float\" min=\"-720.0\" max=\"720.0\">150</param>\n"			
 			"<effect>\n"
 				"<object-type>all</object-type>\n"
 				"<effects-menu>\n"
diff --git a/src/extension/internal/bluredge.cpp b/src/extension/internal/bluredge.cpp
index 0e3aa98ce..4a04e3c33 100644
--- a/src/extension/internal/bluredge.cpp
+++ b/src/extension/internal/bluredge.cpp
@@ -131,8 +131,8 @@ BlurEdge::init (void)
         "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
             "<name>" N_("Inset/Outset Halo") "</name>\n"
             "<id>org.inkscape.effect.bluredge</id>\n"
-            "<param name=\"blur-width\" gui-text=\"" N_("Width:") "\" gui-description=\"" N_("Width in px of the halo") "\" scope=\"document\" type=\"float\" min=\"1.0\" max=\"50.0\">1.0</param>\n"
-            "<param name=\"num-steps\" gui-text=\"" N_("Number of steps:") "\" gui-description=\"" N_("Number of inset/outset copies of the object to make") "\" scope=\"document\" type=\"int\" min=\"5\" max=\"100\">11</param>\n"
+            "<param name=\"blur-width\" _gui-text=\"" N_("Width:") "\" gui-description=\"" N_("Width in px of the halo") "\" scope=\"document\" type=\"float\" min=\"1.0\" max=\"50.0\">1.0</param>\n"
+            "<param name=\"num-steps\" _gui-text=\"" N_("Number of steps:") "\" gui-description=\"" N_("Number of inset/outset copies of the object to make") "\" scope=\"document\" type=\"int\" min=\"5\" max=\"100\">11</param>\n"
             "<effect>\n"
                 "<object-type>all</object-type>\n"
                 "<effects-menu>\n"
diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp
index 5dc412301..e8f47e79e 100644
--- a/src/extension/internal/cairo-ps-out.cpp
+++ b/src/extension/internal/cairo-ps-out.cpp
@@ -326,23 +326,23 @@ CairoPsOutput::init (void)
         "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
             "<name>" N_("PostScript") "</name>\n"
             "<id>" SP_MODULE_KEY_PRINT_CAIRO_PS "</id>\n"
-            "<param name=\"PSlevel\" gui-text=\"" N_("Restrict to PS level:") "\" type=\"enum\" >\n"
+            "<param name=\"PSlevel\" _gui-text=\"" N_("Restrict to PS level:") "\" type=\"enum\" >\n"
                 "<_item value='PS3'>" N_("PostScript level 3") "</_item>\n"
                 "<_item value='PS2'>" N_("PostScript level 2") "</_item>\n"
             "</param>\n"
-            "<param name=\"textToPath\" gui-text=\"" N_("Text output options:") "\" type=\"optiongroup\">\n"
-                "<option value=\"embed\">" N_("Embed fonts") "</option>\n"
-                "<option value=\"paths\">" N_("Convert text to paths") "</option>\n"
-                "<option value=\"LaTeX\">" N_("Omit text in PDF and create LaTeX file") "</option>\n"
+            "<param name=\"textToPath\" _gui-text=\"" N_("Text output options:") "\" type=\"optiongroup\">\n"
+                "<_option value=\"embed\">" N_("Embed fonts") "</_option>\n"
+                "<_option value=\"paths\">" N_("Convert text to paths") "</_option>\n"
+                "<_option value=\"LaTeX\">" N_("Omit text in PDF and create LaTeX file") "</_option>\n"
             "</param>\n"
-            "<param name=\"blurToBitmap\" gui-text=\"" N_("Rasterize filter effects") "\" type=\"boolean\">true</param>\n"
-            "<param name=\"resolution\" gui-text=\"" N_("Resolution for rasterization (dpi):") "\" type=\"int\" min=\"1\" max=\"10000\">96</param>\n"
-            "<param name=\"area\" gui-text=\"" N_("Output page size") "\" type=\"optiongroup\" >\n"
+            "<param name=\"blurToBitmap\" _gui-text=\"" N_("Rasterize filter effects") "\" type=\"boolean\">true</param>\n"
+            "<param name=\"resolution\" _gui-text=\"" N_("Resolution for rasterization (dpi):") "\" type=\"int\" min=\"1\" max=\"10000\">96</param>\n"
+            "<param name=\"area\" _gui-text=\"" N_("Output page size") "\" type=\"optiongroup\" >\n"
                 "<_option value=\"page\">" N_("Use document's page size") "</_option>"
                 "<_option value=\"drawing\">" N_("Use exported object's size") "</_option>"
             "</param>"
-            "<param name=\"bleed\" gui-text=\"" N_("Bleed/margin (mm):") "\" type=\"float\" min=\"-10000\" max=\"10000\">0</param>\n"
-            "<param name=\"exportId\" gui-text=\"" N_("Limit export to the object with ID:") "\" type=\"string\"></param>\n"
+            "<param name=\"bleed\" _gui-text=\"" N_("Bleed/margin (mm):") "\" type=\"float\" min=\"-10000\" max=\"10000\">0</param>\n"
+            "<param name=\"exportId\" _gui-text=\"" N_("Limit export to the object with ID:") "\" type=\"string\"></param>\n"
             "<output>\n"
             "<extension>.ps</extension>\n"
                 "<mimetype>image/x-postscript</mimetype>\n"
@@ -368,23 +368,23 @@ CairoEpsOutput::init (void)
         "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
             "<name>" N_("Encapsulated PostScript") "</name>\n"
             "<id>" SP_MODULE_KEY_PRINT_CAIRO_EPS "</id>\n"
-            "<param name=\"PSlevel\" gui-text=\"" N_("Restrict to PS level:") "\" type=\"enum\" >\n"
+            "<param name=\"PSlevel\" _gui-text=\"" N_("Restrict to PS level:") "\" type=\"enum\" >\n"
                 "<_item value='PS3'>" N_("PostScript level 3") "</_item>\n"
                 "<_item value='PS2'>" N_("PostScript level 2") "</_item>\n"
             "</param>\n"
-            "<param name=\"textToPath\" gui-text=\"" N_("Text output options:") "\" type=\"optiongroup\">\n"
-                "<option value=\"embed\">" N_("Embed fonts") "</option>\n"
-                "<option value=\"paths\">" N_("Convert text to paths") "</option>\n"
-                "<option value=\"LaTeX\">" N_("Omit text in PDF and create LaTeX file") "</option>\n"
+            "<param name=\"textToPath\" _gui-text=\"" N_("Text output options:") "\" type=\"optiongroup\">\n"
+                "<_option value=\"embed\">" N_("Embed fonts") "</_option>\n"
+                "<_option value=\"paths\">" N_("Convert text to paths") "</_option>\n"
+                "<_option value=\"LaTeX\">" N_("Omit text in PDF and create LaTeX file") "</_option>\n"
             "</param>\n"
-            "<param name=\"blurToBitmap\" gui-text=\"" N_("Rasterize filter effects") "\" type=\"boolean\">true</param>\n"
-            "<param name=\"resolution\" gui-text=\"" N_("Resolution for rasterization (dpi):") "\" type=\"int\" min=\"1\" max=\"10000\">96</param>\n"
-            "<param name=\"area\" gui-text=\"" N_("Output page size") "\" type=\"optiongroup\" >\n"
+            "<param name=\"blurToBitmap\" _gui-text=\"" N_("Rasterize filter effects") "\" type=\"boolean\">true</param>\n"
+            "<param name=\"resolution\" _gui-text=\"" N_("Resolution for rasterization (dpi):") "\" type=\"int\" min=\"1\" max=\"10000\">96</param>\n"
+            "<param name=\"area\" _gui-text=\"" N_("Output page size") "\" type=\"optiongroup\" >\n"
                 "<_option value=\"page\">" N_("Use document's page size") "</_option>"
                 "<_option value=\"drawing\">" N_("Use exported object's size") "</_option>"
             "</param>"
-            "<param name=\"bleed\" gui-text=\"" N_("Bleed/margin (mm)") "\" type=\"float\" min=\"-10000\" max=\"10000\">0</param>\n"
-            "<param name=\"exportId\" gui-text=\"" N_("Limit export to the object with ID:") "\" type=\"string\"></param>\n"
+            "<param name=\"bleed\" _gui-text=\"" N_("Bleed/margin (mm)") "\" type=\"float\" min=\"-10000\" max=\"10000\">0</param>\n"
+            "<param name=\"exportId\" _gui-text=\"" N_("Limit export to the object with ID:") "\" type=\"string\"></param>\n"
             "<output>\n"
                 "<extension>.eps</extension>\n"
                 "<mimetype>image/x-e-postscript</mimetype>\n"
diff --git a/src/extension/internal/cairo-renderer-pdf-out.cpp b/src/extension/internal/cairo-renderer-pdf-out.cpp
index e5c9406c9..5576676b2 100644
--- a/src/extension/internal/cairo-renderer-pdf-out.cpp
+++ b/src/extension/internal/cairo-renderer-pdf-out.cpp
@@ -241,25 +241,25 @@ CairoRendererPdfOutput::init (void)
         "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
             "<name>Portable Document Format</name>\n"
             "<id>org.inkscape.output.pdf.cairorenderer</id>\n"
-            "<param name=\"PDFversion\" gui-text=\"" N_("Restrict to PDF version:") "\" type=\"enum\" >\n"
+            "<param name=\"PDFversion\" _gui-text=\"" N_("Restrict to PDF version:") "\" type=\"enum\" >\n"
 #if (CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0))
                 "<_item value='PDF-1.5'>" N_("PDF 1.5") "</_item>\n"
 #endif
                 "<_item value='PDF-1.4'>" N_("PDF 1.4") "</_item>\n"
             "</param>\n"
-            "<param name=\"textToPath\" gui-text=\"" N_("Text output options:") "\" type=\"optiongroup\">\n"
-                "<option value=\"embed\">" N_("Embed fonts") "</option>\n"
-                "<option value=\"paths\">" N_("Convert text to paths") "</option>\n"
-                "<option value=\"LaTeX\">" N_("Omit text in PDF and create LaTeX file") "</option>\n"
+            "<param name=\"textToPath\" _gui-text=\"" N_("Text output options:") "\" type=\"optiongroup\">\n"
+                "<_option value=\"embed\">" N_("Embed fonts") "</_option>\n"
+                "<_option value=\"paths\">" N_("Convert text to paths") "</_option>\n"
+                "<_option value=\"LaTeX\">" N_("Omit text in PDF and create LaTeX file") "</_option>\n"
             "</param>\n"
-            "<param name=\"blurToBitmap\" gui-text=\"" N_("Rasterize filter effects") "\" type=\"boolean\">true</param>\n"
-            "<param name=\"resolution\" gui-text=\"" N_("Resolution for rasterization (dpi):") "\" type=\"int\" min=\"1\" max=\"10000\">96</param>\n"
-            "<param name=\"area\" gui-text=\"" N_("Output page size:") "\" type=\"optiongroup\" >\n"
+            "<param name=\"blurToBitmap\" _gui-text=\"" N_("Rasterize filter effects") "\" type=\"boolean\">true</param>\n"
+            "<param name=\"resolution\" _gui-text=\"" N_("Resolution for rasterization (dpi):") "\" type=\"int\" min=\"1\" max=\"10000\">96</param>\n"
+            "<param name=\"area\" _gui-text=\"" N_("Output page size:") "\" type=\"optiongroup\" >\n"
                 "<_option value=\"page\">" N_("Use document's page size") "</_option>"
                 "<_option value=\"drawing\">" N_("Use exported object's size") "</_option>"
             "</param>"
-            "<param name=\"bleed\" gui-text=\"" N_("Bleed/margin (mm):") "\" type=\"float\" min=\"-10000\" max=\"10000\">0</param>\n"
-            "<param name=\"exportId\" gui-text=\"" N_("Limit export to the object with ID:") "\" type=\"string\"></param>\n"
+            "<param name=\"bleed\" _gui-text=\"" N_("Bleed/margin (mm):") "\" type=\"float\" min=\"-10000\" max=\"10000\">0</param>\n"
+            "<param name=\"exportId\" _gui-text=\"" N_("Limit export to the object with ID:") "\" type=\"string\"></param>\n"
             "<output>\n"
                 "<extension>.pdf</extension>\n"
                 "<mimetype>application/pdf</mimetype>\n"
diff --git a/src/extension/internal/emf-inout.cpp b/src/extension/internal/emf-inout.cpp
index 13520c40b..12751c5ec 100644
--- a/src/extension/internal/emf-inout.cpp
+++ b/src/extension/internal/emf-inout.cpp
@@ -3614,17 +3614,17 @@ Emf::init (void)
         "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
             "<name>" N_("EMF Output") "</name>\n"
             "<id>org.inkscape.output.emf</id>\n"
-            "<param name=\"textToPath\" gui-text=\"" N_("Convert texts to paths") "\" type=\"boolean\">true</param>\n"
-            "<param name=\"TnrToSymbol\" gui-text=\"" N_("Map Unicode to Symbol font") "\" type=\"boolean\">true</param>\n"
-            "<param name=\"TnrToWingdings\" gui-text=\"" N_("Map Unicode to Wingdings") "\" type=\"boolean\">true</param>\n"
-            "<param name=\"TnrToZapfDingbats\" gui-text=\"" N_("Map Unicode to Zapf Dingbats") "\" type=\"boolean\">true</param>\n"
-            "<param name=\"UsePUA\" gui-text=\"" N_("Use MS Unicode PUA (0xF020-0xF0FF) for converted characters") "\" type=\"boolean\">false</param>\n"
-            "<param name=\"FixPPTCharPos\" gui-text=\"" N_("Compensate for PPT font bug") "\" type=\"boolean\">false</param>\n"
-            "<param name=\"FixPPTDashLine\" gui-text=\"" N_("Convert dashed/dotted lines to single lines") "\" type=\"boolean\">false</param>\n"
-            "<param name=\"FixPPTGrad2Polys\" gui-text=\"" N_("Convert gradients to colored polygon series") "\" type=\"boolean\">false</param>\n"
-            "<param name=\"FixPPTLinGrad\" gui-text=\"" N_("Use native rectangular linear gradients") "\" type=\"boolean\">false</param>\n"
-            "<param name=\"FixPPTPatternAsHatch\" gui-text=\"" N_("Map all fill patterns to standard EMF hatches") "\" type=\"boolean\">false</param>\n"
-            "<param name=\"FixImageRot\" gui-text=\"" N_("Ignore image rotations") "\" type=\"boolean\">false</param>\n"
+            "<param name=\"textToPath\" _gui-text=\"" N_("Convert texts to paths") "\" type=\"boolean\">true</param>\n"
+            "<param name=\"TnrToSymbol\" _gui-text=\"" N_("Map Unicode to Symbol font") "\" type=\"boolean\">true</param>\n"
+            "<param name=\"TnrToWingdings\" _gui-text=\"" N_("Map Unicode to Wingdings") "\" type=\"boolean\">true</param>\n"
+            "<param name=\"TnrToZapfDingbats\" _gui-text=\"" N_("Map Unicode to Zapf Dingbats") "\" type=\"boolean\">true</param>\n"
+            "<param name=\"UsePUA\" _gui-text=\"" N_("Use MS Unicode PUA (0xF020-0xF0FF) for converted characters") "\" type=\"boolean\">false</param>\n"
+            "<param name=\"FixPPTCharPos\" _gui-text=\"" N_("Compensate for PPT font bug") "\" type=\"boolean\">false</param>\n"
+            "<param name=\"FixPPTDashLine\" _gui-text=\"" N_("Convert dashed/dotted lines to single lines") "\" type=\"boolean\">false</param>\n"
+            "<param name=\"FixPPTGrad2Polys\" _gui-text=\"" N_("Convert gradients to colored polygon series") "\" type=\"boolean\">false</param>\n"
+            "<param name=\"FixPPTLinGrad\" _gui-text=\"" N_("Use native rectangular linear gradients") "\" type=\"boolean\">false</param>\n"
+            "<param name=\"FixPPTPatternAsHatch\" _gui-text=\"" N_("Map all fill patterns to standard EMF hatches") "\" type=\"boolean\">false</param>\n"
+            "<param name=\"FixImageRot\" _gui-text=\"" N_("Ignore image rotations") "\" type=\"boolean\">false</param>\n"
             "<output>\n"
                 "<extension>.emf</extension>\n"
                 "<mimetype>image/x-emf</mimetype>\n"
diff --git a/src/extension/internal/filter/bevels.h b/src/extension/internal/filter/bevels.h
index ea9d537ad..68e94ad3d 100644
--- a/src/extension/internal/filter/bevels.h
+++ b/src/extension/internal/filter/bevels.h
@@ -52,10 +52,10 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
               "<name>" N_("Diffuse Light") "</name>\n"
               "<id>org.inkscape.effect.filter.DiffuseLight</id>\n"
-              "<param name=\"smooth\" gui-text=\"" N_("Smoothness") "\" type=\"float\" appearance=\"full\" min=\"0.0\" max=\"10\">6</param>\n"
-              "<param name=\"elevation\" gui-text=\"" N_("Elevation (°)") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"360\">25</param>\n"
-              "<param name=\"azimuth\" gui-text=\"" N_("Azimuth (°)") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"360\">235</param>\n"
-              "<param name=\"color\" gui-text=\"" N_("Lighting color") "\" type=\"color\">-1</param>\n"
+              "<param name=\"smooth\" _gui-text=\"" N_("Smoothness") "\" type=\"float\" appearance=\"full\" min=\"0.0\" max=\"10\">6</param>\n"
+              "<param name=\"elevation\" _gui-text=\"" N_("Elevation (°)") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"360\">25</param>\n"
+              "<param name=\"azimuth\" _gui-text=\"" N_("Azimuth (°)") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"360\">235</param>\n"
+              "<param name=\"color\" _gui-text=\"" N_("Lighting color") "\" type=\"color\">-1</param>\n"
               "<effect>\n"
                 "<object-type>all</object-type>\n"
                 "<effects-menu>\n"
@@ -132,11 +132,11 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
               "<name>" N_("Matte Jelly") "</name>\n"
               "<id>org.inkscape.effect.filter.MatteJelly</id>\n"
-              "<param name=\"smooth\" gui-text=\"" N_("Smoothness") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.00\" max=\"10.00\">7</param>\n"
-              "<param name=\"bright\" gui-text=\"" N_("Brightness") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.00\" max=\"5.00\">0.9</param>\n"
-              "<param name=\"elevation\" gui-text=\"" N_("Elevation (°)") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"360\">60</param>\n"
-              "<param name=\"azimuth\" gui-text=\"" N_("Azimuth (°)") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"360\">225</param>\n"
-              "<param name=\"color\" gui-text=\"" N_("Lighting color") "\" type=\"color\">-1</param>\n"
+              "<param name=\"smooth\" _gui-text=\"" N_("Smoothness") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.00\" max=\"10.00\">7</param>\n"
+              "<param name=\"bright\" _gui-text=\"" N_("Brightness") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.00\" max=\"5.00\">0.9</param>\n"
+              "<param name=\"elevation\" _gui-text=\"" N_("Elevation (°)") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"360\">60</param>\n"
+              "<param name=\"azimuth\" _gui-text=\"" N_("Azimuth (°)") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"360\">225</param>\n"
+              "<param name=\"color\" _gui-text=\"" N_("Lighting color") "\" type=\"color\">-1</param>\n"
               "<effect>\n"
                 "<object-type>all</object-type>\n"
                 "<effects-menu>\n"
@@ -216,11 +216,11 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
               "<name>" N_("Specular Light") "</name>\n"
               "<id>org.inkscape.effect.filter.SpecularLight</id>\n"
-              "<param name=\"smooth\" gui-text=\"" N_("Smoothness") "\" type=\"float\" appearance=\"full\" min=\"0.0\" max=\"10\">6</param>\n"
-              "<param name=\"bright\" gui-text=\"" N_("Brightness") "\" type=\"float\" appearance=\"full\" min=\"0.0\" max=\"5\">1</param>\n"
-              "<param name=\"elevation\" gui-text=\"" N_("Elevation (°)") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"360\">45</param>\n"
-              "<param name=\"azimuth\" gui-text=\"" N_("Azimuth (°)") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"360\">235</param>\n"
-              "<param name=\"color\" gui-text=\"" N_("Lighting color") "\" type=\"color\">-1</param>\n"
+              "<param name=\"smooth\" _gui-text=\"" N_("Smoothness") "\" type=\"float\" appearance=\"full\" min=\"0.0\" max=\"10\">6</param>\n"
+              "<param name=\"bright\" _gui-text=\"" N_("Brightness") "\" type=\"float\" appearance=\"full\" min=\"0.0\" max=\"5\">1</param>\n"
+              "<param name=\"elevation\" _gui-text=\"" N_("Elevation (°)") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"360\">45</param>\n"
+              "<param name=\"azimuth\" _gui-text=\"" N_("Azimuth (°)") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"360\">235</param>\n"
+              "<param name=\"color\" _gui-text=\"" N_("Lighting color") "\" type=\"color\">-1</param>\n"
               "<effect>\n"
                 "<object-type>all</object-type>\n"
                 "<effects-menu>\n"
diff --git a/src/extension/internal/filter/blurs.h b/src/extension/internal/filter/blurs.h
index fe1b9c930..77581ed96 100644
--- a/src/extension/internal/filter/blurs.h
+++ b/src/extension/internal/filter/blurs.h
@@ -53,9 +53,9 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
               "<name>" N_("Blur") "</name>\n"
               "<id>org.inkscape.effect.filter.Blur</id>\n"
-              "<param name=\"hblur\" gui-text=\"" N_("Horizontal blur") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"100.00\">2</param>\n"
-              "<param name=\"vblur\" gui-text=\"" N_("Vertical blur") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"100.00\">2</param>\n"
-              "<param name=\"content\" gui-text=\"" N_("Blur content only") "\" type=\"boolean\">False</param>\n"
+              "<param name=\"hblur\" _gui-text=\"" N_("Horizontal blur") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"100.00\">2</param>\n"
+              "<param name=\"vblur\" _gui-text=\"" N_("Vertical blur") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"100.00\">2</param>\n"
+              "<param name=\"content\" _gui-text=\"" N_("Blur content only") "\" type=\"boolean\">False</param>\n"
               "<effect>\n"
                 "<object-type>all</object-type>\n"
                 "<effects-menu>\n"
@@ -124,7 +124,7 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
               "<name>" N_("Clean Edges") "</name>\n"
               "<id>org.inkscape.effect.filter.CleanEdges</id>\n"
-              "<param name=\"blur\" gui-text=\"" N_("Strength") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"2.00\">0.4</param>\n"
+              "<param name=\"blur\" _gui-text=\"" N_("Strength") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"2.00\">0.4</param>\n"
               "<effect>\n"
                 "<object-type>all</object-type>\n"
                 "<effects-menu>\n"
@@ -184,11 +184,11 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
               "<name>" N_("Cross Blur") "</name>\n"
               "<id>org.inkscape.effect.filter.CrossBlur</id>\n"
-              "<param name=\"bright\" gui-text=\"" N_("Brightness") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.\" max=\"10.00\">0</param>\n"
-              "<param name=\"fade\" gui-text=\"" N_("Fading") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.\" max=\"1.00\">0</param>\n"
-              "<param name=\"hblur\" gui-text=\"" N_("Horizontal blur") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"20.00\">5</param>\n"
-              "<param name=\"vblur\" gui-text=\"" N_("Vertical blur") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"20.00\">5</param>\n"
-              "<param name=\"blend\" gui-text=\"" N_("Blend:") "\" type=\"enum\">\n"
+              "<param name=\"bright\" _gui-text=\"" N_("Brightness") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.\" max=\"10.00\">0</param>\n"
+              "<param name=\"fade\" _gui-text=\"" N_("Fading") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.\" max=\"1.00\">0</param>\n"
+              "<param name=\"hblur\" _gui-text=\"" N_("Horizontal blur") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"20.00\">5</param>\n"
+              "<param name=\"vblur\" _gui-text=\"" N_("Vertical blur") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"20.00\">5</param>\n"
+              "<param name=\"blend\" _gui-text=\"" N_("Blend:") "\" type=\"enum\">\n"
                 "<_item value=\"darken\">" N_("Darken") "</_item>\n"
                 "<_item value=\"screen\">" N_("Screen") "</_item>\n"
                 "<_item value=\"multiply\">" N_("Multiply") "</_item>\n"
@@ -259,7 +259,7 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
               "<name>" N_("Feather") "</name>\n"
               "<id>org.inkscape.effect.filter.Feather</id>\n"
-              "<param name=\"blur\" gui-text=\"" N_("Strength") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"100.00\">5</param>\n"
+              "<param name=\"blur\" _gui-text=\"" N_("Strength") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"100.00\">5</param>\n"
               "<effect>\n"
                 "<object-type>all</object-type>\n"
                 "<effects-menu>\n"
@@ -326,22 +326,22 @@ public:
               "<id>org.inkscape.effect.filter.ImageBlur</id>\n"
               "<param name=\"tab\" type=\"notebook\">\n"
                 "<page name=\"optionstab\" _gui-text=\"Options\">\n"
-                  "<param name=\"hblur\" gui-text=\"" N_("Horizontal blur") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"50.00\">3</param>\n"
-                  "<param name=\"vblur\" gui-text=\"" N_("Vertical blur") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"50.00\">3</param>\n"
-                  "<param name=\"dilat\" gui-text=\"" N_("Dilatation") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"100\">6</param>\n"
-                  "<param name=\"erosion\" gui-text=\"" N_("Erosion") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"100\">2</param>\n"
-                  "<param name=\"opacity\" gui-text=\"" N_("Opacity") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"1\">1</param>\n"
+                  "<param name=\"hblur\" _gui-text=\"" N_("Horizontal blur") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"50.00\">3</param>\n"
+                  "<param name=\"vblur\" _gui-text=\"" N_("Vertical blur") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"50.00\">3</param>\n"
+                  "<param name=\"dilat\" _gui-text=\"" N_("Dilatation") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"100\">6</param>\n"
+                  "<param name=\"erosion\" _gui-text=\"" N_("Erosion") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"100\">2</param>\n"
+                  "<param name=\"opacity\" _gui-text=\"" N_("Opacity") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"1\">1</param>\n"
                 "</page>\n"
                 "<page name=\"backgroundtab\" _gui-text=\"Background\">\n"
-                  "<param name=\"color\" gui-text=\"" N_("Background color") "\" type=\"color\">-1</param>\n"
-                  "<param name=\"blend\" gui-text=\"" N_("Blend type:") "\" type=\"enum\">\n"
+                  "<param name=\"color\" _gui-text=\"" N_("Background color") "\" type=\"color\">-1</param>\n"
+                  "<param name=\"blend\" _gui-text=\"" N_("Blend type:") "\" type=\"enum\">\n"
                     "<_item value=\"normal\">" N_("Normal") "</_item>\n"
                     "<_item value=\"darken\">" N_("Darken") "</_item>\n"
                     "<_item value=\"screen\">" N_("Screen") "</_item>\n"
                     "<_item value=\"multiply\">" N_("Multiply") "</_item>\n"
                     "<_item value=\"lighten\">" N_("Lighten") "</_item>\n"
                   "</param>\n"
-                  "<param name=\"background\" gui-text=\"" N_("Blend to background") "\" type=\"boolean\" >false</param>\n"
+                  "<param name=\"background\" _gui-text=\"" N_("Blend to background") "\" type=\"boolean\" >false</param>\n"
                 "</page>\n"
               "</param>\n"
               "<effect>\n"
diff --git a/src/extension/internal/filter/bumps.h b/src/extension/internal/filter/bumps.h
index b59b1ef50..cbda5ea35 100644
--- a/src/extension/internal/filter/bumps.h
+++ b/src/extension/internal/filter/bumps.h
@@ -81,52 +81,52 @@ public:
               "<id>org.inkscape.effect.filter.Bump</id>\n"
               "<param name=\"tab\" type=\"notebook\">\n"
                 "<page name=\"optionstab\" _gui-text=\"Options\">\n"
-                  "<param name=\"simplifyImage\" gui-text=\"" N_("Image simplification") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"10.00\">0.01</param>\n"
-                  "<param name=\"simplifyBump\" gui-text=\"" N_("Bump simplification") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"10.00\">0.01</param>\n"
-                  "<param name=\"crop\" gui-text=\"" N_("Crop") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-50.\" max=\"50.\">0</param>\n"
+                  "<param name=\"simplifyImage\" _gui-text=\"" N_("Image simplification") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"10.00\">0.01</param>\n"
+                  "<param name=\"simplifyBump\" _gui-text=\"" N_("Bump simplification") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"10.00\">0.01</param>\n"
+                  "<param name=\"crop\" _gui-text=\"" N_("Crop") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-50.\" max=\"50.\">0</param>\n"
                   "<_param name=\"sourceHeader\" type=\"description\" appearance=\"header\">" N_("Bump source") "</_param>\n"
-                    "<param name=\"red\" gui-text=\"" N_("Red") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-50.\" max=\"50.\">0</param>\n"
-                    "<param name=\"green\" gui-text=\"" N_("Green") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-50.\" max=\"50.\">0</param>\n"
-                    "<param name=\"blue\" gui-text=\"" N_("Blue") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-50.\" max=\"50.\">0</param>\n"
-                    "<param name=\"background\" gui-text=\"" N_("Bump from background") "\" indent=\"1\" type=\"boolean\">false</param>\n"
+                    "<param name=\"red\" _gui-text=\"" N_("Red") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-50.\" max=\"50.\">0</param>\n"
+                    "<param name=\"green\" _gui-text=\"" N_("Green") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-50.\" max=\"50.\">0</param>\n"
+                    "<param name=\"blue\" _gui-text=\"" N_("Blue") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-50.\" max=\"50.\">0</param>\n"
+                    "<param name=\"background\" _gui-text=\"" N_("Bump from background") "\" indent=\"1\" type=\"boolean\">false</param>\n"
                 "</page>\n"
                 "<page name=\"lightingtab\" _gui-text=\"Lighting\">\n"
-                  "<param name=\"lightType\" gui-text=\"" N_("Lighting type:") "\" type=\"enum\">\n"
+                  "<param name=\"lightType\" _gui-text=\"" N_("Lighting type:") "\" type=\"enum\">\n"
                     "<_item value=\"specular\">" N_("Specular") "</_item>\n"
                     "<_item value=\"diffuse\">" N_("Diffuse") "</_item>\n"
                   "</param>\n"
-                  "<param name=\"height\" gui-text=\"" N_("Height") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"50.\">5</param>\n"
-                  "<param name=\"lightness\" gui-text=\"" N_("Lightness") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"5.\">1</param>\n"
-                  "<param name=\"precision\" gui-text=\"" N_("Precision") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"128\">15</param>\n"
-                  "<param name=\"lightingColor\" gui-text=\"" N_("Color") "\" type=\"color\">-1</param>\n"
+                  "<param name=\"height\" _gui-text=\"" N_("Height") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"50.\">5</param>\n"
+                  "<param name=\"lightness\" _gui-text=\"" N_("Lightness") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"5.\">1</param>\n"
+                  "<param name=\"precision\" _gui-text=\"" N_("Precision") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"128\">15</param>\n"
+                  "<param name=\"lightingColor\" _gui-text=\"" N_("Color") "\" type=\"color\">-1</param>\n"
                 "</page>\n"
                 "<page name=\"lightsourcetab\" _gui-text=\"" N_("Light source") "\">\n"
-                  "<param name=\"lightSource\" gui-text=\"" N_("Light source:") "\" type=\"enum\">\n"
+                  "<param name=\"lightSource\" _gui-text=\"" N_("Light source:") "\" type=\"enum\">\n"
                     "<_item value=\"distant\">" N_("Distant") "</_item>\n"
                     "<_item value=\"point\">" N_("Point") "</_item>\n"
                     "<_item value=\"spot\">" N_("Spot") "</_item>\n"
                   "</param>\n"
                   "<_param name=\"distantHeader\" type=\"description\" appearance=\"header\">" N_("Distant light options") "</_param>\n"
-                    "<param name=\"distantAzimuth\" gui-text=\"" N_("Azimuth") "\" type=\"int\" indent=\"1\" appearance=\"full\" min=\"0\" max=\"360\">225</param>\n"
-                    "<param name=\"distantElevation\" gui-text=\"" N_("Elevation") "\" type=\"int\" indent=\"1\" appearance=\"full\" min=\"0\" max=\"180\">45</param>\n"
+                    "<param name=\"distantAzimuth\" _gui-text=\"" N_("Azimuth") "\" type=\"int\" indent=\"1\" appearance=\"full\" min=\"0\" max=\"360\">225</param>\n"
+                    "<param name=\"distantElevation\" _gui-text=\"" N_("Elevation") "\" type=\"int\" indent=\"1\" appearance=\"full\" min=\"0\" max=\"180\">45</param>\n"
                   "<_param name=\"pointHeader\" type=\"description\" appearance=\"header\">" N_("Point light options") "</_param>\n"
-                    "<param name=\"pointX\" gui-text=\"" N_("X location") "\" type=\"int\" indent=\"1\" appearance=\"full\" min=\"-5000\" max=\"5000\">526</param>\n"
-                    "<param name=\"pointY\" gui-text=\"" N_("Y location") "\" type=\"int\" indent=\"1\" appearance=\"full\" min=\"-5000\" max=\"5000\">372</param>\n"
-                    "<param name=\"pointZ\" gui-text=\"" N_("Z location") "\" type=\"int\" indent=\"1\" appearance=\"full\" min=\"0\" max=\"5000\">150</param>\n"
+                    "<param name=\"pointX\" _gui-text=\"" N_("X location") "\" type=\"int\" indent=\"1\" appearance=\"full\" min=\"-5000\" max=\"5000\">526</param>\n"
+                    "<param name=\"pointY\" _gui-text=\"" N_("Y location") "\" type=\"int\" indent=\"1\" appearance=\"full\" min=\"-5000\" max=\"5000\">372</param>\n"
+                    "<param name=\"pointZ\" _gui-text=\"" N_("Z location") "\" type=\"int\" indent=\"1\" appearance=\"full\" min=\"0\" max=\"5000\">150</param>\n"
                   "<_param name=\"spotHeader\" type=\"description\" appearance=\"header\">" N_("Spot light options") "</_param>\n"
-                    "<param name=\"spotX\" gui-text=\"" N_("X location") "\" type=\"int\" indent=\"1\" appearance=\"full\" min=\"-5000\" max=\"5000\">526</param>\n"
-                    "<param name=\"spotY\" gui-text=\"" N_("Y location") "\" type=\"int\" indent=\"1\" appearance=\"full\" min=\"-5000\" max=\"5000\">372</param>\n"
-                    "<param name=\"spotZ\" gui-text=\"" N_("Z location") "\" type=\"int\" indent=\"1\" appearance=\"full\" min=\"-5000\" max=\"5000\">150</param>\n"
-                    "<param name=\"spotAtX\" gui-text=\"" N_("X target") "\" type=\"int\" indent=\"1\" appearance=\"full\" min=\"-5000\" max=\"5000\">0</param>\n"
-                    "<param name=\"spotAtY\" gui-text=\"" N_("Y target") "\" type=\"int\" indent=\"1\" appearance=\"full\" min=\"-5000\" max=\"5000\">0</param>\n"
-                    "<param name=\"spotAtZ\" gui-text=\"" N_("Z target") "\" type=\"int\" indent=\"1\" appearance=\"full\" min=\"-5000\" max=\"0\">-1000</param>\n"
-                    "<param name=\"spotExponent\" gui-text=\"" N_("Specular exponent") "\" type=\"int\" indent=\"1\" appearance=\"full\" min=\"1\" max=\"100\">1</param>\n"
-                    "<param name=\"spotConeAngle\" gui-text=\"" N_("Cone angle") "\" type=\"int\" indent=\"1\" appearance=\"full\" min=\"0\" max=\"100\">50</param>\n"
+                    "<param name=\"spotX\" _gui-text=\"" N_("X location") "\" type=\"int\" indent=\"1\" appearance=\"full\" min=\"-5000\" max=\"5000\">526</param>\n"
+                    "<param name=\"spotY\" _gui-text=\"" N_("Y location") "\" type=\"int\" indent=\"1\" appearance=\"full\" min=\"-5000\" max=\"5000\">372</param>\n"
+                    "<param name=\"spotZ\" _gui-text=\"" N_("Z location") "\" type=\"int\" indent=\"1\" appearance=\"full\" min=\"-5000\" max=\"5000\">150</param>\n"
+                    "<param name=\"spotAtX\" _gui-text=\"" N_("X target") "\" type=\"int\" indent=\"1\" appearance=\"full\" min=\"-5000\" max=\"5000\">0</param>\n"
+                    "<param name=\"spotAtY\" _gui-text=\"" N_("Y target") "\" type=\"int\" indent=\"1\" appearance=\"full\" min=\"-5000\" max=\"5000\">0</param>\n"
+                    "<param name=\"spotAtZ\" _gui-text=\"" N_("Z target") "\" type=\"int\" indent=\"1\" appearance=\"full\" min=\"-5000\" max=\"0\">-1000</param>\n"
+                    "<param name=\"spotExponent\" _gui-text=\"" N_("Specular exponent") "\" type=\"int\" indent=\"1\" appearance=\"full\" min=\"1\" max=\"100\">1</param>\n"
+                    "<param name=\"spotConeAngle\" _gui-text=\"" N_("Cone angle") "\" type=\"int\" indent=\"1\" appearance=\"full\" min=\"0\" max=\"100\">50</param>\n"
                 "</page>\n"
                 "<page name=\"colortab\" _gui-text=\"Color bump\">\n"
-                  "<param name=\"imageColor\" gui-text=\"" N_("Image color") "\" type=\"color\">-987158017</param>\n"
-                  "<param name=\"colorize\" gui-text=\"" N_("Color bump") "\" type=\"boolean\" >false</param>\n"
-                  "<param name=\"blend\" gui-text=\"" N_("Blend type:") "\" type=\"enum\">\n"
+                  "<param name=\"imageColor\" _gui-text=\"" N_("Image color") "\" type=\"color\">-987158017</param>\n"
+                  "<param name=\"colorize\" _gui-text=\"" N_("Color bump") "\" type=\"boolean\" >false</param>\n"
+                  "<param name=\"blend\" _gui-text=\"" N_("Blend type:") "\" type=\"enum\">\n"
                     "<_item value=\"normal\">" N_("Normal") "</_item>\n"
                     "<_item value=\"darken\">" N_("Darken") "</_item>\n"
                     "<_item value=\"screen\">" N_("Screen") "</_item>\n"
@@ -310,35 +310,35 @@ public:
               "<id>org.inkscape.effect.filter.WaxBump</id>\n"
               "<param name=\"tab\" type=\"notebook\">\n"
                 "<page name=\"optionstab\" _gui-text=\"Options\">\n"
-                  "<param name=\"simplifyImage\" gui-text=\"" N_("Image simplification") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"10.00\">1.5</param>\n"
-                  "<param name=\"simplifyBump\" gui-text=\"" N_("Bump simplification") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"10.00\">1</param>\n"
-                  "<param name=\"crop\" gui-text=\"" N_("Crop") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-10.\" max=\"10.\">1</param>\n"
+                  "<param name=\"simplifyImage\" _gui-text=\"" N_("Image simplification") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"10.00\">1.5</param>\n"
+                  "<param name=\"simplifyBump\" _gui-text=\"" N_("Bump simplification") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"10.00\">1</param>\n"
+                  "<param name=\"crop\" _gui-text=\"" N_("Crop") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-10.\" max=\"10.\">1</param>\n"
                   "<_param name=\"sourceHeader\" type=\"description\" appearance=\"header\">" N_("Bump source") "</_param>\n"
-                    "<param name=\"red\" gui-text=\"" N_("Red") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-10.\" max=\"10.\">0</param>\n"
-                    "<param name=\"green\" gui-text=\"" N_("Green") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-10.\" max=\"10.\">0</param>\n"
-                    "<param name=\"blue\" gui-text=\"" N_("Blue") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-10.\" max=\"10.\">0</param>\n"
-                    "<param name=\"background\" gui-text=\"" N_("Background:") "\" type=\"enum\">\n"
+                    "<param name=\"red\" _gui-text=\"" N_("Red") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-10.\" max=\"10.\">0</param>\n"
+                    "<param name=\"green\" _gui-text=\"" N_("Green") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-10.\" max=\"10.\">0</param>\n"
+                    "<param name=\"blue\" _gui-text=\"" N_("Blue") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-10.\" max=\"10.\">0</param>\n"
+                    "<param name=\"background\" _gui-text=\"" N_("Background:") "\" type=\"enum\">\n"
                       "<_item value=\"flood1\">" N_("Color") "</_item>\n"
                       "<_item value=\"SourceGraphic\">" N_("Image") "</_item>\n"
                       "<_item value=\"blur1\">" N_("Blurred image") "</_item>\n"
                     "</param>\n"
-                    "<param name=\"bgopacity\" gui-text=\"" N_("Background opacity") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.\" max=\"1.\">0</param>\n"
+                    "<param name=\"bgopacity\" _gui-text=\"" N_("Background opacity") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.\" max=\"1.\">0</param>\n"
                 "</page>\n"
                 "<page name=\"lightingtab\" _gui-text=\"" N_("Lighting") "\">\n"
-                  "<param name=\"lightingColor\" gui-text=\"" N_("Color") "\" type=\"color\">-1</param>\n"
-                  "<param name=\"height\" gui-text=\"" N_("Height") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-50.\" max=\"50.\">5</param>\n"
-                  "<param name=\"lightness\" gui-text=\"" N_("Lightness") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"10.\">1.4</param>\n"
-                  "<param name=\"precision\" gui-text=\"" N_("Precision") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"50\">35</param>\n"
-                  "<param name=\"distantAzimuth\" gui-text=\"" N_("Azimuth") "\" type=\"int\" indent=\"1\" appearance=\"full\" min=\"0\" max=\"360\">225</param>\n"
-                  "<param name=\"distantElevation\" gui-text=\"" N_("Elevation") "\" type=\"int\" indent=\"1\" appearance=\"full\" min=\"0\" max=\"180\">60</param>\n"
-                  "<param name=\"lightingblend\" gui-text=\"" N_("Lighting blend:") "\" type=\"enum\">\n"
+                  "<param name=\"lightingColor\" _gui-text=\"" N_("Color") "\" type=\"color\">-1</param>\n"
+                  "<param name=\"height\" _gui-text=\"" N_("Height") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-50.\" max=\"50.\">5</param>\n"
+                  "<param name=\"lightness\" _gui-text=\"" N_("Lightness") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"10.\">1.4</param>\n"
+                  "<param name=\"precision\" _gui-text=\"" N_("Precision") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"50\">35</param>\n"
+                  "<param name=\"distantAzimuth\" _gui-text=\"" N_("Azimuth") "\" type=\"int\" indent=\"1\" appearance=\"full\" min=\"0\" max=\"360\">225</param>\n"
+                  "<param name=\"distantElevation\" _gui-text=\"" N_("Elevation") "\" type=\"int\" indent=\"1\" appearance=\"full\" min=\"0\" max=\"180\">60</param>\n"
+                  "<param name=\"lightingblend\" _gui-text=\"" N_("Lighting blend:") "\" type=\"enum\">\n"
                     "<_item value=\"screen\">" N_("Screen") "</_item>\n"
                     "<_item value=\"normal\">" N_("Normal") "</_item>\n"
                     "<_item value=\"darken\">" N_("Darken") "</_item>\n"
                     "<_item value=\"multiply\">" N_("Multiply") "</_item>\n"
                     "<_item value=\"lighten\">" N_("Lighten") "</_item>\n"
                   "</param>\n"
-                  "<param name=\"highlightblend\" gui-text=\"" N_("Highlight blend:") "\" type=\"enum\">\n"
+                  "<param name=\"highlightblend\" _gui-text=\"" N_("Highlight blend:") "\" type=\"enum\">\n"
                     "<_item value=\"screen\">" N_("Screen") "</_item>\n"
                     "<_item value=\"normal\">" N_("Normal") "</_item>\n"
                     "<_item value=\"darken\">" N_("Darken") "</_item>\n"
@@ -347,9 +347,9 @@ public:
                   "</param>\n"
                 "</page>\n"
                 "<page name=\"colortab\" _gui-text=\"Bump\">\n"
-                  "<param name=\"imageColor\" gui-text=\"" N_("Bump color") "\" type=\"color\">-520083713</param>\n"
-                  "<param name=\"revert\" gui-text=\"" N_("Revert bump") "\" type=\"boolean\" >false</param>\n"
-                  "<param name=\"transparency\" gui-text=\"" N_("Transparency type:") "\" type=\"enum\">\n"
+                  "<param name=\"imageColor\" _gui-text=\"" N_("Bump color") "\" type=\"color\">-520083713</param>\n"
+                  "<param name=\"revert\" _gui-text=\"" N_("Revert bump") "\" type=\"boolean\" >false</param>\n"
+                  "<param name=\"transparency\" _gui-text=\"" N_("Transparency type:") "\" type=\"enum\">\n"
                     "<_item value=\"atop\">" N_("Atop") "</_item>\n"
                     "<_item value=\"in\">" N_("In") "</_item>\n"
                   "</param>\n"
diff --git a/src/extension/internal/filter/color.h b/src/extension/internal/filter/color.h
index b9c76615c..a6b777d20 100644
--- a/src/extension/internal/filter/color.h
+++ b/src/extension/internal/filter/color.h
@@ -72,10 +72,10 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
               "<name>" N_("Brilliance") "</name>\n"
               "<id>org.inkscape.effect.filter.Brilliance</id>\n"
-              "<param name=\"brightness\" gui-text=\"" N_("Brightness") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"1\" max=\"10.00\">2</param>\n"
-              "<param name=\"sat\" gui-text=\"" N_("Over-saturation") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.0\" max=\"10.00\">0.5</param>\n"
-              "<param name=\"lightness\" gui-text=\"" N_("Lightness") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-10.00\" max=\"10.00\">0</param>\n"
-              "<param name=\"invert\" gui-text=\"" N_("Inverted") "\" type=\"boolean\">false</param>\n"
+              "<param name=\"brightness\" _gui-text=\"" N_("Brightness") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"1\" max=\"10.00\">2</param>\n"
+              "<param name=\"sat\" _gui-text=\"" N_("Over-saturation") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.0\" max=\"10.00\">0.5</param>\n"
+              "<param name=\"lightness\" _gui-text=\"" N_("Lightness") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-10.00\" max=\"10.00\">0</param>\n"
+              "<param name=\"invert\" _gui-text=\"" N_("Inverted") "\" type=\"boolean\">false</param>\n"
               "<effect>\n"
                 "<object-type>all</object-type>\n"
                 "<effects-menu>\n"
@@ -154,15 +154,15 @@ public:
               "<id>org.inkscape.effect.filter.ChannelPaint</id>\n"
                 "<param name=\"tab\" type=\"notebook\">\n"
                   "<page name=\"optionstab\" _gui-text=\"Options\">\n"
-                    "<param name=\"saturation\" gui-text=\"" N_("Saturation") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.\" max=\"1.\">1</param>\n"
-                    "<param name=\"red\" gui-text=\"" N_("Red") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-10.\" max=\"10.\">-1</param>\n"
-                    "<param name=\"green\" gui-text=\"" N_("Green") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-10.\" max=\"10.\">0.5</param>\n"
-                    "<param name=\"blue\" gui-text=\"" N_("Blue") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-10.\" max=\"10.\">0.5</param>\n"
-                    "<param name=\"alpha\" gui-text=\"" N_("Alpha") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-10.\" max=\"10.\">1</param>\n"
-                    "<param name=\"invert\" gui-text=\"" N_("Inverted") "\" type=\"boolean\">false</param>\n"
+                    "<param name=\"saturation\" _gui-text=\"" N_("Saturation") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.\" max=\"1.\">1</param>\n"
+                    "<param name=\"red\" _gui-text=\"" N_("Red") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-10.\" max=\"10.\">-1</param>\n"
+                    "<param name=\"green\" _gui-text=\"" N_("Green") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-10.\" max=\"10.\">0.5</param>\n"
+                    "<param name=\"blue\" _gui-text=\"" N_("Blue") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-10.\" max=\"10.\">0.5</param>\n"
+                    "<param name=\"alpha\" _gui-text=\"" N_("Alpha") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-10.\" max=\"10.\">1</param>\n"
+                    "<param name=\"invert\" _gui-text=\"" N_("Inverted") "\" type=\"boolean\">false</param>\n"
                   "</page>\n"
                   "<page name=\"colortab\" _gui-text=\"Color\">\n"
-                    "<param name=\"color\" gui-text=\"" N_("Color") "\" type=\"color\">16777215</param>\n"
+                    "<param name=\"color\" _gui-text=\"" N_("Color") "\" type=\"color\">16777215</param>\n"
                   "</page>\n"
                 "</param>\n"
               "<effect>\n"
@@ -255,7 +255,7 @@ public:
               "<id>org.inkscape.effect.filter.ColorBlindness</id>\n"
               "<param name=\"tab\" type=\"notebook\">\n"
                 "<page name=\"optionstab\" _gui-text=\"Options\">\n"
-                  "<param name=\"type\" gui-text=\"" N_("Blindness type:") "\" type=\"enum\">\n"
+                  "<param name=\"type\" _gui-text=\"" N_("Blindness type:") "\" type=\"enum\">\n"
                     "<_item value=\"0.618 0.32 0.062 0 0 0.163 0.775 0.062 0 0 0.163 0.32 0.516 0 0 0 0 0 1 0 \">" N_("Rod monochromacy (atypical achromatopsia)") "</_item>\n"
                     "<_item value=\"0.299 0.587 0.114 0 0 0.299 0.587 0.114 0 0 0.299 0.587 0.114 0 0 0 0 0 1 0 \">" N_("Cone monochromacy (typical achromatopsia)") "</_item>\n"
                     "<_item value=\"0.8 0.2 0 0 0 0.2583 0.74167 0 0 0 0 0.14167 0.85833 0 0 0 0 0 1 0 \">" N_("Green weak (deuteranomaly)") "</_item>\n"
@@ -328,8 +328,8 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
               "<name>" N_("Color Shift") "</name>\n"
               "<id>org.inkscape.effect.filter.ColorShift</id>\n"
-              "<param name=\"shift\" gui-text=\"" N_("Shift (°)") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"360\">330</param>\n"
-              "<param name=\"sat\" gui-text=\"" N_("Saturation") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.\" max=\"1\">0.6</param>\n"
+              "<param name=\"shift\" _gui-text=\"" N_("Shift (°)") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"360\">330</param>\n"
+              "<param name=\"sat\" _gui-text=\"" N_("Saturation") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.\" max=\"1\">0.6</param>\n"
               "<effect>\n"
                 "<object-type>all</object-type>\n"
                 "<effects-menu>\n"
@@ -393,17 +393,17 @@ public:
                 "<id>org.inkscape.effect.filter.Colorize</id>\n"
                 "<param name=\"tab\" type=\"notebook\">\n"
                   "<page name=\"optionstab\" _gui-text=\"Options\">\n"
-                    "<param name=\"hlight\" gui-text=\"" N_("Harsh light") "\" type=\"float\" appearance=\"full\" min=\"0\" max=\"10\">0</param>\n"
-                    "<param name=\"nlight\" gui-text=\"" N_("Normal light") "\" type=\"float\" appearance=\"full\" min=\"0\" max=\"10\">1</param>\n"
-                    "<param name=\"duotone\" gui-text=\"" N_("Duotone") "\" type=\"boolean\" >false</param>\n"
-                    "<param name=\"blend1\" gui-text=\"" N_("Blend 1:") "\" type=\"enum\">\n"
+                    "<param name=\"hlight\" _gui-text=\"" N_("Harsh light") "\" type=\"float\" appearance=\"full\" min=\"0\" max=\"10\">0</param>\n"
+                    "<param name=\"nlight\" _gui-text=\"" N_("Normal light") "\" type=\"float\" appearance=\"full\" min=\"0\" max=\"10\">1</param>\n"
+                    "<param name=\"duotone\" _gui-text=\"" N_("Duotone") "\" type=\"boolean\" >false</param>\n"
+                    "<param name=\"blend1\" _gui-text=\"" N_("Blend 1:") "\" type=\"enum\">\n"
                       "<_item value=\"multiply\">" N_("Multiply") "</_item>\n"
                       "<_item value=\"normal\">" N_("Normal") "</_item>\n"
                       "<_item value=\"screen\">" N_("Screen") "</_item>\n"
                       "<_item value=\"lighten\">" N_("Lighten") "</_item>\n"
                       "<_item value=\"darken\">" N_("Darken") "</_item>\n"
                     "</param>\n"
-                    "<param name=\"blend2\" gui-text=\"" N_("Blend 2:") "\" type=\"enum\">\n"
+                    "<param name=\"blend2\" _gui-text=\"" N_("Blend 2:") "\" type=\"enum\">\n"
                       "<_item value=\"screen\">" N_("Screen") "</_item>\n"
                       "<_item value=\"multiply\">" N_("Multiply") "</_item>\n"
                       "<_item value=\"normal\">" N_("Normal") "</_item>\n"
@@ -412,7 +412,7 @@ public:
                     "</param>\n"
                   "</page>\n"
                   "<page name=\"colortab\" _gui-text=\"Color\">\n"
-                    "<param name=\"color\" gui-text=\"" N_("Color") "\" type=\"color\">-1639776001</param>\n"
+                    "<param name=\"color\" _gui-text=\"" N_("Color") "\" type=\"color\">-1639776001</param>\n"
                   "</page>\n"
                 "</param>\n"
                 "<effect>\n"
@@ -498,7 +498,7 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
               "<name>" N_("Component Transfer") "</name>\n"
               "<id>org.inkscape.effect.filter.ComponentTransfer</id>\n"
-              "<param name=\"type\" gui-text=\"" N_("Type:") "\" type=\"enum\">\n"
+              "<param name=\"type\" _gui-text=\"" N_("Type:") "\" type=\"enum\">\n"
                 "<_item value=\"identity\">" N_("Identity") "</_item>\n"
                 "<_item value=\"table\">" N_("Table") "</_item>\n"
                 "<_item value=\"discrete\">" N_("Discrete") "</_item>\n"
@@ -585,8 +585,8 @@ public:
               "<id>org.inkscape.effect.filter.Duochrome</id>\n"
               "<param name=\"tab\" type=\"notebook\">\n"
                 "<page name=\"optionstab\" _gui-text=\"Options\">\n"
-                  "<param name=\"fluo\" gui-text=\"" N_("Fluorescence level") "\" type=\"float\" appearance=\"full\" min=\"0\" max=\"2\">0</param>\n"
-                  "<param name=\"swap\" gui-text=\"" N_("Swap:") "\" type=\"enum\">\n"
+                  "<param name=\"fluo\" _gui-text=\"" N_("Fluorescence level") "\" type=\"float\" appearance=\"full\" min=\"0\" max=\"2\">0</param>\n"
+                  "<param name=\"swap\" _gui-text=\"" N_("Swap:") "\" type=\"enum\">\n"
                     "<_item value=\"none\">" N_("No swap") "</_item>\n"
                     "<_item value=\"full\">" N_("Color and alpha") "</_item>\n"
                     "<_item value=\"color\">" N_("Color only") "</_item>\n"
@@ -594,10 +594,10 @@ public:
                   "</param>\n"
                 "</page>\n"
                 "<page name=\"co11tab\" _gui-text=\"Color 1\">\n"
-                  "<param name=\"color1\" gui-text=\"" N_("Color 1") "\" type=\"color\">1364325887</param>\n"
+                  "<param name=\"color1\" _gui-text=\"" N_("Color 1") "\" type=\"color\">1364325887</param>\n"
                 "</page>\n"
                 "<page name=\"co12tab\" _gui-text=\"Color 2\">\n"
-                  "<param name=\"color2\" gui-text=\"" N_("Color 2") "\" type=\"color\">-65281</param>\n"
+                  "<param name=\"color2\" _gui-text=\"" N_("Color 2") "\" type=\"color\">-65281</param>\n"
                 "</page>\n"
               "</param>\n"
               "<effect>\n"
@@ -708,7 +708,7 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
               "<name>" N_("Extract Channel") "</name>\n"
               "<id>org.inkscape.effect.filter.ExtractChannel</id>\n"
-              "<param name=\"source\" gui-text=\"" N_("Channel:") "\" type=\"enum\">\n"
+              "<param name=\"source\" _gui-text=\"" N_("Channel:") "\" type=\"enum\">\n"
                 "<_item value=\"r\">" N_("Red") "</_item>\n"
                 "<_item value=\"g\">" N_("Green") "</_item>\n"
                 "<_item value=\"b\">" N_("Blue") "</_item>\n"
@@ -716,12 +716,12 @@ public:
                 "<_item value=\"m\">" N_("Magenta") "</_item>\n"
                 "<_item value=\"y\">" N_("Yellow") "</_item>\n"
               "</param>\n"
-              "<param name=\"blend\" gui-text=\"" N_("Background blend mode:") "\" type=\"enum\">\n"
+              "<param name=\"blend\" _gui-text=\"" N_("Background blend mode:") "\" type=\"enum\">\n"
                 "<_item value=\"multiply\">" N_("Multiply") "</_item>\n"
                 "<_item value=\"normal\">" N_("Normal") "</_item>\n"
                 "<_item value=\"screen\">" N_("Screen") "</_item>\n"
               "</param>\n"
-              "<param name=\"alpha\" gui-text=\"" N_("Channel to alpha") "\" type=\"boolean\">false</param>\n"
+              "<param name=\"alpha\" _gui-text=\"" N_("Channel to alpha") "\" type=\"boolean\">false</param>\n"
               "<effect>\n"
                 "<object-type>all</object-type>\n"
                 "<effects-menu>\n"
@@ -814,8 +814,8 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
               "<name>" N_("Fade to Black or White") "</name>\n"
               "<id>org.inkscape.effect.filter.FadeToBW</id>\n"
-              "<param name=\"level\" gui-text=\"" N_("Level") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"1\">1</param>\n"
-              "<param name=\"fadeto\" gui-text=\"" N_("Fade to:") "\" type=\"enum\">\n"
+              "<param name=\"level\" _gui-text=\"" N_("Level") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"1\">1</param>\n"
+              "<param name=\"fadeto\" _gui-text=\"" N_("Fade to:") "\" type=\"enum\">\n"
                 "<_item value=\"black\">" N_("Black") "</_item>\n"
                 "<_item value=\"white\">" N_("White") "</_item>\n"
               "</param>\n"
@@ -893,11 +893,11 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
               "<name>" N_("Greyscale") "</name>\n"
               "<id>org.inkscape.effect.filter.Greyscale</id>\n"
-              "<param name=\"red\" gui-text=\"" N_("Red") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-10.00\" max=\"10.00\">0.21</param>\n"
-              "<param name=\"green\" gui-text=\"" N_("Green") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-10.00\" max=\"10.00\">0.72</param>\n"
-              "<param name=\"blue\" gui-text=\"" N_("Blue") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-10.00\" max=\"10.00\">0.072</param>\n"
-              "<param name=\"strength\" gui-text=\"" N_("Lightness") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-10.00\" max=\"10.00\">0</param>\n"
-              "<param name=\"transparent\" gui-text=\"" N_("Transparent") "\" type=\"boolean\" >false</param>\n"
+              "<param name=\"red\" _gui-text=\"" N_("Red") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-10.00\" max=\"10.00\">0.21</param>\n"
+              "<param name=\"green\" _gui-text=\"" N_("Green") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-10.00\" max=\"10.00\">0.72</param>\n"
+              "<param name=\"blue\" _gui-text=\"" N_("Blue") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-10.00\" max=\"10.00\">0.072</param>\n"
+              "<param name=\"strength\" _gui-text=\"" N_("Lightness") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-10.00\" max=\"10.00\">0</param>\n"
+              "<param name=\"transparent\" _gui-text=\"" N_("Transparent") "\" type=\"boolean\" >false</param>\n"
               "<effect>\n"
                 "<object-type>all</object-type>\n"
                 "<effects-menu>\n"
@@ -979,16 +979,16 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
               "<name>" N_("Invert") "</name>\n"
               "<id>org.inkscape.effect.filter.Invert</id>\n"
-              "<param name=\"channels\" gui-text=\"" N_("Invert channels:") "\" type=\"enum\">\n"
+              "<param name=\"channels\" _gui-text=\"" N_("Invert channels:") "\" type=\"enum\">\n"
                 "<_item value=\"0\">" N_("No inversion") "</_item>\n"
                 "<_item value=\"1\">" N_("Red and blue") "</_item>\n"
                 "<_item value=\"2\">" N_("Red and green") "</_item>\n"
                 "<_item value=\"3\">" N_("Green and blue") "</_item>\n"
               "</param>\n"
-              "<param name=\"opacify\" gui-text=\"" N_("Light transparency") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.\" max=\"1\">0</param>\n"
-              "<param name=\"hue\" gui-text=\"" N_("Invert hue") "\" type=\"boolean\" >false</param>\n"
-              "<param name=\"lightness\" gui-text=\"" N_("Invert lightness") "\" type=\"boolean\" >false</param>\n"
-              "<param name=\"transparency\" gui-text=\"" N_("Invert transparency") "\" type=\"boolean\" >false</param>\n"
+              "<param name=\"opacify\" _gui-text=\"" N_("Light transparency") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.\" max=\"1\">0</param>\n"
+              "<param name=\"hue\" _gui-text=\"" N_("Invert hue") "\" type=\"boolean\" >false</param>\n"
+              "<param name=\"lightness\" _gui-text=\"" N_("Invert lightness") "\" type=\"boolean\" >false</param>\n"
+              "<param name=\"transparency\" _gui-text=\"" N_("Invert transparency") "\" type=\"boolean\" >false</param>\n"
               "<effect>\n"
                 "<object-type>all</object-type>\n"
                 "<effects-menu>\n"
@@ -1114,9 +1114,9 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
               "<name>" N_("Lighting") "</name>\n"
               "<id>org.inkscape.effect.filter.Lighting</id>\n"
-              "<param name=\"amplitude\" gui-text=\"" N_("Lights") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.00\" max=\"20.00\">1</param>\n"
-              "<param name=\"exponent\" gui-text=\"" N_("Shadows") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.00\" max=\"20.00\">1</param>\n"
-              "<param name=\"offset\" gui-text=\"" N_("Offset") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-1.00\" max=\"1.00\">0</param>\n"
+              "<param name=\"amplitude\" _gui-text=\"" N_("Lights") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.00\" max=\"20.00\">1</param>\n"
+              "<param name=\"exponent\" _gui-text=\"" N_("Shadows") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.00\" max=\"20.00\">1</param>\n"
+              "<param name=\"offset\" _gui-text=\"" N_("Offset") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-1.00\" max=\"1.00\">0</param>\n"
               "<effect>\n"
                 "<object-type>all</object-type>\n"
                 "<effects-menu>\n"
@@ -1185,8 +1185,8 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
               "<name>" N_("Lightness-Contrast") "</name>\n"
               "<id>org.inkscape.effect.filter.LightnessContrast</id>\n"
-              "<param name=\"lightness\" gui-text=\"" N_("Lightness") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-100\" max=\"100\">0</param>\n"
-              "<param name=\"contrast\" gui-text=\"" N_("Contrast") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-100\" max=\"100\">0</param>\n"
+              "<param name=\"lightness\" _gui-text=\"" N_("Lightness") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-100\" max=\"100\">0</param>\n"
+              "<param name=\"contrast\" _gui-text=\"" N_("Contrast") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-100\" max=\"100\">0</param>\n"
               "<effect>\n"
                 "<object-type>all</object-type>\n"
                 "<effects-menu>\n"
@@ -1267,17 +1267,17 @@ public:
               "<param name=\"tab\" type=\"notebook\">\n"
                 "<page name=\"offsettab\" _gui-text=\"Offset\">\n"
                   "<_param name=\"redOffset\" type=\"description\" appearance=\"header\">" N_("Red offset") "</_param>\n"
-                    "<param name=\"rx\" gui-text=\"" N_("X") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-100.\" max=\"100.\">-6</param>\n"
-                    "<param name=\"ry\" gui-text=\"" N_("Y") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-100.\" max=\"100.\">-6</param>\n"
+                    "<param name=\"rx\" _gui-text=\"" N_("X") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-100.\" max=\"100.\">-6</param>\n"
+                    "<param name=\"ry\" _gui-text=\"" N_("Y") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-100.\" max=\"100.\">-6</param>\n"
                 "<_param name=\"greenOffset\" type=\"description\" appearance=\"header\">" N_("Green offset") "</_param>\n"
-                    "<param name=\"gx\" gui-text=\"" N_("X") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-100.\" max=\"100.\">6</param>\n"
-                    "<param name=\"gy\" gui-text=\"" N_("Y") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-100.\" max=\"100.\">7</param>\n"
+                    "<param name=\"gx\" _gui-text=\"" N_("X") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-100.\" max=\"100.\">6</param>\n"
+                    "<param name=\"gy\" _gui-text=\"" N_("Y") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-100.\" max=\"100.\">7</param>\n"
                   "<_param name=\"redOffset\" type=\"description\" appearance=\"header\">" N_("Blue offset") "</_param>\n"
-                    "<param name=\"bx\" gui-text=\"" N_("X") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-100.\" max=\"100.\">1</param>\n"
-                    "<param name=\"by\" gui-text=\"" N_("Y") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-100.\" max=\"100.\">-16</param>\n"
+                    "<param name=\"bx\" _gui-text=\"" N_("X") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-100.\" max=\"100.\">1</param>\n"
+                    "<param name=\"by\" _gui-text=\"" N_("Y") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-100.\" max=\"100.\">-16</param>\n"
                 "</page>\n"
                 "<page name=\"coltab\" _gui-text=\"Color\">\n"
-                  "<param name=\"color\" gui-text=\"" N_("Background color") "\" type=\"color\">255</param>\n"
+                  "<param name=\"color\" _gui-text=\"" N_("Background color") "\" type=\"color\">255</param>\n"
                 "</page>\n"
               "</param>\n"
               "<effect>\n"
@@ -1379,17 +1379,17 @@ public:
               "<param name=\"tab\" type=\"notebook\">\n"
                 "<page name=\"offsettab\" _gui-text=\"Offset\">\n"
                   "<_param name=\"cyanOffset\" type=\"description\" appearance=\"header\">" N_("Cyan offset") "</_param>\n"
-                    "<param name=\"cx\" gui-text=\"" N_("X") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-100.\" max=\"100.\">-6</param>\n"
-                    "<param name=\"cy\" gui-text=\"" N_("Y") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-100.\" max=\"100.\">-6</param>\n"
+                    "<param name=\"cx\" _gui-text=\"" N_("X") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-100.\" max=\"100.\">-6</param>\n"
+                    "<param name=\"cy\" _gui-text=\"" N_("Y") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-100.\" max=\"100.\">-6</param>\n"
                 "<_param name=\"magentaOffset\" type=\"description\" appearance=\"header\">" N_("Magenta offset") "</_param>\n"
-                    "<param name=\"mx\" gui-text=\"" N_("X") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-100.\" max=\"100.\">6</param>\n"
-                    "<param name=\"my\" gui-text=\"" N_("Y") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-100.\" max=\"100.\">7</param>\n"
+                    "<param name=\"mx\" _gui-text=\"" N_("X") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-100.\" max=\"100.\">6</param>\n"
+                    "<param name=\"my\" _gui-text=\"" N_("Y") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-100.\" max=\"100.\">7</param>\n"
                   "<_param name=\"yellowOffset\" type=\"description\" appearance=\"header\">" N_("Yellow offset") "</_param>\n"
-                    "<param name=\"yx\" gui-text=\"" N_("X") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-100.\" max=\"100.\">1</param>\n"
-                    "<param name=\"yy\" gui-text=\"" N_("Y") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-100.\" max=\"100.\">-16</param>\n"
+                    "<param name=\"yx\" _gui-text=\"" N_("X") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-100.\" max=\"100.\">1</param>\n"
+                    "<param name=\"yy\" _gui-text=\"" N_("Y") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-100.\" max=\"100.\">-16</param>\n"
                 "</page>\n"
                 "<page name=\"coltab\" _gui-text=\"Color\">\n"
-                  "<param name=\"color\" gui-text=\"" N_("Background color") "\" type=\"color\">-1</param>\n"
+                  "<param name=\"color\" _gui-text=\"" N_("Background color") "\" type=\"color\">-1</param>\n"
                 "</page>\n"
               "</param>\n"
               "<effect>\n"
@@ -1482,15 +1482,15 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
               "<name>" N_("Quadritone fantasy") "</name>\n"
               "<id>org.inkscape.effect.filter.Quadritone</id>\n"
-                "<param name=\"dist\" gui-text=\"" N_("Hue distribution (°)") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"360\">280</param>\n"
-                "<param name=\"colors\" gui-text=\"" N_("Colors") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"360\">100</param>\n"
-                "<param name=\"blend1\" gui-text=\"" N_("Blend 1:") "\" type=\"enum\">\n"
+                "<param name=\"dist\" _gui-text=\"" N_("Hue distribution (°)") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"360\">280</param>\n"
+                "<param name=\"colors\" _gui-text=\"" N_("Colors") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"360\">100</param>\n"
+                "<param name=\"blend1\" _gui-text=\"" N_("Blend 1:") "\" type=\"enum\">\n"
                   "<_item value=\"normal\">" N_("Normal") "</_item>\n"
                   "<_item value=\"multiply\">" N_("Multiply") "</_item>\n"
                   "<_item value=\"screen\">" N_("Screen") "</_item>\n"
                 "</param>\n"
-                "<param name=\"sat\" gui-text=\"" N_("Over-saturation") "\" type=\"float\" appearance=\"full\" precision=\"2\"  min=\"0.00\" max=\"1.00\">0</param>\n"
-                "<param name=\"blend2\" gui-text=\"" N_("Blend 2:") "\" type=\"enum\">\n"
+                "<param name=\"sat\" _gui-text=\"" N_("Over-saturation") "\" type=\"float\" appearance=\"full\" precision=\"2\"  min=\"0.00\" max=\"1.00\">0</param>\n"
+                "<param name=\"blend2\" _gui-text=\"" N_("Blend 2:") "\" type=\"enum\">\n"
                   "<_item value=\"normal\">" N_("Normal") "</_item>\n"
                   "<_item value=\"screen\">" N_("Screen") "</_item>\n"
                   "<_item value=\"multiply\">" N_("Multiply") "</_item>\n"
@@ -1568,8 +1568,8 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
               "<name>" N_("Solarize") "</name>\n"
               "<id>org.inkscape.effect.filter.Solarize</id>\n"
-              "<param name=\"rotate\" gui-text=\"" N_("Hue rotation (°)") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"360\">0</param>\n"
-              "<param name=\"type\" gui-text=\"" N_("Type:") "\" type=\"enum\">\n"
+              "<param name=\"rotate\" _gui-text=\"" N_("Hue rotation (°)") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"360\">0</param>\n"
+              "<param name=\"type\" _gui-text=\"" N_("Type:") "\" type=\"enum\">\n"
                 "<_item value=\"solarize\">" N_("Solarize") "</_item>\n"
                 "<_item value=\"moonarize\">" N_("Moonarize") "</_item>\n"
               "</param>\n"
@@ -1657,31 +1657,31 @@ public:
               "<id>org.inkscape.effect.filter.Tritone</id>\n"
               "<param name=\"tab\" type=\"notebook\">\n"
                 "<page name=\"optionstab\" _gui-text=\"Options\">\n"
-                  "<param name=\"type\" gui-text=\"" N_("Type:") "\" type=\"enum\">\n"
+                  "<param name=\"type\" _gui-text=\"" N_("Type:") "\" type=\"enum\">\n"
                     "<_item value=\"normal\">" N_("Normal") "</_item>\n"
                     "<_item value=\"enhue\">" N_("Enhance hue") "</_item>\n"
                     "<_item value=\"phospho\">" N_("Phosphorescence") "</_item>\n"
                     "<_item value=\"phosphoB\">" N_("Colored nights") "</_item>\n"
                     "<_item value=\"htb\">" N_("Hue to background") "</_item>\n"
                   "</param>\n"
-                  "<param name=\"globalblend\" gui-text=\"" N_("Global blend:") "\" type=\"enum\">\n"
+                  "<param name=\"globalblend\" _gui-text=\"" N_("Global blend:") "\" type=\"enum\">\n"
                     "<_item value=\"lighten\">" N_("Lighten") "</_item>\n"
                     "<_item value=\"screen\">" N_("Screen") "</_item>\n"
                     "<_item value=\"multiply\">" N_("Multiply") "</_item>\n"
                     "<_item value=\"darken\">" N_("Darken") "</_item>\n"
                   "</param>\n"
-                  "<param name=\"glow\" gui-text=\"" N_("Glow") "\" type=\"float\" appearance=\"full\" min=\"0.01\" max=\"10\">0.01</param>\n"
-                  "<param name=\"glowblend\" gui-text=\"" N_("Glow blend:") "\" type=\"enum\">\n"
+                  "<param name=\"glow\" _gui-text=\"" N_("Glow") "\" type=\"float\" appearance=\"full\" min=\"0.01\" max=\"10\">0.01</param>\n"
+                  "<param name=\"glowblend\" _gui-text=\"" N_("Glow blend:") "\" type=\"enum\">\n"
                     "<_item value=\"normal\">" N_("Normal") "</_item>\n"
                     "<_item value=\"multiply\">" N_("Multiply") "</_item>\n"
                     "<_item value=\"darken\">" N_("Darken") "</_item>\n"
                   "</param>\n"
-                  "<param name=\"llight\" gui-text=\"" N_("Local light") "\" type=\"float\" appearance=\"full\" min=\"0\" max=\"10\">0</param>\n"
-                  "<param name=\"glight\" gui-text=\"" N_("Global light") "\" type=\"float\" appearance=\"full\" min=\"0\" max=\"10\">1</param>\n"
+                  "<param name=\"llight\" _gui-text=\"" N_("Local light") "\" type=\"float\" appearance=\"full\" min=\"0\" max=\"10\">0</param>\n"
+                  "<param name=\"glight\" _gui-text=\"" N_("Global light") "\" type=\"float\" appearance=\"full\" min=\"0\" max=\"10\">1</param>\n"
                 "</page>\n"
                 "<page name=\"co1tab\" _gui-text=\"Color\">\n"
-                  "<param name=\"dist\" gui-text=\"" N_("Hue distribution (°):") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"360\">0</param>\n"
-                  "<param name=\"color\" gui-text=\"" N_("Color") "\" type=\"color\">-73203457</param>\n"
+                  "<param name=\"dist\" _gui-text=\"" N_("Hue distribution (°):") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"360\">0</param>\n"
+                  "<param name=\"color\" _gui-text=\"" N_("Color") "\" type=\"color\">-73203457</param>\n"
                 "</page>\n"
               "</param>\n"
               "<effect>\n"
diff --git a/src/extension/internal/filter/distort.h b/src/extension/internal/filter/distort.h
index 586d34226..56aab51f5 100644
--- a/src/extension/internal/filter/distort.h
+++ b/src/extension/internal/filter/distort.h
@@ -66,29 +66,29 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
               "<name>" N_("Felt Feather") "</name>\n"
               "<id>org.inkscape.effect.filter.FeltFeather</id>\n"
-              "<param name=\"type\" gui-text=\"" N_("Type:") "\" type=\"enum\">\n"
+              "<param name=\"type\" _gui-text=\"" N_("Type:") "\" type=\"enum\">\n"
                 "<_item value=\"in\">" N_("In") "</_item>\n"
                 "<_item value=\"out\">" N_("Out") "</_item>\n"
               "</param>\n"
-              "<param name=\"hblur\" gui-text=\"" N_("Horizontal blur") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"30.00\">15</param>\n"
-              "<param name=\"vblur\" gui-text=\"" N_("Vertical blur") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"30.00\">15</param>\n"
-              "<param name=\"dilat\" gui-text=\"" N_("Dilatation") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"100\">1</param>\n"
-              "<param name=\"erosion\" gui-text=\"" N_("Erosion") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"100\">0</param>\n"
-              "<param name=\"stroke\" gui-text=\"" N_("Stroke:") "\" type=\"enum\">\n"
+              "<param name=\"hblur\" _gui-text=\"" N_("Horizontal blur") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"30.00\">15</param>\n"
+              "<param name=\"vblur\" _gui-text=\"" N_("Vertical blur") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"30.00\">15</param>\n"
+              "<param name=\"dilat\" _gui-text=\"" N_("Dilatation") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"100\">1</param>\n"
+              "<param name=\"erosion\" _gui-text=\"" N_("Erosion") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"100\">0</param>\n"
+              "<param name=\"stroke\" _gui-text=\"" N_("Stroke:") "\" type=\"enum\">\n"
                 "<_item value=\"atop\">" N_("Normal") "</_item>\n"
                 "<_item value=\"over\">" N_("Wide") "</_item>\n"
                 "<_item value=\"in\">" N_("Narrow") "</_item>\n"
                 "<_item value=\"xor\">" N_("No fill") "</_item>\n"
               "</param>\n"
-              "<param name=\"turbulence\" indent=\"1\" gui-text=\"" N_("Turbulence:") "\" type=\"enum\">\n"
+              "<param name=\"turbulence\" indent=\"1\" _gui-text=\"" N_("Turbulence:") "\" type=\"enum\">\n"
                 "<_item value=\"fractalNoise\">" N_("Fractal noise") "</_item>\n"
                 "<_item value=\"turbulence\">" N_("Turbulence") "</_item>\n"
               "</param>\n"
-              "<param name=\"hfreq\" gui-text=\"" N_("Horizontal frequency") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"100.\">5</param>\n"
-              "<param name=\"vfreq\" gui-text=\"" N_("Vertical frequency") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"100.\">5</param>\n"
-              "<param name=\"complexity\" gui-text=\"" N_("Complexity") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"5\">3</param>\n"
-              "<param name=\"variation\" gui-text=\"" N_("Variation") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"100\">0</param>\n"
-              "<param name=\"intensity\" gui-text=\"" N_("Intensity") "\" type=\"float\" appearance=\"full\" min=\"0.0\" max=\"100\">30</param>\n"
+              "<param name=\"hfreq\" _gui-text=\"" N_("Horizontal frequency") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"100.\">5</param>\n"
+              "<param name=\"vfreq\" _gui-text=\"" N_("Vertical frequency") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"100.\">5</param>\n"
+              "<param name=\"complexity\" _gui-text=\"" N_("Complexity") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"5\">3</param>\n"
+              "<param name=\"variation\" _gui-text=\"" N_("Variation") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"100\">0</param>\n"
+              "<param name=\"intensity\" _gui-text=\"" N_("Intensity") "\" type=\"float\" appearance=\"full\" min=\"0.0\" max=\"100\">30</param>\n"
               "<effect>\n"
                 "<object-type>all</object-type>\n"
                 "<effects-menu>\n"
@@ -189,15 +189,15 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
               "<name>" N_("Roughen") "</name>\n"
               "<id>org.inkscape.effect.filter.Roughen</id>\n"
-              "<param name=\"type\" gui-text=\"" N_("Turbulence type:") "\" type=\"enum\">\n"
+              "<param name=\"type\" _gui-text=\"" N_("Turbulence type:") "\" type=\"enum\">\n"
                 "<_item value=\"fractalNoise\">" N_("Fractal noise") "</_item>\n"
                 "<_item value=\"turbulence\">" N_("Turbulence") "</_item>\n"
               "</param>\n"
-              "<param name=\"hfreq\" gui-text=\"" N_("Horizontal frequency") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.1\" max=\"1000.00\">1.3</param>\n"
-              "<param name=\"vfreq\" gui-text=\"" N_("Vertical frequency") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.1\" max=\"1000.00\">1.3</param>\n"
-              "<param name=\"complexity\" gui-text=\"" N_("Complexity") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"5\">5</param>\n"
-              "<param name=\"variation\" gui-text=\"" N_("Variation") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"360\">0</param>\n"
-              "<param name=\"intensity\" gui-text=\"" N_("Intensity") "\" type=\"float\" appearance=\"full\" min=\"0.0\" max=\"50\">6.6</param>\n"
+              "<param name=\"hfreq\" _gui-text=\"" N_("Horizontal frequency") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.1\" max=\"1000.00\">1.3</param>\n"
+              "<param name=\"vfreq\" _gui-text=\"" N_("Vertical frequency") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.1\" max=\"1000.00\">1.3</param>\n"
+              "<param name=\"complexity\" _gui-text=\"" N_("Complexity") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"5\">5</param>\n"
+              "<param name=\"variation\" _gui-text=\"" N_("Variation") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"360\">0</param>\n"
+              "<param name=\"intensity\" _gui-text=\"" N_("Intensity") "\" type=\"float\" appearance=\"full\" min=\"0.0\" max=\"50\">6.6</param>\n"
               "<effect>\n"
                 "<object-type>all</object-type>\n"
                 "<effects-menu>\n"
diff --git a/src/extension/internal/filter/image.h b/src/extension/internal/filter/image.h
index 00cd2cf21..868588f80 100644
--- a/src/extension/internal/filter/image.h
+++ b/src/extension/internal/filter/image.h
@@ -48,13 +48,13 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
               "<name>" N_("Edge Detect") "</name>\n"
               "<id>org.inkscape.effect.filter.EdgeDetect</id>\n"
-              "<param name=\"type\" gui-text=\"" N_("Detect:") "\" type=\"enum\" >\n"
+              "<param name=\"type\" _gui-text=\"" N_("Detect:") "\" type=\"enum\" >\n"
                 "<_item value=\"all\">" N_("All") "</_item>\n"
                 "<_item value=\"vertical\">" N_("Vertical lines") "</_item>\n"
                 "<_item value=\"horizontal\">" N_("Horizontal lines") "</_item>\n"
               "</param>\n"
-              "<param name=\"level\" gui-text=\"" N_("Level") "\" type=\"float\" appearance=\"full\" min=\"0.1\" max=\"100.0\">1.0</param>\n"
-              "<param name=\"inverted\" gui-text=\"" N_("Invert colors") "\" type=\"boolean\" >false</param>\n"
+              "<param name=\"level\" _gui-text=\"" N_("Level") "\" type=\"float\" appearance=\"full\" min=\"0.1\" max=\"100.0\">1.0</param>\n"
+              "<param name=\"inverted\" _gui-text=\"" N_("Invert colors") "\" type=\"boolean\" >false</param>\n"
               "<effect>\n"
                 "<object-type>all</object-type>\n"
                 "<effects-menu>\n"
diff --git a/src/extension/internal/filter/morphology.h b/src/extension/internal/filter/morphology.h
index 7e10884a1..e1785f7d3 100644
--- a/src/extension/internal/filter/morphology.h
+++ b/src/extension/internal/filter/morphology.h
@@ -57,17 +57,17 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
               "<name>" N_("Cross-smooth") "</name>\n"
               "<id>org.inkscape.effect.filter.crosssmooth</id>\n"
-              "<param name=\"type\" gui-text=\"" N_("Type:") "\" type=\"enum\">\n"
+              "<param name=\"type\" _gui-text=\"" N_("Type:") "\" type=\"enum\">\n"
                 "<_item value=\"in\">" N_("Inner") "</_item>\n"
                 "<_item value=\"over\">" N_("Outer") "</_item>\n"
                 "<_item value=\"xor\">" N_("Open") "</_item>\n"
               "</param>\n"
-              "<param name=\"width\" gui-text=\"" N_("Width") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"30.\">10</param>\n"
-              "<param name=\"level\" gui-text=\"" N_("Level") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.2\" max=\"2\">1</param>\n"
-              "<param name=\"dilat\" gui-text=\"" N_("Dilatation") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"1\" max=\"100\">10</param>\n"
-              "<param name=\"erosion\" gui-text=\"" N_("Erosion") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"1\" max=\"100\">1</param>\n"
-              "<param name=\"antialias\" gui-text=\"" N_("Antialiasing") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"1\">1</param>\n"
-              "<param name=\"content\" gui-text=\"" N_("Blur content") "\" type=\"boolean\" >false</param>\n"
+              "<param name=\"width\" _gui-text=\"" N_("Width") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"30.\">10</param>\n"
+              "<param name=\"level\" _gui-text=\"" N_("Level") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.2\" max=\"2\">1</param>\n"
+              "<param name=\"dilat\" _gui-text=\"" N_("Dilatation") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"1\" max=\"100\">10</param>\n"
+              "<param name=\"erosion\" _gui-text=\"" N_("Erosion") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"1\" max=\"100\">1</param>\n"
+              "<param name=\"antialias\" _gui-text=\"" N_("Antialiasing") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"1\">1</param>\n"
+              "<param name=\"content\" _gui-text=\"" N_("Blur content") "\" type=\"boolean\" >false</param>\n"
 
               "<effect>\n"
                 "<object-type>all</object-type>\n"
@@ -167,33 +167,33 @@ public:
               "<id>org.inkscape.effect.filter.Outline</id>\n"
               "<param name=\"tab\" type=\"notebook\">\n"
                 "<page name=\"optionstab\" _gui-text=\"Options\">\n"
-                  "<param name=\"fill\" gui-text=\"" N_("Fill image") "\" type=\"boolean\" >false</param>\n"
-                  "<param name=\"outline\" gui-text=\"" N_("Hide image") "\" type=\"boolean\" >false</param>\n"
-                  "<param name=\"type\" gui-text=\"" N_("Composite type:") "\" type=\"enum\">\n"
+                  "<param name=\"fill\" _gui-text=\"" N_("Fill image") "\" type=\"boolean\" >false</param>\n"
+                  "<param name=\"outline\" _gui-text=\"" N_("Hide image") "\" type=\"boolean\" >false</param>\n"
+                  "<param name=\"type\" _gui-text=\"" N_("Composite type:") "\" type=\"enum\">\n"
                     "<_item value=\"over\">" N_("Over") "</_item>\n"
                     "<_item value=\"in\">" N_("In") "</_item>\n"
                     "<_item value=\"out\">" N_("Out") "</_item>\n"
                     "<_item value=\"atop\">" N_("Atop") "</_item>\n"
                     "<_item value=\"xor\">" N_("XOR") "</_item>\n"
                   "</param>\n"
-                  "<param name=\"position\" gui-text=\"" N_("Position:") "\" type=\"enum\">\n"
+                  "<param name=\"position\" _gui-text=\"" N_("Position:") "\" type=\"enum\">\n"
                     "<_item value=\"inside\">" N_("Inside") "</_item>\n"
                     "<_item value=\"outside\">" N_("Outside") "</_item>\n"
                     "<_item value=\"overlayed\">" N_("Overlayed") "</_item>\n"
                   "</param>\n"
-                  "<param name=\"width1\" gui-text=\"" N_("Width 1") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"20.00\">4</param>\n"
-                  "<param name=\"dilat1\" gui-text=\"" N_("Dilatation 1") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"1\" max=\"100\">100</param>\n"
-                  "<param name=\"erosion1\" gui-text=\"" N_("Erosion 1") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"100\">1</param>\n"
-                  "<param name=\"width2\" gui-text=\"" N_("Width 2") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"20.00\">0.5</param>\n"
-                  "<param name=\"dilat2\" gui-text=\"" N_("Dilatation 2") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"1\" max=\"100\">50</param>\n"
-                  "<param name=\"erosion2\" gui-text=\"" N_("Erosion 2") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"100\">5</param>\n"
-                  "<param name=\"antialias\" gui-text=\"" N_("Antialiasing") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"1\">1</param>\n"
-                  "<param name=\"smooth\" gui-text=\"" N_("Smooth") "\" type=\"boolean\" >false</param>\n"
+                  "<param name=\"width1\" _gui-text=\"" N_("Width 1") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"20.00\">4</param>\n"
+                  "<param name=\"dilat1\" _gui-text=\"" N_("Dilatation 1") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"1\" max=\"100\">100</param>\n"
+                  "<param name=\"erosion1\" _gui-text=\"" N_("Erosion 1") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"100\">1</param>\n"
+                  "<param name=\"width2\" _gui-text=\"" N_("Width 2") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"20.00\">0.5</param>\n"
+                  "<param name=\"dilat2\" _gui-text=\"" N_("Dilatation 2") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"1\" max=\"100\">50</param>\n"
+                  "<param name=\"erosion2\" _gui-text=\"" N_("Erosion 2") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"100\">5</param>\n"
+                  "<param name=\"antialias\" _gui-text=\"" N_("Antialiasing") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"1\">1</param>\n"
+                  "<param name=\"smooth\" _gui-text=\"" N_("Smooth") "\" type=\"boolean\" >false</param>\n"
                 "</page>\n"
                 "<page name=\"co11tab\" _gui-text=\"Color\">\n"
-                  "<param name=\"color\" gui-text=\"" N_("Color") "\" type=\"color\">255</param>\n"
-                  "<param name=\"fopacity\" gui-text=\"" N_("Fill opacity:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"1\">1</param>\n"
-                  "<param name=\"sopacity\" gui-text=\"" N_("Stroke opacity:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"1\">1</param>\n"
+                  "<param name=\"color\" _gui-text=\"" N_("Color") "\" type=\"color\">255</param>\n"
+                  "<param name=\"fopacity\" _gui-text=\"" N_("Fill opacity:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"1\">1</param>\n"
+                  "<param name=\"sopacity\" _gui-text=\"" N_("Stroke opacity:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"1\">1</param>\n"
                 "</page>\n"
               "</param>\n"
               "<effect>\n"
diff --git a/src/extension/internal/filter/overlays.h b/src/extension/internal/filter/overlays.h
index 1ca745166..f6c0509c8 100644
--- a/src/extension/internal/filter/overlays.h
+++ b/src/extension/internal/filter/overlays.h
@@ -57,20 +57,20 @@ public:
               "<id>org.inkscape.effect.filter.NoiseFill</id>\n"
               "<param name=\"tab\" type=\"notebook\">\n"
                 "<page name=\"optionstab\" _gui-text=\"" N_("Options") "\">\n"
-                  "<param name=\"type\" gui-text=\"" N_("Turbulence type:") "\" type=\"enum\">\n"
+                  "<param name=\"type\" _gui-text=\"" N_("Turbulence type:") "\" type=\"enum\">\n"
                     "<_item value=\"fractalNoise\">" N_("Fractal noise") "</_item>\n"
                     "<_item value=\"turbulence\">" N_("Turbulence") "</_item>\n"
                   "</param>\n"
-                  "<param name=\"hfreq\" gui-text=\"" N_("Horizontal frequency:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"10000.00\">20</param>\n"
-                  "<param name=\"vfreq\" gui-text=\"" N_("Vertical frequency:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"10000.00\">40</param>\n"
-                  "<param name=\"complexity\" gui-text=\"" N_("Complexity:") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"5\">5</param>\n"
-                  "<param name=\"variation\" gui-text=\"" N_("Variation:") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"360\">0</param>\n"
-                  "<param name=\"dilat\" gui-text=\"" N_("Dilatation:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"1\" max=\"50\">3</param>\n"
-                  "<param name=\"erosion\" gui-text=\"" N_("Erosion:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"50\">1</param>\n"
-                  "<param name=\"inverted\" gui-text=\"" N_("Inverted") "\" type=\"boolean\" >false</param>\n"
+                  "<param name=\"hfreq\" _gui-text=\"" N_("Horizontal frequency:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"10000.00\">20</param>\n"
+                  "<param name=\"vfreq\" _gui-text=\"" N_("Vertical frequency:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"10000.00\">40</param>\n"
+                  "<param name=\"complexity\" _gui-text=\"" N_("Complexity:") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"5\">5</param>\n"
+                  "<param name=\"variation\" _gui-text=\"" N_("Variation:") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"360\">0</param>\n"
+                  "<param name=\"dilat\" _gui-text=\"" N_("Dilatation:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"1\" max=\"50\">3</param>\n"
+                  "<param name=\"erosion\" _gui-text=\"" N_("Erosion:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"50\">1</param>\n"
+                  "<param name=\"inverted\" _gui-text=\"" N_("Inverted") "\" type=\"boolean\" >false</param>\n"
                 "</page>\n"
                 "<page name=\"co11tab\" _gui-text=\"" N_("Noise color") "\">\n"
-                  "<param name=\"color\" gui-text=\"" N_("Color") "\" type=\"color\">354957823</param>\n"
+                  "<param name=\"color\" _gui-text=\"" N_("Color") "\" type=\"color\">354957823</param>\n"
                 "</page>\n"
               "</param>\n"
               "<effect>\n"
diff --git a/src/extension/internal/filter/paint.h b/src/extension/internal/filter/paint.h
index 941177f39..43f4b6c90 100644
--- a/src/extension/internal/filter/paint.h
+++ b/src/extension/internal/filter/paint.h
@@ -72,32 +72,32 @@ public:
               "<id>org.inkscape.effect.filter.Chromolitho</id>\n"
               "<param name=\"tab\" type=\"notebook\">\n"
                 "<page name=\"optionstab\" _gui-text=\"Options\">\n"
-                  "<param name=\"drawing\" gui-text=\"" N_("Drawing mode") "\" type=\"boolean\" >true</param>\n"
-                  "<param name=\"dblend\" gui-text=\"" N_("Drawing blend:") "\" type=\"enum\">\n"
+                  "<param name=\"drawing\" _gui-text=\"" N_("Drawing mode") "\" type=\"boolean\" >true</param>\n"
+                  "<param name=\"dblend\" _gui-text=\"" N_("Drawing blend:") "\" type=\"enum\">\n"
                     "<_item value=\"darken\">Darken</_item>\n"
                     "<_item value=\"normal\">Normal</_item>\n"
                     "<_item value=\"multiply\">Multiply</_item>\n"
                     "<_item value=\"screen\">Screen</_item>\n"
                     "<_item value=\"lighten\">Lighten</_item>\n"
                   "</param>\n"
-                  "<param name=\"transparent\" gui-text=\"" N_("Transparent") "\" type=\"boolean\" >false</param>\n"
-                  "<param name=\"dented\" gui-text=\"" N_("Dented") "\" type=\"boolean\" >false</param>\n"
-                  "<param name=\"inverted\" gui-text=\"" N_("Inverted") "\" type=\"boolean\" >false</param>\n"
-                  "<param name=\"light\" gui-text=\"" N_("Lightness") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"10\">0</param>\n"
-                  "<param name=\"saturation\" gui-text=\"" N_("Saturation") "\" type=\"float\" precision=\"2\" appearance=\"full\" min=\"0\" max=\"1\">1</param>\n"
-                  "<param name=\"noise\" gui-text=\"" N_("Noise reduction") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"1000\">10</param>\n"
-                  "<param name=\"smooth\" gui-text=\"" N_("Smoothness") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"10.00\">1</param>\n"
+                  "<param name=\"transparent\" _gui-text=\"" N_("Transparent") "\" type=\"boolean\" >false</param>\n"
+                  "<param name=\"dented\" _gui-text=\"" N_("Dented") "\" type=\"boolean\" >false</param>\n"
+                  "<param name=\"inverted\" _gui-text=\"" N_("Inverted") "\" type=\"boolean\" >false</param>\n"
+                  "<param name=\"light\" _gui-text=\"" N_("Lightness") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"10\">0</param>\n"
+                  "<param name=\"saturation\" _gui-text=\"" N_("Saturation") "\" type=\"float\" precision=\"2\" appearance=\"full\" min=\"0\" max=\"1\">1</param>\n"
+                  "<param name=\"noise\" _gui-text=\"" N_("Noise reduction") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"1000\">10</param>\n"
+                  "<param name=\"smooth\" _gui-text=\"" N_("Smoothness") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"10.00\">1</param>\n"
                 "</page>\n"
                 "<page name=\"graintab\" _gui-text=\"" N_("Grain") "\">\n"
-                  "<param name=\"grain\" gui-text=\"" N_("Grain mode") "\" type=\"boolean\" >true</param>\n"
-                  "<param name=\"grainxf\" gui-text=\"" N_("Horizontal frequency") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"1000\">1000</param>\n"
-                  "<param name=\"grainyf\" gui-text=\"" N_("Vertical frequency") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"1000\">1000</param>\n"
-                  "<param name=\"grainc\" gui-text=\"" N_("Complexity") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"5\">1</param>\n"
-                  "<param name=\"grainv\" gui-text=\"" N_("Variation") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"1000\">0</param>\n"
-                  "<param name=\"grainexp\" gui-text=\"" N_("Expansion") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"1\" max=\"50\">1</param>\n"
-                  "<param name=\"grainero\" gui-text=\"" N_("Erosion") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"40\">0</param>\n"
-                  "<param name=\"graincol\" gui-text=\"" N_("Color") "\" type=\"boolean\" >true</param>\n"
-                  "<param name=\"gblend\" gui-text=\"" N_("Grain blend:") "\" type=\"enum\">\n"
+                  "<param name=\"grain\" _gui-text=\"" N_("Grain mode") "\" type=\"boolean\" >true</param>\n"
+                  "<param name=\"grainxf\" _gui-text=\"" N_("Horizontal frequency") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"1000\">1000</param>\n"
+                  "<param name=\"grainyf\" _gui-text=\"" N_("Vertical frequency") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"1000\">1000</param>\n"
+                  "<param name=\"grainc\" _gui-text=\"" N_("Complexity") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"5\">1</param>\n"
+                  "<param name=\"grainv\" _gui-text=\"" N_("Variation") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"1000\">0</param>\n"
+                  "<param name=\"grainexp\" _gui-text=\"" N_("Expansion") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"1\" max=\"50\">1</param>\n"
+                  "<param name=\"grainero\" _gui-text=\"" N_("Erosion") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"40\">0</param>\n"
+                  "<param name=\"graincol\" _gui-text=\"" N_("Color") "\" type=\"boolean\" >true</param>\n"
+                  "<param name=\"gblend\" _gui-text=\"" N_("Grain blend:") "\" type=\"enum\">\n"
                     "<_item value=\"normal\">Normal</_item>\n"
                     "<_item value=\"multiply\">Multiply</_item>\n"
                     "<_item value=\"screen\">Screen</_item>\n"
@@ -231,12 +231,12 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
               "<name>" N_("Cross Engraving") "</name>\n"
               "<id>org.inkscape.effect.filter.CrossEngraving</id>\n"
-              "<param name=\"clean\" gui-text=\"" N_("Clean-up") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"500\">30</param>\n"
-              "<param name=\"dilat\" gui-text=\"" N_("Dilatation") "\" type=\"float\" appearance=\"full\" min=\"1\" max=\"50\">1</param>\n"
-              "<param name=\"erosion\" gui-text=\"" N_("Erosion") "\" type=\"float\" appearance=\"full\" min=\"0\" max=\"50\">0</param>\n"
-              "<param name=\"strength\" gui-text=\"" N_("Strength") "\" type=\"float\" appearance=\"full\" min=\"0.1\" max=\"10\">0.5</param>\n"
-              "<param name=\"length\" gui-text=\"" N_("Length") "\" type=\"float\" appearance=\"full\" min=\"0.5\" max=\"20\">4</param>\n"
-              "<param name=\"trans\" gui-text=\"" N_("Transparent") "\" type=\"boolean\" >false</param>\n"
+              "<param name=\"clean\" _gui-text=\"" N_("Clean-up") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"500\">30</param>\n"
+              "<param name=\"dilat\" _gui-text=\"" N_("Dilatation") "\" type=\"float\" appearance=\"full\" min=\"1\" max=\"50\">1</param>\n"
+              "<param name=\"erosion\" _gui-text=\"" N_("Erosion") "\" type=\"float\" appearance=\"full\" min=\"0\" max=\"50\">0</param>\n"
+              "<param name=\"strength\" _gui-text=\"" N_("Strength") "\" type=\"float\" appearance=\"full\" min=\"0.1\" max=\"10\">0.5</param>\n"
+              "<param name=\"length\" _gui-text=\"" N_("Length") "\" type=\"float\" appearance=\"full\" min=\"0.5\" max=\"20\">4</param>\n"
+              "<param name=\"trans\" _gui-text=\"" N_("Transparent") "\" type=\"boolean\" >false</param>\n"
               "<effect>\n"
                 "<object-type>all</object-type>\n"
                 "<effects-menu>\n"
@@ -333,27 +333,27 @@ public:
               "<param name=\"tab\" type=\"notebook\">\n"
                 "<page name=\"optionstab\" _gui-text=\"Options\">\n"
                   "<_param name=\"simplifyheader\" type=\"description\" appearance=\"header\">" N_("Simplify") "</_param>\n"
-                  "<param name=\"simply\" gui-text=\"" N_("Strength") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"20.00\">0.6</param>\n"
-                  "<param name=\"clean\" gui-text=\"" N_("Clean-up") "\" type=\"int\" indent=\"1\" appearance=\"full\" min=\"1\" max=\"500\">10</param>\n"
-                  "<param name=\"erase\" gui-text=\"" N_("Erase") "\" type=\"float\" indent=\"1\" appearance=\"full\" min=\"0\" max=\"60\">0</param>\n"
-                  "<param name=\"translucent\" gui-text=\"" N_("Translucent") "\" indent=\"1\" type=\"boolean\" >false</param>\n"
+                  "<param name=\"simply\" _gui-text=\"" N_("Strength") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"20.00\">0.6</param>\n"
+                  "<param name=\"clean\" _gui-text=\"" N_("Clean-up") "\" type=\"int\" indent=\"1\" appearance=\"full\" min=\"1\" max=\"500\">10</param>\n"
+                  "<param name=\"erase\" _gui-text=\"" N_("Erase") "\" type=\"float\" indent=\"1\" appearance=\"full\" min=\"0\" max=\"60\">0</param>\n"
+                  "<param name=\"translucent\" _gui-text=\"" N_("Translucent") "\" indent=\"1\" type=\"boolean\" >false</param>\n"
                   "<_param name=\"smoothheader\" type=\"description\" appearance=\"header\">" N_("Smoothness") "</_param>\n"
-                    "<param name=\"smooth\" gui-text=\"" N_("Strength") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"20.00\">0.6</param>\n"
-                    "<param name=\"dilat\" gui-text=\"" N_("Dilatation") "\" type=\"float\" indent=\"1\" appearance=\"full\" min=\"1\" max=\"50\">6</param>\n"
-                    "<param name=\"erosion\" gui-text=\"" N_("Erosion") "\" type=\"float\" indent=\"1\" appearance=\"full\" min=\"0\" max=\"50\">2</param>\n"
+                    "<param name=\"smooth\" _gui-text=\"" N_("Strength") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"20.00\">0.6</param>\n"
+                    "<param name=\"dilat\" _gui-text=\"" N_("Dilatation") "\" type=\"float\" indent=\"1\" appearance=\"full\" min=\"1\" max=\"50\">6</param>\n"
+                    "<param name=\"erosion\" _gui-text=\"" N_("Erosion") "\" type=\"float\" indent=\"1\" appearance=\"full\" min=\"0\" max=\"50\">2</param>\n"
                   "<_param name=\"meltheader\" type=\"description\" appearance=\"header\">" N_("Melt") "</_param>\n"
-                    "<param name=\"blur\" gui-text=\"" N_("Level") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"20.00\">1</param>\n"
-                    "<param name=\"bdilat\" gui-text=\"" N_("Dilatation") "\" type=\"float\" indent=\"1\" appearance=\"full\" min=\"1\" max=\"50\">6</param>\n"
-                    "<param name=\"berosion\" gui-text=\"" N_("Erosion") "\" type=\"float\" indent=\"1\" appearance=\"full\" min=\"0\" max=\"50\">2</param>\n"
+                    "<param name=\"blur\" _gui-text=\"" N_("Level") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"20.00\">1</param>\n"
+                    "<param name=\"bdilat\" _gui-text=\"" N_("Dilatation") "\" type=\"float\" indent=\"1\" appearance=\"full\" min=\"1\" max=\"50\">6</param>\n"
+                    "<param name=\"berosion\" _gui-text=\"" N_("Erosion") "\" type=\"float\" indent=\"1\" appearance=\"full\" min=\"0\" max=\"50\">2</param>\n"
                 "</page>\n"
                 "<page name=\"co11tab\" _gui-text=\"Fill color\">\n"
-                  "<param name=\"fcolor\" gui-text=\"" N_("Fill color") "\" type=\"color\">-1515870721</param>\n"
-                  "<param name=\"iof\" gui-text=\"" N_("Image on fill") "\" type=\"boolean\" >false</param>\n"
+                  "<param name=\"fcolor\" _gui-text=\"" N_("Fill color") "\" type=\"color\">-1515870721</param>\n"
+                  "<param name=\"iof\" _gui-text=\"" N_("Image on fill") "\" type=\"boolean\" >false</param>\n"
                 "</page>\n"
                 "<page name=\"co12tab\" _gui-text=\"Stroke color\">\n"
-                  "<param name=\"scolor\" gui-text=\"" N_("Stroke color") "\" type=\"color\">589505535</param>\n"
-                  "<param name=\"ios\" gui-text=\"" N_("Image on stroke") "\" type=\"boolean\" >false</param>\n"
-                  "<param name=\"offset\" gui-text=\"" N_("Offset") "\" type=\"int\" appearance=\"full\" min=\"-100\" max=\"100\">0</param>\n"
+                  "<param name=\"scolor\" _gui-text=\"" N_("Stroke color") "\" type=\"color\">589505535</param>\n"
+                  "<param name=\"ios\" _gui-text=\"" N_("Image on stroke") "\" type=\"boolean\" >false</param>\n"
+                  "<param name=\"offset\" _gui-text=\"" N_("Offset") "\" type=\"int\" appearance=\"full\" min=\"-100\" max=\"100\">0</param>\n"
                 "</page>\n"
               "</param>\n"
               "<effect>\n"
@@ -493,13 +493,13 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
               "<name>" N_("Electrize") "</name>\n"
               "<id>org.inkscape.effect.filter.Electrize</id>\n"
-              "<param name=\"blur\" gui-text=\"" N_("Simplify") "\" type=\"float\" appearance=\"full\" min=\"0.01\" max=\"10.0\">2.0</param>\n"
-              "<param name=\"type\" gui-text=\"" N_("Effect type:") "\" type=\"enum\">\n"
+              "<param name=\"blur\" _gui-text=\"" N_("Simplify") "\" type=\"float\" appearance=\"full\" min=\"0.01\" max=\"10.0\">2.0</param>\n"
+              "<param name=\"type\" _gui-text=\"" N_("Effect type:") "\" type=\"enum\">\n"
                 "<_item value=\"table\">" N_("Table") "</_item>\n"
                 "<_item value=\"discrete\">" N_("Discrete") "</_item>\n"
               "</param>\n"
-              "<param name=\"levels\" gui-text=\"" N_("Levels") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"10\">3</param>\n"
-              "<param name=\"invert\" gui-text=\"" N_("Inverted") "\" type=\"boolean\">false</param>\n"
+              "<param name=\"levels\" _gui-text=\"" N_("Levels") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"10\">3</param>\n"
+              "<param name=\"invert\" _gui-text=\"" N_("Inverted") "\" type=\"boolean\">false</param>\n"
               "<effect>\n"
                 "<object-type>all</object-type>\n"
                 "<effects-menu>\n"
@@ -583,14 +583,14 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
               "<name>" N_("Neon Draw") "</name>\n"
               "<id>org.inkscape.effect.filter.NeonDraw</id>\n"
-              "<param name=\"type\" gui-text=\"" N_("Line type:") "\" type=\"enum\">\n"
+              "<param name=\"type\" _gui-text=\"" N_("Line type:") "\" type=\"enum\">\n"
                 "<_item value=\"table\">" N_("Smoothed") "</_item>\n"
                 "<_item value=\"discrete\">" N_("Contrasted") "</_item>\n"
               "</param>\n"
-              "<param name=\"simply\" gui-text=\"" N_("Simplify") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"20.00\">3</param>\n"
-              "<param name=\"width\" gui-text=\"" N_("Line width") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"20.00\">3</param>\n"
-              "<param name=\"lightness\" gui-text=\"" N_("Lightness") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.00\" max=\"10.00\">1</param>\n"
-              "<param name=\"blend\" gui-text=\"" N_("Blend mode:") "\" type=\"enum\">\n"
+              "<param name=\"simply\" _gui-text=\"" N_("Simplify") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"20.00\">3</param>\n"
+              "<param name=\"width\" _gui-text=\"" N_("Line width") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"20.00\">3</param>\n"
+              "<param name=\"lightness\" _gui-text=\"" N_("Lightness") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.00\" max=\"10.00\">1</param>\n"
+              "<param name=\"blend\" _gui-text=\"" N_("Blend mode:") "\" type=\"enum\">\n"
                 "<_item value=\"normal\">Normal</_item>\n"
                 "<_item value=\"multiply\">Multiply</_item>\n"
                 "<_item value=\"screen\">Screen</_item>\n"
@@ -688,34 +688,34 @@ public:
               "<id>org.inkscape.effect.filter.PointEngraving</id>\n"
               "<param name=\"tab\" type=\"notebook\">\n"
                 "<page name=\"optionstab\" _gui-text=\"" N_("Options") "\">\n"
-                  "<param name=\"type\" gui-text=\"" N_("Turbulence type:") "\" type=\"enum\">\n"
+                  "<param name=\"type\" _gui-text=\"" N_("Turbulence type:") "\" type=\"enum\">\n"
                     "<_item value=\"fractalNoise\">" N_("Fractal noise") "</_item>\n"
                   "<_item value=\"turbulence\">" N_("Turbulence") "</_item>\n"
                   "</param>\n"
-                  "<param name=\"hfreq\" gui-text=\"" N_("Horizontal frequency") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.1\" max=\"100.00\">100</param>\n"
-                  "<param name=\"vfreq\" gui-text=\"" N_("Vertical frequency") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.1\" max=\"100.00\">100</param>\n"
-                  "<param name=\"complexity\" gui-text=\"" N_("Complexity") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"5\">1</param>\n"
-                  "<param name=\"variation\" gui-text=\"" N_("Variation") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"100\">0</param>\n"
-                  "<param name=\"reduction\" gui-text=\"" N_("Noise reduction") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"500\">45</param>\n"
-                  "<param name=\"blend\" gui-text=\"" N_("Noise blend:") "\" type=\"enum\">\n"
+                  "<param name=\"hfreq\" _gui-text=\"" N_("Horizontal frequency") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.1\" max=\"100.00\">100</param>\n"
+                  "<param name=\"vfreq\" _gui-text=\"" N_("Vertical frequency") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.1\" max=\"100.00\">100</param>\n"
+                  "<param name=\"complexity\" _gui-text=\"" N_("Complexity") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"5\">1</param>\n"
+                  "<param name=\"variation\" _gui-text=\"" N_("Variation") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"100\">0</param>\n"
+                  "<param name=\"reduction\" _gui-text=\"" N_("Noise reduction") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"500\">45</param>\n"
+                  "<param name=\"blend\" _gui-text=\"" N_("Noise blend:") "\" type=\"enum\">\n"
                     "<_item value=\"multiply\">" N_("Multiply") "</_item>\n"
                     "<_item value=\"normal\">" N_("Normal") "</_item>\n"
                     "<_item value=\"screen\">" N_("Screen") "</_item>\n"
                     "<_item value=\"lighten\">" N_("Lighten") "</_item>\n"
                     "<_item value=\"darken\">" N_("Darken") "</_item>\n"
                   "</param>\n"
-                  "<param name=\"lightness\" gui-text=\"" N_("Lightness") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"10\">2.5</param>\n"
-                  "<param name=\"grain\" gui-text=\"" N_("Grain lightness") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"10\">1.3</param>\n"
-                  "<param name=\"erase\" gui-text=\"" N_("Erase") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"1\">0</param>\n"
-                  "<param name=\"blur\" gui-text=\"" N_("Blur") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"2\">0.5</param>\n"
+                  "<param name=\"lightness\" _gui-text=\"" N_("Lightness") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"10\">2.5</param>\n"
+                  "<param name=\"grain\" _gui-text=\"" N_("Grain lightness") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"10\">1.3</param>\n"
+                  "<param name=\"erase\" _gui-text=\"" N_("Erase") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"1\">0</param>\n"
+                  "<param name=\"blur\" _gui-text=\"" N_("Blur") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"2\">0.5</param>\n"
                 "</page>\n"
                 "<page name=\"fcolortab\" _gui-text=\"" N_("Fill color") "\">\n"
-                  "<param name=\"fcolor\" gui-text=\"" N_("Color") "\" type=\"color\">-1</param>\n"
-                  "<param name=\"iof\" gui-text=\"" N_("Image on fill") "\" type=\"boolean\" >false</param>\n"
+                  "<param name=\"fcolor\" _gui-text=\"" N_("Color") "\" type=\"color\">-1</param>\n"
+                  "<param name=\"iof\" _gui-text=\"" N_("Image on fill") "\" type=\"boolean\" >false</param>\n"
                 "</page>\n"
                 "<page name=\"pcolortab\" _gui-text=\"" N_("Points color") "\">\n"
-                  "<param name=\"pcolor\" gui-text=\"" N_("Color") "\" type=\"color\">1666789119</param>\n"
-                  "<param name=\"iop\" gui-text=\"" N_("Image on points") "\" type=\"boolean\" >false</param>\n"
+                  "<param name=\"pcolor\" _gui-text=\"" N_("Color") "\" type=\"color\">1666789119</param>\n"
+                  "<param name=\"iop\" _gui-text=\"" N_("Image on points") "\" type=\"boolean\" >false</param>\n"
                 "</page>\n"
               "</param>\n"
               "<effect>\n"
@@ -849,27 +849,27 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
               "<name>" N_("Poster Paint") "</name>\n"
               "<id>org.inkscape.effect.filter.Posterize</id>\n"
-              "<param name=\"type\" gui-text=\"" N_("Effect type:") "\" type=\"enum\">\n"
+              "<param name=\"type\" _gui-text=\"" N_("Effect type:") "\" type=\"enum\">\n"
                 "<_item value=\"normal\">Normal</_item>\n"
                 "<_item value=\"dented\">Dented</_item>\n"
               "</param>\n"
-              "<param name=\"table\" gui-text=\"" N_("Transfer type:") "\" type=\"enum\">\n"
+              "<param name=\"table\" _gui-text=\"" N_("Transfer type:") "\" type=\"enum\">\n"
                 "<_item value=\"discrete\">" N_("Poster") "</_item>\n"
                 "<_item value=\"table\">" N_("Painting") "</_item>\n"
               "</param>\n"
-              "<param name=\"levels\" gui-text=\"" N_("Levels") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"15\">5</param>\n"
-              "<param name=\"blend\" gui-text=\"" N_("Blend mode:") "\" type=\"enum\">\n"
+              "<param name=\"levels\" _gui-text=\"" N_("Levels") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"15\">5</param>\n"
+              "<param name=\"blend\" _gui-text=\"" N_("Blend mode:") "\" type=\"enum\">\n"
                 "<_item value=\"lighten\">Lighten</_item>\n"
                 "<_item value=\"normal\">Normal</_item>\n"
                 "<_item value=\"darken\">Darken</_item>\n"
                 "<_item value=\"multiply\">Multiply</_item>\n"
                 "<_item value=\"screen\">Screen</_item>\n"
               "</param>\n"
-              "<param name=\"blur1\" gui-text=\"" N_("Simplify (primary)") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"100.00\">4.0</param>\n"
-              "<param name=\"blur2\" gui-text=\"" N_("Simplify (secondary)") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"100.00\">0.5</param>\n"
-              "<param name=\"presaturation\" gui-text=\"" N_("Pre-saturation") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.00\" max=\"1.00\">1.00</param>\n"
-              "<param name=\"postsaturation\" gui-text=\"" N_("Post-saturation") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.00\" max=\"1.00\">1.00</param>\n"
-              "<param name=\"antialiasing\" gui-text=\"" N_("Simulate antialiasing") "\" type=\"boolean\">false</param>\n"
+              "<param name=\"blur1\" _gui-text=\"" N_("Simplify (primary)") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"100.00\">4.0</param>\n"
+              "<param name=\"blur2\" _gui-text=\"" N_("Simplify (secondary)") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"100.00\">0.5</param>\n"
+              "<param name=\"presaturation\" _gui-text=\"" N_("Pre-saturation") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.00\" max=\"1.00\">1.00</param>\n"
+              "<param name=\"postsaturation\" _gui-text=\"" N_("Post-saturation") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.00\" max=\"1.00\">1.00</param>\n"
+              "<param name=\"antialiasing\" _gui-text=\"" N_("Simulate antialiasing") "\" type=\"boolean\">false</param>\n"
               "<effect>\n"
                 "<object-type>all</object-type>\n"
                 "<effects-menu>\n"
@@ -972,8 +972,8 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
               "<name>" N_("Posterize Basic") "</name>\n"
               "<id>org.inkscape.effect.filter.PosterizeBasic</id>\n"
-              "<param name=\"levels\" gui-text=\"" N_("Levels") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"20\">5</param>\n"
-              "<param name=\"blur\" gui-text=\"" N_("Simplify") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"20.00\">4.0</param>\n"
+              "<param name=\"levels\" _gui-text=\"" N_("Levels") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"20\">5</param>\n"
+              "<param name=\"blur\" _gui-text=\"" N_("Simplify") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"20.00\">4.0</param>\n"
               "<effect>\n"
                 "<object-type>all</object-type>\n"
                 "<effects-menu>\n"
diff --git a/src/extension/internal/filter/protrusions.h b/src/extension/internal/filter/protrusions.h
index 965a1bdc5..ad75d8896 100644
--- a/src/extension/internal/filter/protrusions.h
+++ b/src/extension/internal/filter/protrusions.h
@@ -47,7 +47,7 @@ public:
 			"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
 				"<name>" N_("Snow crest") "</name>\n"
 				"<id>org.inkscape.effect.filter.snow</id>\n"
-				"<param name=\"drift\" gui-text=\"" N_("Drift Size") "\" type=\"float\" appearance=\"full\" min=\"0.0\" max=\"20.0\">3.5</param>\n"
+				"<param name=\"drift\" _gui-text=\"" N_("Drift Size") "\" type=\"float\" appearance=\"full\" min=\"0.0\" max=\"20.0\">3.5</param>\n"
 				"<effect>\n"
 					"<object-type>all</object-type>\n"
 					"<effects-menu>\n"
diff --git a/src/extension/internal/filter/shadows.h b/src/extension/internal/filter/shadows.h
index 0d54950bf..e69e05669 100644
--- a/src/extension/internal/filter/shadows.h
+++ b/src/extension/internal/filter/shadows.h
@@ -58,10 +58,10 @@ public:
               "<id>org.inkscape.effect.filter.ColorDropShadow</id>\n"
               "<param name=\"tab\" type=\"notebook\">\n"
                 "<page name=\"optionstab\" _gui-text=\"" N_("Options") "\">\n"
-                  "<param name=\"blur\" gui-text=\"" N_("Blur radius (px)") "\" type=\"float\" appearance=\"full\" min=\"0.0\" max=\"200.0\">3.0</param>\n"
-                  "<param name=\"xoffset\" gui-text=\"" N_("Horizontal offset (px)") "\" type=\"float\" appearance=\"full\" min=\"-50.0\" max=\"50.0\">6.0</param>\n"
-                  "<param name=\"yoffset\" gui-text=\"" N_("Vertical offset (px)") "\" type=\"float\" appearance=\"full\" min=\"-50.0\" max=\"50.0\">6.0</param>\n"
-                  "<param name=\"type\" gui-text=\"" N_("Shadow type:") "\" type=\"enum\" >\n"
+                  "<param name=\"blur\" _gui-text=\"" N_("Blur radius (px)") "\" type=\"float\" appearance=\"full\" min=\"0.0\" max=\"200.0\">3.0</param>\n"
+                  "<param name=\"xoffset\" _gui-text=\"" N_("Horizontal offset (px)") "\" type=\"float\" appearance=\"full\" min=\"-50.0\" max=\"50.0\">6.0</param>\n"
+                  "<param name=\"yoffset\" _gui-text=\"" N_("Vertical offset (px)") "\" type=\"float\" appearance=\"full\" min=\"-50.0\" max=\"50.0\">6.0</param>\n"
+                  "<param name=\"type\" _gui-text=\"" N_("Shadow type:") "\" type=\"enum\" >\n"
                     "<_item value=\"outer\">" N_("Outer") "</_item>\n"
                     "<_item value=\"inner\">" N_("Inner") "</_item>\n"
                     "<_item value=\"outercut\">" N_("Outer cutout") "</_item>\n"
@@ -70,8 +70,8 @@ public:
                   "</param>\n"
                 "</page>\n"
                 "<page name=\"coltab\" _gui-text=\"" N_("Blur color") "\">\n"
-                  "<param name=\"color\" gui-text=\"" N_("Color") "\" type=\"color\">127</param>\n"
-                  "<param name=\"objcolor\" gui-text=\"" N_("Use object's color") "\" type=\"boolean\" >false</param>\n"
+                  "<param name=\"color\" _gui-text=\"" N_("Color") "\" type=\"color\">127</param>\n"
+                  "<param name=\"objcolor\" _gui-text=\"" N_("Use object's color") "\" type=\"boolean\" >false</param>\n"
                 "</page>\n"
               "</param>\n"
               "<effect>\n"
diff --git a/src/extension/internal/filter/textures.h b/src/extension/internal/filter/textures.h
index 32eef6054..a2584c627 100644
--- a/src/extension/internal/filter/textures.h
+++ b/src/extension/internal/filter/textures.h
@@ -61,18 +61,18 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
             "<name>" N_("Ink Blot") "</name>\n"
               "<id>org.inkscape.effect.filter.InkBlot</id>\n"
-              "<param name=\"type\" gui-text=\"" N_("Turbulence type:") "\" type=\"enum\">\n"
+              "<param name=\"type\" _gui-text=\"" N_("Turbulence type:") "\" type=\"enum\">\n"
                 "<_item value=\"fractalNoise\">Fractal noise</_item>\n"
                 "<_item value=\"turbulence\">Turbulence</_item>\n"
               "</param>\n"
-              "<param name=\"freq\" gui-text=\"" N_("Frequency:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"100.00\">4</param>\n"
-              "<param name=\"complexity\" gui-text=\"" N_("Complexity:") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"5\">3</param>\n"
-              "<param name=\"variation\" gui-text=\"" N_("Variation:") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"100\">0</param>\n"
-              "<param name=\"hblur\" gui-text=\"" N_("Horizontal inlay:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"30.00\">10</param>\n"
-              "<param name=\"vblur\" gui-text=\"" N_("Vertical inlay:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"30.00\">10</param>\n"
-              "<param name=\"displacement\" gui-text=\"" N_("Displacement:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.\" max=\"100.00\">50</param>\n"
-              "<param name=\"blend\" gui-text=\"" N_("Blend:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"30.00\">5</param>\n"
-              "<param name=\"stroke\" gui-text=\"" N_("Stroke:") "\" type=\"enum\">\n"
+              "<param name=\"freq\" _gui-text=\"" N_("Frequency:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"100.00\">4</param>\n"
+              "<param name=\"complexity\" _gui-text=\"" N_("Complexity:") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"5\">3</param>\n"
+              "<param name=\"variation\" _gui-text=\"" N_("Variation:") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"100\">0</param>\n"
+              "<param name=\"hblur\" _gui-text=\"" N_("Horizontal inlay:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"30.00\">10</param>\n"
+              "<param name=\"vblur\" _gui-text=\"" N_("Vertical inlay:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"30.00\">10</param>\n"
+              "<param name=\"displacement\" _gui-text=\"" N_("Displacement:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.\" max=\"100.00\">50</param>\n"
+              "<param name=\"blend\" _gui-text=\"" N_("Blend:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"30.00\">5</param>\n"
+              "<param name=\"stroke\" _gui-text=\"" N_("Stroke:") "\" type=\"enum\">\n"
                 "<_item value=\"over\">" N_("Wide") "</_item>\n"
                 "<_item value=\"atop\">" N_("Normal") "</_item>\n"
                 "<_item value=\"in\">" N_("Narrow") "</_item>\n"
@@ -81,9 +81,9 @@ public:
                 "<_item value=\"arithmetic\">" N_("Custom") "</_item>\n"
               "</param>\n"
               "<_param name=\"customHeader\" type=\"description\" appearance=\"header\">" N_("Custom stroke options") "</_param>\n"
-                "<param name=\"k1\" gui-text=\"" N_("k1:") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-10.\" max=\"10.\">1.5</param>\n"
-                "<param name=\"k2\" gui-text=\"" N_("k2:") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-10.\" max=\"10.\">-0.25</param>\n"
-                "<param name=\"k3\" gui-text=\"" N_("k3:") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-10.\" max=\"10.\">0.5</param>\n"
+                "<param name=\"k1\" _gui-text=\"" N_("k1:") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-10.\" max=\"10.\">1.5</param>\n"
+                "<param name=\"k2\" _gui-text=\"" N_("k2:") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-10.\" max=\"10.\">-0.25</param>\n"
+                "<param name=\"k3\" _gui-text=\"" N_("k3:") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-10.\" max=\"10.\">0.5</param>\n"
               "<effect>\n"
                 "<object-type>all</object-type>\n"
                 "<effects-menu>\n"
diff --git a/src/extension/internal/filter/transparency.h b/src/extension/internal/filter/transparency.h
index dcbae26b5..da89498bb 100644
--- a/src/extension/internal/filter/transparency.h
+++ b/src/extension/internal/filter/transparency.h
@@ -52,11 +52,11 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
               "<name>" N_("Blend") "</name>\n"
               "<id>org.inkscape.effect.filter.Blend</id>\n"
-              "<param name=\"source\" gui-text=\"" N_("Source:") "\" type=\"enum\">\n"
+              "<param name=\"source\" _gui-text=\"" N_("Source:") "\" type=\"enum\">\n"
                 "<_item value=\"BackgroundImage\">" N_("Background") "</_item>\n"
                 "<_item value=\"SourceGraphic\">" N_("Image") "</_item>\n"
               "</param>\n"
-              "<param name=\"mode\" gui-text=\"" N_("Mode:") "\" type=\"enum\">\n"
+              "<param name=\"mode\" _gui-text=\"" N_("Mode:") "\" type=\"enum\">\n"
                 "<_item value=\"multiply\">" N_("Multiply") "</_item>\n"
                 "<_item value=\"normal\">" N_("Normal") "</_item>\n"
                 "<_item value=\"screen\">" N_("Screen") "</_item>\n"
@@ -129,11 +129,11 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
               "<name>" N_("Channel Transparency") "</name>\n"
               "<id>org.inkscape.effect.filter.ChannelTransparency</id>\n"
-              "<param name=\"red\" gui-text=\"" N_("Red") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-10.\" max=\"10.\">-1</param>\n"
-              "<param name=\"green\" gui-text=\"" N_("Green") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-10.\" max=\"10.\">0.5</param>\n"
-              "<param name=\"blue\" gui-text=\"" N_("Blue") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-10.\" max=\"10.\">0.5</param>\n"
-              "<param name=\"alpha\" gui-text=\"" N_("Alpha") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-10.\" max=\"10.\">1</param>\n"
-              "<param name=\"invert\" gui-text=\"" N_("Inverted") "\" type=\"boolean\">false</param>\n"
+              "<param name=\"red\" _gui-text=\"" N_("Red") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-10.\" max=\"10.\">-1</param>\n"
+              "<param name=\"green\" _gui-text=\"" N_("Green") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-10.\" max=\"10.\">0.5</param>\n"
+              "<param name=\"blue\" _gui-text=\"" N_("Blue") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-10.\" max=\"10.\">0.5</param>\n"
+              "<param name=\"alpha\" _gui-text=\"" N_("Alpha") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-10.\" max=\"10.\">1</param>\n"
+              "<param name=\"invert\" _gui-text=\"" N_("Inverted") "\" type=\"boolean\">false</param>\n"
               "<effect>\n"
                 "<object-type>all</object-type>\n"
                 "<effects-menu>\n"
@@ -204,10 +204,10 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
               "<name>" N_("Light Eraser") "</name>\n"
               "<id>org.inkscape.effect.filter.LightEraser</id>\n"
-              "<param name=\"expand\" gui-text=\"" N_("Expansion") "\" type=\"float\" appearance=\"full\"  min=\"0\" max=\"1000\">50</param>\n"
-              "<param name=\"erode\" gui-text=\"" N_("Erosion") "\" type=\"float\" appearance=\"full\" min=\"1\" max=\"1000\">100</param>\n"
-              "<param name=\"opacity\" gui-text=\"" N_("Global opacity") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.\" max=\"1.\">1</param>\n"
-              "<param name=\"invert\" gui-text=\"" N_("Inverted") "\" type=\"boolean\">false</param>\n"
+              "<param name=\"expand\" _gui-text=\"" N_("Expansion") "\" type=\"float\" appearance=\"full\"  min=\"0\" max=\"1000\">50</param>\n"
+              "<param name=\"erode\" _gui-text=\"" N_("Erosion") "\" type=\"float\" appearance=\"full\" min=\"1\" max=\"1000\">100</param>\n"
+              "<param name=\"opacity\" _gui-text=\"" N_("Global opacity") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.\" max=\"1.\">1</param>\n"
+              "<param name=\"invert\" _gui-text=\"" N_("Inverted") "\" type=\"boolean\">false</param>\n"
               "<effect>\n"
                 "<object-type>all</object-type>\n"
                 "<effects-menu>\n"
@@ -278,9 +278,9 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
               "<name>" N_("Opacity") "</name>\n"
               "<id>org.inkscape.effect.filter.Opacity</id>\n"
-              "<param name=\"expand\" gui-text=\"" N_("Expansion") "\" type=\"float\" appearance=\"full\"  min=\"1\" max=\"1000\">5</param>\n"
-              "<param name=\"erode\" gui-text=\"" N_("Erosion") "\" type=\"float\" appearance=\"full\" min=\"0\" max=\"1000\">1</param>\n"
-              "<param name=\"opacity\" gui-text=\"" N_("Global opacity") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.\" max=\"1.\">1</param>\n"
+              "<param name=\"expand\" _gui-text=\"" N_("Expansion") "\" type=\"float\" appearance=\"full\"  min=\"1\" max=\"1000\">5</param>\n"
+              "<param name=\"erode\" _gui-text=\"" N_("Erosion") "\" type=\"float\" appearance=\"full\" min=\"0\" max=\"1000\">1</param>\n"
+              "<param name=\"opacity\" _gui-text=\"" N_("Global opacity") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.\" max=\"1.\">1</param>\n"
               "<effect>\n"
                 "<object-type>all</object-type>\n"
                 "<effects-menu>\n"
@@ -340,9 +340,9 @@ public:
             "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
               "<name>" N_("Silhouette") "</name>\n"
               "<id>org.inkscape.effect.filter.Silhouette</id>\n"
-              "<param name=\"blur\" gui-text=\"" N_("Blur") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"50.00\">0.01</param>\n"
-              "<param name=\"cutout\" gui-text=\"" N_("Cutout") "\" type=\"boolean\">false</param>\n"
-              "<param name=\"color\" gui-text=\"" N_("Color") "\" type=\"color\">255</param>\n"
+              "<param name=\"blur\" _gui-text=\"" N_("Blur") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"50.00\">0.01</param>\n"
+              "<param name=\"cutout\" _gui-text=\"" N_("Cutout") "\" type=\"boolean\">false</param>\n"
+              "<param name=\"color\" _gui-text=\"" N_("Color") "\" type=\"color\">255</param>\n"
               "<effect>\n"
                 "<object-type>all</object-type>\n"
                 "<effects-menu>\n"
diff --git a/src/extension/internal/gdkpixbuf-input.cpp b/src/extension/internal/gdkpixbuf-input.cpp
index c15e28854..b30c67a4d 100644
--- a/src/extension/internal/gdkpixbuf-input.cpp
+++ b/src/extension/internal/gdkpixbuf-input.cpp
@@ -208,7 +208,7 @@ GdkpixbufInput::init(void)
                     "<_option value='optimizeSpeed' >" N_("Blocky (optimizeSpeed)") "</_option>\n"
                   "</param>\n"
 
-                  "<param name=\"do_not_ask\" _gui-description='" N_("Hide the dialog next time and always apply the same actions.") "' gui-text=\"" N_("Don't ask again") "\" type=\"boolean\" >false</param>\n"
+                  "<param name=\"do_not_ask\" _gui-description='" N_("Hide the dialog next time and always apply the same actions.") "' _gui-text=\"" N_("Don't ask again") "\" type=\"boolean\" >false</param>\n"
                   "<input>\n"
                     "<extension>.%s</extension>\n"
                     "<mimetype>%s</mimetype>\n"
diff --git a/src/extension/internal/grid.cpp b/src/extension/internal/grid.cpp
index e6938b9e2..c766bd828 100644
--- a/src/extension/internal/grid.cpp
+++ b/src/extension/internal/grid.cpp
@@ -198,11 +198,11 @@ Grid::init (void)
         "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
             "<name>" N_("Grid") "</name>\n"
             "<id>org.inkscape.effect.grid</id>\n"
-            "<param name=\"lineWidth\" gui-text=\"" N_("Line Width:") "\" type=\"float\">1.0</param>\n"
-            "<param name=\"xspacing\" gui-text=\"" N_("Horizontal Spacing:") "\" type=\"float\" min=\"0.1\" max=\"1000\">10.0</param>\n"
-            "<param name=\"yspacing\" gui-text=\"" N_("Vertical Spacing:") "\" type=\"float\" min=\"0.1\" max=\"1000\">10.0</param>\n"
-            "<param name=\"xoffset\" gui-text=\"" N_("Horizontal Offset:") "\" type=\"float\" min=\"0.0\" max=\"1000\">0.0</param>\n"
-            "<param name=\"yoffset\" gui-text=\"" N_("Vertical Offset:") "\" type=\"float\" min=\"0.0\" max=\"1000\">0.0</param>\n"
+            "<param name=\"lineWidth\" _gui-text=\"" N_("Line Width:") "\" type=\"float\">1.0</param>\n"
+            "<param name=\"xspacing\" _gui-text=\"" N_("Horizontal Spacing:") "\" type=\"float\" min=\"0.1\" max=\"1000\">10.0</param>\n"
+            "<param name=\"yspacing\" _gui-text=\"" N_("Vertical Spacing:") "\" type=\"float\" min=\"0.1\" max=\"1000\">10.0</param>\n"
+            "<param name=\"xoffset\" _gui-text=\"" N_("Horizontal Offset:") "\" type=\"float\" min=\"0.0\" max=\"1000\">0.0</param>\n"
+            "<param name=\"yoffset\" _gui-text=\"" N_("Vertical Offset:") "\" type=\"float\" min=\"0.0\" max=\"1000\">0.0</param>\n"
             "<effect>\n"
                 "<object-type>all</object-type>\n"
                 "<effects-menu>\n"
diff --git a/src/extension/internal/wmf-inout.cpp b/src/extension/internal/wmf-inout.cpp
index b8b0c73de..c7226a58a 100644
--- a/src/extension/internal/wmf-inout.cpp
+++ b/src/extension/internal/wmf-inout.cpp
@@ -3193,15 +3193,15 @@ Wmf::init (void)
         "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
             "<name>" N_("WMF Output") "</name>\n"
             "<id>org.inkscape.output.wmf</id>\n"
-            "<param name=\"textToPath\" gui-text=\"" N_("Convert texts to paths") "\" type=\"boolean\">true</param>\n"
-            "<param name=\"TnrToSymbol\" gui-text=\"" N_("Map Unicode to Symbol font") "\" type=\"boolean\">true</param>\n"
-            "<param name=\"TnrToWingdings\" gui-text=\"" N_("Map Unicode to Wingdings") "\" type=\"boolean\">true</param>\n"
-            "<param name=\"TnrToZapfDingbats\" gui-text=\"" N_("Map Unicode to Zapf Dingbats") "\" type=\"boolean\">true</param>\n"
-            "<param name=\"UsePUA\" gui-text=\"" N_("Use MS Unicode PUA (0xF020-0xF0FF) for converted characters") "\" type=\"boolean\">false</param>\n"
-            "<param name=\"FixPPTCharPos\" gui-text=\"" N_("Compensate for PPT font bug") "\" type=\"boolean\">false</param>\n"
-            "<param name=\"FixPPTDashLine\" gui-text=\"" N_("Convert dashed/dotted lines to single lines") "\" type=\"boolean\">false</param>\n"
-            "<param name=\"FixPPTGrad2Polys\" gui-text=\"" N_("Convert gradients to colored polygon series") "\" type=\"boolean\">false</param>\n"
-            "<param name=\"FixPPTPatternAsHatch\" gui-text=\"" N_("Map all fill patterns to standard WMF hatches") "\" type=\"boolean\">false</param>\n"
+            "<param name=\"textToPath\" _gui-text=\"" N_("Convert texts to paths") "\" type=\"boolean\">true</param>\n"
+            "<param name=\"TnrToSymbol\" _gui-text=\"" N_("Map Unicode to Symbol font") "\" type=\"boolean\">true</param>\n"
+            "<param name=\"TnrToWingdings\" _gui-text=\"" N_("Map Unicode to Wingdings") "\" type=\"boolean\">true</param>\n"
+            "<param name=\"TnrToZapfDingbats\" _gui-text=\"" N_("Map Unicode to Zapf Dingbats") "\" type=\"boolean\">true</param>\n"
+            "<param name=\"UsePUA\" _gui-text=\"" N_("Use MS Unicode PUA (0xF020-0xF0FF) for converted characters") "\" type=\"boolean\">false</param>\n"
+            "<param name=\"FixPPTCharPos\" _gui-text=\"" N_("Compensate for PPT font bug") "\" type=\"boolean\">false</param>\n"
+            "<param name=\"FixPPTDashLine\" _gui-text=\"" N_("Convert dashed/dotted lines to single lines") "\" type=\"boolean\">false</param>\n"
+            "<param name=\"FixPPTGrad2Polys\" _gui-text=\"" N_("Convert gradients to colored polygon series") "\" type=\"boolean\">false</param>\n"
+            "<param name=\"FixPPTPatternAsHatch\" _gui-text=\"" N_("Map all fill patterns to standard WMF hatches") "\" type=\"boolean\">false</param>\n"
             "<output>\n"
                 "<extension>.wmf</extension>\n"
                 "<mimetype>image/x-wmf</mimetype>\n"
diff --git a/src/extension/param/bool.cpp b/src/extension/param/bool.cpp
index de9b1c586..119c43f2f 100644
--- a/src/extension/param/bool.cpp
+++ b/src/extension/param/bool.cpp
@@ -14,12 +14,12 @@
 #include <gtkmm/box.h>
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/checkbutton.h>
+#include <glib/gi18n.h>
 
 #include "xml/node.h"
 #include "../extension.h"
 #include "bool.h"
 #include "preferences.h"
-#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/param/float.cpp b/src/extension/param/float.cpp
index 81508f6c0..c68242371 100644
--- a/src/extension/param/float.cpp
+++ b/src/extension/param/float.cpp
@@ -15,12 +15,12 @@
 #include <gtkmm/scale.h>
 #include "ui/widget/spinbutton.h"
 #include "ui/widget/spin-scale.h"
+#include <glib/gi18n.h>
 
 #include "xml/node.h"
 #include "extension/extension.h"
 #include "preferences.h"
 #include "float.h"
-#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/param/int.cpp b/src/extension/param/int.cpp
index c286018fd..f2399b320 100644
--- a/src/extension/param/int.cpp
+++ b/src/extension/param/int.cpp
@@ -15,12 +15,12 @@
 #include <gtkmm/scale.h>
 #include "ui/widget/spinbutton.h"
 #include "ui/widget/spin-scale.h"
+#include <glib/gi18n.h>
 
 #include "xml/node.h"
 #include "extension/extension.h"
 #include "preferences.h"
 #include "int.h"
-#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/param/parameter.cpp b/src/extension/param/parameter.cpp
index 10029893f..a5632a39a 100644
--- a/src/extension/param/parameter.cpp
+++ b/src/extension/param/parameter.cpp
@@ -40,6 +40,8 @@
 #include "radiobutton.h"
 #include "string.h"
 
+#include <glibmm/i18n.h>
+
 namespace Inkscape {
 namespace Extension {
 
diff --git a/src/extension/prefdialog.cpp b/src/extension/prefdialog.cpp
index 0ea15a5cd..2521dc1de 100644
--- a/src/extension/prefdialog.cpp
+++ b/src/extension/prefdialog.cpp
@@ -273,7 +273,7 @@ PrefDialog::on_response (int signal) {
 
 #include "internal/clear-n_.h"
 
-const char * PrefDialog::live_param_xml = "<param name=\"__live_effect__\" type=\"boolean\" gui-text=\"" N_("Live preview") "\" gui-description=\"" N_("Is the effect previewed live on canvas?") "\" scope=\"user\">false</param>";
+const char * PrefDialog::live_param_xml = "<param name=\"__live_effect__\" type=\"boolean\" _gui-text=\"" N_("Live preview") "\" gui-description=\"" N_("Is the effect previewed live on canvas?") "\" scope=\"user\">false</param>";
 
 }; }; /* namespace Inkscape, Extension */
 
diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index 732c67304..1868ca43b 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -714,6 +714,7 @@ Effect::getParameter(const char * key)
 {
     Glib::ustring stringkey(key);
 
+    if (param_vector.empty()) return NULL;
     std::vector<Parameter *>::iterator it = param_vector.begin();
     while (it != param_vector.end()) {
         Parameter * param = *it;
diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp
index 7ea1d465c..bed191e83 100644
--- a/src/live_effects/parameter/path.cpp
+++ b/src/live_effects/parameter/path.cpp
@@ -73,7 +73,21 @@ PathParam::PathParam( const Glib::ustring& label, const Glib::ustring& tip,
 PathParam::~PathParam()
 {
     remove_link();
-
+    using namespace Inkscape::UI;
+    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+    if (desktop) {
+        if (tools_isactive(desktop, TOOLS_NODES)) {
+            SPItem * item = SP_ACTIVE_DESKTOP->getSelection()->singleItem();
+            if (item != NULL) {
+                Inkscape::UI::Tools::NodeTool *nt = static_cast<Inkscape::UI::Tools::NodeTool*>(desktop->event_context);
+                std::set<ShapeRecord> shapes;
+                ShapeRecord r;
+                r.item = item;
+                shapes.insert(r);
+                nt->_multipath->setItems(shapes);
+            }
+        }
+    }
     g_free(defvalue);
 }
 
@@ -207,6 +221,9 @@ PathParam::param_newWidget()
 void
 PathParam::param_editOncanvas(SPItem *item, SPDesktop * dt)
 {
+    SPDocument *document = dt->getDocument();
+    bool saved = DocumentUndo::getUndoSensitive(document);
+    DocumentUndo::setUndoSensitive(document, false);
     using namespace Inkscape::UI;
 
     // TODO remove the tools_switch atrocity.
@@ -220,14 +237,20 @@ PathParam::param_editOncanvas(SPItem *item, SPDesktop * dt)
 
     r.role = SHAPE_ROLE_LPE_PARAM;
     r.edit_transform = item->i2dt_affine(); // TODO is it right?
+    r.edit_transform *= item->transform.inverse();
     if (!href) {
         r.item = reinterpret_cast<SPItem*>(param_effect->getLPEObj());
         r.lpe_key = param_key;
+        Geom::PathVector stored_pv =  _pathvector;
+        param_write_to_repr("M0,0 L1,0");
+        const char *svgd = sp_svg_write_path(stored_pv);
+        param_write_to_repr(svgd);
     } else {
         r.item = ref.getObject();
     }
     shapes.insert(r);
     nt->_multipath->setItems(shapes);
+    DocumentUndo::setUndoSensitive(document, saved);
 }
 
 void
@@ -435,7 +458,8 @@ PathParam::paste_param_path(const char *svgd)
         SPItem * item = SP_ACTIVE_DESKTOP->getSelection()->singleItem();
         if (item != NULL) {
             Geom::PathVector path_clipboard =  sp_svg_read_pathv(svgd);
-            path_clipboard *= item->i2doc_affine().inverse();
+            path_clipboard *= item->i2doc_affine().inverse() * item->transform;
+            path_clipboard *= Geom::Translate(path_clipboard.initialPoint() - _pathvector.initialPoint()).inverse();
             svgd = sp_svg_write_path( path_clipboard );
         }
         
diff --git a/src/object-set.cpp b/src/object-set.cpp
index ba7999c19..8aaa68e70 100644
--- a/src/object-set.cpp
+++ b/src/object-set.cpp
@@ -18,13 +18,14 @@ bool ObjectSet::add(SPObject* object) {
         return false;
     }
 
+    // very nice function, but needs refinement
     // check if there is mutual ancestor for some elements, which can replace all of them in the set
-    SPObject* o = _getMutualAncestor(object);
+//    object = _getMutualAncestor(object);
 
     // remove all descendants from the set
-    _removeDescendantsFromSet(o);
+    _removeDescendantsFromSet(object);
 
-    _add(o);
+    _add(object);
     return true;
 }
 
@@ -132,3 +133,11 @@ void ObjectSet::_removeAncestorsFromSet(SPObject *object) {
 ObjectSet::~ObjectSet() {
     clear();
 }
+
+multi_index_container::iterator ObjectSet::begin() {
+    return container.begin();
+}
+
+multi_index_container::iterator ObjectSet::end() {
+    return container.end();
+}
diff --git a/src/object-set.h b/src/object-set.h
index 8160cd27b..7a52788f3 100644
--- a/src/object-set.h
+++ b/src/object-set.h
@@ -41,6 +41,8 @@ public:
     bool contains(SPObject* object);
     void clear();
     int size();
+    multi_index_container::iterator begin();
+    multi_index_container::iterator end();
 
 private:
     void _add(SPObject* object);
diff --git a/src/preferences-skeleton.h b/src/preferences-skeleton.h
index 5ccc4d729..38196a58e 100644
--- a/src/preferences-skeleton.h
+++ b/src/preferences-skeleton.h
@@ -338,7 +338,8 @@ static char const preferences_skeleton[] =
 "           style_defaults_remove=\"0\" "
 "           check_on_reading=\"0\" "
 "           check_on_editing=\"0\" "
-"           check_on_writing=\"0\"/>\n"
+"           check_on_writing=\"0\" "
+"           sort_attributes=\"0\"/>\n"
 "    <group id=\"externalresources\">\n"
 "      <group id=\"xml\" "
 "           allow_net_access=\"0\"/>\n"
diff --git a/src/selection.cpp b/src/selection.cpp
index 6fc426be7..146d07a9d 100644
--- a/src/selection.cpp
+++ b/src/selection.cpp
@@ -17,14 +17,10 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
 #endif
-#include "macros.h"
+
 #include "inkscape.h"
 #include "document.h"
-#include "layer-model.h"
-#include "selection.h"
-#include <2geom/rect.h>
 #include "xml/repr.h"
 #include "preferences.h"
 
@@ -32,21 +28,15 @@
 #include "sp-path.h"
 #include "sp-item-group.h"
 #include "box3d.h"
-#include "box3d.h"
 #include "persp3d.h"
-
-#include <sigc++/functors/mem_fun.h>
+#include <boost/lambda/lambda.hpp>
+#include <boost/lambda/casts.hpp>
 
 #define SP_SELECTION_UPDATE_PRIORITY (G_PRIORITY_HIGH_IDLE + 1)
 
 namespace Inkscape {
 
 Selection::Selection(LayerModel *layers, SPDesktop *desktop) :
-    _objs(std::list<SPObject*>()),
-    _objs_vector(std::vector<SPObject*>()),
-    _objs_set(std::set<SPObject*>()),
-    _reprs(std::vector<XML::Node*>()),
-    _items(std::vector<SPItem*>()),
     _layers(layers),
     _desktop(desktop),
     _selection_context(NULL),
@@ -122,18 +112,8 @@ Selection::_releaseContext(SPObject *obj)
     _selection_context = NULL;
 }
 
-void Selection::_invalidateCachedLists() {
-    _items.clear();
-    _reprs.clear();
-    _objs_vector.clear();
-}
-
 void Selection::_clear() {
-    _invalidateCachedLists();
-    while (!_objs.empty()) {
-        SPObject *obj=_objs.front();
-        _remove(obj);
-    }
+    _selectionSet.clear();
 }
 
 SPObject *Selection::activeContext() {
@@ -142,13 +122,11 @@ SPObject *Selection::activeContext() {
     return _layers->currentLayer();
     }
 
-bool Selection::includes(SPObject *obj) const {
-    if (obj == NULL)
-        return FALSE;
-
-    g_return_val_if_fail(SP_IS_OBJECT(obj), FALSE);
+bool Selection::includes(SPObject *obj)  {
+    g_return_val_if_fail(obj != NULL, false);
+    g_return_val_if_fail(SP_IS_OBJECT(obj), false);
 
-    return ( _objs_set.find(obj)!=_objs_set.end() );
+    return _selectionSet.contains(obj);
 }
 
 void Selection::add(SPObject *obj, bool persist_selection_context/* = false */) {
@@ -156,11 +134,6 @@ void Selection::add(SPObject *obj, bool persist_selection_context/* = false */)
     g_return_if_fail(SP_IS_OBJECT(obj));
     g_return_if_fail(obj->document != NULL);
 
-    if (includes(obj)) {
-        return;
-    }
-
-    _invalidateCachedLists();
     _add(obj);
     _emitChanged(persist_selection_context);
 }
@@ -175,18 +148,8 @@ void Selection::add_3D_boxes_recursively(SPObject *obj) {
 }
 
 void Selection::_add(SPObject *obj) {
-    // unselect any of the item's ancestors and descendants which may be selected
-    // (to prevent double-selection)
-    _removeObjectDescendants(obj);
-    _removeObjectAncestors(obj);
-    g_return_if_fail(SP_IS_OBJECT(obj));
-
-    _objs.push_front(obj);
-    _objs_set.insert(obj);
-
+    _selectionSet.add(obj);
     add_3D_boxes_recursively(obj);
-
-    _release_connections[obj] = obj->connectRelease(sigc::mem_fun(*this, (void (Selection::*)(SPObject *))&Selection::remove));
     _modified_connections[obj] = obj->connectModified(sigc::mem_fun(*this, &Selection::_schedule_modified));
 }
 
@@ -196,8 +159,8 @@ void Selection::set(SPObject *object, bool persist_selection_context) {
 }
 
 void Selection::toggle(SPObject *obj) {
-    if (includes (obj)) {
-        remove (obj);
+    if (includes(obj)) {
+        remove(obj);
     } else {
         add(obj);
     }
@@ -206,9 +169,7 @@ void Selection::toggle(SPObject *obj) {
 void Selection::remove(SPObject *obj) {
     g_return_if_fail(obj != NULL);
     g_return_if_fail(SP_IS_OBJECT(obj));
-    g_return_if_fail(includes(obj));
 
-    _invalidateCachedLists();
     _remove(obj);
     _emitChanged();
 }
@@ -231,13 +192,8 @@ void Selection::_remove(SPObject *obj) {
     _modified_connections[obj].disconnect();
     _modified_connections.erase(obj);
 
-    _release_connections[obj].disconnect();
-    _release_connections.erase(obj);
-
+    _selectionSet.remove(obj);
     remove_3D_boxes_recursively(obj);
-
-    _objs.remove(obj);
-    _objs_set.erase(obj);
 }
 
 void Selection::setList(std::vector<SPItem*> const &list) {
@@ -245,20 +201,20 @@ void Selection::setList(std::vector<SPItem*> const &list) {
     if (!list.empty()) {
         _clear();
         addList(list);
-    } else clear();
+    } else {
+        clear();
+    }
 }
 
 void Selection::addList(std::vector<SPItem*> const &list) {
-
     if (list.empty())
         return;
 
-    _invalidateCachedLists();
-
-    for ( std::vector<SPItem*>::const_iterator iter=list.begin();iter!=list.end(); ++iter) {
+    for (std::vector<SPItem*>::const_iterator iter = list.begin(); iter != list.end(); ++iter) {
         SPObject *obj = *iter;
-        if (includes(obj)) continue;
-        _add (obj);
+        if (!includes(obj)) {
+            _add(obj);
+        }
     }
 
     _emitChanged();
@@ -267,8 +223,8 @@ void Selection::addList(std::vector<SPItem*> const &list) {
 void Selection::setReprList(std::vector<XML::Node*> const &list) {
     _clear();
 
-    for ( std::vector<XML::Node*>::const_reverse_iterator iter=list.rbegin();iter!=list.rend(); ++iter) {
-        SPObject *obj=_objectForXMLNode(*iter);
+    for (std::vector<XML::Node*>::const_reverse_iterator iter = list.rbegin(); iter != list.rend(); ++iter) {
+        SPObject *obj = _objectForXMLNode(*iter);
         if (obj) {
             _add(obj);
         }
@@ -282,39 +238,27 @@ void Selection::clear() {
     _emitChanged();
 }
 
-std::vector<SPObject*> const &Selection::list() {
-    if(!_objs_vector.empty())
-    return _objs_vector;
-
-    for ( std::list<SPObject*>::const_iterator iter=_objs.begin();iter!=_objs.end(); ++iter) {
-            _objs_vector.push_back(*iter);
-    }
-    return _objs_vector;
-
+bool Selection::isEmpty() {
+    return _selectionSet.size() == 0;
 }
 
-std::vector<SPItem*> const &Selection::itemList() {
-    if (!_items.empty()) {
-        return _items;
-    }
+std::vector<SPObject*> Selection::list() {
+    return std::vector<SPObject*>(_selectionSet.begin(), _selectionSet.end());
+}
 
-    for ( std::list<SPObject*>::const_iterator iter=_objs.begin();iter!=_objs.end(); ++iter) {
-        SPObject *obj=*iter;
-        if (SP_IS_ITEM(obj)) {
-            _items.push_back(SP_ITEM(obj));
-        }
-    }
-    return _items;
+std::vector<SPItem*> Selection::itemList() {
+    std::vector<SPObject *> tmp = list();
+    std::vector<SPItem*> result;
+    std::remove_if(tmp.begin(), tmp.end(), [](SPObject* o){return !SP_IS_ITEM(o);});
+    std::transform(tmp.begin(), tmp.end(), std::back_inserter(result), [](SPObject* o){return SP_ITEM(o);});
+    return result;
 }
 
-std::vector<XML::Node*> const &Selection::reprList() {
-    if (!_reprs.empty()) { return _reprs; }
+std::vector<XML::Node*> Selection::reprList() {
     std::vector<SPItem*> list = itemList();
-    for ( std::vector<SPItem*>::const_iterator iter=list.begin();iter!=list.end(); ++iter) {
-        SPObject *obj = *iter;
-        _reprs.push_back(obj->getRepr());
-    }
-    return _reprs;
+    std::vector<XML::Node*> result;
+    std::transform(list.begin(), list.end(), std::back_inserter(result), [](SPItem* item) { return item->getRepr(); });
+    return result;
 }
 
 std::list<Persp3D *> const Selection::perspList() {
@@ -343,20 +287,22 @@ std::list<SPBox3D *> const Selection::box3DList(Persp3D *persp) {
 }
 
 SPObject *Selection::single() {
-    if ( _objs.size() == 1 ) {
-        return _objs.front();
-    } else {
-        return NULL;
+    if (_selectionSet.size() == 1) {
+        return *_selectionSet.begin();
     }
+
+    return nullptr;
 }
 
 SPItem *Selection::singleItem() {
-    std::vector<SPItem*> const items=itemList();
-    if ( items.size()==1) {
-        return items[0];
-    } else {
-        return NULL;
+    if (_selectionSet.size() == 1) {
+        SPObject* obj = *_selectionSet.begin();
+        if (SP_IS_ITEM(obj)) {
+            return SP_ITEM(obj);
+        }
     }
+
+    return nullptr;
 }
 
 SPItem *Selection::smallestItem(Selection::CompareSize compare) {
@@ -378,19 +324,20 @@ SPItem *Selection::_sizeistItem(bool sml, Selection::CompareSize compare) {
         Geom::Rect bbox = *obox;
 
         gdouble size = compare == 2 ? bbox.area() :
-            (compare == 1 ? bbox.width() : bbox.height());
+                       (compare == 1 ? bbox.width() : bbox.height());
         size = sml ? size : size * -1;
         if (size < max) {
             max = size;
             ist = SP_ITEM(*i);
         }
     }
+
     return ist;
 }
 
 Inkscape::XML::Node *Selection::singleRepr() {
-    SPObject *obj=single();
-    return obj ? obj->getRepr() : NULL;
+    SPObject *obj = single();
+    return obj ? obj->getRepr() : nullptr;
 }
 
 Geom::OptRect Selection::bounds(SPItem::BBoxType type) const
@@ -484,34 +431,6 @@ std::vector<Inkscape::SnapCandidatePoint> Selection::getSnapPoints(SnapPreferenc
     return p;
 }
 
-void Selection::_removeObjectDescendants(SPObject *obj) {
-    std::vector<SPObject*> toremove;
-    for ( std::list<SPObject*>::const_iterator iter=_objs.begin();iter!=_objs.end(); ++iter) {
-        SPObject *sel_obj= dynamic_cast<SPObject*>(*iter);
-        SPObject *parent = sel_obj->parent;
-        while (parent) {
-            if ( parent == obj ) {
-                toremove.push_back(sel_obj);
-                break;
-            }
-            parent = parent->parent;
-        }
-    }
-    for ( std::vector<SPObject*>::const_iterator iter=toremove.begin();iter!=toremove.end(); ++iter) {
-        _remove(*iter);
-    }
-}
-
-void Selection::_removeObjectAncestors(SPObject *obj) {
-        SPObject *parent = obj->parent;
-        while (parent) {
-            if (includes(parent)) {
-                _remove(parent);
-            }
-            parent = parent->parent;
-        }
-}
-
 SPObject *Selection::_objectForXMLNode(Inkscape::XML::Node *repr) const {
     g_return_val_if_fail(repr != NULL, NULL);
     gchar const *id = repr->attribute("id");
@@ -528,6 +447,7 @@ size_t Selection::numberOfLayers() {
         SPObject *layer = _layers->layerForObject(*iter);
         layers.insert(layer);
     }
+
     return layers.size();
 }
 
diff --git a/src/selection.h b/src/selection.h
index 952dde51d..91d033d58 100644
--- a/src/selection.h
+++ b/src/selection.h
@@ -25,7 +25,7 @@
 #include "gc-anchored.h"
 #include "inkgc/gc-soft-ptr.h"
 #include "sp-item.h"
-
+#include "object-set.h"
 
 
 class SPDesktop;
@@ -110,7 +110,9 @@ public:
      *
      * @param the xml node of the item to add
      */
-    void add(XML::Node *repr) { add(_objectForXMLNode(repr)); }
+    void add(XML::Node *repr) {
+        add(_objectForXMLNode(repr));
+    }
 
     /**
      * Set the selection to a single specific object.
@@ -124,7 +126,9 @@ public:
      *
      * @param repr the xml node of the item to select
      */
-    void set(XML::Node *repr) { set(_objectForXMLNode(repr)); }
+    void set(XML::Node *repr) {
+        set(_objectForXMLNode(repr));
+    }
 
     /**
      * Removes an item from the set of selected objects.
@@ -174,12 +178,11 @@ public:
 
     /**  Add items from an STL iterator range to the selection.
      *  \param  from the begin iterator
-     *  \param  to   the end iterator
+     *  \param  to the end iterator
      */
     template <typename InputIterator>
     void add(InputIterator from, InputIterator to) {
-        _invalidateCachedLists();
-        while ( from != to ) {
+        while (from != to) {
             _add(*from);
             ++from;
         }
@@ -194,17 +197,17 @@ public:
     /**
      * Returns true if no items are selected.
      */
-    bool isEmpty() const { return _objs.empty(); }
+    bool isEmpty();
 
     /**
      * Returns true if the given object is selected.
      */
-    bool includes(SPObject *obj) const;
+    bool includes(SPObject *obj);
 
     /**
      * Returns true if the given item is selected.
      */
-    bool includes(XML::Node *repr) const {
+    bool includes(XML::Node *repr) {
         return includes(_objectForXMLNode(repr));
     }
 
@@ -240,13 +243,13 @@ public:
     XML::Node *singleRepr();
 
     /** Returns the list of selected objects. */
-    std::vector<SPObject*> const &list();
+    std::vector<SPObject*> list();
     /** Returns the list of selected SPItems. */
-    std::vector<SPItem*> const &itemList();
+    std::vector<SPItem*> itemList();
     /** Returns a list of the xml nodes of all selected objects. */
     /// \todo only returns reprs of SPItems currently; need a separate
     ///      method for that
-    std::vector<XML::Node*> const &reprList();
+    std::vector<XML::Node*> reprList();
 
     /** Returns a list of all perspectives which have a 3D box in the current selection.
        (these may also be nested in groups) */
@@ -344,13 +347,6 @@ private:
     void _emitModified(unsigned int flags);
     /** Issues changed selection signal. */
     void _emitChanged(bool persist_selection_context = false);
-
-    void _invalidateCachedLists();
-
-    /** unselect all descendants of the given item. */
-    void _removeObjectDescendants(SPObject *obj);
-    /** unselect all ancestors of the given item. */
-    void _removeObjectAncestors(SPObject *obj);
     /** clears the selection (without issuing a notification). */
     void _clear();
     /** adds an object (without issuing a notification). */
@@ -362,15 +358,9 @@ private:
     /** Releases an active layer object that is being removed. */
     void _releaseContext(SPObject *obj);
 
-    mutable std::list<SPObject*> _objs; //to more efficiently remove arbitrary elements
-    mutable std::vector<SPObject*> _objs_vector; // to be returned by list();
-    mutable std::set<SPObject*> _objs_set; //to efficiently test if object is selected
-    mutable std::vector<XML::Node*> _reprs;
-    mutable std::vector<SPItem*> _items;
+    ObjectSet _selectionSet;
 
-    void add_box_perspective(SPBox3D *box);
     void add_3D_boxes_recursively(SPObject *obj);
-    void remove_box_perspective(SPBox3D *box);
     void remove_3D_boxes_recursively(SPObject *obj);
     SPItem *_sizeistItem(bool sml, CompareSize compare);
 
@@ -383,7 +373,6 @@ private:
     unsigned int _idle;
 
     std::map<SPObject *, sigc::connection> _modified_connections;
-    std::map<SPObject *, sigc::connection> _release_connections;
     sigc::connection _context_release_connection;
 
     sigc::signal<void, Selection *> _changed_signal;
diff --git a/src/sp-item.cpp b/src/sp-item.cpp
index af81194c2..9fd6e8ecc 100644
--- a/src/sp-item.cpp
+++ b/src/sp-item.cpp
@@ -399,7 +399,6 @@ void SPItem::build(SPDocument *document, Inkscape::XML::Node *repr) {
     object->readAttr( "clip-path" );
     object->readAttr( "mask" );
     object->readAttr( "sodipodi:insensitive" );
-    object->readAttr( "sodipodi:nonprintable" );
     object->readAttr( "inkscape:transform-center-x" );
     object->readAttr( "inkscape:transform-center-y" );
     object->readAttr( "inkscape:connector-avoid" );
diff --git a/src/style-internal.h b/src/style-internal.h
index 767552784..6cc8c6c4e 100644
--- a/src/style-internal.h
+++ b/src/style-internal.h
@@ -520,7 +520,7 @@ public:
     {}
 
     SPIEnumBits( Glib::ustring const &name, SPStyleEnum const *enums, unsigned value = 0, bool inherits = true ) :
-        SPIEnum( name, enums, value, inherit )
+        SPIEnum( name, enums, value, inherits )
     {}
 
     virtual ~SPIEnumBits()
diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 5900a2359..0977729ae 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -565,7 +565,6 @@ bool MeasureTool::root_handler(GdkEvent* event)
         explicit_base = boost::none;
         explicit_base_tmp = boost::none;
         last_end = boost::none;
-        start_p = desktop->w2d(button_w);
 
         if (event->button.button == 1 && !this->space_panning) {
             // save drag origin
diff --git a/src/xml/repr-io.cpp b/src/xml/repr-io.cpp
index 4a6f59b43..6977bc1e2 100644
--- a/src/xml/repr-io.cpp
+++ b/src/xml/repr-io.cpp
@@ -34,6 +34,7 @@
 #include "extension/extension.h"
 
 #include "attribute-rel-util.h"
+#include "attribute-sort-util.h"
 
 #include "preferences.h"
 
@@ -882,6 +883,10 @@ static void sp_repr_write_stream_root_element(Node *repr, Writer &out,
     bool clean = prefs->getBool("/options/svgoutput/check_on_writing");
     if (clean) sp_attribute_clean_tree( repr );
 
+    // Sort attributes in a canonical order (helps with "diffing" SVG files).
+    bool sort = prefs->getBool("/options/svgoutput/sort_attributes");
+    if (sort) sp_attribute_sort_tree( repr );
+
     Glib::QueryQuark xml_prefix=g_quark_from_static_string("xml");
 
     NSMap ns_map;
diff --git a/testfiles/src/attributes-test.cpp b/testfiles/src/attributes-test.cpp
index 41c0274ec..e53eb9aef 100644
--- a/testfiles/src/attributes-test.cpp
+++ b/testfiles/src/attributes-test.cpp
@@ -1,3 +1,4 @@
+
 /*
  * Unit tests for attributes.
  *
@@ -406,6 +407,8 @@ std::vector<AttributeInfo> getKnownAttrs()
         AttributeInfo("inkscape:layoutOptions", true),
         AttributeInfo("inkscape:lockguides", true),
         AttributeInfo("inkscape:locked", true),
+        AttributeInfo("inkscape:measure-end", true),
+        AttributeInfo("inkscape:measure-start", true),
         AttributeInfo("inkscape:object-nodes", true),
         AttributeInfo("inkscape:object-paths", true),
         AttributeInfo("inkscape:original", true),
@@ -431,6 +434,7 @@ std::vector<AttributeInfo> getKnownAttrs()
         AttributeInfo("inkscape:snap-nodes", true),
         AttributeInfo("inkscape:snap-object-midpoints", true),
         AttributeInfo("inkscape:snap-others", true),
+        AttributeInfo("inkscape:snap-from-guide", true),
         AttributeInfo("inkscape:snap-page", true),
         AttributeInfo("inkscape:snap-path-clip", true),
         AttributeInfo("inkscape:snap-path-mask", true),
@@ -460,11 +464,11 @@ std::vector<AttributeInfo> getKnownAttrs()
         AttributeInfo("sodipodi:argument", true),
         AttributeInfo("sodipodi:cx", true),
         AttributeInfo("sodipodi:cy", true),
+        AttributeInfo("sodipodi:docname", true),
         AttributeInfo("sodipodi:end", true),
         AttributeInfo("sodipodi:expansion", true),
         AttributeInfo("sodipodi:insensitive", true),
         AttributeInfo("sodipodi:linespacing", true),
-        AttributeInfo("sodipodi:nonprintable", true),
         AttributeInfo("sodipodi:open", true),
         AttributeInfo("sodipodi:original", true),
         AttributeInfo("sodipodi:r1", true),
@@ -477,6 +481,7 @@ std::vector<AttributeInfo> getKnownAttrs()
         AttributeInfo("sodipodi:sides", true),
         AttributeInfo("sodipodi:start", true),
         AttributeInfo("sodipodi:t0", true),
+        AttributeInfo("sodipodi:type", true),
         AttributeInfo("sodipodi:version", false),
 
         // SPMeshPatch
diff --git a/testfiles/src/object-set-test.cpp b/testfiles/src/object-set-test.cpp
index c3c058d9a..124740495 100644
--- a/testfiles/src/object-set-test.cpp
+++ b/testfiles/src/object-set-test.cpp
@@ -118,8 +118,8 @@ TEST_F(ObjectSetTest, AdvancedDescendants) {
     EXPECT_TRUE(set.contains(X));
     bool resultF2 = set.add(F);
     EXPECT_TRUE(resultF2);
-    EXPECT_EQ(1, set.size());
-    EXPECT_TRUE(set.contains(A));
+    EXPECT_EQ(5, set.size());
+    EXPECT_TRUE(set.contains(F));
 }
 
 TEST_F(ObjectSetTest, Removing) {
@@ -184,3 +184,20 @@ TEST_F(ObjectSetTest, SetRemoving) {
     EXPECT_STREQ(nullptr, A->getId());
     EXPECT_STREQ(nullptr, C->getId());
 }
+
+TEST_F(ObjectSetTest, SetOrder) {
+    set.add(A);
+    set.add(D);
+    set.add(B);
+    set.add(E);
+    set.add(C);
+    EXPECT_EQ(5, set.size());
+    auto it = set.begin();
+    EXPECT_EQ(A, *it++);
+    EXPECT_EQ(D, *it++);
+    EXPECT_EQ(B, *it++);
+    EXPECT_EQ(E, *it++);
+    EXPECT_EQ(C, *it++);
+    EXPECT_EQ(set.end(), it);
+
+}
\ No newline at end of file