[nautilus-actions/file-manager-actions] Full review of the UI margins



commit 1ed64b2c63eff7bd5fb9d5c072e404625fe8e4ed
Author: Pierre Wieser <pwieser trychlos org>
Date:   Tue Feb 14 22:18:50 2017 +0100

    Full review of the UI margins

 src/ui/fma-export-ask.ui        |  122 ++--
 src/ui/fma-legend.ui            |  529 +++++++----------
 src/ui/fma-main-window.ui       |  611 +++++++++++--------
 src/ui/fma-preferences-editor.c |   24 +-
 src/ui/fma-preferences.ui       | 1283 +++++++++++++++++++++------------------
 5 files changed, 1335 insertions(+), 1234 deletions(-)
---
diff --git a/src/ui/fma-export-ask.ui b/src/ui/fma-export-ask.ui
index 8f40f75..be21811 100644
--- a/src/ui/fma-export-ask.ui
+++ b/src/ui/fma-export-ask.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.4"/>
   <object class="GtkDialog" id="ExportAskDialog">
@@ -51,20 +51,79 @@
           </packing>
         </child>
         <child>
-          <object class="GtkGrid" id="grid1">
+          <object class="GtkGrid">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="row_spacing">3</property>
+            <property name="row_spacing">2</property>
             <child>
-              <object class="GtkSeparator" id="separator1">
+              <object class="GtkFrame">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">in</property>
+                <child>
+                  <object class="GtkGrid" id="grid1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="margin_left">8</property>
+                    <property name="margin_right">2</property>
+                    <property name="margin_top">2</property>
+                    <property name="margin_bottom">2</property>
+                    <property name="row_spacing">3</property>
+                    <child>
+                      <object class="GtkLabel" id="ExportAskLabel">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xpad">6</property>
+                        <property name="wrap">True</property>
+                        <property name="xalign">0</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label47">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xpad">6</property>
+                        <property name="label" translatable="yes">Which format should I choose to export it 
?</property>
+                        <property name="wrap">True</property>
+                        <property name="xalign">0</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="export-format-ask">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="orientation">vertical</property>
+                        <child>
+                          <placeholder/>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">2</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes"> About to export item(s) </property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="left_attach">0</property>
-                <property name="top_attach">3</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
@@ -79,56 +138,7 @@
               </object>
               <packing>
                 <property name="left_attach">0</property>
-                <property name="top_attach">4</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="ExportAskLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="xpad">6</property>
-                <property name="wrap">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label47">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="xpad">6</property>
-                <property name="label" translatable="yes">Which format should I choose to export it 
?</property>
-                <property name="wrap">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
                 <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox" id="export-format-ask">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
           </object>
diff --git a/src/ui/fma-legend.ui b/src/ui/fma-legend.ui
index 60ff689..ab97e53 100644
--- a/src/ui/fma-legend.ui
+++ b/src/ui/fma-legend.ui
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.4"/>
   <object class="GtkWindow" id="LegendDialog">
     <property name="can_focus">False</property>
     <property name="type_hint">dialog</property>
     <child>
-      <object class="GtkVBox" id="vbox16">
+      <object class="GtkGrid">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="border_width">12</property>
-        <property name="spacing">6</property>
+        <property name="row_spacing">2</property>
+        <property name="column_spacing">4</property>
         <child>
-          <object class="GtkHBox" id="hbox11">
+          <object class="GtkGrid">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="spacing">6</property>
+            <property name="row_spacing">2</property>
+            <property name="column_spacing">4</property>
             <child>
               <object class="GtkImage" id="image9">
                 <property name="visible">True</property>
@@ -23,695 +24,611 @@
                 <property name="stock">gtk-help</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label25">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
                 <property name="label" translatable="yes">&lt;span size="larger"&gt;&lt;b&gt;Parameter 
Legend&lt;/b&gt;&lt;/span&gt;</property>
                 <property name="use_markup">True</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkHSeparator" id="hseparator2">
+          <object class="GtkSeparator">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">1</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkTable" id="table5">
+          <object class="GtkGrid">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="n_rows">22</property>
-            <property name="n_columns">2</property>
-            <property name="column_spacing">2</property>
-            <property name="row_spacing">6</property>
+            <property name="margin_left">20</property>
+            <property name="margin_right">2</property>
+            <property name="row_spacing">2</property>
+            <property name="column_spacing">4</property>
             <child>
               <object class="GtkLabel" id="label20">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">&lt;b&gt;%b&lt;/b&gt; :</property>
+                <property name="label" translatable="yes">&lt;b&gt;%b&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label21">
+              <object class="GtkLabel" id="label14">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">&lt;b&gt;%B&lt;/b&gt; :</property>
-                <property name="use_markup">True</property>
+                <property name="label" translatable="yes">: (first) basename.</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label5">
+              <object class="GtkLabel" id="label21">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">&lt;b&gt;%c&lt;/b&gt; :</property>
+                <property name="label" translatable="yes">&lt;b&gt;%B&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label22">
+              <object class="GtkLabel" id="label37">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">&lt;b&gt;%d&lt;/b&gt; :</property>
-                <property name="use_markup">True</property>
+                <property name="label" translatable="yes">: space-separated list of the basenames of the 
selected file(s)/folder(s).</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label23">
+              <object class="GtkLabel" id="label5">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">&lt;b&gt;%D&lt;/b&gt; :</property>
+                <property name="label" translatable="yes">&lt;b&gt;%c&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-                <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">2</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label33">
+              <object class="GtkLabel" id="label24">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
+                <property name="label" translatable="yes">: count of selected item(s).</property>
+                <property name="xalign">0</property>
                 <property name="yalign">0</property>
-                <property name="label" translatable="yes">&lt;b&gt;%p&lt;/b&gt; :</property>
-                <property name="use_markup">True</property>
               </object>
               <packing>
-                <property name="top_attach">13</property>
-                <property name="bottom_attach">14</property>
-                <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">2</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label35">
+              <object class="GtkLabel" id="label22">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">&lt;b&gt;%s&lt;/b&gt; :</property>
+                <property name="label" translatable="yes">&lt;b&gt;%d&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="top_attach">14</property>
-                <property name="bottom_attach">15</property>
-                <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">3</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label11">
+              <object class="GtkLabel" id="label26">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
+                <property name="label" translatable="yes">: (first) base directory.</property>
+                <property name="xalign">0</property>
                 <property name="yalign">0</property>
-                <property name="label" translatable="yes">&lt;b&gt;%u&lt;/b&gt; :</property>
-                <property name="use_markup">True</property>
               </object>
               <packing>
-                <property name="top_attach">15</property>
-                <property name="bottom_attach">16</property>
-                <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">3</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label36">
+              <object class="GtkLabel" id="label23">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">&lt;b&gt;%U&lt;/b&gt; :</property>
+                <property name="label" translatable="yes">&lt;b&gt;%D&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="top_attach">16</property>
-                <property name="bottom_attach">17</property>
-                <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">4</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label13">
+              <object class="GtkLabel" id="label27">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
+                <property name="label" translatable="yes">: space-separated list of the base directories of 
the selected file(s)/folder(s).</property>
+                <property name="xalign">0</property>
                 <property name="yalign">0</property>
-                <property name="label" translatable="yes">&lt;b&gt;%%&lt;/b&gt; :</property>
-                <property name="use_markup">True</property>
               </object>
               <packing>
-                <property name="top_attach">21</property>
-                <property name="bottom_attach">22</property>
-                <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">4</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label14">
+              <object class="GtkLabel" id="label46">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="label" translatable="yes">&lt;b&gt;%f&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
                 <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">(first) basename.</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="x_options">GTK_FILL</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">5</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label37">
+              <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="label" translatable="yes">: (first) filename.</property>
                 <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">space-separated list of the basenames of the 
selected file(s)/folder(s).</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="x_options">GTK_FILL</property>
+                <property name="top_attach">5</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label24">
+              <object class="GtkLabel" id="label62">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="label" translatable="yes">&lt;b&gt;%F&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
                 <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">count of selected item(s).</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_FILL</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">6</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label26">
+              <object class="GtkLabel" id="label63">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="label" translatable="yes">: space-separated list of the filenames of the 
selected file(s)/folder(s).</property>
                 <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">(first) base directory.</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="x_options">GTK_FILL</property>
+                <property name="top_attach">6</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label27">
+              <object class="GtkLabel" id="label64">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="label" translatable="yes">&lt;b&gt;%h&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
                 <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">space-separated list of the base directories of 
the selected file(s)/folder(s).</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-                <property name="x_options">GTK_FILL</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">7</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label28">
+              <object class="GtkLabel" id="label69">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="label" translatable="yes">: hostname of the (first) selected URI.</property>
                 <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">port number of the (first) selected URI.</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">13</property>
-                <property name="bottom_attach">14</property>
-                <property name="x_options">GTK_FILL</property>
+                <property name="top_attach">7</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label30">
+              <object class="GtkLabel" id="label83">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="label" translatable="yes">&lt;b&gt;%m&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
                 <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">scheme of the (first) selected URI.</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">14</property>
-                <property name="bottom_attach">15</property>
-                <property name="x_options">GTK_FILL</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">8</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label31">
+              <object class="GtkLabel" id="label84">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="label" translatable="yes">: (first) mimetype.</property>
                 <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">(first) URI.</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">15</property>
-                <property name="bottom_attach">16</property>
-                <property name="x_options">GTK_FILL</property>
+                <property name="top_attach">8</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="abel32">
+              <object class="GtkLabel" id="label85">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="label" translatable="yes">&lt;b&gt;%M&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
                 <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">space-separated list of the URIs of the selected 
file(s)/folder(s).</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">16</property>
-                <property name="bottom_attach">17</property>
-                <property name="x_options">GTK_FILL</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">9</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label34">
+              <object class="GtkLabel" id="label86">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="label" translatable="yes">: space-separated list of the mimetypes of the 
selected file(s)/folder(s).</property>
                 <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">a percent sign.</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">21</property>
-                <property name="bottom_attach">22</property>
-                <property name="x_options">GTK_FILL</property>
+                <property name="top_attach">9</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label46">
+              <object class="GtkLabel" id="label70">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">&lt;b&gt;%f&lt;/b&gt; :</property>
+                <property name="label" translatable="yes">&lt;b&gt;%n&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="top_attach">5</property>
-                <property name="bottom_attach">6</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">10</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label2">
+              <object class="GtkLabel" id="label78">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="label" translatable="yes">: username of the (first) selected URI.</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">(first) filename.</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">5</property>
-                <property name="bottom_attach">6</property>
+                <property name="top_attach">10</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label62">
+              <object class="GtkLabel" id="label88">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">&lt;b&gt;%F&lt;/b&gt; :</property>
+                <property name="label" translatable="yes">&lt;b&gt;%o&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="top_attach">6</property>
-                <property name="bottom_attach">7</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">11</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label63">
+              <object class="GtkLabel" id="label90">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="label" translatable="yes">: no-op operator which forces a singular form of 
execution.</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">space-separated list of the filenames of the 
selected file(s)/folder(s).</property>
+                <property name="yalign">0</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">6</property>
-                <property name="bottom_attach">7</property>
+                <property name="top_attach">11</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label64">
+              <object class="GtkLabel" id="label89">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">&lt;b&gt;%h&lt;/b&gt; :</property>
+                <property name="label" translatable="yes">&lt;b&gt;%O&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="top_attach">7</property>
-                <property name="bottom_attach">8</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">12</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label69">
+              <object class="GtkLabel" id="label91">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="label" translatable="yes">: no-op operator which forces a plural form of 
execution.</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">hostname of the (first) selected URI.</property>
+                <property name="yalign">0</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">7</property>
-                <property name="bottom_attach">8</property>
+                <property name="top_attach">12</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label70">
+              <object class="GtkLabel" id="label33">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">&lt;b&gt;%n&lt;/b&gt; :</property>
+                <property name="label" translatable="yes">&lt;b&gt;%p&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="top_attach">10</property>
-                <property name="bottom_attach">11</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">13</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label78">
+              <object class="GtkLabel" id="label28">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="label" translatable="yes">: port number of the (first) selected 
URI.</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">username of the (first) selected URI.</property>
+                <property name="yalign">0</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">10</property>
-                <property name="bottom_attach">11</property>
+                <property name="top_attach">13</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label29">
+              <object class="GtkLabel" id="label35">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="label" translatable="yes">&lt;b&gt;%s&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">(first) basename without the extension.</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">17</property>
-                <property name="bottom_attach">18</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">14</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label32">
+              <object class="GtkLabel" id="label30">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="label" translatable="yes">: scheme of the (first) selected URI.</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">space-separated list of the basenames without the 
extension.</property>
+                <property name="yalign">0</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">18</property>
-                <property name="bottom_attach">19</property>
+                <property name="top_attach">14</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label60">
+              <object class="GtkLabel" id="label11">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="label" translatable="yes">&lt;b&gt;%u&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">(first) extension.</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">19</property>
-                <property name="bottom_attach">20</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">15</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label79">
+              <object class="GtkLabel" id="label31">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="label" translatable="yes">: (first) URI.</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">space-separated list of the extensions of the 
selected file(s)/folder(s).</property>
+                <property name="yalign">0</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">20</property>
-                <property name="bottom_attach">21</property>
+                <property name="top_attach">15</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label9">
+              <object class="GtkLabel" id="label36">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">&lt;b&gt;%w&lt;/b&gt; :</property>
+                <property name="label" translatable="yes">&lt;b&gt;%U&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="top_attach">17</property>
-                <property name="bottom_attach">18</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">16</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label80">
+              <object class="GtkLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">&lt;b&gt;%W&lt;/b&gt; :</property>
-                <property name="use_markup">True</property>
+                <property name="label" translatable="yes">: space-separated list of the URIs of the selected 
file(s)/folder(s).</property>
+                <property name="xalign">0</property>
+                <property name="yalign">0</property>
               </object>
               <packing>
-                <property name="top_attach">18</property>
-                <property name="bottom_attach">19</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">16</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label81">
+              <object class="GtkLabel" id="label9">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">&lt;b&gt;%x&lt;/b&gt; :</property>
+                <property name="label" translatable="yes">&lt;b&gt;%w&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="top_attach">19</property>
-                <property name="bottom_attach">20</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">17</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label82">
+              <object class="GtkLabel" id="label29">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">&lt;b&gt;%X&lt;/b&gt; :</property>
-                <property name="use_markup">True</property>
+                <property name="label" translatable="yes">: (first) basename without the 
extension.</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="top_attach">20</property>
-                <property name="bottom_attach">21</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">17</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label83">
+              <object class="GtkLabel" id="label80">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">&lt;b&gt;%m&lt;/b&gt; :</property>
+                <property name="label" translatable="yes">&lt;b&gt;%W&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="top_attach">8</property>
-                <property name="bottom_attach">9</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">18</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label85">
+              <object class="GtkLabel" id="label32">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">&lt;b&gt;%M&lt;/b&gt; :</property>
-                <property name="use_markup">True</property>
+                <property name="label" translatable="yes">: space-separated list of the basenames without 
the extension.</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="top_attach">9</property>
-                <property name="bottom_attach">10</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">18</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label84">
+              <object class="GtkLabel" id="label81">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="label" translatable="yes">&lt;b&gt;%x&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">(first) mimetype.</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">8</property>
-                <property name="bottom_attach">9</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">19</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label86">
+              <object class="GtkLabel" id="label60">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="label" translatable="yes">: (first) extension.</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">space-separated list of the mimetypes of the 
selected file(s)/folder(s).</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">9</property>
-                <property name="bottom_attach">10</property>
+                <property name="top_attach">19</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label88">
+              <object class="GtkLabel" id="label82">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">&lt;b&gt;%o&lt;/b&gt; :</property>
+                <property name="label" translatable="yes">&lt;b&gt;%X&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="top_attach">11</property>
-                <property name="bottom_attach">12</property>
-                <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">20</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label89">
+              <object class="GtkLabel" id="label79">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">&lt;b&gt;%O&lt;/b&gt; :</property>
-                <property name="use_markup">True</property>
+                <property name="label" translatable="yes">: space-separated list of the extensions of the 
selected file(s)/folder(s).</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="top_attach">12</property>
-                <property name="bottom_attach">13</property>
-                <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">20</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label90">
+              <object class="GtkLabel" id="label13">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="label" translatable="yes">&lt;b&gt;%%&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
                 <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">no-op operator which forces a singular form of 
execution.</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">11</property>
-                <property name="bottom_attach">12</property>
-                <property name="x_options">GTK_FILL</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">21</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label91">
+              <object class="GtkLabel" id="label34">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="label" translatable="yes">: a percent sign.</property>
                 <property name="xalign">0</property>
                 <property name="yalign">0</property>
-                <property name="label" translatable="yes">no-op operator which forces a plural form of 
execution.</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">12</property>
-                <property name="bottom_attach">13</property>
-                <property name="x_options">GTK_FILL</property>
+                <property name="top_attach">21</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="padding">4</property>
-            <property name="position">2</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">2</property>
           </packing>
         </child>
       </object>
diff --git a/src/ui/fma-main-window.ui b/src/ui/fma-main-window.ui
index 8f99dd8..ef51632 100644
--- a/src/ui/fma-main-window.ui
+++ b/src/ui/fma-main-window.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.4"/>
   <object class="GtkWindow" id="MainWindow">
@@ -9,22 +9,25 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="row_spacing">2</property>
+        <property name="column_spacing">4</property>
         <child>
           <object class="GtkPaned" id="main-paned">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="margin_left">2</property>
+            <property name="margin_right">2</property>
             <child>
               <object class="GtkGrid" id="grid2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_left">4</property>
                 <property name="margin_right">2</property>
-                <property name="row_spacing">3</property>
+                <property name="row_spacing">2</property>
+                <property name="column_spacing">4</property>
                 <child>
                   <object class="GtkGrid" id="grid3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="column_spacing">4</property>
+                    <property name="column_spacing">2</property>
                     <child>
                       <object class="GtkLabel" id="ActionsListLabel">
                         <property name="visible">True</property>
@@ -151,9 +154,11 @@
                   <object class="GtkGrid" id="grid100">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">4</property>
-                    <property name="margin_right">4</property>
-                    <property name="margin_bottom">4</property>
+                    <property name="margin_left">2</property>
+                    <property name="margin_right">2</property>
+                    <property name="margin_bottom">2</property>
+                    <property name="row_spacing">2</property>
+                    <property name="column_spacing">4</property>
                     <child>
                       <object class="GtkFrame" id="frame110">
                         <property name="visible">True</property>
@@ -165,9 +170,9 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_left">8</property>
-                            <property name="margin_right">4</property>
-                            <property name="margin_bottom">4</property>
-                            <property name="row_spacing">3</property>
+                            <property name="margin_right">2</property>
+                            <property name="margin_bottom">2</property>
+                            <property name="row_spacing">2</property>
                             <property name="column_spacing">4</property>
                             <child>
                               <object class="GtkCheckButton" id="ActionTargetSelectionButton">
@@ -176,7 +181,6 @@
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="tooltip_text" translatable="yes">When checked, the item will 
be candidate to be displayed in the file manager context menu, with a non-empty selection.</property>
-                                <property name="halign">start</property>
                                 <property name="use_underline">True</property>
                                 <property name="xalign">0.5</property>
                                 <property name="draw_indicator">True</property>
@@ -194,7 +198,6 @@
                                 <property name="receives_default">False</property>
                                 <property name="tooltip_text" translatable="yes">When checked, the item will 
be candidate to be displayed in the file manager context menu when the selection is empty.
 In this case, the defined conditions will be applied to the current displayed folder.</property>
-                                <property name="halign">start</property>
                                 <property name="use_underline">True</property>
                                 <property name="xalign">0.5</property>
                                 <property name="draw_indicator">True</property>
@@ -238,7 +241,6 @@ In this case, the defined conditions will be applied to the current displayed fo
                                 <property name="receives_default">False</property>
                                 <property name="tooltip_text" translatable="yes">When checked, the item will 
be candidate to be displayed in the file manager toolbar.
 In this case, the defined conditions will be applied to the current folder, and do not depend of the 
possible current selection.</property>
-                                <property name="halign">start</property>
                                 <property name="use_underline">True</property>
                                 <property name="xalign">0.5</property>
                                 <property name="draw_indicator">True</property>
@@ -255,7 +257,6 @@ In this case, the defined conditions will be applied to the current folder, and
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="tooltip_text" translatable="yes">When checked, the label 
displayed in the toolbar will be the same that the one displayed in the context menus.</property>
-                                <property name="halign">start</property>
                                 <property name="use_underline">True</property>
                                 <property name="xalign">0.5</property>
                                 <property name="draw_indicator">True</property>
@@ -334,7 +335,8 @@ In this case, the defined conditions will be applied to the current folder, and
                               <object class="GtkGrid" id="grid7">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="column_spacing">4</property>
+                                <property name="row_spacing">2</property>
+                                <property name="column_spacing">2</property>
                                 <child>
                                   <object class="GtkAspectFrame" id="ActionIconFrame">
                                     <property name="visible">True</property>
@@ -434,9 +436,11 @@ In this case, the defined conditions will be applied to the current folder, and
                   <object class="GtkGrid" id="grid200">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">4</property>
-                    <property name="margin_right">4</property>
-                    <property name="margin_bottom">4</property>
+                    <property name="margin_left">2</property>
+                    <property name="margin_right">2</property>
+                    <property name="margin_bottom">2</property>
+                    <property name="row_spacing">2</property>
+                    <property name="column_spacing">4</property>
                     <child>
                       <object class="GtkFrame" id="frame210">
                         <property name="visible">True</property>
@@ -448,8 +452,8 @@ In this case, the defined conditions will be applied to the current folder, and
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_left">8</property>
-                            <property name="margin_right">4</property>
-                            <property name="margin_bottom">4</property>
+                            <property name="margin_right">2</property>
+                            <property name="margin_bottom">2</property>
                             <property name="row_spacing">2</property>
                             <property name="column_spacing">4</property>
                             <child>
@@ -505,9 +509,9 @@ In this case, the defined conditions will be applied to the current folder, and
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_left">8</property>
-                            <property name="margin_right">4</property>
-                            <property name="margin_bottom">4</property>
-                            <property name="row_spacing">3</property>
+                            <property name="margin_right">2</property>
+                            <property name="margin_bottom">2</property>
+                            <property name="row_spacing">2</property>
                             <property name="column_spacing">4</property>
                             <child>
                               <object class="GtkLabel" id="CommandPathLabel">
@@ -515,7 +519,6 @@ In this case, the defined conditions will be applied to the current folder, and
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">_Path :</property>
                                 <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">CommandPathEntry</property>
                                 <property name="xalign">1</property>
                               </object>
                               <packing>
@@ -529,7 +532,6 @@ In this case, the defined conditions will be applied to the current folder, and
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">P_arameters :</property>
                                 <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">CommandParametersEntry</property>
                                 <property name="xalign">1</property>
                               </object>
                               <packing>
@@ -551,13 +553,38 @@ In this case, the defined conditions will be applied to the current folder, and
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkEntry" id="CommandPathEntry">
+                              <object class="GtkGrid">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="tooltip_text" translatable="yes">The path of the command.
+                                <property name="can_focus">False</property>
+                                <property name="row_spacing">2</property>
+                                <property name="column_spacing">2</property>
+                                <child>
+                                  <object class="GtkEntry" id="CommandPathEntry">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="tooltip_text" translatable="yes">The path of the command.
 If this is not an absolute path, then the PATH environment variable at execution time will be 
considered.</property>
-                                <property name="hexpand">True</property>
-                                <property name="invisible_char">●</property>
+                                    <property name="hexpand">True</property>
+                                    <property name="invisible_char">●</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="CommandPathButton">
+                                    <property name="label" translatable="yes">_Browse...</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="use_underline">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="top_attach">0</property>
+                                  </packing>
+                                </child>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -565,11 +592,36 @@ If this is not an absolute path, then the PATH environment variable at execution
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkEntry" id="CommandParametersEntry">
+                              <object class="GtkGrid">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="tooltip_text" translatable="yes">The parameters of the 
command.</property>
-                                <property name="invisible_char">●</property>
+                                <property name="can_focus">False</property>
+                                <property name="row_spacing">2</property>
+                                <property name="column_spacing">2</property>
+                                <child>
+                                  <object class="GtkEntry" id="CommandParametersEntry">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="tooltip_text" translatable="yes">The parameters of the 
command.</property>
+                                    <property name="invisible_char">●</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkToggleButton" id="CommandLegendButton">
+                                    <property name="label" translatable="yes">Le_gend</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="use_underline">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="top_attach">0</property>
+                                  </packing>
+                                </child>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -577,94 +629,90 @@ If this is not an absolute path, then the PATH environment variable at execution
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkButton" id="CommandPathButton">
-                                <property name="label" translatable="yes">_Browse...</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">2</property>
-                                <property name="top_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkToggleButton" id="CommandLegendButton">
-                                <property name="label" translatable="yes">Le_gend</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">2</property>
-                                <property name="top_attach">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="CommandWorkingDirectoryButton">
-                                <property name="label" translatable="yes">B_rowse...</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">2</property>
-                                <property name="top_attach">3</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkEntry" id="WorkingDirectoryEntry">
+                              <object class="GtkGrid">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="tooltip_text" translatable="yes">The default working 
directory the command should be started in.</property>
-                                <property name="hexpand">True</property>
-                                <property name="invisible_char">●</property>
+                                <property name="can_focus">False</property>
+                                <property name="row_spacing">2</property>
+                                <property name="column_spacing">2</property>
+                                <child>
+                                  <object class="GtkExpander" id="expander1">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <child>
+                                      <object class="GtkLabel" id="CommandExampleLabel">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="halign">start</property>
+                                        <property name="label" translatable="yes">Example</property>
+                                        <property name="wrap">True</property>
+                                        <attributes>
+                                          <attribute name="style" value="italic"/>
+                                          <attribute name="scale" value="0.80000000000000004"/>
+                                        </attributes>
+                                      </object>
+                                    </child>
+                                    <child type="label">
+                                      <object class="GtkLabel" id="label1">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="label" 
translatable="yes">&lt;small&gt;&lt;i&gt;Example&lt;/i&gt;&lt;/small&gt;</property>
+                                        <property name="use_markup">True</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">0</property>
+                                    <property name="width">2</property>
+                                  </packing>
+                                </child>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
-                                <property name="top_attach">3</property>
+                                <property name="top_attach">2</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkExpander" id="expander1">
+                              <object class="GtkGrid">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="row_spacing">2</property>
+                                <property name="column_spacing">2</property>
                                 <child>
-                                  <object class="GtkLabel" id="CommandExampleLabel">
+                                  <object class="GtkEntry" id="WorkingDirectoryEntry">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="halign">start</property>
-                                    <property name="label" translatable="yes">Example</property>
-                                    <property name="wrap">True</property>
-                                    <attributes>
-                                      <attribute name="style" value="italic"/>
-                                      <attribute name="scale" value="0.80000000000000004"/>
-                                    </attributes>
+                                    <property name="can_focus">True</property>
+                                    <property name="tooltip_text" translatable="yes">The default working 
directory the command should be started in.</property>
+                                    <property name="hexpand">True</property>
+                                    <property name="invisible_char">●</property>
                                   </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">0</property>
+                                  </packing>
                                 </child>
-                                <child type="label">
-                                  <object class="GtkLabel" id="label1">
+                                <child>
+                                  <object class="GtkButton" id="CommandWorkingDirectoryButton">
+                                    <property name="label" translatable="yes">B_rowse...</property>
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" 
translatable="yes">&lt;small&gt;&lt;i&gt;Example&lt;/i&gt;&lt;/small&gt;</property>
-                                    <property name="use_markup">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="use_underline">True</property>
                                   </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="top_attach">0</property>
+                                  </packing>
                                 </child>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
-                                <property name="top_attach">2</property>
+                                <property name="top_attach">3</property>
                               </packing>
                             </child>
                             <child>
                               <placeholder/>
                             </child>
-                            <child>
-                              <placeholder/>
-                            </child>
                           </object>
                         </child>
                         <child type="label">
@@ -704,9 +752,9 @@ Defining several profiles lets you have several commands, each applying with a d
                   <object class="GtkGrid" id="grid300">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">4</property>
-                    <property name="margin_right">4</property>
-                    <property name="margin_bottom">4</property>
+                    <property name="margin_left">2</property>
+                    <property name="margin_right">2</property>
+                    <property name="margin_bottom">2</property>
                     <child>
                       <object class="GtkFrame" id="frame310">
                         <property name="visible">True</property>
@@ -718,8 +766,8 @@ Defining several profiles lets you have several commands, each applying with a d
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_left">8</property>
-                            <property name="margin_right">4</property>
-                            <property name="margin_bottom">4</property>
+                            <property name="margin_right">2</property>
+                            <property name="margin_bottom">2</property>
                             <property name="column_spacing">4</property>
                             <child>
                               <object class="GtkLabel" id="ExecutionModeLabel">
@@ -738,7 +786,6 @@ Defining several profiles lets you have several commands, each applying with a d
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="tooltip_text" translatable="yes">The command will be started 
as a standard graphical user interface.</property>
-                                <property name="halign">start</property>
                                 <property name="use_underline">True</property>
                                 <property name="xalign">0.5</property>
                                 <property name="active">True</property>
@@ -756,7 +803,6 @@ Defining several profiles lets you have several commands, each applying with a d
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="tooltip_text" translatable="yes">The command will be started 
in the preferred terminal of the graphical environment.</property>
-                                <property name="halign">start</property>
                                 <property name="use_underline">True</property>
                                 <property name="xalign">0.5</property>
                                 <property name="draw_indicator">True</property>
@@ -775,7 +821,6 @@ Defining several profiles lets you have several commands, each applying with a d
                                 <property name="receives_default">False</property>
                                 <property name="tooltip_text" translatable="yes">This option makes use of a 
special feature of the file manager, which would allow a terminal to be ran inside of it.
 An acceptable fallback is running in the standard terminal.</property>
-                                <property name="halign">start</property>
                                 <property name="use_underline">True</property>
                                 <property name="xalign">0.5</property>
                                 <property name="draw_indicator">True</property>
@@ -795,7 +840,6 @@ An acceptable fallback is running in the standard terminal.</property>
                                 <property name="tooltip_text" translatable="yes">The command will be run in 
a terminal.
 The terminal will be closed at the end of the execution; standard error and output streams will be displayed.
 An acceptable fallback is running in the standard terminal.</property>
-                                <property name="halign">start</property>
                                 <property name="use_underline">True</property>
                                 <property name="xalign">0.5</property>
                                 <property name="draw_indicator">True</property>
@@ -842,9 +886,9 @@ An acceptable fallback is running in the standard terminal.</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_left">8</property>
-                            <property name="margin_right">4</property>
-                            <property name="margin_bottom">4</property>
-                            <property name="row_spacing">3</property>
+                            <property name="margin_right">2</property>
+                            <property name="margin_bottom">2</property>
+                            <property name="row_spacing">2</property>
                             <property name="column_spacing">4</property>
                             <child>
                               <object class="GtkCheckButton" id="StartupNotifyButton">
@@ -855,7 +899,6 @@ An acceptable fallback is running in the standard terminal.</property>
                                 <property name="tooltip_text" translatable="yes">When checked, it is known 
that the run command will send a "remove" message to the desktop environment.
 See the Startup Notification Protocol Specification for more details.
 Only relevant when chosen execution mode is Normal.</property>
-                                <property name="halign">start</property>
                                 <property name="use_underline">True</property>
                                 <property name="xalign">0.5</property>
                                 <property name="draw_indicator">True</property>
@@ -923,8 +966,9 @@ Only relevant when chosen execution mode is Normal.</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_left">8</property>
-                            <property name="margin_right">4</property>
-                            <property name="margin_bottom">4</property>
+                            <property name="margin_right">2</property>
+                            <property name="margin_bottom">2</property>
+                            <property name="row_spacing">2</property>
                             <property name="column_spacing">4</property>
                             <child>
                               <object class="GtkLabel" id="ExecuteAsLabel">
@@ -992,9 +1036,9 @@ Leave the field empty to run the command as the current user.</property>
                   <object class="GtkGrid" id="grid400">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">4</property>
-                    <property name="margin_right">4</property>
-                    <property name="margin_bottom">4</property>
+                    <property name="margin_left">2</property>
+                    <property name="margin_right">2</property>
+                    <property name="margin_bottom">2</property>
                     <child>
                       <object class="GtkFrame" id="frame410">
                         <property name="visible">True</property>
@@ -1006,8 +1050,8 @@ Leave the field empty to run the command as the current user.</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_left">8</property>
-                            <property name="margin_right">4</property>
-                            <property name="margin_bottom">4</property>
+                            <property name="margin_right">2</property>
+                            <property name="margin_bottom">2</property>
                             <property name="row_spacing">3</property>
                             <child>
                               <object class="GtkLabel" id="label411">
@@ -1026,7 +1070,7 @@ Leave the field empty to run the command as the current user.</property>
                               <object class="GtkGrid" id="grid411">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="column_spacing">4</property>
+                                <property name="column_spacing">2</property>
                                 <child>
                                   <object class="GtkScrolledWindow" id="scrolledwindow412">
                                     <property name="visible">True</property>
@@ -1059,7 +1103,7 @@ Basenames may be negated to specify for which basenames your item must not appea
                                   <object class="GtkGrid" id="grid412">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="row_spacing">3</property>
+                                    <property name="row_spacing">2</property>
                                     <child>
                                       <object class="GtkButton" id="AddBasenameButton">
                                         <property name="visible">True</property>
@@ -1167,9 +1211,11 @@ Basenames may be negated to specify for which basenames your item must not appea
                   <object class="GtkGrid" id="grid500">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">4</property>
-                    <property name="margin_right">4</property>
-                    <property name="margin_bottom">4</property>
+                    <property name="margin_left">2</property>
+                    <property name="margin_right">2</property>
+                    <property name="margin_bottom">2</property>
+                    <property name="row_spacing">2</property>
+                    <property name="column_spacing">4</property>
                     <child>
                       <object class="GtkFrame" id="frame510">
                         <property name="visible">True</property>
@@ -1181,9 +1227,10 @@ Basenames may be negated to specify for which basenames your item must not appea
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_left">8</property>
-                            <property name="margin_right">4</property>
-                            <property name="margin_bottom">4</property>
-                            <property name="row_spacing">3</property>
+                            <property name="margin_right">2</property>
+                            <property name="margin_bottom">2</property>
+                            <property name="row_spacing">2</property>
+                            <property name="column_spacing">4</property>
                             <child>
                               <object class="GtkLabel" id="label511">
                                 <property name="visible">True</property>
@@ -1201,7 +1248,8 @@ Basenames may be negated to specify for which basenames your item must not appea
                               <object class="GtkGrid" id="grid511">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="column_spacing">4</property>
+                                <property name="row_spacing">2</property>
+                                <property name="column_spacing">2</property>
                                 <child>
                                   <object class="GtkScrolledWindow" id="scrolledwindow512">
                                     <property name="visible">True</property>
@@ -1231,7 +1279,7 @@ Mimetypes may be negated to specify for which type of objects your item must not
                                   <object class="GtkGrid" id="grid512">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="row_spacing">3</property>
+                                    <property name="row_spacing">2</property>
                                     <child>
                                       <object class="GtkButton" id="AddMimetypeButton">
                                         <property name="visible">True</property>
@@ -1322,9 +1370,11 @@ Mimetypes may be negated to specify for which type of objects your item must not
                   <object class="GtkGrid" id="grid600">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">4</property>
-                    <property name="margin_right">4</property>
-                    <property name="margin_bottom">4</property>
+                    <property name="margin_left">2</property>
+                    <property name="margin_right">2</property>
+                    <property name="margin_bottom">2</property>
+                    <property name="row_spacing">2</property>
+                    <property name="column_spacing">4</property>
                     <child>
                       <object class="GtkFrame" id="frame610">
                         <property name="visible">True</property>
@@ -1336,10 +1386,10 @@ Mimetypes may be negated to specify for which type of objects your item must not
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_left">8</property>
-                            <property name="margin_right">4</property>
-                            <property name="margin_bottom">4</property>
-                            <property name="row_spacing">3</property>
-                            <property name="column_spacing">4</property>
+                            <property name="margin_right">2</property>
+                            <property name="margin_bottom">2</property>
+                            <property name="row_spacing">2</property>
+                            <property name="column_spacing">2</property>
                             <child>
                               <object class="GtkLabel" id="label611">
                                 <property name="visible">True</property>
@@ -1383,7 +1433,7 @@ Folder filters may be negated to specify for which folders your item must not ap
                               <object class="GtkGrid" id="grid611">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="row_spacing">3</property>
+                                <property name="row_spacing">2</property>
                                 <child>
                                   <object class="GtkButton" id="AddFolderButton">
                                     <property name="visible">True</property>
@@ -1481,9 +1531,9 @@ Folder filters may be negated to specify for which folders your item must not ap
                   <object class="GtkGrid" id="grid700">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">4</property>
-                    <property name="margin_right">4</property>
-                    <property name="margin_bottom">4</property>
+                    <property name="margin_left">2</property>
+                    <property name="margin_right">2</property>
+                    <property name="margin_bottom">2</property>
                     <child>
                       <object class="GtkFrame" id="frame710">
                         <property name="visible">True</property>
@@ -1495,10 +1545,10 @@ Folder filters may be negated to specify for which folders your item must not ap
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_left">8</property>
-                            <property name="margin_right">4</property>
-                            <property name="margin_bottom">4</property>
-                            <property name="row_spacing">3</property>
-                            <property name="column_spacing">4</property>
+                            <property name="margin_right">2</property>
+                            <property name="margin_bottom">2</property>
+                            <property name="row_spacing">2</property>
+                            <property name="column_spacing">2</property>
                             <child>
                               <object class="GtkLabel" id="label711">
                                 <property name="visible">True</property>
@@ -1543,7 +1593,7 @@ Filters may be negated to specify for which schemes your item must not appear.</
                               <object class="GtkGrid" id="grid711">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="row_spacing">3</property>
+                                <property name="row_spacing">2</property>
                                 <child>
                                   <object class="GtkButton" id="AddSchemeButton">
                                     <property name="visible">True</property>
@@ -1641,9 +1691,9 @@ Filters may be negated to specify for which schemes your item must not appear.</
                   <object class="GtkGrid" id="grid800">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">4</property>
-                    <property name="margin_right">4</property>
-                    <property name="margin_bottom">4</property>
+                    <property name="margin_left">2</property>
+                    <property name="margin_right">2</property>
+                    <property name="margin_bottom">2</property>
                     <child>
                       <object class="GtkFrame" id="frame810">
                         <property name="visible">True</property>
@@ -1655,10 +1705,10 @@ Filters may be negated to specify for which schemes your item must not appear.</
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_left">8</property>
-                            <property name="margin_right">4</property>
-                            <property name="margin_bottom">4</property>
-                            <property name="row_spacing">3</property>
-                            <property name="column_spacing">4</property>
+                            <property name="margin_right">2</property>
+                            <property name="margin_bottom">2</property>
+                            <property name="row_spacing">2</property>
+                            <property name="column_spacing">2</property>
                             <child>
                               <object class="GtkLabel" id="label77">
                                 <property name="visible">True</property>
@@ -1703,8 +1753,7 @@ Capabilities may be negated to specify for which capabilities your item must not
                               <object class="GtkGrid" id="grid820">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="row_spacing">3</property>
-                                <property name="column_spacing">3</property>
+                                <property name="row_spacing">2</property>
                                 <child>
                                   <object class="GtkButton" id="AddCapabilityButton">
                                     <property name="visible">True</property>
@@ -1788,9 +1837,10 @@ Filters may be negated to specify for which capabilities your item must not appe
                   <object class="GtkGrid" id="grid900">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">4</property>
-                    <property name="margin_right">4</property>
-                    <property name="margin_bottom">4</property>
+                    <property name="margin_left">2</property>
+                    <property name="margin_right">2</property>
+                    <property name="margin_bottom">2</property>
+                    <property name="row_spacing">2</property>
                     <child>
                       <object class="GtkFrame" id="frame910">
                         <property name="visible">True</property>
@@ -1802,8 +1852,8 @@ Filters may be negated to specify for which capabilities your item must not appe
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_left">8</property>
-                            <property name="margin_right">4</property>
-                            <property name="margin_bottom">4</property>
+                            <property name="margin_right">2</property>
+                            <property name="margin_bottom">2</property>
                             <property name="column_spacing">4</property>
                             <child>
                               <object class="GtkLabel" id="label17">
@@ -1877,8 +1927,8 @@ Filters may be negated to specify for which capabilities your item must not appe
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_left">8</property>
-                            <property name="margin_right">4</property>
-                            <property name="margin_bottom">4</property>
+                            <property name="margin_right">2</property>
+                            <property name="margin_bottom">2</property>
                             <property name="row_spacing">3</property>
                             <property name="column_spacing">4</property>
                             <child>
@@ -1937,7 +1987,7 @@ Filters may be negated to specify for which capabilities your item must not appe
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
-                                    <property name="top_attach">0</property>
+                                    <property name="top_attach">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -1954,7 +2004,7 @@ Filters may be negated to specify for which capabilities your item must not appe
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
-                                    <property name="top_attach">1</property>
+                                    <property name="top_attach">2</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -1971,7 +2021,17 @@ Filters may be negated to specify for which capabilities your item must not appe
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
-                                    <property name="top_attach">2</property>
+                                    <property name="top_attach">3</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">0</property>
                                   </packing>
                                 </child>
                               </object>
@@ -2007,9 +2067,9 @@ Filters may be negated to specify for which capabilities your item must not appe
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_left">8</property>
-                            <property name="margin_right">4</property>
-                            <property name="margin_bottom">4</property>
-                            <property name="row_spacing">4</property>
+                            <property name="margin_right">2</property>
+                            <property name="margin_bottom">2</property>
+                            <property name="row_spacing">2</property>
                             <property name="column_spacing">4</property>
                             <child>
                               <object class="GtkLabel" id="label55">
@@ -2064,13 +2124,37 @@ Filters may be negated to specify for which capabilities your item must not appe
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkEntry" id="TryExecEntry">
+                              <object class="GtkGrid">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="tooltip_text" translatable="yes">This is an advanced 
condition based on the presence of an executable file on the file system.
+                                <property name="can_focus">False</property>
+                                <property name="column_spacing">2</property>
+                                <child>
+                                  <object class="GtkButton" id="TryExecButton">
+                                    <property name="label" translatable="yes">Bro_wse...</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="use_underline">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="top_attach">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="TryExecEntry">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="tooltip_text" translatable="yes">This is an advanced 
condition based on the presence of an executable file on the file system.
 This may be used for example to test for a prerequisite package.</property>
-                                <property name="hexpand">True</property>
-                                <property name="invisible_char">●</property>
+                                    <property name="hexpand">True</property>
+                                    <property name="invisible_char">●</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">0</property>
+                                  </packing>
+                                </child>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -2078,13 +2162,34 @@ This may be used for example to test for a prerequisite package.</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkEntry" id="ShowIfRegisteredEntry">
+                              <object class="GtkGrid">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="tooltip_text" translatable="yes">This is an advanced 
condition based on the presence of a particular service on the D-Bus system.
+                                <property name="can_focus">False</property>
+                                <property name="column_spacing">2</property>
+                                <child>
+                                  <object class="GtkEntry" id="ShowIfRegisteredEntry">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="tooltip_text" translatable="yes">This is an advanced 
condition based on the presence of a particular service on the D-Bus system.
 This may be used for example for testing that a prerequisite service is currently available.</property>
-                                <property name="hexpand">True</property>
-                                <property name="invisible_char">●</property>
+                                    <property name="hexpand">True</property>
+                                    <property name="invisible_char">●</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="ShowIfRegisteredLabel">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="top_attach">0</property>
+                                  </packing>
+                                </child>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -2092,14 +2197,35 @@ This may be used for example for testing that a prerequisite service is currentl
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkEntry" id="ShowIfTrueEntry">
+                              <object class="GtkGrid">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="tooltip_text" translatable="yes">This is an advanced 
condition based on a runtime result.
+                                <property name="can_focus">False</property>
+                                <property name="column_spacing">2</property>
+                                <child>
+                                  <object class="GtkEntry" id="ShowIfTrueEntry">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="tooltip_text" translatable="yes">This is an advanced 
condition based on a runtime result.
 Enter here a command which is able to display the exact "true" string on its standard output.
 This may be used for example for testing a complex condition.</property>
-                                <property name="hexpand">True</property>
-                                <property name="invisible_char">●</property>
+                                    <property name="hexpand">True</property>
+                                    <property name="invisible_char">●</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="ShowIfTrueLabel">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="top_attach">0</property>
+                                  </packing>
+                                </child>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -2107,52 +2233,44 @@ This may be used for example for testing a complex condition.</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkEntry" id="ShowIfRunningEntry">
+                              <object class="GtkGrid">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="tooltip_text" translatable="yes">This is an advanced 
condition based on the presence of a running binary.
+                                <property name="can_focus">False</property>
+                                <property name="column_spacing">2</property>
+                                <child>
+                                  <object class="GtkButton" id="ShowIfRunningButton">
+                                    <property name="label" translatable="yes">Brow_se...</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="use_underline">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="top_attach">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="ShowIfRunningEntry">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="tooltip_text" translatable="yes">This is an advanced 
condition based on the presence of a running binary.
 Note that only the basename of the binary is checked, not its dirname nor its parameters.
 This may be used for example for testing the presence of a prerequisite daemon.</property>
-                                <property name="hexpand">True</property>
-                                <property name="invisible_char">●</property>
+                                    <property name="hexpand">True</property>
+                                    <property name="invisible_char">●</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">0</property>
+                                  </packing>
+                                </child>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="top_attach">3</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="GtkButton" id="TryExecButton">
-                                <property name="label" translatable="yes">Bro_wse...</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">2</property>
-                                <property name="top_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="ShowIfRunningButton">
-                                <property name="label" translatable="yes">Brow_se...</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">2</property>
-                                <property name="top_attach">3</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <placeholder/>
-                            </child>
-                            <child>
-                              <placeholder/>
-                            </child>
                           </object>
                         </child>
                         <child type="label">
@@ -2191,9 +2309,9 @@ This may be used for example for testing the presence of a prerequisite daemon.<
                   <object class="GtkGrid" id="gridA00">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">4</property>
-                    <property name="margin_right">4</property>
-                    <property name="margin_bottom">4</property>
+                    <property name="margin_left">2</property>
+                    <property name="margin_right">2</property>
+                    <property name="margin_bottom">2</property>
                     <child>
                       <object class="GtkFrame" id="frameA10">
                         <property name="visible">True</property>
@@ -2206,10 +2324,10 @@ This may be used for example for testing the presence of a prerequisite daemon.<
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_left">8</property>
-                            <property name="margin_right">4</property>
-                            <property name="margin_bottom">4</property>
+                            <property name="margin_right">2</property>
+                            <property name="margin_bottom">2</property>
                             <property name="vexpand">True</property>
-                            <property name="row_spacing">3</property>
+                            <property name="row_spacing">2</property>
                             <property name="column_spacing">4</property>
                             <child>
                               <object class="GtkCheckButton" id="ActionEnabledButton">
@@ -2342,19 +2460,19 @@ Note: this is not yet implemented in FileManager-Actions.</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_left">8</property>
-                            <property name="margin_right">4</property>
-                            <property name="margin_bottom">4</property>
-                            <property name="row_spacing">3</property>
+                            <property name="margin_right">2</property>
+                            <property name="margin_bottom">2</property>
+                            <property name="row_spacing">2</property>
                             <property name="column_spacing">4</property>
                             <child>
                               <object class="GtkCheckButton" id="ActionReadonlyButton">
                                 <property name="label" translatable="yes">Read-only item</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">False</property>
                                 <property name="tooltip_text" translatable="yes">This box is checked if the 
item cannot be edited.
 There may be multiple reasons for why an item cannot be edited. See your User's Manual.</property>
-                                <property name="focus_on_click">False</property>
                                 <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
                               </object>
@@ -2467,30 +2585,6 @@ There may be multiple reasons for why an item cannot be edited. See your User's
             <child>
               <placeholder/>
             </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -2528,8 +2622,9 @@ There may be multiple reasons for why an item cannot be edited. See your User's
   </object>
   <object class="GtkSizeGroup" id="CommandButtonSizeGroup">
     <widgets>
-      <widget name="CommandLegendButton"/>
       <widget name="CommandPathButton"/>
+      <widget name="CommandLegendButton"/>
+      <widget name="CommandWorkingDirectoryButton"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup" id="CommandLabelSizeGroup">
@@ -2540,6 +2635,14 @@ There may be multiple reasons for why an item cannot be edited. See your User's
       <widget name="CommandWDLabel"/>
     </widgets>
   </object>
+  <object class="GtkSizeGroup" id="EnvironmentExecutionSizeGroup">
+    <widgets>
+      <widget name="TryExecButton"/>
+      <widget name="ShowIfRunningButton"/>
+      <widget name="ShowIfRegisteredLabel"/>
+      <widget name="ShowIfTrueLabel"/>
+    </widgets>
+  </object>
   <object class="GtkSizeGroup" id="EnvironmentLabelSizeGroup">
     <widgets>
       <widget name="label17"/>
diff --git a/src/ui/fma-preferences-editor.c b/src/ui/fma-preferences-editor.c
index 18c5fa2..1b421ce 100644
--- a/src/ui/fma-preferences-editor.c
+++ b/src/ui/fma-preferences-editor.c
@@ -265,12 +265,12 @@ ioptions_list_get_options( const FMAIOptionsList *instance, GtkWidget *container
 
        options = NULL;
 
-       if( container == base_window_get_widget( BASE_WINDOW( instance ), "PreferencesExportFormatVBox" )){
+       if( container == base_window_get_widget( BASE_WINDOW( instance ), "PreferencesExportFormatParent" )){
                application = FMA_APPLICATION( base_window_get_application( BASE_WINDOW( instance )));
                updater = fma_application_get_updater( application );
                options = fma_exporter_get_formats( FMA_PIVOT( updater ));
 
-       } else if( container == base_window_get_widget( BASE_WINDOW( instance ), "PreferencesImportModeVBox" 
)){
+       } else if( container == base_window_get_widget( BASE_WINDOW( instance ), 
"PreferencesImportModeParent" )){
                options = fma_importer_get_modes();
 
        } else {
@@ -289,10 +289,10 @@ ioptions_list_free_options( const FMAIOptionsList *instance, GtkWidget *containe
 
        g_return_if_fail( FMA_IS_PREFERENCES_EDITOR( instance ));
 
-       if( container == base_window_get_widget( BASE_WINDOW( instance ), "PreferencesExportFormatVBox" )){
+       if( container == base_window_get_widget( BASE_WINDOW( instance ), "PreferencesExportFormatParent" )){
                fma_exporter_free_formats( options );
 
-       } else if( container == base_window_get_widget( BASE_WINDOW( instance ), "PreferencesImportModeVBox" 
)){
+       } else if( container == base_window_get_widget( BASE_WINDOW( instance ), 
"PreferencesImportModeParent" )){
                fma_importer_free_modes( options );
 
        } else {
@@ -312,10 +312,10 @@ ioptions_list_get_ask_option( const FMAIOptionsList *instance, GtkWidget *contai
 
        option = NULL;
 
-       if( container == base_window_get_widget( BASE_WINDOW( instance ), "PreferencesExportFormatVBox" )){
+       if( container == base_window_get_widget( BASE_WINDOW( instance ), "PreferencesExportFormatParent" )){
                option = fma_exporter_get_ask_option();
 
-       } else if( container == base_window_get_widget( BASE_WINDOW( instance ), "PreferencesImportModeVBox" 
)){
+       } else if( container == base_window_get_widget( BASE_WINDOW( instance ), 
"PreferencesImportModeParent" )){
                option = fma_importer_get_ask_mode();
 
        } else {
@@ -488,10 +488,10 @@ on_base_initialize_gtk( FMAPreferencesEditor *editor, GtkDialog *toplevel, gpoin
 
                desktop_create_model( editor );
 
-               container = base_window_get_widget( BASE_WINDOW( editor ), "PreferencesImportModeVBox" );
+               container = base_window_get_widget( BASE_WINDOW( editor ), "PreferencesImportModeParent" );
                fma_ioptions_list_gtk_init( FMA_IOPTIONS_LIST( editor ), container, TRUE );
 
-               container = base_window_get_widget( BASE_WINDOW( editor ), "PreferencesExportFormatVBox" );
+               container = base_window_get_widget( BASE_WINDOW( editor ), "PreferencesExportFormatParent" );
                fma_ioptions_list_gtk_init( FMA_IOPTIONS_LIST( editor ), container, TRUE );
 
                listview = GTK_TREE_VIEW( base_window_get_widget( BASE_WINDOW( editor ), "SchemesTreeView" ));
@@ -544,7 +544,7 @@ on_base_initialize_window( FMAPreferencesEditor *editor, gpointer user_data )
 
                /* fourth tab: import mode
                 */
-               container = base_window_get_widget( BASE_WINDOW( editor ), "PreferencesImportModeVBox" );
+               container = base_window_get_widget( BASE_WINDOW( editor ), "PreferencesImportModeParent" );
                import_mode = fma_settings_get_string( IPREFS_IMPORT_PREFERRED_MODE, NULL, 
&editor->private->import_mode_mandatory );
                fma_ioptions_list_set_editable(
                                FMA_IOPTIONS_LIST( editor ), container,
@@ -556,7 +556,7 @@ on_base_initialize_window( FMAPreferencesEditor *editor, gpointer user_data )
 
                /* fifth tab: export format
                 */
-               container = base_window_get_widget( BASE_WINDOW( editor ), "PreferencesExportFormatVBox" );
+               container = base_window_get_widget( BASE_WINDOW( editor ), "PreferencesExportFormatParent" );
                export_format = fma_settings_get_string( IPREFS_EXPORT_PREFERRED_FORMAT, NULL, 
&editor->private->export_format_mandatory );
                fma_ioptions_list_set_editable(
                                FMA_IOPTIONS_LIST( editor ), container,
@@ -1243,7 +1243,7 @@ on_dialog_ok( BaseDialog *dialog )
                /* fourth tab: import mode
                 */
                if( !editor->private->import_mode_mandatory ){
-                       container = base_window_get_widget( BASE_WINDOW( editor ), 
"PreferencesImportModeVBox" );
+                       container = base_window_get_widget( BASE_WINDOW( editor ), 
"PreferencesImportModeParent" );
                        option = fma_ioptions_list_get_selected( FMA_IOPTIONS_LIST( editor ), container );
                        g_return_if_fail( FMA_IS_IMPORT_MODE( option ));
                        import_mode = fma_ioption_get_id( option );
@@ -1254,7 +1254,7 @@ on_dialog_ok( BaseDialog *dialog )
                /* fifth tab: export format
                 */
                if( !editor->private->export_format_mandatory ){
-                       container = base_window_get_widget( BASE_WINDOW( editor ), 
"PreferencesExportFormatVBox" );
+                       container = base_window_get_widget( BASE_WINDOW( editor ), 
"PreferencesExportFormatParent" );
                        option = fma_ioptions_list_get_selected( FMA_IOPTIONS_LIST( editor ), container );
                        g_debug( "fma_preferences_editor_on_dialog_ok: option=%p", ( void * ) option );
                        g_return_if_fail( FMA_IS_EXPORT_FORMAT( option ));
diff --git a/src/ui/fma-preferences.ui b/src/ui/fma-preferences.ui
index bce0c2c..25de433 100644
--- a/src/ui/fma-preferences.ui
+++ b/src/ui/fma-preferences.ui
@@ -1,90 +1,141 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
 <interface>
-  <requires lib="gtk+" version="2.20"/>
-  <!-- interface-naming-policy toplevel-contextual -->
+  <requires lib="gtk+" version="3.4"/>
   <object class="GtkDialog" id="PreferencesDialog">
+    <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">FileManager-Actions Preferences</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox4">
+      <object class="GtkBox" id="dialog-vbox4">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area4">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="CancelButton">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="OKButton">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkNotebook" id="PreferencesNotebook">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <child>
-              <object class="GtkVBox" id="vbox33">
+              <object class="GtkGrid" id="p1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_left">2</property>
+                <property name="margin_right">2</property>
+                <property name="margin_top">2</property>
+                <property name="margin_bottom">2</property>
+                <property name="row_spacing">2</property>
                 <child>
                   <object class="GtkFrame" id="frame3">
                     <property name="visible">True</property>
-                    <property name="border_width">6</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">in</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment3">
+                      <object class="GtkGrid">
                         <property name="visible">True</property>
-                        <property name="left_padding">12</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_left">8</property>
+                        <property name="margin_right">2</property>
+                        <property name="margin_top">2</property>
+                        <property name="margin_bottom">2</property>
+                        <property name="hexpand">True</property>
                         <child>
-                          <object class="GtkVBox" id="vbox30">
+                          <object class="GtkRadioButton" id="OrderAlphaAscButton">
+                            <property name="label" translatable="yes">_Ascending alphabetical 
order</property>
                             <property name="visible">True</property>
-                            <property name="border_width">6</property>
-                            <property name="homogeneous">True</property>
-                            <child>
-                              <object class="GtkRadioButton" id="OrderAlphaAscButton">
-                                <property name="label" translatable="yes">_Ascending alphabetical 
order</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="tooltip_text" translatable="yes">Menus and actions will be 
displayed in the ascending alphabetical order of their label, both in the Nautilus context menu and in the 
NACT user interface.</property>
-                                <property name="use_underline">True</property>
-                                <property name="active">True</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkRadioButton" id="OrderAlphaDescButton">
-                                <property name="label" translatable="yes">_Descending alphabetical 
order</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="tooltip_text" translatable="yes">Menus and actions will be 
displayed in the descending alphabetical order of their label, both in the Nautilus context menu and in the 
NACT user interface.</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
-                                <property name="group">OrderAlphaAscButton</property>
-                              </object>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkRadioButton" id="OrderManualButton">
-                                <property name="label" translatable="yes">_Manual order</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="tooltip_text" translatable="yes">Display order of menus and 
actions, both in the Nautilus context menu and in the NACT user interface, must be manually 
adjusted.</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
-                                <property name="group">OrderAlphaAscButton</property>
-                              </object>
-                              <packing>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="tooltip_text" translatable="yes">Menus and actions will be 
displayed in the ascending alphabetical order of their label, both in the Nautilus context menu and in the 
NACT user interface.</property>
+                            <property name="use_underline">True</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">True</property>
                           </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="OrderAlphaDescButton">
+                            <property name="label" translatable="yes">_Descending alphabetical 
order</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="tooltip_text" translatable="yes">Menus and actions will be 
displayed in the descending alphabetical order of their label, both in the Nautilus context menu and in the 
NACT user interface.</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">OrderAlphaAscButton</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="OrderManualButton">
+                            <property name="label" translatable="yes">_Manual order</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="tooltip_text" translatable="yes">Display order of menus and 
actions, both in the Nautilus context menu and in the NACT user interface, must be manually 
adjusted.</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">OrderAlphaAscButton</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">2</property>
+                          </packing>
                         </child>
                       </object>
                     </child>
                     <child type="label">
                       <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xpad">5</property>
                         <property name="label" translatable="yes">&lt;b&gt;Items 
ordering&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
@@ -92,61 +143,62 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="position">0</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkFrame" id="frame1">
                     <property name="visible">True</property>
-                    <property name="border_width">6</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">in</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment1">
+                      <object class="GtkGrid">
                         <property name="visible">True</property>
-                        <property name="left_padding">12</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_left">8</property>
+                        <property name="margin_right">2</property>
+                        <property name="margin_top">2</property>
+                        <property name="margin_bottom">2</property>
+                        <property name="hexpand">True</property>
                         <child>
-                          <object class="GtkVBox" id="vbox17">
+                          <object class="GtkCheckButton" id="CreateRootMenuButton">
+                            <property name="label" translatable="yes">_Create a root 'FileManager-Actions' 
menu</property>
                             <property name="visible">True</property>
-                            <property name="border_width">6</property>
-                            <property name="homogeneous">True</property>
-                            <child>
-                              <object class="GtkCheckButton" id="CreateRootMenuButton">
-                                <property name="label" translatable="yes">_Create a root 
'FileManager-Actions' menu</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="tooltip_text" translatable="yes">When this option is 
checked, menus and actions will actually be displayed as sub-items of a root 'FileManager-Actions' menu in 
the Nautilus context menu.</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkCheckButton" id="AddAboutButton">
-                                <property name="label" translatable="yes">Add an 'A_bout 
FileManager-Actions' item in the Nautilus context menus</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="tooltip_text" translatable="yes">When this option is 
checked, an 'About FileManager-Actions' item will be added to the root FileManager-Actions menu in the 
Nautilus context menu.
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="tooltip_text" translatable="yes">When this option is checked, 
menus and actions will actually be displayed as sub-items of a root 'FileManager-Actions' menu in the 
Nautilus context menu.</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="AddAboutButton">
+                            <property name="label" translatable="yes">Add an 'A_bout FileManager-Actions' 
item in the Nautilus context menus</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="tooltip_text" translatable="yes">When this option is checked, an 
'About FileManager-Actions' item will be added to the root FileManager-Actions menu in the Nautilus context 
menu.
 Note that this item will be displayed only if a unique menu is defined in the Nautilus context menu (e.g. 
when having checked the root 'FileManager-Actions' menu option above).</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
                           </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">1</property>
+                          </packing>
                         </child>
                       </object>
                     </child>
                     <child type="label">
                       <object class="GtkLabel" id="label41">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xpad">5</property>
                         <property name="label" translatable="yes">&lt;b&gt;Nautilus menu 
layout&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
@@ -154,8 +206,8 @@ Note that this item will be displayed only if a unique menu is defined in the Na
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="position">1</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
                   </packing>
                 </child>
               </object>
@@ -163,6 +215,7 @@ Note that this item will be displayed only if a unique menu is defined in the Na
             <child type="tab">
               <object class="GtkLabel" id="label39">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="tooltip_text" translatable="yes">This tab lets you choose how the actions 
are ordered in the displayed list as well as in the Nautilus context menu. You may also choose here how 
actions will be displayed in the Nautilus context menu.</property>
                 <property name="label" translatable="yes">_Runtime preferences</property>
                 <property name="use_underline">True</property>
@@ -172,85 +225,76 @@ Note that this item will be displayed only if a unique menu is defined in the Na
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox700">
+              <object class="GtkGrid" id="p2">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_left">2</property>
+                <property name="margin_right">2</property>
+                <property name="margin_top">2</property>
+                <property name="margin_bottom">2</property>
+                <property name="row_spacing">2</property>
                 <child>
                   <object class="GtkFrame" id="frame710">
                     <property name="visible">True</property>
-                    <property name="border_width">6</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">in</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment710">
+                      <object class="GtkGrid">
                         <property name="visible">True</property>
-                        <property name="left_padding">12</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_left">8</property>
+                        <property name="margin_right">2</property>
+                        <property name="margin_top">2</property>
+                        <property name="margin_bottom">2</property>
+                        <property name="hexpand">True</property>
+                        <property name="row_spacing">2</property>
+                        <property name="column_spacing">4</property>
                         <child>
-                          <object class="GtkVBox" id="vbox711">
+                          <object class="GtkLabel" id="label711">
                             <property name="visible">True</property>
-                            <property name="border_width">6</property>
-                            <child>
-                              <object class="GtkTable" id="table711">
-                                <property name="visible">True</property>
-                                <property name="tooltip_text" translatable="yes">Specify here the command to 
run and keep opened a terminal.
-This command should include a 'COMMAND' keyword, which will be substituted at runtime with the action path 
and parameters.</property>
-                                <property name="n_rows">2</property>
-                                <property name="n_columns">2</property>
-                                <property name="column_spacing">4</property>
-                                <property name="row_spacing">4</property>
-                                <child>
-                                  <object class="GtkLabel" id="label711">
-                                    <property name="visible">True</property>
-                                    <property name="xalign">1</property>
-                                    <property name="label" translatable="yes">_Command pattern :</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkEntry" id="TerminalPrefixEntry">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="invisible_char">&#x25CF;</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="TerminalPrefixExample">
-                                    <property name="visible">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="use_markup">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">_Command pattern :</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">1</property>
                           </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkEntry" id="TerminalPrefixEntry">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="invisible_char">●</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="TerminalPrefixExample">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="use_markup">True</property>
+                            <property name="xalign">0</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <placeholder/>
                         </child>
                       </object>
                     </child>
                     <child type="label">
                       <object class="GtkLabel" id="label710">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xpad">5</property>
                         <property name="label" translatable="yes">&lt;b&gt;Execution in a 
terminal&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
@@ -258,87 +302,76 @@ This command should include a 'COMMAND' keyword, which will be substituted at ru
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="position">0</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkFrame" id="frame720">
                     <property name="visible">True</property>
-                    <property name="border_width">6</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">in</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment720">
+                      <object class="GtkGrid">
                         <property name="visible">True</property>
-                        <property name="left_padding">12</property>
+                        <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                        <property name="row_spacing">2</property>
+                        <property name="column_spacing">4</property>
                         <child>
-                          <object class="GtkVBox" id="vbox721">
+                          <object class="GtkLabel" id="label721">
                             <property name="visible">True</property>
-                            <property name="border_width">6</property>
-                            <child>
-                              <object class="GtkTable" id="table721">
-                                <property name="visible">True</property>
-                                <property name="n_rows">2</property>
-                                <property name="n_columns">2</property>
-                                <property name="column_spacing">4</property>
-                                <property name="row_spacing">4</property>
-                                <child>
-                                  <object class="GtkLabel" id="label721">
-                                    <property name="visible">True</property>
-                                    <property name="xalign">1</property>
-                                    <property name="label" translatable="yes">Running _desktop environment 
:</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkComboBox" id="DesktopComboBox">
-                                    <property name="visible">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label6">
-                                    <property name="visible">True</property>
-                                    <property name="xalign">1</property>
-                                    <property name="label" translatable="yes">&lt;i&gt;Currently detected 
:&lt;/i&gt;</property>
-                                    <property name="use_markup">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="DesktopLabel">
-                                    <property name="visible">True</property>
-                                    <property name="xalign">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <placeholder/>
-                            </child>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Running _desktop environment 
:</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">1</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkComboBox" id="DesktopComboBox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                           </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label6">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">&lt;i&gt;Currently detected 
:&lt;/i&gt;</property>
+                            <property name="use_markup">True</property>
+                            <property name="xalign">1</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="DesktopLabel">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">1</property>
+                          </packing>
                         </child>
                       </object>
                     </child>
                     <child type="label">
                       <object class="GtkLabel" id="label720">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xpad">5</property>
                         <property name="label" translatable="yes">&lt;b&gt;Desktop 
environment&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
@@ -346,13 +379,10 @@ This command should include a 'COMMAND' keyword, which will be substituted at ru
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="position">1</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
                   </packing>
                 </child>
-                <child>
-                  <placeholder/>
-                </child>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -361,6 +391,7 @@ This command should include a 'COMMAND' keyword, which will be substituted at ru
             <child type="tab">
               <object class="GtkLabel" id="label700">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="tooltip_text" translatable="yes">This tab lets you specify parameters needed 
for some execution modes.</property>
                 <property name="label" translatable="yes">Runtime E_xecution</property>
                 <property name="use_underline">True</property>
@@ -371,91 +402,106 @@ This command should include a 'COMMAND' keyword, which will be substituted at ru
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox34">
+              <object class="GtkGrid" id="p3">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_left">2</property>
+                <property name="margin_right">2</property>
+                <property name="margin_top">2</property>
+                <property name="margin_bottom">2</property>
+                <property name="row_spacing">2</property>
                 <child>
                   <object class="GtkFrame" id="frame2">
                     <property name="visible">True</property>
-                    <property name="border_width">6</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">in</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment2">
+                      <object class="GtkGrid">
                         <property name="visible">True</property>
-                        <property name="left_padding">12</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_left">8</property>
+                        <property name="margin_right">2</property>
+                        <property name="margin_top">2</property>
+                        <property name="margin_bottom">2</property>
+                        <property name="hexpand">True</property>
                         <child>
-                          <object class="GtkVBox" id="vbox25">
+                          <object class="GtkLabel" id="label45">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="ypad">6</property>
+                            <property name="label" translatable="yes">What to do when pasting or duplicating 
an item in the tree ?</property>
+                            <property name="wrap">True</property>
+                            <property name="xalign">0</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkGrid">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="margin_left">8</property>
+                            <property name="margin_top">8</property>
                             <child>
-                              <object class="GtkLabel" id="label45">
+                              <object class="GtkCheckButton" id="RelabelMenuButton">
+                                <property name="label" translatable="yes">Relabel _menus</property>
                                 <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="ypad">6</property>
-                                <property name="label" translatable="yes">What to do when pasting or 
duplicating an item in the tree ?</property>
-                                <property name="wrap">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="tooltip_text" translatable="yes">When a menu is 
copied/pasted, or duplicated, the new menu will be relabelled as 'Copy of ...'.</property>
+                                <property name="use_underline">True</property>
+                                <property name="draw_indicator">True</property>
                               </object>
                               <packing>
-                                <property name="position">0</property>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">0</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkVBox" id="vbox27">
+                              <object class="GtkCheckButton" id="RelabelActionButton">
+                                <property name="label" translatable="yes">Relabel _actions</property>
                                 <property name="visible">True</property>
-                                <property name="border_width">6</property>
-                                <child>
-                                  <object class="GtkCheckButton" id="RelabelMenuButton">
-                                    <property name="label" translatable="yes">Relabel _menus</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="tooltip_text" translatable="yes">When a menu is 
copied/pasted, or duplicated, the new menu will be relabelled as 'Copy of ...'.</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="draw_indicator">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkCheckButton" id="RelabelActionButton">
-                                    <property name="label" translatable="yes">Relabel _actions</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="tooltip_text" translatable="yes">When an action is 
copied/pasted, or duplicated, the new action will be relabelled as 'Copy of ...'.</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="draw_indicator">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkCheckButton" id="RelabelProfileButton">
-                                    <property name="label" translatable="yes">Relabel _profiles</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="tooltip_text" translatable="yes">When a profile is 
copied/pasted, or duplicated, the new profile will be relabelled as 'Copy of ...'.</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="draw_indicator">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="position">2</property>
-                                  </packing>
-                                </child>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="tooltip_text" translatable="yes">When an action is 
copied/pasted, or duplicated, the new action will be relabelled as 'Copy of ...'.</property>
+                                <property name="use_underline">True</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="RelabelProfileButton">
+                                <property name="label" translatable="yes">Relabel _profiles</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="tooltip_text" translatable="yes">When a profile is 
copied/pasted, or duplicated, the new profile will be relabelled as 'Copy of ...'.</property>
+                                <property name="use_underline">True</property>
+                                <property name="draw_indicator">True</property>
                               </object>
                               <packing>
-                                <property name="position">1</property>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">2</property>
                               </packing>
                             </child>
                           </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">1</property>
+                          </packing>
                         </child>
                       </object>
                     </child>
                     <child type="label">
                       <object class="GtkLabel" id="label42">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xpad">5</property>
                         <property name="label" translatable="yes">&lt;b&gt;Relabeling 
items&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
@@ -463,62 +509,61 @@ This command should include a 'COMMAND' keyword, which will be substituted at ru
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="position">0</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkFrame" id="frame6">
                     <property name="visible">True</property>
-                    <property name="border_width">6</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">in</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment6">
+                      <object class="GtkGrid">
                         <property name="visible">True</property>
-                        <property name="left_padding">12</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_left">8</property>
+                        <property name="margin_right">2</property>
+                        <property name="margin_top">2</property>
+                        <property name="margin_bottom">2</property>
+                        <property name="hexpand">True</property>
                         <child>
-                          <object class="GtkVBox" id="vbox43">
+                          <object class="GtkCheckButton" id="EscCloseButton">
+                            <property name="label" translatable="yes">Esc key _quits the assistant</property>
                             <property name="visible">True</property>
-                            <property name="border_width">6</property>
-                            <child>
-                              <object class="GtkCheckButton" id="EscCloseButton">
-                                <property name="label" translatable="yes">Esc key _quits the 
assistant</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="tooltip_text" translatable="yes">When this option is 
checked, the 'Escape' key will let you quit the current assistant. Else, quitting the assistant is only 
possible by hitting the 'Cancel' button.</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkCheckButton" id="EscConfirmButton">
-                                <property name="label" translatable="yes">Ask for a _confirmation when 
quitting the assistant on Esc key</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="tooltip_text" translatable="yes">This option is only 
relevant when the 'Escape' key lets the user quit the assistant. When checked, the user will be prompted for 
a confirmation in order to help prevent erroneous hits of the Esc key.</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <placeholder/>
-                            </child>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="tooltip_text" translatable="yes">When this option is checked, 
the 'Escape' key will let you quit the current assistant. Else, quitting the assistant is only possible by 
hitting the 'Cancel' button.</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
                           </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="EscConfirmButton">
+                            <property name="label" translatable="yes">Ask for a _confirmation when quitting 
the assistant on Esc key</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="tooltip_text" translatable="yes">This option is only relevant 
when the 'Escape' key lets the user quit the assistant. When checked, the user will be prompted for a 
confirmation in order to help prevent erroneous hits of the Esc key.</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">1</property>
+                          </packing>
                         </child>
                       </object>
                     </child>
                     <child type="label">
                       <object class="GtkLabel" id="label16">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xpad">5</property>
                         <property name="label" translatable="yes">&lt;b&gt;Assistants&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
@@ -526,93 +571,98 @@ This command should include a 'COMMAND' keyword, which will be substituted at ru
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="position">1</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkFrame" id="frame8">
                     <property name="visible">True</property>
-                    <property name="border_width">6</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">in</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment8">
+                      <object class="GtkGrid">
                         <property name="visible">True</property>
-                        <property name="left_padding">12</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_left">8</property>
+                        <property name="margin_right">2</property>
+                        <property name="margin_top">2</property>
+                        <property name="margin_bottom">2</property>
+                        <property name="hexpand">True</property>
+                        <child>
+                          <object class="GtkCheckButton" id="AutoSaveCheckButton">
+                            <property name="label" translatable="yes">Automatically _saves pending 
modifications</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="tooltip_text" translatable="yes">When this option is checked, 
pending modification will be periodically and automatically saved.</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
                         <child>
-                          <object class="GtkVBox" id="AutoSaveVBox">
+                          <object class="GtkGrid">
                             <property name="visible">True</property>
-                            <property name="border_width">6</property>
+                            <property name="can_focus">False</property>
+                            <property name="column_spacing">4</property>
+                            <child>
+                              <object class="GtkLabel" id="AutoSaveLabel1">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xpad">4</property>
+                                <property name="label" translatable="yes">Periodicity :</property>
+                                <property name="xalign">1</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">0</property>
+                              </packing>
+                            </child>
                             <child>
-                              <object class="GtkCheckButton" id="AutoSaveCheckButton">
-                                <property name="label" translatable="yes">Automatically _saves pending 
modifications</property>
+                              <object class="GtkSpinButton" id="AutoSavePeriodicitySpinButton">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="tooltip_text" translatable="yes">When this option is 
checked, pending modification will be periodically and automatically saved.</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
+                                <property name="invisible_char">●</property>
+                                <property name="width_chars">5</property>
+                                <property name="snap_to_ticks">True</property>
+                                <property name="numeric">True</property>
+                                <property name="update_policy">if-valid</property>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="position">0</property>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">0</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkHBox" id="hbox2">
+                              <object class="GtkLabel" id="AutoSaveLabel2">
                                 <property name="visible">True</property>
-                                <child>
-                                  <object class="GtkLabel" id="AutoSaveLabel1">
-                                    <property name="visible">True</property>
-                                    <property name="xalign">1</property>
-                                    <property name="xpad">4</property>
-                                    <property name="label" translatable="yes">Periodicity :</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkSpinButton" id="AutoSavePeriodicitySpinButton">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="invisible_char">&#x25CF;</property>
-                                    <property name="width_chars">5</property>
-                                    <property name="snap_to_ticks">True</property>
-                                    <property name="numeric">True</property>
-                                    <property name="update_policy">if-valid</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="AutoSaveLabel2">
-                                    <property name="visible">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="xpad">4</property>
-                                    <property name="label" translatable="yes">minutes</property>
-                                  </object>
-                                  <packing>
-                                    <property name="position">2</property>
-                                  </packing>
-                                </child>
+                                <property name="can_focus">False</property>
+                                <property name="xpad">4</property>
+                                <property name="label" translatable="yes">minutes</property>
+                                <property name="xalign">0</property>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="position">1</property>
+                                <property name="left_attach">2</property>
+                                <property name="top_attach">0</property>
                               </packing>
                             </child>
                           </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">1</property>
+                          </packing>
                         </child>
                       </object>
                     </child>
                     <child type="label">
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xpad">5</property>
                         <property name="label" translatable="yes">&lt;b&gt;Auto-save&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
@@ -620,8 +670,8 @@ This command should include a 'COMMAND' keyword, which will be substituted at ru
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="position">2</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
                   </packing>
                 </child>
               </object>
@@ -632,6 +682,7 @@ This command should include a 'COMMAND' keyword, which will be substituted at ru
             <child type="tab">
               <object class="GtkLabel" id="label40">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="tooltip_text" translatable="yes">This tab allows the user to choose custom 
preferences for the FileManager-Actions Configuration Tool user interface.</property>
                 <property name="label" translatable="yes">_UI Preferences</property>
                 <property name="use_underline">True</property>
@@ -642,64 +693,73 @@ This command should include a 'COMMAND' keyword, which will be substituted at ru
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox35">
+              <object class="GtkGrid" id="p4">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_left">2</property>
+                <property name="margin_right">2</property>
+                <property name="margin_top">2</property>
+                <property name="margin_bottom">2</property>
                 <child>
                   <object class="GtkFrame" id="frame4">
                     <property name="visible">True</property>
-                    <property name="border_width">6</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">in</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment4">
+                      <object class="GtkGrid">
                         <property name="visible">True</property>
-                        <property name="left_padding">12</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_left">8</property>
+                        <property name="margin_right">2</property>
+                        <property name="margin_top">2</property>
+                        <property name="margin_bottom">2</property>
+                        <property name="hexpand">True</property>
+                        <property name="row_spacing">2</property>
                         <child>
-                          <object class="GtkVBox" id="vbox13">
+                          <object class="GtkLabel" id="label8">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="ypad">10</property>
+                            <property name="label" translatable="yes">What to do when an item, action or 
menu, selected to be imported, has the same identifier that a currently existing one ?</property>
+                            <property name="wrap">True</property>
+                            <property name="xalign">0</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="PreferencesImportModeParent">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="margin_left">8</property>
+                            <property name="margin_top">8</property>
+                            <property name="orientation">vertical</property>
                             <child>
-                              <object class="GtkLabel" id="label8">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="ypad">10</property>
-                                <property name="label" translatable="yes">What to do when an item, action or 
menu, selected to be imported, has the same identifier that a currently existing one ?</property>
-                                <property name="wrap">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkVBox" id="PreferencesImportModeVBox">
-                                <property name="visible">True</property>
-                                <property name="border_width">6</property>
-                                <property name="homogeneous">True</property>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">1</property>
-                              </packing>
+                              <placeholder/>
                             </child>
                           </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">1</property>
+                          </packing>
                         </child>
                       </object>
                     </child>
                     <child type="label">
                       <object class="GtkLabel" id="label44">
                         <property name="visible">True</property>
-                        <property name="xpad">5</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">&lt;b&gt;Import mode&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="position">0</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
               </object>
@@ -710,6 +770,7 @@ This command should include a 'COMMAND' keyword, which will be substituted at ru
             <child type="tab">
               <object class="GtkLabel" id="label48">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="tooltip_text" translatable="yes">This tab lets you decide on the default 
behavior of import operations.</property>
                 <property name="label" translatable="yes">_Import</property>
                 <property name="use_underline">True</property>
@@ -720,55 +781,65 @@ This command should include a 'COMMAND' keyword, which will be substituted at ru
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox41">
+              <object class="GtkGrid" id="p5">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_left">2</property>
+                <property name="margin_right">2</property>
+                <property name="margin_top">2</property>
+                <property name="margin_bottom">2</property>
                 <child>
                   <object class="GtkFrame" id="frame5">
                     <property name="visible">True</property>
-                    <property name="border_width">6</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">in</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment5">
+                      <object class="GtkGrid">
                         <property name="visible">True</property>
-                        <property name="left_padding">12</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_left">8</property>
+                        <property name="margin_right">2</property>
+                        <property name="margin_top">2</property>
+                        <property name="margin_bottom">2</property>
+                        <property name="hexpand">True</property>
+                        <property name="row_spacing">2</property>
                         <child>
-                          <object class="GtkVBox" id="vbox15">
+                          <object class="GtkLabel" id="label5">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="ypad">10</property>
+                            <property name="label" translatable="yes">What is your preferred export format 
?</property>
+                            <property name="wrap">True</property>
+                            <property name="xalign">0</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="PreferencesExportFormatParent">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="margin_left">8</property>
+                            <property name="margin_top">8</property>
+                            <property name="orientation">vertical</property>
                             <child>
-                              <object class="GtkLabel" id="label5">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="ypad">10</property>
-                                <property name="label" translatable="yes">What is your preferred export 
format ?</property>
-                                <property name="wrap">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkVBox" id="PreferencesExportFormatVBox">
-                                <property name="visible">True</property>
-                                <property name="border_width">6</property>
-                                <property name="homogeneous">True</property>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">1</property>
-                              </packing>
+                              <placeholder/>
                             </child>
                           </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">1</property>
+                          </packing>
                         </child>
                       </object>
                     </child>
                     <child type="label">
                       <object class="GtkLabel" id="label49">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xpad">5</property>
                         <property name="label" translatable="yes">&lt;b&gt;Export format&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
@@ -776,8 +847,8 @@ This command should include a 'COMMAND' keyword, which will be substituted at ru
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="position">0</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
               </object>
@@ -788,6 +859,7 @@ This command should include a 'COMMAND' keyword, which will be substituted at ru
             <child type="tab">
               <object class="GtkLabel" id="label51">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="tooltip_text" translatable="yes">This tab lets you decide on the default 
behavior of export operations.</property>
                 <property name="label" translatable="yes">_Export</property>
                 <property name="use_underline">True</property>
@@ -798,104 +870,120 @@ This command should include a 'COMMAND' keyword, which will be substituted at ru
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox44">
+              <object class="GtkGrid" id="p6">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_left">2</property>
+                <property name="margin_right">2</property>
+                <property name="margin_top">2</property>
+                <property name="margin_bottom">2</property>
                 <child>
                   <object class="GtkFrame" id="frame13">
                     <property name="visible">True</property>
-                    <property name="border_width">6</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">in</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment13">
+                      <object class="GtkGrid">
                         <property name="visible">True</property>
-                        <property name="top_padding">8</property>
-                        <property name="bottom_padding">8</property>
-                        <property name="left_padding">10</property>
-                        <property name="right_padding">6</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_left">8</property>
+                        <property name="margin_right">2</property>
+                        <property name="margin_top">2</property>
+                        <property name="margin_bottom">2</property>
+                        <property name="hexpand">True</property>
+                        <property name="row_spacing">2</property>
+                        <property name="column_spacing">2</property>
                         <child>
-                          <object class="GtkHBox" id="hbox10">
+                          <object class="GtkGrid">
                             <property name="visible">True</property>
-                            <property name="spacing">6</property>
+                            <property name="can_focus">False</property>
+                            <property name="row_spacing">2</property>
                             <child>
-                              <object class="GtkScrolledWindow" id="scrolledwindow13">
+                              <object class="GtkButton" id="AddSchemeButton">
                                 <property name="visible">True</property>
+                                <property name="sensitive">False</property>
                                 <property name="can_focus">True</property>
-                                <property name="shadow_type">in</property>
+                                <property name="receives_default">True</property>
+                                <property name="tooltip_text" translatable="yes">Click to add a new default 
scheme.</property>
+                                <property name="valign">start</property>
                                 <child>
-                                  <object class="GtkTreeView" id="SchemesTreeView">
+                                  <object class="GtkImage" id="image16">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="tooltip_text" translatable="yes">You may define here any 
number of schemes. They will be proposed as default schemes when defining conditions for an action.
-If the list becomes empty, NACT will automatically refill in with this default list.
-You can add a new scheme by clicking on the '+' button.</property>
-                                    <property name="headers_visible">False</property>
-                                    <property name="rules_hint">True</property>
-                                    <property name="show_expanders">False</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="stock">gtk-add</property>
                                   </object>
                                 </child>
                               </object>
                               <packing>
-                                <property name="position">0</property>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">0</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkVBox" id="vbox29">
+                              <object class="GtkButton" id="RemoveSchemeButton">
                                 <property name="visible">True</property>
-                                <property name="spacing">6</property>
-                                <child>
-                                  <object class="GtkButton" id="AddSchemeButton">
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="tooltip_text" translatable="yes">Click to add a new 
default scheme.</property>
-                                    <child>
-                                      <object class="GtkImage" id="image16">
-                                        <property name="visible">True</property>
-                                        <property name="stock">gtk-add</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
+                                <property name="sensitive">False</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="tooltip_text" translatable="yes">Click to remove the 
selected default scheme.</property>
+                                <property name="valign">start</property>
                                 <child>
-                                  <object class="GtkButton" id="RemoveSchemeButton">
+                                  <object class="GtkImage" id="image17">
                                     <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="tooltip_text" translatable="yes">Click to remove the 
selected default scheme.</property>
-                                    <child>
-                                      <object class="GtkImage" id="image17">
-                                        <property name="visible">True</property>
-                                        <property name="stock">gtk-remove</property>
-                                      </object>
-                                    </child>
+                                    <property name="can_focus">False</property>
+                                    <property name="stock">gtk-remove</property>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="position">1</property>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">1</property>
                               </packing>
                             </child>
+                            <child>
+                              <placeholder/>
+                            </child>
                           </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkScrolledWindow" id="scrolledwindow13">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="shadow_type">in</property>
+                            <child>
+                              <object class="GtkTreeView" id="SchemesTreeView">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="tooltip_text" translatable="yes">You may define here any 
number of schemes. They will be proposed as default schemes when defining conditions for an action.
+If the list becomes empty, NACT will automatically refill in with this default list.
+You can add a new scheme by clicking on the '+' button.</property>
+                                <property name="hexpand">True</property>
+                                <property name="vexpand">True</property>
+                                <property name="headers_visible">False</property>
+                                <property name="rules_hint">True</property>
+                                <property name="show_expanders">False</property>
+                                <child internal-child="selection">
+                                  <object class="GtkTreeSelection"/>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
+                          </packing>
                         </child>
                       </object>
                     </child>
                     <child type="label">
                       <object class="GtkLabel" id="label55">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xpad">5</property>
                         <property name="label" translatable="yes">&lt;b&gt;Default 
schemes&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
@@ -903,7 +991,8 @@ You can add a new scheme by clicking on the '+' button.</property>
                     </child>
                   </object>
                   <packing>
-                    <property name="position">0</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
               </object>
@@ -914,6 +1003,7 @@ You can add a new scheme by clicking on the '+' button.</property>
             <child type="tab">
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="tooltip_text" translatable="yes">This tab lets you decide which schemes are 
proposed by default when editing advanced conditions for an item.</property>
                 <property name="label" translatable="yes">_Schemes</property>
                 <property name="use_underline">True</property>
@@ -924,95 +1014,109 @@ You can add a new scheme by clicking on the '+' button.</property>
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox1">
+              <object class="GtkGrid" id="p7">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_left">2</property>
+                <property name="margin_right">2</property>
+                <property name="margin_top">2</property>
+                <property name="margin_bottom">2</property>
                 <child>
                   <object class="GtkFrame" id="frame7">
                     <property name="visible">True</property>
-                    <property name="border_width">6</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">in</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment7">
+                      <object class="GtkGrid">
                         <property name="visible">True</property>
-                        <property name="top_padding">8</property>
-                        <property name="bottom_padding">8</property>
-                        <property name="left_padding">10</property>
-                        <property name="right_padding">6</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_left">8</property>
+                        <property name="margin_right">2</property>
+                        <property name="margin_top">2</property>
+                        <property name="margin_bottom">2</property>
+                        <property name="hexpand">True</property>
+                        <property name="row_spacing">2</property>
+                        <property name="column_spacing">2</property>
                         <child>
-                          <object class="GtkHBox" id="hbox1">
+                          <object class="GtkScrolledWindow" id="scrolledwindow7">
                             <property name="visible">True</property>
-                            <property name="spacing">6</property>
+                            <property name="can_focus">True</property>
+                            <property name="shadow_type">in</property>
                             <child>
-                              <object class="GtkScrolledWindow" id="scrolledwindow7">
+                              <object class="GtkTreeView" id="ProvidersTreeView">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="shadow_type">in</property>
-                                <child>
-                                  <object class="GtkTreeView" id="ProvidersTreeView">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="tooltip_text" translatable="yes">Define here, for 
available I/O providers, if you want them to be read at startup, to be writable, and the order in which they 
will be tested when trying to write a new menu or action.</property>
-                                    <property name="headers_visible">False</property>
-                                    <property name="rules_hint">True</property>
-                                    <property name="show_expanders">False</property>
-                                  </object>
+                                <property name="tooltip_text" translatable="yes">Define here, for available 
I/O providers, if you want them to be read at startup, to be writable, and the order in which they will be 
tested when trying to write a new menu or action.</property>
+                                <property name="hexpand">True</property>
+                                <property name="vexpand">True</property>
+                                <property name="headers_visible">False</property>
+                                <property name="rules_hint">True</property>
+                                <property name="show_expanders">False</property>
+                                <child internal-child="selection">
+                                  <object class="GtkTreeSelection"/>
                                 </child>
                               </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkGrid">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="row_spacing">2</property>
+                            <child>
+                              <object class="GtkButton" id="ProviderButtonUp">
+                                <property name="label" translatable="yes">_Up</property>
+                                <property name="visible">True</property>
+                                <property name="sensitive">False</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="tooltip_text" translatable="yes">Move up the selected I/O 
provider in the order of priority when trying to write a new item.</property>
+                                <property name="valign">start</property>
+                                <property name="image">image</property>
+                                <property name="use_underline">True</property>
+                              </object>
                               <packing>
-                                <property name="position">0</property>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">0</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkVBox" id="vbox2">
+                              <object class="GtkButton" id="ProviderButtonDown">
+                                <property name="label" translatable="yes">_Down</property>
                                 <property name="visible">True</property>
-                                <property name="spacing">6</property>
-                                <child>
-                                  <object class="GtkButton" id="ProviderButtonUp">
-                                    <property name="label" translatable="yes">_Up</property>
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="tooltip_text" translatable="yes">Move up the selected 
I/O provider in the order of priority when trying to write a new item.</property>
-                                    <property name="image">image</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkButton" id="ProviderButtonDown">
-                                    <property name="label" translatable="yes">_Down</property>
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="image">image3</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">2</property>
-                                  </packing>
-                                </child>
+                                <property name="sensitive">False</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="valign">start</property>
+                                <property name="image">image3</property>
+                                <property name="use_underline">True</property>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="position">1</property>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">1</property>
                               </packing>
                             </child>
+                            <child>
+                              <placeholder/>
+                            </child>
                           </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">0</property>
+                          </packing>
                         </child>
                       </object>
                     </child>
                     <child type="label">
                       <object class="GtkLabel" id="label3">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xpad">5</property>
                         <property name="label" translatable="yes">&lt;b&gt;Activation and 
priority&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
@@ -1020,7 +1124,8 @@ You can add a new scheme by clicking on the '+' button.</property>
                     </child>
                   </object>
                   <packing>
-                    <property name="position">0</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
               </object>
@@ -1031,6 +1136,7 @@ You can add a new scheme by clicking on the '+' button.</property>
             <child type="tab">
               <object class="GtkLabel" id="label43">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="tooltip_text" translatable="yes">This tab lets you decide whether the I/O 
providers are enabled or not, and in which order they will be tried when writing a new item.</property>
                 <property name="label" translatable="yes">I/O _Providers</property>
                 <property name="use_underline">True</property>
@@ -1043,48 +1149,10 @@ You can add a new scheme by clicking on the '+' button.</property>
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area4">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="CancelButton">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="OKButton">
-                <property name="label">gtk-ok</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
       </object>
     </child>
     <action-widgets>
@@ -1092,23 +1160,26 @@ You can add a new scheme by clicking on the '+' button.</property>
       <action-widget response="0">OKButton</action-widget>
     </action-widgets>
   </object>
+  <object class="GtkSizeGroup" id="RuntimeExecutionLabel">
+    <widgets>
+      <widget name="label711"/>
+      <widget name="label721"/>
+    </widgets>
+  </object>
   <object class="GtkImage" id="image">
     <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <property name="xalign">0</property>
     <property name="stock">gtk-go-up</property>
   </object>
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <property name="stock">gtk-missing-image</property>
   </object>
   <object class="GtkImage" id="image3">
     <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <property name="stock">gtk-go-down</property>
   </object>
-  <object class="GtkSizeGroup" id="RuntimeExecutionLabel">
-    <widgets>
-      <widget name="label711"/>
-      <widget name="label721"/>
-    </widgets>
-  </object>
 </interface>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]