gnunet-svn
[Top][All Lists]
Advanced

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

[taler-anastasis-gtk] branch master updated: -fix about dialog, fix glad


From: gnunet
Subject: [taler-anastasis-gtk] branch master updated: -fix about dialog, fix glade licenses, update docs
Date: Fri, 30 Jul 2021 10:33:25 +0200

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository anastasis-gtk.

The following commit(s) were added to refs/heads/master by this push:
     new 717fc05  -fix about dialog, fix glade licenses, update docs
717fc05 is described below

commit 717fc050cf0162f96677632b05c6274172b46b53
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Fri Jul 30 10:33:23 2021 +0200

    -fix about dialog, fix glade licenses, update docs
---
 README                                         |    9 +-
 contrib/Makefile.am                            |    2 +-
 contrib/anastasis_gtk_about_window.glade.in    |  329 +-----
 contrib/anastasis_gtk_auth_add_email.glade     |  100 +-
 contrib/anastasis_gtk_auth_add_post.glade      |  136 ++-
 contrib/anastasis_gtk_auth_add_question.glade  |  146 +--
 contrib/anastasis_gtk_auth_add_sms.glade       |   98 +-
 contrib/anastasis_gtk_auth_add_video.glade     |   96 +-
 contrib/anastasis_gtk_challenge_code.glade     |  108 +-
 contrib/anastasis_gtk_challenge_question.glade |  106 +-
 contrib/anastasis_gtk_edit_policy.glade        |  131 ++-
 contrib/anastasis_gtk_edit_providers.glade     |  117 +--
 contrib/anastasis_gtk_main_window.glade        | 1289 ++++++++++++------------
 contrib/anastasis_gtk_open_file_dialog.glade   |   64 +-
 contrib/anastasis_gtk_open_secret_dialog.glade |   64 +-
 contrib/anastasis_gtk_save_file_dialog.glade   |   50 +-
 contrib/anastasis_gtk_save_secret_dialog.glade |   50 +-
 contrib/get_version.sh                         |    1 +
 contrib/logo.png                               |  Bin 0 -> 1915 bytes
 contrib/logo.svg                               |  655 ------------
 contrib/pogen.sh                               |    1 +
 contrib/this_stays_private.glade               |   47 +-
 src/anastasis/anastasis-gtk_about.c            |   26 +-
 23 files changed, 1521 insertions(+), 2104 deletions(-)

diff --git a/README b/README
index 2ea06ac..ba33176 100644
--- a/README
+++ b/README
@@ -2,9 +2,10 @@
 ANASTASIS-GTK
 =============
 
-This package includes GTK interfaces to Anastasis.  The code is
-released under the GNU General Public License (v3 or later).
-See COPYING for details.
+This package includes GTK interfaces to GNU Anastasis.  Anastasis is a
+GNU package enabling distributed key backup and recovery. The code is
+released under the GNU General Public License (v3 or later).  See
+COPYING for details.
 
 
 Dependencies
@@ -29,7 +30,7 @@ Installation
 For generic installation instructions, see INSTALL.
 
 In order to compile or run this code, you need to first install the
-main GNUnet, gnunet-gtk, GNU Taler and Anastasis codebases.
+main GNUnet, gnunet-gtk, GNU Taler and GNU Anastasis codebases.
 
 Then you may need to tell configure where the GNUnet installation is
 located.  The following command will install the GTK interfaces in the
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index b65bfc4..add354e 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -7,7 +7,7 @@ pkgdatadir= $(prefix)/share/anastasis/
 
 IMAGES = \
   qr_dummy.png \
-  logo.svg \
+  logo.png \
   country_selection.jpg \
   continent_selection.jpg \
   user_attributes.png \
diff --git a/contrib/anastasis_gtk_about_window.glade.in 
b/contrib/anastasis_gtk_about_window.glade.in
index 508aaec..b7ee59f 100644
--- a/contrib/anastasis_gtk_about_window.glade.in
+++ b/contrib/anastasis_gtk_about_window.glade.in
@@ -1,311 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.38.2 -->
 <interface>
-  <requires lib="gtk+" version="2.20"/>
-  <!-- interface-naming-policy project-wide -->
-  <object class="GtkTextBuffer" id="credits_art_contents">
-    <property name="text"></property>
-  </object>
-  <object class="GtkTextBuffer" id="credits_authors_contents">
-    <property name="text"></property>
-  </object>
-  <object class="GtkTextBuffer" id="credits_docs_contents">
-    <property name="text"></property>
-  </object>
-  <object class="GtkTextBuffer" id="credits_trans_contents">
-    <property name="text"></property>
-  </object>
-  <object class="GtkTextBuffer" id="license_contents">
-    <property name="text" translatable="yes">License should be loaded here at 
runtime from the license file (no need to copy the whole GPL in 
here...).</property>
-  </object>
-  <object class="GtkWindow" id="about_window">
-    <property name="can_focus">False</property>
-    <property name="modal">True</property>
-    <property name="destroy_with_parent">True</property>
-    <signal name="realize" handler="GNUNET_GTK_about_window_realized" 
swapped="no"/>
-    <signal name="delete-event" 
handler="GNUNET_GTK_about_window_got_delete_event" swapped="no"/>
-    <child>
-      <object class="GtkVBox" id="about_main_vbox">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="border_width">10</property>
-        <child>
-          <object class="GtkImage" id="about_logo_image">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="pixbuf">gnunet_logo.png</property>
+  <requires lib="gtk+" version="3.0"/>
+  <object class="GtkAboutDialog" id="about_window">
+    <property name="can-focus">False</property>
+    <property name="type-hint">dialog</property>
+    <property name="program-name">anastasis-gtk</property>
+    <property name="version">@ANASTASIS_GTK_VERSION3@</property>
+    <property name="copyright" translatable="yes">(C) 
@ANASTASIS_GTK_YEARFROM@-@ANASTASIS_YEARTO@ Anastasis SARL</property>
+    <property name="website">https://anastasis.lu/</property>
+    <property name="website-label" translatable="yes">Anastasis</property>
+    <property name="authors">Belen Pena
+Christian Grothoff
+Dennis Neufeld</property>
+    <property name="documenters">Christian Grothoff
+Dominik Meister
+Dennis Neufeld</property>
+    <property name="logo">logo.svg</property>
+    <property name="license-type">gpl-3-0</property>
+    <signal name="response" handler="ANASTASIS_GTK_about_close_response" 
swapped="no"/>
+    <child internal-child="vbox">
+      <object class="GtkBox">
+        <property name="can-focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox">
+            <property name="can-focus">False</property>
+            <property name="layout-style">end</property>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">True</property>
+            <property name="fill">False</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="about_name_version_label">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label">@ANASTASIS_GTK_NAME@ 
@ANASTASIS_GTK_VERSION3@</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-              <attribute name="size" value="200"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="about_copyright_label">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label">(C) 
@ANASTASIS_GTK_YEARFROM@-@ANASTASIS_YEARTO@ The GNUnet Project</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="about_link_label">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label">&lt;a 
href="https://anastasis.lu/"&gt;DESCRIPTION&lt;/a&gt;</property>
-            <property name="use_markup">True</property>
-            <property name="wrap">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkNotebook" id="about_credits_notebook">
-            <property name="can_focus">True</property>
-            <child>
-              <object class="GtkScrolledWindow" 
id="about_credits_authors_scroller">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hscrollbar_policy">automatic</property>
-                <property name="vscrollbar_policy">automatic</property>
-                <child>
-                  <object class="GtkTextView" 
id="about_credits_authors_textview">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="editable">False</property>
-                    <property name="wrap_mode">word</property>
-                    <property name="cursor_visible">False</property>
-                    <property name="buffer">credits_authors_contents</property>
-                    <property name="accepts_tab">False</property>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="about_credits_authors_tab">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Developed 
by</property>
-              </object>
-              <packing>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkScrolledWindow" 
id="about_credits_docs_scroller">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hscrollbar_policy">automatic</property>
-                <property name="vscrollbar_policy">automatic</property>
-                <child>
-                  <object class="GtkTextView" id="about_credits_docs_textview">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="editable">False</property>
-                    <property name="wrap_mode">word</property>
-                    <property name="cursor_visible">False</property>
-                    <property name="buffer">credits_docs_contents</property>
-                    <property name="accepts_tab">False</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="about_credits_docs_tab">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Documented 
by</property>
-              </object>
-              <packing>
-                <property name="position">1</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkScrolledWindow" 
id="about_credits_trans_scroller">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hscrollbar_policy">automatic</property>
-                <property name="vscrollbar_policy">automatic</property>
-                <child>
-                  <object class="GtkTextView" 
id="about_credits_trans_textview">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="editable">False</property>
-                    <property name="wrap_mode">word</property>
-                    <property name="cursor_visible">False</property>
-                    <property name="buffer">credits_trans_contents</property>
-                    <property name="accepts_tab">False</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="about_credits_trans_tab">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Translated 
by</property>
-              </object>
-              <packing>
-                <property name="position">2</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkScrolledWindow" 
id="about_credits_art_scroller">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hscrollbar_policy">automatic</property>
-                <property name="vscrollbar_policy">automatic</property>
-                <child>
-                  <object class="GtkTextView" id="about_credits_art_textview">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="editable">False</property>
-                    <property name="wrap_mode">word</property>
-                    <property name="cursor_visible">False</property>
-                    <property name="buffer">credits_art_contents</property>
-                    <property name="accepts_tab">False</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="position">3</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="about_credits_art_tab">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Artwork by</property>
-              </object>
-              <packing>
-                <property name="position">3</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">4</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkScrolledWindow" id="about_license_scroller">
-            <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">never</property>
-            <property name="shadow_type">out</property>
-            <child>
-              <object class="GtkTextView" id="about_license_textview">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="editable">False</property>
-                <property name="wrap_mode">word</property>
-                <property name="cursor_visible">False</property>
-                <property name="buffer">license_contents</property>
-                <property name="accepts_tab">False</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">5</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHBox" id="about_buttons_hbox">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="border_width">5</property>
-            <property name="homogeneous">True</property>
-            <child>
-              <object class="GtkButton" id="about_credits_button">
-                <property name="label" translatable="yes">Credits</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <signal name="clicked" 
handler="GNUNET_GTK_about_credits_button_clicked" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="about_license_button">
-                <property name="label" translatable="yes">License</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <signal name="clicked" 
handler="GNUNET_GTK_about_license_button_clicked" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="about_close_button">
-                <property name="label">gtk-close</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-                <signal name="clicked" 
handler="GNUNET_GTK_about_close_button_clicked" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">False</property>
-                <property name="pack_type">end</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">6</property>
-          </packing>
+          <placeholder/>
         </child>
       </object>
     </child>
diff --git a/contrib/anastasis_gtk_auth_add_email.glade 
b/contrib/anastasis_gtk_auth_add_email.glade
index d2767da..2975bdf 100644
--- a/contrib/anastasis_gtk_auth_add_email.glade
+++ b/contrib/anastasis_gtk_auth_add_email.glade
@@ -1,39 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 -->
-<interface>
+<!-- Generated with glade 3.38.2 
+
+Copyright (C) 2019-2021 Anastasis SARL
+
+This file is part of anastasis-gtk.
+
+anastasis-gtk is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+anastasis-gtk is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with anastasis-gtk.  If not, see <http://www.gnu.org/licenses/>.
+
+Author: Belen Pena, Christian Grothoff, Dennis Neufeld
+
+-->
+<interface domain="">
   <requires lib="gtk+" version="3.6"/>
+  <!-- interface-license-type gplv3 -->
+  <!-- interface-name anastasis-gtk -->
+  <!-- interface-description Key backup and recovery -->
+  <!-- interface-copyright 2019-2021 Anastasis SARL -->
+  <!-- interface-authors Belen Pena, Christian Grothoff, Dennis Neufeld -->
   <object class="GtkDialog" id="anastasis_gtk_b_email_dialog">
-    <property name="can_focus">False</property>
-    <property name="type_hint">dialog</property>
+    <property name="can-focus">False</property>
+    <property name="type-hint">dialog</property>
     <signal name="response" handler="anastasis_gtk_b_email_dialog_response_cb" 
swapped="no"/>
-    <child type="titlebar">
-      <object class="GtkLabel">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Add email 
authentication</property>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget 
response="-6">anastasis_gtk_b_email_dialog_btn_cancel</action-widget>
-      <action-widget 
response="-5">anastasis_gtk_b_email_dialog_btn_ok</action-widget>
-    </action-widgets>
     <child internal-child="vbox">
       <object class="GtkBox">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
+            <property name="can-focus">False</property>
+            <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" 
id="anastasis_gtk_b_email_dialog_btn_cancel">
                 <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-                <property name="always_show_image">True</property>
+                <property name="can-focus">False</property>
+                <property name="receives-default">False</property>
+                <property name="use-stock">True</property>
+                <property name="always-show-image">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -46,12 +61,12 @@
                 <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
-                <property name="can_focus">False</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-                <property name="always_show_image">True</property>
+                <property name="can-focus">False</property>
+                <property name="can-default">True</property>
+                <property name="has-default">True</property>
+                <property name="receives-default">False</property>
+                <property name="use-stock">True</property>
+                <property name="always-show-image">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -69,16 +84,16 @@
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes">Email 
address:</property>
                   </object>
                   <packing>
@@ -91,13 +106,13 @@
                 <child>
                   <object class="GtkEntry" 
id="anastasis_gtk_b_email_dialog_mailaddress_entry">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="has_focus">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="has-focus">True</property>
                     <property name="hexpand">True</property>
-                    <property name="activates_default">True</property>
-                    <property name="width_chars">36</property>
-                    <property 
name="primary_icon_stock">gtk-dialog-authentication</property>
-                    <property name="input_purpose">email</property>
+                    <property name="activates-default">True</property>
+                    <property name="width-chars">36</property>
+                    <property 
name="primary-icon-stock">gtk-dialog-authentication</property>
+                    <property name="input-purpose">email</property>
                     <signal name="changed" 
handler="anastasis_gtk_b_email_dialog_mailaddress_entry_changed_cb" 
swapped="no"/>
                   </object>
                   <packing>
@@ -129,5 +144,16 @@
       <action-widget 
response="-6">anastasis_gtk_b_email_dialog_btn_cancel</action-widget>
       <action-widget 
response="-5">anastasis_gtk_b_email_dialog_btn_ok</action-widget>
     </action-widgets>
+    <child type="titlebar">
+      <object class="GtkLabel">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="label" translatable="yes">Add email 
authentication</property>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget 
response="-6">anastasis_gtk_b_email_dialog_btn_cancel</action-widget>
+      <action-widget 
response="-5">anastasis_gtk_b_email_dialog_btn_ok</action-widget>
+    </action-widgets>
   </object>
 </interface>
diff --git a/contrib/anastasis_gtk_auth_add_post.glade 
b/contrib/anastasis_gtk_auth_add_post.glade
index 8584ae4..0887a40 100644
--- a/contrib/anastasis_gtk_auth_add_post.glade
+++ b/contrib/anastasis_gtk_auth_add_post.glade
@@ -1,39 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 -->
+<!-- Generated with glade 3.38.2 
+
+Copyright (C) 2019-2021 Anastasis SARL
+
+This file is part of anastasis-gtk.
+
+anastasis-gtk is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+anastasis-gtk is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with anastasis-gtk.  If not, see <http://www.gnu.org/licenses/>.
+
+Author: Christian Grothoff
+
+-->
 <interface>
   <requires lib="gtk+" version="3.6"/>
+  <!-- interface-license-type gplv3 -->
+  <!-- interface-name anastasis-gtk -->
+  <!-- interface-description Key backup and recovery -->
+  <!-- interface-copyright 2019-2021 Anastasis SARL -->
+  <!-- interface-authors Christian Grothoff -->
   <object class="GtkDialog" id="anastasis_gtk_b_post_dialog">
-    <property name="can_focus">False</property>
-    <property name="type_hint">dialog</property>
+    <property name="can-focus">False</property>
+    <property name="type-hint">dialog</property>
     <signal name="response" handler="anastasis_gtk_b_post_dialog_response_cb" 
swapped="no"/>
-    <child type="titlebar">
-      <object class="GtkLabel">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Add post 
authentication</property>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget 
response="-6">anastasis_gtk_b_post_dialog_btn_cancel</action-widget>
-      <action-widget 
response="-5">anastasis_gtk_b_post_dialog_btn_ok</action-widget>
-    </action-widgets>
     <child internal-child="vbox">
       <object class="GtkBox">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
+            <property name="can-focus">False</property>
+            <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" 
id="anastasis_gtk_b_post_dialog_btn_cancel">
                 <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-                <property name="always_show_image">True</property>
+                <property name="can-focus">False</property>
+                <property name="receives-default">False</property>
+                <property name="use-stock">True</property>
+                <property name="always-show-image">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -46,12 +61,12 @@
                 <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
-                <property name="can_focus">False</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-                <property name="always_show_image">True</property>
+                <property name="can-focus">False</property>
+                <property name="can-default">True</property>
+                <property name="has-default">True</property>
+                <property name="receives-default">False</property>
+                <property name="use-stock">True</property>
+                <property name="always-show-image">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -69,13 +84,13 @@
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="orientation">vertical</property>
             <property name="spacing">5</property>
             <child>
               <object class="GtkSeparator">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -86,13 +101,13 @@
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes">_Full 
name:</property>
-                    <property name="use_underline">True</property>
+                    <property name="use-underline">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -104,10 +119,10 @@
                 <child>
                   <object class="GtkEntry" 
id="anastasis_gtk_b_post_dialog_full_name_entry">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="has_focus">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="has-focus">True</property>
                     <property name="hexpand">True</property>
-                    <property name="activates_default">True</property>
+                    <property name="activates-default">True</property>
                     <signal name="changed" 
handler="anastasis_gtk_b_post_dialog_entry_changed_cb" swapped="no"/>
                   </object>
                   <packing>
@@ -127,13 +142,13 @@
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" 
translatable="yes">_Street:</property>
-                    <property name="use_underline">True</property>
+                    <property name="use-underline">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -145,9 +160,9 @@
                 <child>
                   <object class="GtkEntry" 
id="anastasis_gtk_b_post_dialog_street_entry">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="can-focus">True</property>
                     <property name="hexpand">True</property>
-                    <property name="activates_default">True</property>
+                    <property name="activates-default">True</property>
                     <signal name="changed" 
handler="anastasis_gtk_b_post_dialog_entry_changed_cb" swapped="no"/>
                   </object>
                   <packing>
@@ -167,13 +182,13 @@
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes">_City:</property>
-                    <property name="use_underline">True</property>
+                    <property name="use-underline">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -185,9 +200,9 @@
                 <child>
                   <object class="GtkEntry" 
id="anastasis_gtk_b_post_dialog_city_entry">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="can-focus">True</property>
                     <property name="hexpand">True</property>
-                    <property name="activates_default">True</property>
+                    <property name="activates-default">True</property>
                     <signal name="changed" 
handler="anastasis_gtk_b_post_dialog_entry_changed_cb" swapped="no"/>
                   </object>
                   <packing>
@@ -207,13 +222,13 @@
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" 
translatable="yes">_Postcode:</property>
-                    <property name="use_underline">True</property>
+                    <property name="use-underline">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -225,9 +240,9 @@
                 <child>
                   <object class="GtkEntry" 
id="anastasis_gtk_b_post_dialog_postcode_entry">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="can-focus">True</property>
                     <property name="hexpand">True</property>
-                    <property name="activates_default">True</property>
+                    <property name="activates-default">True</property>
                     <signal name="changed" 
handler="anastasis_gtk_b_post_dialog_entry_changed_cb" swapped="no"/>
                   </object>
                   <packing>
@@ -247,13 +262,13 @@
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" 
translatable="yes">Countr_y:</property>
-                    <property name="use_underline">True</property>
+                    <property name="use-underline">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -265,9 +280,9 @@
                 <child>
                   <object class="GtkEntry" 
id="anastasis_gtk_b_post_dialog_country_entry">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="can-focus">True</property>
                     <property name="hexpand">True</property>
-                    <property name="activates_default">True</property>
+                    <property name="activates-default">True</property>
                     <signal name="changed" 
handler="anastasis_gtk_b_post_dialog_entry_changed_cb" swapped="no"/>
                   </object>
                   <packing>
@@ -297,5 +312,16 @@
       <action-widget 
response="-6">anastasis_gtk_b_post_dialog_btn_cancel</action-widget>
       <action-widget 
response="-5">anastasis_gtk_b_post_dialog_btn_ok</action-widget>
     </action-widgets>
+    <child type="titlebar">
+      <object class="GtkLabel">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="label" translatable="yes">Add post 
authentication</property>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget 
response="-6">anastasis_gtk_b_post_dialog_btn_cancel</action-widget>
+      <action-widget 
response="-5">anastasis_gtk_b_post_dialog_btn_ok</action-widget>
+    </action-widgets>
   </object>
 </interface>
diff --git a/contrib/anastasis_gtk_auth_add_question.glade 
b/contrib/anastasis_gtk_auth_add_question.glade
index 2480ec8..3984a69 100644
--- a/contrib/anastasis_gtk_auth_add_question.glade
+++ b/contrib/anastasis_gtk_auth_add_question.glade
@@ -1,39 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 -->
+<!-- Generated with glade 3.38.2 
+
+Copyright (C) 2019-2021 Anastasis SARL
+
+This file is part of anastasis-gtk.
+
+anastasis-gtk is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+anastasis-gtk is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with anastasis-gtk.  If not, see <http://www.gnu.org/licenses/>.
+
+Author: Christian Grothoff
+
+-->
 <interface>
   <requires lib="gtk+" version="3.6"/>
+  <!-- interface-license-type gplv3 -->
+  <!-- interface-name anastasis-gtk -->
+  <!-- interface-description Key backup and recovery -->
+  <!-- interface-copyright 2019-2021 Anastasis SARL -->
+  <!-- interface-authors Christian Grothoff -->
   <object class="GtkDialog" id="anastasis_gtk_b_question_dialog">
-    <property name="can_focus">False</property>
-    <property name="type_hint">dialog</property>
+    <property name="can-focus">False</property>
+    <property name="type-hint">dialog</property>
     <signal name="response" 
handler="anastasis_gtk_b_question_dialog_response_cb" swapped="no"/>
-    <child type="titlebar">
-      <object class="GtkLabel">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Add security question 
authentication</property>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget 
response="-6">anastasis_gtk_b_question_dialog_btn_cancel</action-widget>
-      <action-widget 
response="-5">anastasis_gtk_b_question_dialog_btn_ok</action-widget>
-    </action-widgets>
     <child internal-child="vbox">
       <object class="GtkBox">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
+            <property name="can-focus">False</property>
+            <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" 
id="anastasis_gtk_b_question_dialog_btn_cancel">
                 <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-                <property name="always_show_image">True</property>
+                <property name="can-focus">False</property>
+                <property name="receives-default">False</property>
+                <property name="use-stock">True</property>
+                <property name="always-show-image">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -46,12 +61,12 @@
                 <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
-                <property name="can_focus">False</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-                <property name="always_show_image">True</property>
+                <property name="can-focus">False</property>
+                <property name="can-default">True</property>
+                <property name="has-default">True</property>
+                <property name="receives-default">False</property>
+                <property name="use-stock">True</property>
+                <property name="always-show-image">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -69,12 +84,12 @@
         <child>
           <object class="GtkBox" id="question_vbox">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkSeparator">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -85,18 +100,18 @@
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkBox">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <child>
                       <object class="GtkLabel">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="label" translatable="yes">Security 
_question:</property>
-                        <property name="use_underline">True</property>
+                        <property name="use-underline">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -108,11 +123,11 @@
                     <child>
                       <object class="GtkEntry" 
id="anastasis_gtk_b_question_dialog_question_entry">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="can-focus">True</property>
                         <property name="hexpand">True</property>
-                        <property name="activates_default">True</property>
-                        <property name="width_chars">60</property>
-                        <property 
name="primary_icon_stock">gtk-dialog-question</property>
+                        <property name="activates-default">True</property>
+                        <property name="width-chars">60</property>
+                        <property 
name="primary-icon-stock">gtk-dialog-question</property>
                         <signal name="changed" 
handler="anastasis_gtk_b_question_dialog_question_entry_changed_cb" 
swapped="no"/>
                       </object>
                       <packing>
@@ -133,13 +148,13 @@
                 <child>
                   <object class="GtkBox" id="private_hbox">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin_left">10</property>
-                    <property name="margin_right">10</property>
+                    <property name="can-focus">False</property>
+                    <property name="margin-left">10</property>
+                    <property name="margin-right">10</property>
                     <child>
                       <object class="GtkLabel" id="privacy_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="label" translatable="yes">This stays 
private</property>
                       </object>
                       <packing>
@@ -151,10 +166,10 @@
                     </child>
                     <child>
                       <object class="GtkImage" id="blindfold_image">
-                        <property name="width_request">24</property>
-                        <property name="height_request">24</property>
+                        <property name="width-request">24</property>
+                        <property name="height-request">24</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property 
name="pixbuf">noun_blindfold_3574196.svg</property>
                       </object>
                       <packing>
@@ -184,7 +199,7 @@
             <child>
               <object class="GtkSeparator">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -203,18 +218,18 @@
         <child>
           <object class="GtkBox" id="answer_vbox">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" 
translatable="yes">_Answer:</property>
-                    <property name="use_underline">True</property>
+                    <property name="use-underline">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -226,11 +241,11 @@
                 <child>
                   <object class="GtkEntry" 
id="anastasis_gtk_b_question_dialog_answer_entry">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="can-focus">True</property>
                     <property name="hexpand">True</property>
-                    <property name="activates_default">True</property>
-                    <property name="width_chars">60</property>
-                    <property 
name="primary_icon_stock">gtk-dialog-authentication</property>
+                    <property name="activates-default">True</property>
+                    <property name="width-chars">60</property>
+                    <property 
name="primary-icon-stock">gtk-dialog-authentication</property>
                     <signal name="changed" 
handler="anastasis_gtk_b_question_dialog_answer_entry_changed_cb" swapped="no"/>
                   </object>
                   <packing>
@@ -251,13 +266,13 @@
             <child>
               <object class="GtkBox" id="private_hbox1">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_left">10</property>
-                <property name="margin_right">10</property>
+                <property name="can-focus">False</property>
+                <property name="margin-left">10</property>
+                <property name="margin-right">10</property>
                 <child>
                   <object class="GtkLabel" id="privacy_label1">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes">This stays 
private</property>
                   </object>
                   <packing>
@@ -269,10 +284,10 @@
                 </child>
                 <child>
                   <object class="GtkImage" id="blindfold_image1">
-                    <property name="width_request">24</property>
-                    <property name="height_request">24</property>
+                    <property name="width-request">24</property>
+                    <property name="height-request">24</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property 
name="pixbuf">noun_blindfold_3574196.svg</property>
                   </object>
                   <packing>
@@ -306,5 +321,16 @@
       <action-widget 
response="-6">anastasis_gtk_b_question_dialog_btn_cancel</action-widget>
       <action-widget 
response="-5">anastasis_gtk_b_question_dialog_btn_ok</action-widget>
     </action-widgets>
+    <child type="titlebar">
+      <object class="GtkLabel">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="label" translatable="yes">Add security question 
authentication</property>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget 
response="-6">anastasis_gtk_b_question_dialog_btn_cancel</action-widget>
+      <action-widget 
response="-5">anastasis_gtk_b_question_dialog_btn_ok</action-widget>
+    </action-widgets>
   </object>
 </interface>
diff --git a/contrib/anastasis_gtk_auth_add_sms.glade 
b/contrib/anastasis_gtk_auth_add_sms.glade
index 0b37dc3..f6ad2f7 100644
--- a/contrib/anastasis_gtk_auth_add_sms.glade
+++ b/contrib/anastasis_gtk_auth_add_sms.glade
@@ -1,39 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 -->
+<!-- Generated with glade 3.38.2 
+
+Copyright (C) 2019-2021 Anastasis SARL
+
+This file is part of anastasis-gtk.
+
+anastasis-gtk is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+anastasis-gtk is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with anastasis-gtk.  If not, see <http://www.gnu.org/licenses/>.
+
+Author: Christian Grothoff
+
+-->
 <interface>
   <requires lib="gtk+" version="3.6"/>
+  <!-- interface-license-type gplv3 -->
+  <!-- interface-name anastasis-gtk -->
+  <!-- interface-description Key backup and recovery -->
+  <!-- interface-copyright 2019-2021 Anastasis SARL -->
+  <!-- interface-authors Christian Grothoff -->
   <object class="GtkDialog" id="anastasis_gtk_b_sms_dialog">
-    <property name="can_focus">False</property>
-    <property name="type_hint">dialog</property>
+    <property name="can-focus">False</property>
+    <property name="type-hint">dialog</property>
     <signal name="response" handler="anastasis_gtk_b_sms_dialog_response_cb" 
swapped="no"/>
-    <child type="titlebar">
-      <object class="GtkLabel">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Add sms 
authentication</property>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget 
response="-6">anastasis_gtk_b_sms_dialog_btn_cancel</action-widget>
-      <action-widget 
response="-5">anastasis_gtk_b_sms_dialog_btn_ok</action-widget>
-    </action-widgets>
     <child internal-child="vbox">
       <object class="GtkBox">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
+            <property name="can-focus">False</property>
+            <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" 
id="anastasis_gtk_b_sms_dialog_btn_cancel">
                 <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-                <property name="always_show_image">True</property>
+                <property name="can-focus">False</property>
+                <property name="receives-default">False</property>
+                <property name="use-stock">True</property>
+                <property name="always-show-image">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -46,12 +61,12 @@
                 <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
-                <property name="can_focus">False</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-                <property name="always_show_image">True</property>
+                <property name="can-focus">False</property>
+                <property name="can-default">True</property>
+                <property name="has-default">True</property>
+                <property name="receives-default">False</property>
+                <property name="use-stock">True</property>
+                <property name="always-show-image">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -69,16 +84,16 @@
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes">Phone 
number:</property>
                   </object>
                   <packing>
@@ -91,13 +106,13 @@
                 <child>
                   <object class="GtkEntry" 
id="anastasis_gtk_b_sms_dialog_phonenumber_entry">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="can-focus">True</property>
                     <property name="hexpand">True</property>
-                    <property name="activates_default">True</property>
-                    <property name="width_chars">24</property>
-                    <property 
name="primary_icon_stock">gtk-dialog-authentication</property>
-                    <property name="placeholder_text" 
translatable="yes">+41123456789</property>
-                    <property name="input_purpose">phone</property>
+                    <property name="activates-default">True</property>
+                    <property name="width-chars">24</property>
+                    <property 
name="primary-icon-stock">gtk-dialog-authentication</property>
+                    <property name="placeholder-text" 
translatable="yes">+41123456789</property>
+                    <property name="input-purpose">phone</property>
                     <signal name="changed" 
handler="anastasis_gtk_b_sms_dialog_phonenumber_entry_changed_cb" swapped="no"/>
                   </object>
                   <packing>
@@ -128,5 +143,16 @@
       <action-widget 
response="-6">anastasis_gtk_b_sms_dialog_btn_cancel</action-widget>
       <action-widget 
response="-5">anastasis_gtk_b_sms_dialog_btn_ok</action-widget>
     </action-widgets>
+    <child type="titlebar">
+      <object class="GtkLabel">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="label" translatable="yes">Add sms 
authentication</property>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget 
response="-6">anastasis_gtk_b_sms_dialog_btn_cancel</action-widget>
+      <action-widget 
response="-5">anastasis_gtk_b_sms_dialog_btn_ok</action-widget>
+    </action-widgets>
   </object>
 </interface>
diff --git a/contrib/anastasis_gtk_auth_add_video.glade 
b/contrib/anastasis_gtk_auth_add_video.glade
index 46f49c9..5524075 100644
--- a/contrib/anastasis_gtk_auth_add_video.glade
+++ b/contrib/anastasis_gtk_auth_add_video.glade
@@ -1,40 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 -->
+<!-- Generated with glade 3.38.2 
+
+Copyright (C) 2019-2021 Anastasis SARL
+
+This file is part of anastasis-gtk.
+
+anastasis-gtk is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+anastasis-gtk is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with anastasis-gtk.  If not, see <http://www.gnu.org/licenses/>.
+
+Author: Christian Grothoff
+
+-->
 <interface>
   <requires lib="gtk+" version="3.6"/>
+  <!-- interface-license-type gplv3 -->
+  <!-- interface-name anastasis-gtk -->
+  <!-- interface-description key backup and recovery -->
+  <!-- interface-copyright 2019-2021 Anastasis SARL -->
+  <!-- interface-authors Christian Grothoff -->
   <object class="GtkDialog" id="anastasis_gtk_b_video_dialog">
-    <property name="can_focus">False</property>
-    <property name="type_hint">dialog</property>
-    <child type="titlebar">
-      <object class="GtkLabel">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Add video 
authentication</property>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget 
response="-6">anastasis_gtk_b_video_dialog_btn_cancel</action-widget>
-      <action-widget 
response="-5">anastasis_gtk_b_video_dialog_btn_ok</action-widget>
-    </action-widgets>
+    <property name="can-focus">False</property>
+    <property name="type-hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
+            <property name="can-focus">False</property>
+            <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" 
id="anastasis_gtk_b_video_dialog_btn_cancel">
                 <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-                <property name="always_show_image">True</property>
+                <property name="can-focus">True</property>
+                <property name="can-default">True</property>
+                <property name="has-default">True</property>
+                <property name="receives-default">True</property>
+                <property name="use-stock">True</property>
+                <property name="always-show-image">True</property>
                 <signal name="clicked" 
handler="anastasis_gtk_b_video_dialog_btn_cancel_clicked_cb" swapped="no"/>
               </object>
               <packing>
@@ -48,12 +63,12 @@
                 <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-                <property name="always_show_image">True</property>
+                <property name="can-focus">True</property>
+                <property name="can-default">True</property>
+                <property name="has-default">True</property>
+                <property name="receives-default">True</property>
+                <property name="use-stock">True</property>
+                <property name="always-show-image">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -71,7 +86,7 @@
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -82,11 +97,11 @@
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes">Choose a 
photo:</property>
                   </object>
                   <packing>
@@ -99,8 +114,8 @@
                 <child>
                   <object class="GtkFileChooserButton">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="has_focus">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="has-focus">True</property>
                     <property name="title" translatable="yes"/>
                   </object>
                   <packing>
@@ -120,7 +135,7 @@
             </child>
             <child>
               <object class="GtkImage">
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="stock">gtk-missing-image</property>
               </object>
               <packing>
@@ -142,5 +157,16 @@
       <action-widget 
response="-6">anastasis_gtk_b_video_dialog_btn_cancel</action-widget>
       <action-widget 
response="-5">anastasis_gtk_b_video_dialog_btn_ok</action-widget>
     </action-widgets>
+    <child type="titlebar">
+      <object class="GtkLabel">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="label" translatable="yes">Add video 
authentication</property>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget 
response="-6">anastasis_gtk_b_video_dialog_btn_cancel</action-widget>
+      <action-widget 
response="-5">anastasis_gtk_b_video_dialog_btn_ok</action-widget>
+    </action-widgets>
   </object>
 </interface>
diff --git a/contrib/anastasis_gtk_challenge_code.glade 
b/contrib/anastasis_gtk_challenge_code.glade
index ca492c6..11de07b 100644
--- a/contrib/anastasis_gtk_challenge_code.glade
+++ b/contrib/anastasis_gtk_challenge_code.glade
@@ -1,39 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 -->
+<!-- Generated with glade 3.38.2 
+
+Copyright (C) 2019-2021 Anastasis SARL
+
+This file is part of anastasis-gtk.
+
+anastasis-gtk is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+anastasis-gtk is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with anastasis-gtk.  If not, see <http://www.gnu.org/licenses/>.
+
+Author: Christian Grothoff
+
+-->
 <interface>
   <requires lib="gtk+" version="3.6"/>
+  <!-- interface-license-type gplv3 -->
+  <!-- interface-name anastasis-gtk -->
+  <!-- interface-description key backup and recovery -->
+  <!-- interface-copyright 2019-2021 Anastasis SARL -->
+  <!-- interface-authors Christian Grothoff -->
   <object class="GtkDialog" id="anastasis_gtk_c_code_dialog">
-    <property name="can_focus">False</property>
-    <property name="type_hint">dialog</property>
+    <property name="can-focus">False</property>
+    <property name="type-hint">dialog</property>
     <signal name="response" handler="anastasis_gtk_c_code_dialog_response_cb" 
swapped="no"/>
-    <child type="titlebar">
-      <object class="GtkLabel" id="anastasis_gtk_c_code_dialog_label">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Security token 
challenge</property>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget 
response="-6">anastasis_gtk_c_code_dialog_btn_cancel</action-widget>
-      <action-widget 
response="-5">anastasis_gtk_c_code_dialog_btn_ok</action-widget>
-    </action-widgets>
     <child internal-child="vbox">
       <object class="GtkBox">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
+            <property name="can-focus">False</property>
+            <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" 
id="anastasis_gtk_c_code_dialog_btn_cancel">
                 <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>
-                <property name="always_show_image">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
+                <property name="use-stock">True</property>
+                <property name="always-show-image">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -46,10 +61,10 @@
                 <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
-                <property name="can_focus">False</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-                <property name="always_show_image">True</property>
+                <property name="can-focus">False</property>
+                <property name="receives-default">True</property>
+                <property name="use-stock">True</property>
+                <property name="always-show-image">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -66,7 +81,7 @@
         </child>
         <child>
           <object class="GtkLabel" id="anastasis_gtk_c_code_error_label">
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="label">ERROR MESSAGE (SET DYNAMICALLY BY 
PROGRAM)</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -83,11 +98,11 @@
         <child>
           <object class="GtkBox" id="anastasis_gtk_c_challenge_box">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <child>
               <object class="GtkLabel" 
id="anastasis_gtk_c_challenge_pre_label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes">Challenge:</property>
               </object>
               <packing>
@@ -100,7 +115,7 @@
             <child>
               <object class="GtkLabel" id="anastasis_gtk_c_challenge_label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label">SET DYNAMICALLY BY PROGRAM</property>
                 <attributes>
                   <attribute name="style" value="italic"/>
@@ -122,12 +137,12 @@
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkSeparator">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -138,11 +153,11 @@
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes">Code sent 
to:</property>
                   </object>
                   <packing>
@@ -155,7 +170,7 @@
                 <child>
                   <object class="GtkLabel" id="challenge_instructions_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label">SET DYNAMICALLY BY 
PROGRAM</property>
                     <attributes>
                       <attribute name="style" value="italic"/>
@@ -178,7 +193,7 @@
             <child>
               <object class="GtkSeparator">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -196,11 +211,11 @@
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <child>
               <object class="GtkLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes">Enter the 
code:</property>
               </object>
               <packing>
@@ -213,12 +228,12 @@
             <child>
               <object class="GtkEntry" id="anastasis_gtk_c_code_entry">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can-focus">True</property>
                 <property name="hexpand">True</property>
-                <property name="width_chars">24</property>
+                <property name="width-chars">24</property>
                 <property name="text">A-</property>
-                <property 
name="primary_icon_stock">gtk-dialog-authentication</property>
-                <property name="placeholder_text" 
translatable="yes">A-</property>
+                <property 
name="primary-icon-stock">gtk-dialog-authentication</property>
+                <property name="placeholder-text" 
translatable="yes">A-</property>
                 <signal name="changed" 
handler="anastasis_gtk_c_code_dialog_answer_entry_changed_cb" swapped="no"/>
               </object>
               <packing>
@@ -242,5 +257,16 @@
       <action-widget 
response="-6">anastasis_gtk_c_code_dialog_btn_cancel</action-widget>
       <action-widget 
response="-5">anastasis_gtk_c_code_dialog_btn_ok</action-widget>
     </action-widgets>
+    <child type="titlebar">
+      <object class="GtkLabel" id="anastasis_gtk_c_code_dialog_label">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="label" translatable="yes">Security token 
challenge</property>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget 
response="-6">anastasis_gtk_c_code_dialog_btn_cancel</action-widget>
+      <action-widget 
response="-5">anastasis_gtk_c_code_dialog_btn_ok</action-widget>
+    </action-widgets>
   </object>
 </interface>
diff --git a/contrib/anastasis_gtk_challenge_question.glade 
b/contrib/anastasis_gtk_challenge_question.glade
index fd5d11e..97cc1ec 100644
--- a/contrib/anastasis_gtk_challenge_question.glade
+++ b/contrib/anastasis_gtk_challenge_question.glade
@@ -1,39 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 -->
+<!-- Generated with glade 3.38.2 
+
+Copyright (C) 2019-2021 Anastasis SARL
+
+This file is part of anastasis-gtk.
+
+anastasis-gtk is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+anastasis-gtk is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with anastasis-gtk.  If not, see <http://www.gnu.org/licenses/>.
+
+Author: Christian Grothoff
+
+-->
 <interface>
   <requires lib="gtk+" version="3.6"/>
+  <!-- interface-license-type gplv3 -->
+  <!-- interface-name anastasis-gtk -->
+  <!-- interface-description key backup and recovery  -->
+  <!-- interface-copyright 2019-2021 Anastasis SARL -->
+  <!-- interface-authors Christian Grothoff -->
   <object class="GtkDialog" id="anastasis_gtk_c_question_dialog">
-    <property name="can_focus">False</property>
-    <property name="type_hint">dialog</property>
+    <property name="can-focus">False</property>
+    <property name="type-hint">dialog</property>
     <signal name="response" 
handler="anastasis_gtk_c_question_dialog_response_cb" swapped="no"/>
-    <child type="titlebar">
-      <object class="GtkLabel">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Solve secuity question 
challenge</property>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget 
response="-6">anastasis_gtk_b_question_dialog_btn_cancel</action-widget>
-      <action-widget 
response="-5">anastasis_gtk_c_question_dialog_btn_ok</action-widget>
-    </action-widgets>
     <child internal-child="vbox">
       <object class="GtkBox">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
+            <property name="can-focus">False</property>
+            <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" 
id="anastasis_gtk_b_question_dialog_btn_cancel">
                 <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-                <property name="always_show_image">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
+                <property name="use-stock">True</property>
+                <property name="always-show-image">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -46,12 +61,12 @@
                 <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
-                <property name="can_focus">False</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-                <property name="always_show_image">True</property>
+                <property name="can-focus">False</property>
+                <property name="can-default">True</property>
+                <property name="has-default">True</property>
+                <property name="receives-default">False</property>
+                <property name="use-stock">True</property>
+                <property name="always-show-image">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -68,7 +83,7 @@
         </child>
         <child>
           <object class="GtkLabel" id="anastasis_gtk_c_question_error_label">
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="label">ERROR MESSAGE (SET DYNAMICALLY BY 
PROGRAM)</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -85,12 +100,12 @@
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkSeparator">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -101,11 +116,11 @@
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes">Security 
question:</property>
                   </object>
                   <packing>
@@ -118,7 +133,7 @@
                 <child>
                   <object class="GtkLabel" id="security_question_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label">SET DYNAMICALLY BY 
PROGRAM</property>
                     <attributes>
                       <attribute name="style" value="italic"/>
@@ -141,7 +156,7 @@
             <child>
               <object class="GtkSeparator">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -159,11 +174,11 @@
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <child>
               <object class="GtkLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes">Answer:</property>
               </object>
               <packing>
@@ -176,11 +191,11 @@
             <child>
               <object class="GtkEntry" 
id="anastasis_gtk_c_question_dialog_answer_entry">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can-focus">True</property>
                 <property name="hexpand">True</property>
-                <property name="activates_default">True</property>
-                <property name="width_chars">60</property>
-                <property 
name="primary_icon_stock">gtk-dialog-authentication</property>
+                <property name="activates-default">True</property>
+                <property name="width-chars">60</property>
+                <property 
name="primary-icon-stock">gtk-dialog-authentication</property>
                 <signal name="changed" 
handler="anastasis_gtk_c_question_dialog_answer_entry_changed_cb" swapped="no"/>
               </object>
               <packing>
@@ -204,5 +219,16 @@
       <action-widget 
response="-6">anastasis_gtk_b_question_dialog_btn_cancel</action-widget>
       <action-widget 
response="-5">anastasis_gtk_c_question_dialog_btn_ok</action-widget>
     </action-widgets>
+    <child type="titlebar">
+      <object class="GtkLabel">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="label" translatable="yes">Solve secuity question 
challenge</property>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget 
response="-6">anastasis_gtk_b_question_dialog_btn_cancel</action-widget>
+      <action-widget 
response="-5">anastasis_gtk_c_question_dialog_btn_ok</action-widget>
+    </action-widgets>
   </object>
 </interface>
diff --git a/contrib/anastasis_gtk_edit_policy.glade 
b/contrib/anastasis_gtk_edit_policy.glade
index 58194b4..c2d538c 100644
--- a/contrib/anastasis_gtk_edit_policy.glade
+++ b/contrib/anastasis_gtk_edit_policy.glade
@@ -1,46 +1,69 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 -->
+<!-- Generated with glade 3.38.2 
+
+Copyright (C) 2019-2021 Anastasis SARL
+
+This file is part of anastasis-gtk.
+
+anastasis-gtk is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+anastasis-gtk is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with anastasis-gtk.  If not, see <http://www.gnu.org/licenses/>.
+
+Author: Christian Grothoff
+
+-->
 <interface>
   <requires lib="gtk+" version="3.24"/>
+  <!-- interface-license-type gplv3 -->
+  <!-- interface-name anastasis-gtk -->
+  <!-- interface-description key backup and recovery -->
+  <!-- interface-copyright 2019-2021 Anastasis SARL -->
+  <!-- interface-authors Christian Grothoff -->
   <object class="GtkAdjustment" id="adjustment_h">
     <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment_v">
     <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
   </object>
   <object class="GtkDialog" id="anastasis_gtk_policy_edit_dialog">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="title" translatable="yes">Edit policy</property>
     <property name="modal">True</property>
-    <property name="window_position">center</property>
-    <property name="type_hint">dialog</property>
+    <property name="window-position">center</property>
+    <property name="type-hint">dialog</property>
     <property name="gravity">center</property>
     <signal name="response" 
handler="anastasis_gtk_policy_edit_dialog_response_cb" swapped="no"/>
-    <child type="titlebar">
-      <placeholder/>
-    </child>
     <child internal-child="vbox">
       <object class="GtkBox">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
+            <property name="can-focus">False</property>
+            <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="cancel_button">
                 <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>
-                <property name="always_show_image">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
+                <property name="use-stock">True</property>
+                <property name="always-show-image">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -53,10 +76,10 @@
                 <property name="label">gtk-ok</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="use_stock">True</property>
-                <property name="always_show_image">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
+                <property name="use-stock">True</property>
+                <property name="always-show-image">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -74,14 +97,14 @@
         <child>
           <object class="GtkBox" id="edit_dialog_vbox">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkLabel" id="edit_frame_label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes">Map challenges to 
providers to select them!</property>
                 <property name="justify">center</property>
                 <attributes>
@@ -98,57 +121,79 @@
             <child>
               <object class="GtkScrolledWindow" id="policy_scrolled_window">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can-focus">True</property>
                 <property name="hadjustment">adjustment_h</property>
                 <property name="vadjustment">adjustment_v</property>
-                <property name="shadow_type">in</property>
-                <property name="propagate_natural_width">True</property>
-                <property name="propagate_natural_height">True</property>
+                <property name="shadow-type">in</property>
+                <property name="propagate-natural-width">True</property>
+                <property name="propagate-natural-height">True</property>
                 <child>
                   <object class="GtkViewport" id="grid_viewport">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="hadjustment">adjustment_h</property>
                     <property name="vadjustment">adjustment_v</property>
                     <child>
+                      <!-- n-columns=3 n-rows=3 -->
                       <object class="GtkGrid" id="policy_grid">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_top">5</property>
-                        <property name="margin_bottom">5</property>
-                        <property name="row_spacing">10</property>
-                        <property name="column_spacing">5</property>
-                        <property name="row_homogeneous">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-top">5</property>
+                        <property name="margin-bottom">5</property>
+                        <property name="row-spacing">10</property>
+                        <property name="column-spacing">5</property>
+                        <property name="row-homogeneous">True</property>
                         <child>
                           <object class="GtkLabel" id="methods_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_left">5</property>
-                            <property name="margin_right">5</property>
+                            <property name="can-focus">False</property>
+                            <property name="margin-left">5</property>
+                            <property name="margin-right">5</property>
                             <property name="label" 
translatable="yes">Authentication method</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="provider_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="label" 
translatable="yes">Anastasis provider</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">0</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
                       </object>
                     </child>
                   </object>
diff --git a/contrib/anastasis_gtk_edit_providers.glade 
b/contrib/anastasis_gtk_edit_providers.glade
index 313830f..5f520fa 100644
--- a/contrib/anastasis_gtk_edit_providers.glade
+++ b/contrib/anastasis_gtk_edit_providers.glade
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 
+<!-- Generated with glade 3.38.2 
 
-Copyright (C) Anastasis SARL
+Copyright (C) 2019-2021 Anastasis SARL
 
 This file is part of Anastasis-gtk.
 
@@ -18,12 +18,15 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with Anastasis-gtk.  If not, see <http://www.gnu.org/licenses/>.
 
+Author: Christian Grothoff
+
 -->
 <interface>
   <requires lib="gtk+" version="3.6"/>
   <!-- interface-license-type lgplv3 -->
   <!-- interface-name Anastasis-gtk -->
-  <!-- interface-copyright Anastasis SARL -->
+  <!-- interface-copyright 2019-2021 Anastasis SARL -->
+  <!-- interface-authors Christian Grothoff -->
   <object class="GtkListStore" id="provider_liststore">
     <columns>
       <!-- column-name url -->
@@ -35,41 +38,30 @@ along with Anastasis-gtk.  If not, see 
<http://www.gnu.org/licenses/>.
     </columns>
   </object>
   <object class="GtkDialog" id="edit_provider_dialog">
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="modal">True</property>
-    <property name="window_position">center</property>
-    <property name="type_hint">dialog</property>
+    <property name="window-position">center</property>
+    <property name="type-hint">dialog</property>
     <signal name="response" handler="edit_provider_dialog_response_cb" 
swapped="no"/>
-    <child type="titlebar">
-      <object class="GtkLabel">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Add Anastasis 
provider</property>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-6">cancel_button</action-widget>
-      <action-widget response="-10">close_button</action-widget>
-    </action-widgets>
     <child internal-child="vbox">
       <object class="GtkBox">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
+            <property name="can-focus">False</property>
+            <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="cancel_button">
                 <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-                <property name="always_show_image">True</property>
+                <property name="can-focus">False</property>
+                <property name="receives-default">False</property>
+                <property name="use-stock">True</property>
+                <property name="always-show-image">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -81,10 +73,10 @@ along with Anastasis-gtk.  If not, see 
<http://www.gnu.org/licenses/>.
               <object class="GtkButton" id="close_button">
                 <property name="label">gtk-apply</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-                <property name="always_show_image">True</property>
+                <property name="can-focus">False</property>
+                <property name="receives-default">False</property>
+                <property name="use-stock">True</property>
+                <property name="always-show-image">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -102,17 +94,17 @@ along with Anastasis-gtk.  If not, see 
<http://www.gnu.org/licenses/>.
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="can-focus">True</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can-focus">True</property>
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin_left">10</property>
+                    <property name="can-focus">False</property>
+                    <property name="margin-left">10</property>
                     <property name="label" translatable="yes">Provider 
URL:</property>
                   </object>
                   <packing>
@@ -125,15 +117,15 @@ along with Anastasis-gtk.  If not, see 
<http://www.gnu.org/licenses/>.
                 <child>
                   <object class="GtkEntry" id="url_entry">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="has_focus">True</property>
-                    <property name="is_focus">True</property>
-                    <property name="activates_default">True</property>
-                    <property name="width_chars">54</property>
-                    <property name="primary_icon_stock">gtk-edit</property>
-                    <property 
name="secondary_icon_activatable">False</property>
-                    <property name="secondary_icon_sensitive">False</property>
-                    <property name="placeholder_text" 
translatable="yes">https://</property>
+                    <property name="can-focus">True</property>
+                    <property name="has-focus">True</property>
+                    <property name="is-focus">True</property>
+                    <property name="activates-default">True</property>
+                    <property name="width-chars">54</property>
+                    <property name="primary-icon-stock">gtk-edit</property>
+                    <property 
name="secondary-icon-activatable">False</property>
+                    <property name="secondary-icon-sensitive">False</property>
+                    <property name="placeholder-text" 
translatable="yes">https://</property>
                     <signal name="changed" handler="url_entry_changed_cb" 
swapped="no"/>
                   </object>
                   <packing>
@@ -148,11 +140,11 @@ along with Anastasis-gtk.  If not, see 
<http://www.gnu.org/licenses/>.
                     <property name="label">gtk-add</property>
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
-                    <property name="can_focus">False</property>
-                    <property name="can_default">True</property>
-                    <property name="has_default">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="use_stock">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="can-default">True</property>
+                    <property name="has-default">True</property>
+                    <property name="receives-default">True</property>
+                    <property name="use-stock">True</property>
                     <signal name="clicked" handler="url_add_button_clicked_cb" 
swapped="no"/>
                   </object>
                   <packing>
@@ -172,28 +164,28 @@ along with Anastasis-gtk.  If not, see 
<http://www.gnu.org/licenses/>.
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
                   <object class="GtkFrame">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin_top">10</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
+                    <property name="can-focus">False</property>
+                    <property name="margin-top">10</property>
+                    <property name="label-xalign">0</property>
+                    <property name="shadow-type">none</property>
                     <child>
                       <object class="GtkAlignment">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="left_padding">12</property>
+                        <property name="can-focus">False</property>
+                        <property name="left-padding">12</property>
                         <child>
                           <object class="GtkViewport">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <child>
                               <object class="GtkTreeView" 
id="provider_tree_view">
-                                <property name="height_request">300</property>
+                                <property name="height-request">300</property>
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <property 
name="model">provider_liststore</property>
                                 <child internal-child="selection">
                                   <object class="GtkTreeSelection">
@@ -233,7 +225,7 @@ along with Anastasis-gtk.  If not, see 
<http://www.gnu.org/licenses/>.
                     <child type="label">
                       <object class="GtkLabel">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="label" translatable="yes">Known 
providers</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
@@ -268,5 +260,16 @@ along with Anastasis-gtk.  If not, see 
<http://www.gnu.org/licenses/>.
       <action-widget response="-6">cancel_button</action-widget>
       <action-widget response="-10">close_button</action-widget>
     </action-widgets>
+    <child type="titlebar">
+      <object class="GtkLabel">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="label" translatable="yes">Add Anastasis 
provider</property>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-6">cancel_button</action-widget>
+      <action-widget response="-10">close_button</action-widget>
+    </action-widgets>
   </object>
 </interface>
diff --git a/contrib/anastasis_gtk_main_window.glade 
b/contrib/anastasis_gtk_main_window.glade
index 9ae07be..a0ec921 100644
--- a/contrib/anastasis_gtk_main_window.glade
+++ b/contrib/anastasis_gtk_main_window.glade
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 
+<!-- Generated with glade 3.38.2 
 
-Copyright (C) Anastasis SARL
+Copyright (C) 2019-2021 Anastasis SARL
 
 This file is part of anastasis-gtk.
 
@@ -21,16 +21,16 @@ along with anastasis-gtk.  If not, see 
<http://www.gnu.org/licenses/>.
 Author: Christian Grothoff, Dennis Neufeld
 
 -->
-<interface domain="anastasis">
+<interface domain="">
   <requires lib="gtk+" version="3.22"/>
   <!-- interface-license-type gplv3 -->
   <!-- interface-name anastasis-gtk -->
   <!-- interface-description Key backup and recovery -->
-  <!-- interface-copyright Anastasis SARL -->
+  <!-- interface-copyright 2019-2021 Anastasis SARL -->
   <!-- interface-authors Christian Grothoff, Dennis Neufeld -->
   <object class="GtkImage" id="add_image">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="stock">gtk-add</property>
   </object>
   <object class="GtkListStore" id="anastasis_gtk_backup_progress_liststore">
@@ -129,19 +129,19 @@ Author: Christian Grothoff, Dennis Neufeld
   </object>
   <object class="GtkAdjustment" id="backup_adjustmenth">
     <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
   </object>
   <object class="GtkAdjustment" id="backup_adjustmentv">
     <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
   </object>
   <object class="GtkImage" id="backup_image">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="margin_left">5</property>
-    <property name="margin_right">5</property>
+    <property name="can-focus">False</property>
+    <property name="margin-left">5</property>
+    <property name="margin-right">5</property>
     <property name="stock">gtk-go-up</property>
   </object>
   <object class="GtkListStore" id="backup_provider_liststore">
@@ -233,34 +233,34 @@ Author: Christian Grothoff, Dennis Neufeld
   </object>
   <object class="GtkImage" id="email_image">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="stock">gtk-missing-image</property>
   </object>
   <object class="GtkAdjustment" id="expiration_year_adjustment">
     <property name="upper">9999</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
   </object>
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="stock">gtk-yes</property>
   </object>
   <object class="GtkImage" id="image_question">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="stock">gtk-dialog-question</property>
   </object>
   <object class="GtkImage" id="open_file_image">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="stock">gtk-open</property>
   </object>
   <object class="GtkImage" id="open_image">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="margin_left">5</property>
-    <property name="margin_right">5</property>
+    <property name="can-focus">False</property>
+    <property name="margin-left">5</property>
+    <property name="margin-right">5</property>
     <property name="stock">gtk-open</property>
   </object>
   <object class="GtkTreeStore" id="policy_review_treestore">
@@ -287,43 +287,43 @@ Author: Christian Grothoff, Dennis Neufeld
   </object>
   <object class="GtkAdjustment" id="policy_version_adjustment">
     <property name="upper">4294967295</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
   </object>
   <object class="GtkEntryBuffer" id="provider_url_entrybuffer">
     <property name="text" translatable="yes">https://</property>
   </object>
   <object class="GtkAdjustment" id="recovery_adjustmenth">
     <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
   </object>
   <object class="GtkAdjustment" id="recovery_adjustmentv">
     <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
   </object>
   <object class="GtkImage" id="restart_image">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="stock">gtk-goto-first</property>
   </object>
   <object class="GtkImage" id="restore_image">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="margin_left">5</property>
-    <property name="margin_right">4</property>
+    <property name="can-focus">False</property>
+    <property name="margin-left">5</property>
+    <property name="margin-right">4</property>
     <property name="stock">gtk-go-down</property>
   </object>
   <object class="GtkAdjustment" id="secret_box_adjustmenth">
     <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
   </object>
   <object class="GtkAdjustment" id="secret_box_adjustmentv">
     <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
   </object>
   <object class="GtkListStore" id="unpaid_qrcodes_liststore">
     <columns>
@@ -337,45 +337,42 @@ Author: Christian Grothoff, Dennis Neufeld
   </object>
   <object class="GtkImage" id="video_image">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="stock">gtk-orientation-portrait</property>
   </object>
   <object class="GtkWindow" id="anastasis_gtk_main_window">
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="events">GDK_BUTTON_PRESS_MASK | 
GDK_STRUCTURE_MASK</property>
-    <property name="window_position">center</property>
-    <property name="default_width">700</property>
-    <property name="default_height">500</property>
+    <property name="window-position">center</property>
+    <property name="default-width">700</property>
+    <property name="default-height">500</property>
     <signal name="delete-event" handler="anastasis_gtk_quit_cb" swapped="no"/>
-    <child type="titlebar">
-      <placeholder/>
-    </child>
     <child>
       <object class="GtkBox" id="anastasis_gtk_main_vbox">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkMenuBar" id="anastasis_gtk_menubar">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <child>
               <object class="GtkMenuItem" id="anastasis_gtk_file_menuitem">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes">_File</property>
-                <property name="use_underline">True</property>
+                <property name="use-underline">True</property>
                 <child type="submenu">
                   <object class="GtkMenu" id="anastasis_gtk_file_menu">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <child>
                       <object class="GtkImageMenuItem" 
id="anastasis_quit_imagemenuitem">
                         <property name="label">gtk-quit</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="use-underline">True</property>
+                        <property name="use-stock">True</property>
                         <signal name="activate" 
handler="anastasis_gtk_quit_cb" swapped="no"/>
                       </object>
                     </child>
@@ -386,20 +383,20 @@ Author: Christian Grothoff, Dennis Neufeld
             <child>
               <object class="GtkMenuItem" id="anastasis_gtk_help_menuitem">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes">_Help</property>
-                <property name="use_underline">True</property>
+                <property name="use-underline">True</property>
                 <child type="submenu">
                   <object class="GtkMenu" id="anastasis_gtk_help_menu">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <child>
                       <object class="GtkImageMenuItem" 
id="anastasis_gtk_about_imagemenuitem">
                         <property name="label">gtk-about</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="use-underline">True</property>
+                        <property name="use-stock">True</property>
                         <signal name="activate" 
handler="anastasis_gtk_about_imagemenuitem_activate_cb" swapped="no"/>
                       </object>
                     </child>
@@ -407,9 +404,9 @@ Author: Christian Grothoff, Dennis Neufeld
                       <object class="GtkImageMenuItem" 
id="anastasis_gtk_animation">
                         <property name="label">Show animation</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="image">image1</property>
-                        <property name="use_stock">False</property>
+                        <property name="use-stock">False</property>
                         <signal name="activate" 
handler="anastasis_gtk_animation_activate_cb" swapped="no"/>
                       </object>
                     </child>
@@ -427,33 +424,33 @@ Author: Christian Grothoff, Dennis Neufeld
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <child>
               <object class="GtkBox" id="anastasis_gtk_progress_vbox">
-                <property name="can_focus">False</property>
-                <property name="margin_right">5</property>
+                <property name="can-focus">False</property>
+                <property name="margin-right">5</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">5</property>
                 <child>
                   <object class="GtkScrolledWindow" 
id="anastasis_gtk_backup_progress_scrolled_window">
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="hadjustment">backup_adjustmenth</property>
                     <property name="vadjustment">backup_adjustmentv</property>
-                    <property name="window_placement_set">False</property>
-                    <property name="shadow_type">in</property>
-                    <property name="propagate_natural_width">True</property>
+                    <property name="window-placement-set">False</property>
+                    <property name="shadow-type">in</property>
+                    <property name="propagate-natural-width">True</property>
                     <child>
                       <object class="GtkTreeView" 
id="anastasis_gtk_backup_progress_treeview">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property 
name="hadjustment">backup_adjustmenth</property>
                         <property 
name="vadjustment">backup_adjustmentv</property>
                         <property 
name="model">anastasis_gtk_backup_progress_liststore</property>
-                        <property name="headers_clickable">False</property>
-                        <property name="enable_search">False</property>
-                        <property name="search_column">0</property>
-                        <property name="show_expanders">False</property>
-                        <property name="tooltip_column">2</property>
+                        <property name="headers-clickable">False</property>
+                        <property name="enable-search">False</property>
+                        <property name="search-column">0</property>
+                        <property name="show-expanders">False</property>
+                        <property name="tooltip-column">2</property>
                         <signal name="button-press-event" 
handler="anastasis_gtk_backup_progress_treeview_button_press_event_cb" 
swapped="no"/>
                         <child internal-child="selection">
                           <object class="GtkTreeSelection" 
id="anastasis_gtk_backup_progress_tree_selection"/>
@@ -486,24 +483,24 @@ Author: Christian Grothoff, Dennis Neufeld
                 <child>
                   <object class="GtkScrolledWindow" 
id="anastasis_gtk_recovery_progress_scrolled_window">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="can-focus">True</property>
                     <property 
name="hadjustment">recovery_adjustmenth</property>
                     <property 
name="vadjustment">recovery_adjustmentv</property>
-                    <property name="window_placement_set">False</property>
-                    <property name="shadow_type">in</property>
-                    <property name="propagate_natural_width">True</property>
+                    <property name="window-placement-set">False</property>
+                    <property name="shadow-type">in</property>
+                    <property name="propagate-natural-width">True</property>
                     <child>
                       <object class="GtkTreeView" 
id="anastasis_gtk_recovery_progress_treeview">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property 
name="hadjustment">recovery_adjustmenth</property>
                         <property 
name="vadjustment">recovery_adjustmentv</property>
                         <property 
name="model">anastasis_gtk_recovery_progress_liststore</property>
-                        <property name="headers_clickable">False</property>
-                        <property name="enable_search">False</property>
-                        <property name="search_column">0</property>
-                        <property name="show_expanders">False</property>
-                        <property name="tooltip_column">2</property>
+                        <property name="headers-clickable">False</property>
+                        <property name="enable-search">False</property>
+                        <property name="search-column">0</property>
+                        <property name="show-expanders">False</property>
+                        <property name="tooltip-column">2</property>
                         <signal name="button-press-event" 
handler="anastasis_gtk_recovery_progress_treeview_button_press_event_cb" 
swapped="no"/>
                         <child internal-child="selection">
                           <object class="GtkTreeSelection" 
id="anastasis_gtk_recovery_progress_tree_selection"/>
@@ -544,29 +541,29 @@ Author: Christian Grothoff, Dennis Neufeld
             <child>
               <object class="GtkScrolledWindow" 
id="anastasis_gtk_scrolledwindow">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can-focus">True</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
                 <property name="hadjustment">recovery_adjustmentv</property>
-                <property name="shadow_type">in</property>
+                <property name="shadow-type">in</property>
                 <child>
                   <object class="GtkViewport" id="anastasis_gtk_viewport">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="vexpand">True</property>
                     <child>
                       <object class="GtkBox">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <child>
                           <object class="GtkBox" id="anastasis_gtk_super_vbox">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkLabel" 
id="anastasis_gtk_error_label">
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <property name="label">DYNAMIC ERROR 
MESSAGE</property>
                                 <attributes>
                                   <attribute name="weight" value="bold"/>
@@ -583,26 +580,26 @@ Author: Christian Grothoff, Dennis Neufeld
                             <child>
                               <object class="GtkAlignment" 
id="anastasis_gtk_start_frame">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="margin_left">10</property>
-                                <property name="left_padding">12</property>
+                                <property name="can-focus">False</property>
+                                <property name="margin-left">10</property>
+                                <property name="left-padding">12</property>
                                 <child>
                                   <object class="GtkBox" 
id="anastasis_gtk_primary_action_hbox">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
+                                    <property name="can-focus">False</property>
                                     <property name="halign">center</property>
-                                    <property name="margin_left">10</property>
-                                    <property name="margin_right">10</property>
-                                    <property name="margin_start">10</property>
-                                    <property name="margin_end">10</property>
-                                    <property name="margin_top">10</property>
-                                    <property 
name="margin_bottom">10</property>
+                                    <property name="margin-left">10</property>
+                                    <property name="margin-right">10</property>
+                                    <property name="margin-start">10</property>
+                                    <property name="margin-end">10</property>
+                                    <property name="margin-top">10</property>
+                                    <property 
name="margin-bottom">10</property>
                                     <property 
name="orientation">vertical</property>
                                     <property name="spacing">20</property>
                                     <child>
                                       <object class="GtkLabel">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
+                                        <property 
name="can-focus">False</property>
                                         <property 
name="halign">center</property>
                                         <property name="label" 
translatable="yes">What do you want to do?</property>
                                         <property 
name="justify">center</property>
@@ -622,12 +619,12 @@ Author: Christian Grothoff, Dennis Neufeld
                                       <object class="GtkButton" 
id="anastasis_gtk_backup_button">
                                         <property name="label" 
translatable="yes">_Back up a secret</property>
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">True</property>
-                                        <property 
name="receives_default">True</property>
-                                        <property name="tooltip_text" 
translatable="yes">Begin fresh backup process</property>
+                                        <property 
name="can-focus">True</property>
+                                        <property 
name="receives-default">True</property>
+                                        <property name="tooltip-text" 
translatable="yes">Begin fresh backup process</property>
                                         <property 
name="image">backup_image</property>
-                                        <property 
name="use_underline">True</property>
-                                        <property 
name="always_show_image">True</property>
+                                        <property 
name="use-underline">True</property>
+                                        <property 
name="always-show-image">True</property>
                                         <signal name="clicked" 
handler="anastasis_gtk_backup_button_clicked_cb" swapped="no"/>
                                       </object>
                                       <packing>
@@ -641,12 +638,12 @@ Author: Christian Grothoff, Dennis Neufeld
                                       <object class="GtkButton" 
id="anastasis_gtk_recovery_button">
                                         <property name="label" 
translatable="yes">_Restore a secret</property>
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">True</property>
-                                        <property 
name="receives_default">True</property>
-                                        <property name="tooltip_text" 
translatable="yes">Begin secret recovery process</property>
+                                        <property 
name="can-focus">True</property>
+                                        <property 
name="receives-default">True</property>
+                                        <property name="tooltip-text" 
translatable="yes">Begin secret recovery process</property>
                                         <property 
name="image">restore_image</property>
-                                        <property 
name="use_underline">True</property>
-                                        <property 
name="always_show_image">True</property>
+                                        <property 
name="use-underline">True</property>
+                                        <property 
name="always-show-image">True</property>
                                         <signal name="clicked" 
handler="anastasis_gtk_recovery_button_clicked_cb" swapped="no"/>
                                       </object>
                                       <packing>
@@ -660,12 +657,12 @@ Author: Christian Grothoff, Dennis Neufeld
                                       <object class="GtkButton" 
id="anastasis_gtk_open_state">
                                         <property name="label">_Open a saved 
action</property>
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">True</property>
-                                        <property 
name="receives_default">True</property>
-                                        <property name="tooltip_text" 
translatable="yes">Continue from file with saved Anastasis state</property>
+                                        <property 
name="can-focus">True</property>
+                                        <property 
name="receives-default">True</property>
+                                        <property name="tooltip-text" 
translatable="yes">Continue from file with saved Anastasis state</property>
                                         <property 
name="image">open_image</property>
-                                        <property 
name="use_underline">True</property>
-                                        <property 
name="always_show_image">True</property>
+                                        <property 
name="use-underline">True</property>
+                                        <property 
name="always-show-image">True</property>
                                         <signal name="clicked" 
handler="anastasis_gtk_open_state_clicked_cb" swapped="no"/>
                                       </object>
                                       <packing>
@@ -686,31 +683,31 @@ Author: Christian Grothoff, Dennis Neufeld
                             </child>
                             <child>
                               <object class="GtkFrame" 
id="anastasis_gtk_continent_frame">
-                                <property name="can_focus">False</property>
-                                <property name="label_xalign">0</property>
-                                <property name="shadow_type">none</property>
+                                <property name="can-focus">False</property>
+                                <property name="label-xalign">0</property>
+                                <property name="shadow-type">none</property>
                                 <child>
                                   <object class="GtkAlignment">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="left_padding">12</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="left-padding">12</property>
                                     <child>
                                       <object class="GtkBox" 
id="anastasis_gtk_continent_vbox">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
+                                        <property 
name="can-focus">False</property>
                                         <child>
                                           <object class="GtkScrolledWindow">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can_focus">True</property>
-                                            <property 
name="shadow_type">in</property>
+                                            <property 
name="can-focus">True</property>
+                                            <property 
name="shadow-type">in</property>
                                             <child>
                                               <object class="GtkTreeView" 
id="anastasis_gtk_continent_treeview">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">True</property>
+                                                <property 
name="can-focus">True</property>
                                                 <property 
name="model">continent_liststore</property>
-                                                <property 
name="enable_search">False</property>
-                                                <property 
name="search_column">0</property>
-                                                <property 
name="activate_on_single_click">True</property>
+                                                <property 
name="enable-search">False</property>
+                                                <property 
name="search-column">0</property>
+                                                <property 
name="activate-on-single-click">True</property>
                                                 <child 
internal-child="selection">
                                                   <object 
class="GtkTreeSelection" id="anastasis_gtk_continent_selection">
                                                     <signal name="changed" 
handler="anastasis_gtk_continent_selection_changed_cb" swapped="no"/>
@@ -740,16 +737,16 @@ Author: Christian Grothoff, Dennis Neufeld
                                         <child>
                                           <object class="GtkScrolledWindow">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can_focus">True</property>
-                                            <property 
name="shadow_type">in</property>
+                                            <property 
name="can-focus">True</property>
+                                            <property 
name="shadow-type">in</property>
                                             <child>
                                               <object class="GtkTreeView" 
id="anastasis_gtk_country_treeview">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">True</property>
+                                                <property 
name="can-focus">True</property>
                                                 <property 
name="model">country_liststore</property>
-                                                <property 
name="enable_search">False</property>
-                                                <property 
name="search_column">0</property>
-                                                <property 
name="activate_on_single_click">True</property>
+                                                <property 
name="enable-search">False</property>
+                                                <property 
name="search-column">0</property>
+                                                <property 
name="activate-on-single-click">True</property>
                                                 <child 
internal-child="selection">
                                                   <object 
class="GtkTreeSelection" id="anastasis_gtk_country_selection">
                                                     <signal name="changed" 
handler="anastasis_gtk_country_selection_changed_cb" swapped="no"/>
@@ -779,12 +776,12 @@ Author: Christian Grothoff, Dennis Neufeld
                                         <child>
                                           <object class="GtkScrolledWindow">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can_focus">True</property>
-                                            <property 
name="shadow_type">in</property>
+                                            <property 
name="can-focus">True</property>
+                                            <property 
name="shadow-type">in</property>
                                             <child>
                                               <object class="GtkTreeView" 
id="anastasis_gtk_currency_treeview">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">True</property>
+                                                <property 
name="can-focus">True</property>
                                                 <property 
name="model">currency_liststore</property>
                                                 <child 
internal-child="selection">
                                                   <object 
class="GtkTreeSelection" id="anastasis_gtk_currency_selection">
@@ -795,7 +792,7 @@ Author: Christian Grothoff, Dennis Neufeld
                                                 <child>
                                                   <object 
class="GtkTreeViewColumn">
                                                     <property name="title" 
translatable="yes">Currencies</property>
-                                                    <property 
name="sort_column_id">0</property>
+                                                    <property 
name="sort-column-id">0</property>
                                                     <child>
                                                       <object 
class="GtkCellRendererText" id="currency"/>
                                                       <attributes>
@@ -821,12 +818,12 @@ Author: Christian Grothoff, Dennis Neufeld
                                 <child type="label">
                                   <object class="GtkLabel">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="tooltip_text" 
translatable="yes">These questions determine which personal attributes we can 
ask you for, and which backup providers could be used.</property>
-                                    <property name="margin_start">5</property>
-                                    <property name="margin_end">5</property>
-                                    <property name="margin_top">5</property>
-                                    <property name="margin_bottom">5</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="tooltip-text" 
translatable="yes">These questions determine which personal attributes we can 
ask you for, and which backup providers could be used.</property>
+                                    <property name="margin-start">5</property>
+                                    <property name="margin-end">5</property>
+                                    <property name="margin-top">5</property>
+                                    <property name="margin-bottom">5</property>
                                     <property name="label" 
translatable="yes">Where do you live? In which currencies do you want to 
pay?</property>
                                     <attributes>
                                       <attribute name="weight" value="bold"/>
@@ -842,42 +839,42 @@ Author: Christian Grothoff, Dennis Neufeld
                             </child>
                             <child>
                               <object class="GtkFrame" 
id="anastasis_gtk_identity_frame">
-                                <property name="can_focus">False</property>
-                                <property name="label_xalign">0</property>
-                                <property name="shadow_type">none</property>
+                                <property name="can-focus">False</property>
+                                <property name="label-xalign">0</property>
+                                <property name="shadow-type">none</property>
                                 <child>
                                   <object class="GtkAlignment">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
+                                    <property name="can-focus">False</property>
                                     <child>
                                       <object class="GtkBox" 
id="who_are_you_hbox">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
+                                        <property 
name="can-focus">False</property>
                                         <property name="spacing">10</property>
                                         <property 
name="homogeneous">True</property>
                                         <child>
                                           <object class="GtkBox" 
id="anastasis_gtk_identity_vbox">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
+                                            <property 
name="can-focus">False</property>
                                             <property 
name="orientation">vertical</property>
                                             <property 
name="spacing">15</property>
                                             <child>
                                               <object class="GtkBox" 
id="anastasis_gtk_ia_full_name_box">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
+                                                <property 
name="can-focus">False</property>
                                                 <property 
name="orientation">vertical</property>
                                                 <child>
                                                   <object class="GtkBox" 
id="anastasis_gtk_ia_full_name_hbox">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="can-focus">False</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="anastasis_gtk_ia_full_name_label">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">False</property>
+                                                        <property 
name="can-focus">False</property>
                                                         <property 
name="halign">start</property>
                                                         <property 
name="valign">center</property>
-                                                        <property 
name="margin_left">20</property>
-                                                        <property 
name="margin_start">20</property>
+                                                        <property 
name="margin-left">20</property>
+                                                        <property 
name="margin-start">20</property>
                                                         <property name="label" 
translatable="yes">Full name:</property>
                                                       </object>
                                                       <packing>
@@ -890,9 +887,9 @@ Author: Christian Grothoff, Dennis Neufeld
                                                     <child>
                                                       <object class="GtkEntry" 
id="anastasis_gtk_ia_full_name_entry">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">True</property>
+                                                        <property 
name="can-focus">True</property>
                                                         <property 
name="hexpand">True</property>
-                                                        <property 
name="placeholder_text" translatable="yes">Max Mustermann</property>
+                                                        <property 
name="placeholder-text" translatable="yes">Max Mustermann</property>
                                                         <signal name="changed" 
handler="AG_identity_changed" swapped="no"/>
                                                       </object>
                                                       <packing>
@@ -913,13 +910,13 @@ Author: Christian Grothoff, Dennis Neufeld
                                                 <child>
                                                   <object class="GtkBox" 
id="private_hbox1">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
-                                                    <property 
name="margin_left">40</property>
+                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="margin-left">40</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="privacy_label1">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">False</property>
-                                                        <property 
name="margin_left">40</property>
+                                                        <property 
name="can-focus">False</property>
+                                                        <property 
name="margin-left">40</property>
                                                         <property name="label" 
translatable="yes">This stays private</property>
                                                       </object>
                                                       <packing>
@@ -931,10 +928,10 @@ Author: Christian Grothoff, Dennis Neufeld
                                                     </child>
                                                     <child>
                                                       <object class="GtkImage" 
id="blindfold_image1">
-                                                        <property 
name="width_request">24</property>
-                                                        <property 
name="height_request">24</property>
+                                                        <property 
name="width-request">24</property>
+                                                        <property 
name="height-request">24</property>
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">False</property>
+                                                        <property 
name="can-focus">False</property>
                                                         <property 
name="pixbuf">noun_blindfold_3574196.svg</property>
                                                       </object>
                                                       <packing>
@@ -955,7 +952,7 @@ Author: Christian Grothoff, Dennis Neufeld
                                                 <child>
                                                   <object class="GtkSeparator">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="can-focus">False</property>
                                                   </object>
                                                   <packing>
                                                     <property 
name="expand">False</property>
@@ -973,18 +970,18 @@ Author: Christian Grothoff, Dennis Neufeld
                                             <child>
                                               <object class="GtkBox" 
id="anastasis_gtk_ia_birthdate_box">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
+                                                <property 
name="can-focus">False</property>
                                                 <property 
name="orientation">vertical</property>
                                                 <child>
                                                   <object class="GtkBox" 
id="anastasis_gtk_ia_birthdate_hbox">
-                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="can-focus">False</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="anastasis_gtk_ia_birthdate_label">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">False</property>
+                                                        <property 
name="can-focus">False</property>
                                                         <property 
name="halign">start</property>
-                                                        <property 
name="margin_left">20</property>
-                                                        <property 
name="margin_start">20</property>
+                                                        <property 
name="margin-left">20</property>
+                                                        <property 
name="margin-start">20</property>
                                                         <property name="label" 
translatable="yes">Birthdate:</property>
                                                       </object>
                                                       <packing>
@@ -997,11 +994,11 @@ Author: Christian Grothoff, Dennis Neufeld
                                                     <child>
                                                       <object 
class="GtkCalendar" id="anastasis_gtk_ia_birthdate_cal">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">True</property>
+                                                        <property 
name="can-focus">True</property>
                                                         <property 
name="year">1980</property>
                                                         <property 
name="month">8</property>
                                                         <property 
name="day">22</property>
-                                                        <property 
name="show_week_numbers">True</property>
+                                                        <property 
name="show-week-numbers">True</property>
                                                         <signal 
name="day-selected" handler="AG_identity_changed" swapped="no"/>
                                                       </object>
                                                       <packing>
@@ -1022,13 +1019,13 @@ Author: Christian Grothoff, Dennis Neufeld
                                                 <child>
                                                   <object class="GtkBox" 
id="private_hbox2">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
-                                                    <property 
name="margin_left">40</property>
+                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="margin-left">40</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="privacy_label2">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">False</property>
-                                                        <property 
name="margin_left">40</property>
+                                                        <property 
name="can-focus">False</property>
+                                                        <property 
name="margin-left">40</property>
                                                         <property name="label" 
translatable="yes">This stays private</property>
                                                       </object>
                                                       <packing>
@@ -1040,10 +1037,10 @@ Author: Christian Grothoff, Dennis Neufeld
                                                     </child>
                                                     <child>
                                                       <object class="GtkImage" 
id="blindfold_image2">
-                                                        <property 
name="width_request">24</property>
-                                                        <property 
name="height_request">24</property>
+                                                        <property 
name="width-request">24</property>
+                                                        <property 
name="height-request">24</property>
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">False</property>
+                                                        <property 
name="can-focus">False</property>
                                                         <property 
name="pixbuf">noun_blindfold_3574196.svg</property>
                                                       </object>
                                                       <packing>
@@ -1064,7 +1061,7 @@ Author: Christian Grothoff, Dennis Neufeld
                                                 <child>
                                                   <object class="GtkSeparator">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="can-focus">False</property>
                                                   </object>
                                                   <packing>
                                                     <property 
name="expand">False</property>
@@ -1082,20 +1079,20 @@ Author: Christian Grothoff, Dennis Neufeld
                                             <child>
                                               <object class="GtkBox" 
id="anastasis_gtk_ia_birthplace_box">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
+                                                <property 
name="can-focus">False</property>
                                                 <property 
name="orientation">vertical</property>
                                                 <child>
                                                   <object class="GtkBox" 
id="anastasis_gtk_ia_birthplace_hbox">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="can-focus">False</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="anastasis_gtk_ia_birthplace_label">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">False</property>
+                                                        <property 
name="can-focus">False</property>
                                                         <property 
name="halign">start</property>
                                                         <property 
name="valign">center</property>
-                                                        <property 
name="margin_left">20</property>
-                                                        <property 
name="margin_start">20</property>
+                                                        <property 
name="margin-left">20</property>
+                                                        <property 
name="margin-start">20</property>
                                                         <property name="label" 
translatable="yes">Birthplace:</property>
                                                       </object>
                                                       <packing>
@@ -1108,9 +1105,9 @@ Author: Christian Grothoff, Dennis Neufeld
                                                     <child>
                                                       <object class="GtkEntry" 
id="anastasis_gtk_ia_birthplace_entry">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">True</property>
+                                                        <property 
name="can-focus">True</property>
                                                         <property 
name="hexpand">True</property>
-                                                        <property 
name="placeholder_text" translatable="yes">Earth</property>
+                                                        <property 
name="placeholder-text" translatable="yes">Earth</property>
                                                       </object>
                                                       <packing>
                                                         <property 
name="expand">True</property>
@@ -1130,13 +1127,13 @@ Author: Christian Grothoff, Dennis Neufeld
                                                 <child>
                                                   <object class="GtkBox" 
id="private_hbox3">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
-                                                    <property 
name="margin_left">40</property>
+                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="margin-left">40</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="privacy_label3">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">False</property>
-                                                        <property 
name="margin_left">40</property>
+                                                        <property 
name="can-focus">False</property>
+                                                        <property 
name="margin-left">40</property>
                                                         <property name="label" 
translatable="yes">This stays private</property>
                                                       </object>
                                                       <packing>
@@ -1148,10 +1145,10 @@ Author: Christian Grothoff, Dennis Neufeld
                                                     </child>
                                                     <child>
                                                       <object class="GtkImage" 
id="blindfold_image3">
-                                                        <property 
name="width_request">24</property>
-                                                        <property 
name="height_request">24</property>
+                                                        <property 
name="width-request">24</property>
+                                                        <property 
name="height-request">24</property>
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">False</property>
+                                                        <property 
name="can-focus">False</property>
                                                         <property 
name="pixbuf">noun_blindfold_3574196.svg</property>
                                                       </object>
                                                       <packing>
@@ -1172,7 +1169,7 @@ Author: Christian Grothoff, Dennis Neufeld
                                                 <child>
                                                   <object class="GtkSeparator">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="can-focus">False</property>
                                                   </object>
                                                   <packing>
                                                     <property 
name="expand">False</property>
@@ -1190,19 +1187,19 @@ Author: Christian Grothoff, Dennis Neufeld
                                             <child>
                                               <object class="GtkBox" 
id="anastasis_gtk_ia_ahv_box">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
+                                                <property 
name="can-focus">False</property>
                                                 <property 
name="orientation">vertical</property>
                                                 <child>
                                                   <object class="GtkBox" 
id="anastasis_gtk_ia_ahv_hbox">
-                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="can-focus">False</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="anastasis_gtk_ia_ahv_label">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">False</property>
+                                                        <property 
name="can-focus">False</property>
                                                         <property 
name="halign">start</property>
                                                         <property 
name="valign">center</property>
-                                                        <property 
name="margin_left">20</property>
-                                                        <property 
name="margin_start">20</property>
+                                                        <property 
name="margin-left">20</property>
+                                                        <property 
name="margin-start">20</property>
                                                         <property name="label" 
translatable="yes">AHV number:</property>
                                                       </object>
                                                       <packing>
@@ -1215,13 +1212,13 @@ Author: Christian Grothoff, Dennis Neufeld
                                                     <child>
                                                       <object class="GtkEntry" 
id="anastasis_gtk_ia_ahv_entry">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">True</property>
-                                                        <property 
name="max_length">16</property>
-                                                        <property 
name="width_chars">17</property>
-                                                        <property 
name="max_width_chars">16</property>
-                                                        <property 
name="caps_lock_warning">False</property>
-                                                        <property 
name="placeholder_text" translatable="yes">756.1222.3425.89</property>
-                                                        <property 
name="input_purpose">number</property>
+                                                        <property 
name="can-focus">True</property>
+                                                        <property 
name="max-length">16</property>
+                                                        <property 
name="width-chars">17</property>
+                                                        <property 
name="max-width-chars">16</property>
+                                                        <property 
name="caps-lock-warning">False</property>
+                                                        <property 
name="placeholder-text" translatable="yes">756.1222.3425.89</property>
+                                                        <property 
name="input-purpose">number</property>
                                                         <signal name="changed" 
handler="AG_identity_changed" swapped="no"/>
                                                       </object>
                                                       <packing>
@@ -1241,13 +1238,13 @@ Author: Christian Grothoff, Dennis Neufeld
                                                 <child>
                                                   <object class="GtkBox" 
id="private_hbox4">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
-                                                    <property 
name="margin_left">40</property>
+                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="margin-left">40</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="privacy_label4">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">False</property>
-                                                        <property 
name="margin_left">40</property>
+                                                        <property 
name="can-focus">False</property>
+                                                        <property 
name="margin-left">40</property>
                                                         <property name="label" 
translatable="yes">This stays private</property>
                                                       </object>
                                                       <packing>
@@ -1259,10 +1256,10 @@ Author: Christian Grothoff, Dennis Neufeld
                                                     </child>
                                                     <child>
                                                       <object class="GtkImage" 
id="blindfold_image4">
-                                                        <property 
name="width_request">24</property>
-                                                        <property 
name="height_request">24</property>
+                                                        <property 
name="width-request">24</property>
+                                                        <property 
name="height-request">24</property>
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">False</property>
+                                                        <property 
name="can-focus">False</property>
                                                         <property 
name="pixbuf">noun_blindfold_3574196.svg</property>
                                                       </object>
                                                       <packing>
@@ -1283,7 +1280,7 @@ Author: Christian Grothoff, Dennis Neufeld
                                                 <child>
                                                   <object class="GtkSeparator">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="can-focus">False</property>
                                                   </object>
                                                   <packing>
                                                     <property 
name="expand">False</property>
@@ -1301,19 +1298,19 @@ Author: Christian Grothoff, Dennis Neufeld
                                             <child>
                                               <object class="GtkBox" 
id="anastasis_gtk_ia_tin_de_box">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
+                                                <property 
name="can-focus">False</property>
                                                 <property 
name="orientation">vertical</property>
                                                 <child>
                                                   <object class="GtkBox" 
id="anastasis_gtk_ia_tin_de_hbox">
-                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="can-focus">False</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="anastasis_gtk_ia_tin_de_label">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">False</property>
+                                                        <property 
name="can-focus">False</property>
                                                         <property 
name="halign">start</property>
                                                         <property 
name="valign">center</property>
-                                                        <property 
name="margin_left">20</property>
-                                                        <property 
name="margin_start">20</property>
+                                                        <property 
name="margin-left">20</property>
+                                                        <property 
name="margin-start">20</property>
                                                         <property name="label" 
translatable="yes">Steuerliche Identifikationsnummer:</property>
                                                       </object>
                                                       <packing>
@@ -1326,12 +1323,12 @@ Author: Christian Grothoff, Dennis Neufeld
                                                     <child>
                                                       <object class="GtkEntry" 
id="anastasis_gtk_ia_tin_de_entry">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">True</property>
-                                                        <property 
name="max_length">11</property>
-                                                        <property 
name="width_chars">12</property>
-                                                        <property 
name="max_width_chars">11</property>
-                                                        <property 
name="placeholder_text" translatable="yes">12345678912</property>
-                                                        <property 
name="input_purpose">number</property>
+                                                        <property 
name="can-focus">True</property>
+                                                        <property 
name="max-length">11</property>
+                                                        <property 
name="width-chars">12</property>
+                                                        <property 
name="max-width-chars">11</property>
+                                                        <property 
name="placeholder-text" translatable="yes">12345678912</property>
+                                                        <property 
name="input-purpose">number</property>
                                                       </object>
                                                       <packing>
                                                         <property 
name="expand">False</property>
@@ -1351,13 +1348,13 @@ Author: Christian Grothoff, Dennis Neufeld
                                                 <child>
                                                   <object class="GtkBox" 
id="private_hbox5">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
-                                                    <property 
name="margin_left">40</property>
+                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="margin-left">40</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="privacy_label5">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">False</property>
-                                                        <property 
name="margin_left">40</property>
+                                                        <property 
name="can-focus">False</property>
+                                                        <property 
name="margin-left">40</property>
                                                         <property name="label" 
translatable="yes">This stays private</property>
                                                       </object>
                                                       <packing>
@@ -1369,10 +1366,10 @@ Author: Christian Grothoff, Dennis Neufeld
                                                     </child>
                                                     <child>
                                                       <object class="GtkImage" 
id="blindfold_image5">
-                                                        <property 
name="width_request">24</property>
-                                                        <property 
name="height_request">24</property>
+                                                        <property 
name="width-request">24</property>
+                                                        <property 
name="height-request">24</property>
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">False</property>
+                                                        <property 
name="can-focus">False</property>
                                                         <property 
name="pixbuf">noun_blindfold_3574196.svg</property>
                                                       </object>
                                                       <packing>
@@ -1393,7 +1390,7 @@ Author: Christian Grothoff, Dennis Neufeld
                                                 <child>
                                                   <object class="GtkSeparator">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="can-focus">False</property>
                                                   </object>
                                                   <packing>
                                                     <property 
name="expand">False</property>
@@ -1411,20 +1408,20 @@ Author: Christian Grothoff, Dennis Neufeld
                                             <child>
                                               <object class="GtkBox" 
id="anastasis_gtk_ia_ssn_de_box">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
+                                                <property 
name="can-focus">False</property>
                                                 <property 
name="orientation">vertical</property>
                                                 <child>
                                                   <object class="GtkBox" 
id="anastasis_gtk_ia_ssn_de_hbox">
-                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="can-focus">False</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="anastasis_gtk_ia_ssn_de_label">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">False</property>
-                                                        <property 
name="tooltip_text" translatable="yes">Falls vorhanden sollte diese Nummer auf 
jeden Fall angegeben werden. Nur Beamte, Selbstständige und andere Personen die 
keine Rentenversicherungsnummer haben sollten dieses Feld leer 
lassen.</property>
+                                                        <property 
name="can-focus">False</property>
+                                                        <property 
name="tooltip-text" translatable="yes">Falls vorhanden sollte diese Nummer auf 
jeden Fall angegeben werden. Nur Beamte, Selbstständige und andere Personen die 
keine Rentenversicherungsnummer haben sollten dieses Feld leer 
lassen.</property>
                                                         <property 
name="halign">start</property>
                                                         <property 
name="valign">center</property>
-                                                        <property 
name="margin_left">20</property>
-                                                        <property 
name="margin_start">20</property>
+                                                        <property 
name="margin-left">20</property>
+                                                        <property 
name="margin-start">20</property>
                                                         <property name="label" 
translatable="yes">Sozialversicherungsnummer (optional):</property>
                                                       </object>
                                                       <packing>
@@ -1437,12 +1434,12 @@ Author: Christian Grothoff, Dennis Neufeld
                                                     <child>
                                                       <object class="GtkEntry" 
id="anastasis_gtk_ia_ssn_de_entry">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">True</property>
-                                                        <property 
name="max_length">12</property>
-                                                        <property 
name="width_chars">13</property>
-                                                        <property 
name="max_width_chars">12</property>
-                                                        <property 
name="placeholder_text" translatable="yes">14230460S534</property>
-                                                        <property 
name="input_purpose">alpha</property>
+                                                        <property 
name="can-focus">True</property>
+                                                        <property 
name="max-length">12</property>
+                                                        <property 
name="width-chars">13</property>
+                                                        <property 
name="max-width-chars">12</property>
+                                                        <property 
name="placeholder-text" translatable="yes">14230460S534</property>
+                                                        <property 
name="input-purpose">alpha</property>
                                                         <signal name="changed" 
handler="AG_identity_changed" swapped="no"/>
                                                       </object>
                                                       <packing>
@@ -1463,13 +1460,13 @@ Author: Christian Grothoff, Dennis Neufeld
                                                 <child>
                                                   <object class="GtkBox" 
id="private_hbox6">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
-                                                    <property 
name="margin_left">40</property>
+                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="margin-left">40</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="privacy_label6">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">False</property>
-                                                        <property 
name="margin_left">40</property>
+                                                        <property 
name="can-focus">False</property>
+                                                        <property 
name="margin-left">40</property>
                                                         <property name="label" 
translatable="yes">This stays private</property>
                                                       </object>
                                                       <packing>
@@ -1481,10 +1478,10 @@ Author: Christian Grothoff, Dennis Neufeld
                                                     </child>
                                                     <child>
                                                       <object class="GtkImage" 
id="blindfold_image6">
-                                                        <property 
name="width_request">24</property>
-                                                        <property 
name="height_request">24</property>
+                                                        <property 
name="width-request">24</property>
+                                                        <property 
name="height-request">24</property>
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">False</property>
+                                                        <property 
name="can-focus">False</property>
                                                         <property 
name="pixbuf">noun_blindfold_3574196.svg</property>
                                                       </object>
                                                       <packing>
@@ -1505,7 +1502,7 @@ Author: Christian Grothoff, Dennis Neufeld
                                                 <child>
                                                   <object class="GtkSeparator">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="can-focus">False</property>
                                                   </object>
                                                   <packing>
                                                     <property 
name="expand">False</property>
@@ -1523,19 +1520,19 @@ Author: Christian Grothoff, Dennis Neufeld
                                             <child>
                                               <object class="GtkBox" 
id="anastasis_gtk_ia_ssn_us_box">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
+                                                <property 
name="can-focus">False</property>
                                                 <property 
name="orientation">vertical</property>
                                                 <child>
                                                   <object class="GtkBox" 
id="anastasis_gtk_ia_ssn_us_hbox">
-                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="can-focus">False</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="anastasis_gtk_ia_ssn_us_label">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">False</property>
+                                                        <property 
name="can-focus">False</property>
                                                         <property 
name="halign">start</property>
                                                         <property 
name="valign">center</property>
-                                                        <property 
name="margin_left">20</property>
-                                                        <property 
name="margin_start">20</property>
+                                                        <property 
name="margin-left">20</property>
+                                                        <property 
name="margin-start">20</property>
                                                         <property name="label" 
translatable="yes">Social security number:</property>
                                                       </object>
                                                       <packing>
@@ -1548,11 +1545,11 @@ Author: Christian Grothoff, Dennis Neufeld
                                                     <child>
                                                       <object class="GtkEntry" 
id="anastasis_gtk_ia_ssn_us_entry">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">True</property>
-                                                        <property 
name="max_length">11</property>
-                                                        <property 
name="width_chars">12</property>
-                                                        <property 
name="max_width_chars">11</property>
-                                                        <property 
name="placeholder_text" translatable="yes">000-00-0000</property>
+                                                        <property 
name="can-focus">True</property>
+                                                        <property 
name="max-length">11</property>
+                                                        <property 
name="width-chars">12</property>
+                                                        <property 
name="max-width-chars">11</property>
+                                                        <property 
name="placeholder-text" translatable="yes">000-00-0000</property>
                                                         <signal name="changed" 
handler="AG_identity_changed" swapped="no"/>
                                                       </object>
                                                       <packing>
@@ -1573,13 +1570,13 @@ Author: Christian Grothoff, Dennis Neufeld
                                                 <child>
                                                   <object class="GtkBox" 
id="private_hbox7">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
-                                                    <property 
name="margin_left">40</property>
+                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="margin-left">40</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="privacy_label7">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">False</property>
-                                                        <property 
name="margin_left">40</property>
+                                                        <property 
name="can-focus">False</property>
+                                                        <property 
name="margin-left">40</property>
                                                         <property name="label" 
translatable="yes">This stays private</property>
                                                       </object>
                                                       <packing>
@@ -1591,10 +1588,10 @@ Author: Christian Grothoff, Dennis Neufeld
                                                     </child>
                                                     <child>
                                                       <object class="GtkImage" 
id="blindfold_image7">
-                                                        <property 
name="width_request">24</property>
-                                                        <property 
name="height_request">24</property>
+                                                        <property 
name="width-request">24</property>
+                                                        <property 
name="height-request">24</property>
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">False</property>
+                                                        <property 
name="can-focus">False</property>
                                                         <property 
name="pixbuf">noun_blindfold_3574196.svg</property>
                                                       </object>
                                                       <packing>
@@ -1615,7 +1612,7 @@ Author: Christian Grothoff, Dennis Neufeld
                                                 <child>
                                                   <object class="GtkSeparator">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="can-focus">False</property>
                                                   </object>
                                                   <packing>
                                                     <property 
name="expand">False</property>
@@ -1641,20 +1638,20 @@ Author: Christian Grothoff, Dennis Neufeld
                                         <child>
                                           <object class="GtkBox" 
id="anastasis_gtk_private_explainer_vbox">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
+                                            <property 
name="can-focus">False</property>
                                             <property 
name="orientation">vertical</property>
                                             <property 
name="spacing">20</property>
-                                            <property 
name="baseline_position">top</property>
+                                            <property 
name="baseline-position">top</property>
                                             <child>
                                               <object class="GtkBox" 
id="private_hbox">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
+                                                <property 
name="can-focus">False</property>
                                                 <child>
                                                   <object class="GtkLabel" 
id="privacy_label">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
-                                                    <property 
name="margin_top">5</property>
-                                                    <property 
name="margin_bottom">5</property>
+                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="margin-top">5</property>
+                                                    <property 
name="margin-bottom">5</property>
                                                     <property name="label" 
translatable="yes">This stays private</property>
                                                     <attributes>
                                                       <attribute name="weight" 
value="bold"/>
@@ -1670,10 +1667,10 @@ Author: Christian Grothoff, Dennis Neufeld
                                                 </child>
                                                 <child>
                                                   <object class="GtkImage" 
id="blindfold_image">
-                                                    <property 
name="width_request">24</property>
-                                                    <property 
name="height_request">24</property>
+                                                    <property 
name="width-request">24</property>
+                                                    <property 
name="height-request">24</property>
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="can-focus">False</property>
                                                     <property 
name="pixbuf">noun_blindfold_3574196.svg</property>
                                                   </object>
                                                   <packing>
@@ -1693,9 +1690,9 @@ Author: Christian Grothoff, Dennis Neufeld
                                             <child>
                                               <object class="GtkLabel" 
id="explainer_label">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
-                                                <property 
name="margin_top">5</property>
-                                                <property 
name="margin_bottom">15</property>
+                                                <property 
name="can-focus">False</property>
+                                                <property 
name="margin-top">5</property>
+                                                <property 
name="margin-bottom">15</property>
                                                 <property name="label" 
translatable="yes">The information you have entered here:
 • Will be hashed, and therefore unreadable
 • The non-hashed version is not shared</property>
@@ -1710,9 +1707,9 @@ Author: Christian Grothoff, Dennis Neufeld
                                             <child>
                                               <object class="GtkLabel" 
id="encrypt_label">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
+                                                <property 
name="can-focus">False</property>
                                                 <property name="label" 
translatable="yes">&lt;a 
href="https://taler.net/papers/thesis-anastasis-2020.pdf"&gt;How Anastasis 
encrypts your data&lt;/a&gt;</property>
-                                                <property 
name="use_markup">True</property>
+                                                <property 
name="use-markup">True</property>
                                               </object>
                                               <packing>
                                                 <property 
name="expand">False</property>
@@ -1723,9 +1720,9 @@ Author: Christian Grothoff, Dennis Neufeld
                                             <child>
                                               <object class="GtkLabel" 
id="free_software_label">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
+                                                <property 
name="can-focus">False</property>
                                                 <property name="label" 
translatable="yes">Anastasis is &lt;a 
href="https://www.gnu.org/philosophy/free-sw.html"&gt;Free 
Software&lt;/a&gt;</property>
-                                                <property 
name="use_markup">True</property>
+                                                <property 
name="use-markup">True</property>
                                               </object>
                                               <packing>
                                                 <property 
name="expand">False</property>
@@ -1736,11 +1733,11 @@ Author: Christian Grothoff, Dennis Neufeld
                                             <child>
                                               <object class="GtkLabel" 
id="funding_label">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
-                                                <property 
name="margin_top">10</property>
+                                                <property 
name="can-focus">False</property>
+                                                <property 
name="margin-top">10</property>
                                                 <property name="label" 
translatable="yes">Anastasis is developed by &lt;a 
href="https://anastasis.lu/en/about.html#team"&gt;privacy advocates&lt;/a&gt;
 with &lt;a href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; 
from the European Commission.</property>
-                                                <property 
name="use_markup">True</property>
+                                                <property 
name="use-markup">True</property>
                                                 <property 
name="justify">center</property>
                                               </object>
                                               <packing>
@@ -1752,15 +1749,15 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                             </child>
                                             <child>
                                               <object class="GtkImage" 
id="ec_image">
-                                                <property 
name="width_request">128</property>
-                                                <property 
name="height_request">128</property>
+                                                <property 
name="width-request">128</property>
+                                                <property 
name="height-request">128</property>
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
+                                                <property 
name="can-focus">False</property>
                                                 <property 
name="halign">center</property>
-                                                <property 
name="margin_left">10</property>
-                                                <property 
name="margin_right">10</property>
-                                                <property 
name="margin_top">10</property>
-                                                <property 
name="margin_bottom">10</property>
+                                                <property 
name="margin-left">10</property>
+                                                <property 
name="margin-right">10</property>
+                                                <property 
name="margin-top">10</property>
+                                                <property 
name="margin-bottom">10</property>
                                                 <property 
name="pixbuf">bandiera_stelle.png</property>
                                               </object>
                                               <packing>
@@ -1785,11 +1782,11 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                 <child type="label">
                                   <object class="GtkLabel">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="margin_start">5</property>
-                                    <property name="margin_end">5</property>
-                                    <property name="margin_top">5</property>
-                                    <property name="margin_bottom">5</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="margin-start">5</property>
+                                    <property name="margin-end">5</property>
+                                    <property name="margin-top">5</property>
+                                    <property name="margin-bottom">5</property>
                                     <property name="label" 
translatable="yes">Who are you?</property>
                                     <attributes>
                                       <attribute name="style" value="normal"/>
@@ -1806,43 +1803,43 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                             </child>
                             <child>
                               <object class="GtkFrame" 
id="anastasis_gtk_b_authentication_frame">
-                                <property name="can_focus">False</property>
-                                <property name="label_xalign">0</property>
-                                <property name="shadow_type">none</property>
+                                <property name="can-focus">False</property>
+                                <property name="label-xalign">0</property>
+                                <property name="shadow-type">none</property>
                                 <child>
                                   <object class="GtkAlignment">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="left_padding">12</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="left-padding">12</property>
                                     <child>
                                       <object class="GtkBox">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
+                                        <property 
name="can-focus">False</property>
                                         <property 
name="orientation">vertical</property>
                                         <child>
                                           <object class="GtkFrame">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
-                                            <property 
name="margin_right">50</property>
-                                            <property 
name="margin_end">50</property>
+                                            <property 
name="can-focus">False</property>
+                                            <property 
name="margin-right">50</property>
+                                            <property 
name="margin-end">50</property>
                                             <property 
name="hexpand">True</property>
-                                            <property 
name="label_xalign">0</property>
-                                            <property 
name="shadow_type">none</property>
+                                            <property 
name="label-xalign">0</property>
+                                            <property 
name="shadow-type">none</property>
                                             <child>
                                               <object class="GtkBox" 
id="anastasis_gtk_add_auth_button_box">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
-                                                <property 
name="margin_top">5</property>
-                                                <property 
name="margin_bottom">4</property>
+                                                <property 
name="can-focus">False</property>
+                                                <property 
name="margin-top">5</property>
+                                                <property 
name="margin-bottom">4</property>
                                                 <property 
name="spacing">8</property>
                                                 <property 
name="homogeneous">True</property>
                                                 <child>
                                                   <object class="GtkButton" 
id="anastasis_gtk_btn_add_auth_sms">
                                                     <property name="label" 
translatable="yes">SMS</property>
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">True</property>
-                                                    <property 
name="has_focus">True</property>
-                                                    <property 
name="receives_default">True</property>
+                                                    <property 
name="can-focus">True</property>
+                                                    <property 
name="has-focus">True</property>
+                                                    <property 
name="receives-default">True</property>
                                                     <signal name="clicked" 
handler="anastasis_gtk_btn_add_auth_sms_clicked_cb" swapped="no"/>
                                                   </object>
                                                   <packing>
@@ -1856,8 +1853,8 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                                   <object class="GtkButton" 
id="anastasis_gtk_btn_add_auth_email">
                                                     <property name="label" 
translatable="yes">Email</property>
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">True</property>
-                                                    <property 
name="receives_default">True</property>
+                                                    <property 
name="can-focus">True</property>
+                                                    <property 
name="receives-default">True</property>
                                                     <property 
name="image">email_image</property>
                                                     <signal name="clicked" 
handler="anastasis_gtk_btn_add_auth_email_clicked_cb" swapped="no"/>
                                                   </object>
@@ -1872,8 +1869,8 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                                   <object class="GtkButton" 
id="anastasis_gtk_btn_add_auth_question">
                                                     <property name="label" 
translatable="yes">Question</property>
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">True</property>
-                                                    <property 
name="receives_default">True</property>
+                                                    <property 
name="can-focus">True</property>
+                                                    <property 
name="receives-default">True</property>
                                                     <property 
name="image">image_question</property>
                                                     <signal name="clicked" 
handler="anastasis_gtk_btn_add_auth_question_clicked_cb" swapped="no"/>
                                                   </object>
@@ -1888,8 +1885,8 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                                   <object class="GtkButton" 
id="anastasis_gtk_btn_add_auth_post">
                                                     <property name="label" 
translatable="yes">Post</property>
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">True</property>
-                                                    <property 
name="receives_default">True</property>
+                                                    <property 
name="can-focus">True</property>
+                                                    <property 
name="receives-default">True</property>
                                                     <signal name="clicked" 
handler="anastasis_gtk_btn_add_auth_post_clicked_cb" swapped="no"/>
                                                   </object>
                                                   <packing>
@@ -1902,10 +1899,10 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                                 <child>
                                                   <object class="GtkButton" 
id="anastasis_gtk_btn_add_auth_video">
                                                     <property name="label" 
translatable="yes">_Video</property>
-                                                    <property 
name="can_focus">True</property>
-                                                    <property 
name="receives_default">True</property>
+                                                    <property 
name="can-focus">True</property>
+                                                    <property 
name="receives-default">True</property>
                                                     <property 
name="image">video_image</property>
-                                                    <property 
name="use_underline">True</property>
+                                                    <property 
name="use-underline">True</property>
                                                     <signal name="clicked" 
handler="anastasis_gtk_btn_add_auth_video_clicked_cb" swapped="no"/>
                                                   </object>
                                                   <packing>
@@ -1920,7 +1917,7 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                             <child type="label">
                                               <object class="GtkLabel">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
+                                                <property 
name="can-focus">False</property>
                                                 <property name="label" 
translatable="yes">Which authorization method should be added?</property>
                                                 <attributes>
                                                   <attribute name="weight" 
value="bold"/>
@@ -1938,30 +1935,30 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                         <child>
                                           <object class="GtkBox" 
id="anastasis_gtk_b_authentication_hbox">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
+                                            <property 
name="can-focus">False</property>
                                             <child>
                                               <object class="GtkFrame">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
-                                                <property 
name="label_xalign">0</property>
-                                                <property 
name="shadow_type">none</property>
+                                                <property 
name="can-focus">False</property>
+                                                <property 
name="label-xalign">0</property>
+                                                <property 
name="shadow-type">none</property>
                                                 <child>
                                                   <object class="GtkAlignment">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
-                                                    <property 
name="left_padding">12</property>
+                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="left-padding">12</property>
                                                     <child>
                                                       <object 
class="GtkScrolledWindow">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">True</property>
-                                                        <property 
name="shadow_type">in</property>
+                                                        <property 
name="can-focus">True</property>
+                                                        <property 
name="shadow-type">in</property>
                                                         <child>
                                                           <object 
class="GtkTreeView" id="anastasis_gtk_authentication_methods_list">
                                                             <property 
name="visible">True</property>
-                                                            <property 
name="can_focus">True</property>
+                                                            <property 
name="can-focus">True</property>
                                                             <property 
name="model">authentication_methods_liststore</property>
-                                                            <property 
name="enable_search">False</property>
-                                                            <property 
name="search_column">0</property>
+                                                            <property 
name="enable-search">False</property>
+                                                            <property 
name="search-column">0</property>
                                                             <child 
internal-child="selection">
                                                             <object 
class="GtkTreeSelection" id="anastasis_gtk_authentication_methods_selection">
                                                             <signal 
name="changed" handler="auth_method_selection_changed_cb" swapped="no"/>
@@ -1973,8 +1970,8 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                                             <property 
name="title" translatable="yes">Type</property>
                                                             <property 
name="clickable">True</property>
                                                             <property 
name="reorderable">True</property>
-                                                            <property 
name="sort_indicator">True</property>
-                                                            <property 
name="sort_column_id">0</property>
+                                                            <property 
name="sort-indicator">True</property>
+                                                            <property 
name="sort-column-id">0</property>
                                                             <child>
                                                             <object 
class="GtkCellRendererText" id="type"/>
                                                             <attributes>
@@ -2005,7 +2002,7 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                                 <child type="label">
                                                   <object class="GtkLabel" 
id="anastasis_gtk_authorization_methods_label">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="can-focus">False</property>
                                                     <property name="label" 
translatable="yes">Authorization methods configured so far:</property>
                                                     <attributes>
                                                       <attribute name="weight" 
value="bold"/>
@@ -2023,17 +2020,17 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                             <child>
                                               <object class="GtkBox" 
id="anastasis_gtk_authorization_meta_button_box">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
+                                                <property 
name="can-focus">False</property>
                                                 <property 
name="orientation">vertical</property>
                                                 <child>
                                                   <object class="GtkButton" 
id="anastasis_gtk_edit_provider_list">
                                                     <property name="label" 
translatable="yes">_Add provider</property>
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">True</property>
-                                                    <property 
name="receives_default">True</property>
+                                                    <property 
name="can-focus">True</property>
+                                                    <property 
name="receives-default">True</property>
                                                     <property 
name="image">add_image</property>
-                                                    <property 
name="use_underline">True</property>
-                                                    <property 
name="always_show_image">True</property>
+                                                    <property 
name="use-underline">True</property>
+                                                    <property 
name="always-show-image">True</property>
                                                     <signal name="clicked" 
handler="anastasis_gtk_edit_provider_list_clicked_cb" swapped="no"/>
                                                   </object>
                                                   <packing>
@@ -2048,10 +2045,10 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                                     <property 
name="label">gtk-delete</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="use_stock">True</property>
-                                                    <property 
name="always_show_image">True</property>
+                                                    <property 
name="can-focus">True</property>
+                                                    <property 
name="receives-default">True</property>
+                                                    <property 
name="use-stock">True</property>
+                                                    <property 
name="always-show-image">True</property>
                                                     <signal name="clicked" 
handler="anastasis_gtk_authentication_method_delete_button_clicked_cb" 
swapped="no"/>
                                                   </object>
                                                   <packing>
@@ -2079,7 +2076,7 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                         <child>
                                           <object class="GtkSeparator">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
+                                            <property 
name="can-focus">False</property>
                                           </object>
                                           <packing>
                                             <property 
name="expand">False</property>
@@ -2094,11 +2091,11 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                 <child type="label">
                                   <object class="GtkLabel">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="margin_start">5</property>
-                                    <property name="margin_end">5</property>
-                                    <property name="margin_top">5</property>
-                                    <property name="margin_bottom">5</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="margin-start">5</property>
+                                    <property name="margin-end">5</property>
+                                    <property name="margin-top">5</property>
+                                    <property name="margin-bottom">5</property>
                                     <property name="label" 
translatable="yes">Configure authorization methods!</property>
                                     <attributes>
                                       <attribute name="weight" value="bold"/>
@@ -2114,25 +2111,25 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                             </child>
                             <child>
                               <object class="GtkFrame" 
id="anastasis_gtk_b_policy_frame">
-                                <property name="can_focus">False</property>
-                                <property name="label_xalign">0</property>
-                                <property name="shadow_type">none</property>
+                                <property name="can-focus">False</property>
+                                <property name="label-xalign">0</property>
+                                <property name="shadow-type">none</property>
                                 <child>
                                   <object class="GtkAlignment">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="top_padding">10</property>
-                                    <property 
name="bottom_padding">10</property>
-                                    <property name="left_padding">12</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="top-padding">10</property>
+                                    <property 
name="bottom-padding">10</property>
+                                    <property name="left-padding">12</property>
                                     <child>
                                       <object class="GtkScrolledWindow">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">True</property>
-                                        <property 
name="shadow_type">in</property>
+                                        <property 
name="can-focus">True</property>
+                                        <property 
name="shadow-type">in</property>
                                         <child>
                                           <object class="GtkTreeView" 
id="anastasis_gtk_review_policy_treeview">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can_focus">True</property>
+                                            <property 
name="can-focus">True</property>
                                             <property 
name="model">policy_review_treestore</property>
                                             <signal name="button-press-event" 
handler="anastasis_gtk_review_policy_treeview_button_press_event_cb" 
swapped="no"/>
                                             <signal name="key-press-event" 
handler="anastasis_gtk_review_policy_treeview_key_press_event_cb" swapped="no"/>
@@ -2220,11 +2217,11 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                 <child type="label">
                                   <object class="GtkLabel">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="margin_start">5</property>
-                                    <property name="margin_end">5</property>
-                                    <property name="margin_top">5</property>
-                                    <property name="margin_bottom">5</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="margin-start">5</property>
+                                    <property name="margin-end">5</property>
+                                    <property name="margin-top">5</property>
+                                    <property name="margin-bottom">5</property>
                                     <property name="label" 
translatable="yes">Review recovery policies</property>
                                     <attributes>
                                       <attribute name="weight" value="bold"/>
@@ -2241,40 +2238,40 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                             <child>
                               <object class="GtkFrame" 
id="anastasis_gtk_challenge_frame">
                                 <property 
name="name">anastasis_gtk_challenge_frame</property>
-                                <property name="can_focus">False</property>
-                                <property name="label_xalign">0</property>
-                                <property name="shadow_type">none</property>
+                                <property name="can-focus">False</property>
+                                <property name="label-xalign">0</property>
+                                <property name="shadow-type">none</property>
                                 <child>
                                   <object class="GtkAlignment">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="left_padding">12</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="left-padding">12</property>
                                     <child>
                                       <object class="GtkBox">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
+                                        <property 
name="can-focus">False</property>
                                         <property 
name="orientation">vertical</property>
                                         <child>
                                           <object class="GtkFrame">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
-                                            <property 
name="label_xalign">0</property>
-                                            <property 
name="shadow_type">none</property>
+                                            <property 
name="can-focus">False</property>
+                                            <property 
name="label-xalign">0</property>
+                                            <property 
name="shadow-type">none</property>
                                             <child>
                                               <object class="GtkAlignment">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
-                                                <property 
name="left_padding">12</property>
+                                                <property 
name="can-focus">False</property>
+                                                <property 
name="left-padding">12</property>
                                                 <child>
                                                   <object 
class="GtkScrolledWindow">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">True</property>
-                                                    <property 
name="shadow_type">in</property>
+                                                    <property 
name="can-focus">True</property>
+                                                    <property 
name="shadow-type">in</property>
                                                     <child>
                                                       <object 
class="GtkTreeView" id="anastasis_gtk_challenge_status_treeview">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">True</property>
-                                                        <property 
name="tooltip_text" translatable="yes">Here you can see your progress in 
satisfying authorization challenges and can select the next challenge to 
solve.</property>
+                                                        <property 
name="can-focus">True</property>
+                                                        <property 
name="tooltip-text" translatable="yes">Here you can see your progress in 
satisfying authorization challenges and can select the next challenge to 
solve.</property>
                                                         <property 
name="model">challenge_status_liststore</property>
                                                         <signal 
name="row-activated" 
handler="anastasis_gtk_challenge_status_treeview_row_activated_cb" 
swapped="no"/>
                                                         <child 
internal-child="selection">
@@ -2285,7 +2282,7 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                                         <child>
                                                           <object 
class="GtkTreeViewColumn">
                                                             <property 
name="title" translatable="yes">#</property>
-                                                            <property 
name="sort_column_id">0</property>
+                                                            <property 
name="sort-column-id">0</property>
                                                             <child>
                                                             <object 
class="GtkCellRendererToggle" id="solved">
                                                             <signal 
name="toggled" handler="anastasis_gtk_challenge_status_solved_toggled_cb" 
swapped="no"/>
@@ -2343,7 +2340,7 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                                             <child>
                                                             <object 
class="GtkCellRendererText" id="instructions_text">
                                                             <property 
name="ellipsize">end</property>
-                                                            <property 
name="max_width_chars">20</property>
+                                                            <property 
name="max-width-chars">20</property>
                                                             </object>
                                                             <attributes>
                                                             <attribute 
name="text">14</attribute>
@@ -2400,12 +2397,12 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                             <child type="label">
                                               <object class="GtkLabel">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
-                                                <property name="tooltip_text" 
translatable="yes">Here you can see your progress in satisfying authorization 
challenges and possible next steps.</property>
-                                                <property 
name="margin_start">5</property>
-                                                <property 
name="margin_end">5</property>
-                                                <property 
name="margin_top">5</property>
-                                                <property 
name="margin_bottom">5</property>
+                                                <property 
name="can-focus">False</property>
+                                                <property name="tooltip-text" 
translatable="yes">Here you can see your progress in satisfying authorization 
challenges and possible next steps.</property>
+                                                <property 
name="margin-start">5</property>
+                                                <property 
name="margin-end">5</property>
+                                                <property 
name="margin-top">5</property>
+                                                <property 
name="margin-bottom">5</property>
                                                 <property name="label" 
translatable="yes">Select open challenge to solve:</property>
                                               </object>
                                             </child>
@@ -2419,27 +2416,27 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                         <child>
                                           <object class="GtkFrame">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
-                                            <property 
name="label_xalign">0</property>
-                                            <property 
name="shadow_type">none</property>
+                                            <property 
name="can-focus">False</property>
+                                            <property 
name="label-xalign">0</property>
+                                            <property 
name="shadow-type">none</property>
                                             <child>
                                               <object class="GtkAlignment">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
-                                                <property 
name="left_padding">12</property>
+                                                <property 
name="can-focus">False</property>
+                                                <property 
name="left-padding">12</property>
                                                 <child>
                                                   <object 
class="GtkScrolledWindow">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">True</property>
-                                                    <property 
name="shadow_type">in</property>
+                                                    <property 
name="can-focus">True</property>
+                                                    <property 
name="shadow-type">in</property>
                                                     <child>
                                                       <object 
class="GtkTreeView" id="anastasis_gtk_choose_policy_treeview">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">True</property>
-                                                        <property 
name="tooltip_text" translatable="yes">This table shows possible ways to 
recover the secret. For each policy, the challenges that must still be 
satisfied are listed.</property>
+                                                        <property 
name="can-focus">True</property>
+                                                        <property 
name="tooltip-text" translatable="yes">This table shows possible ways to 
recover the secret. For each policy, the challenges that must still be 
satisfied are listed.</property>
                                                         <property 
name="model">policy_review_treestore</property>
-                                                        <property 
name="enable_search">False</property>
-                                                        <property 
name="search_column">0</property>
+                                                        <property 
name="enable-search">False</property>
+                                                        <property 
name="search-column">0</property>
                                                         <child 
internal-child="selection">
                                                           <object 
class="GtkTreeSelection"/>
                                                         </child>
@@ -2520,12 +2517,12 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                             <child type="label">
                                               <object class="GtkLabel">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
-                                                <property name="tooltip_text" 
translatable="yes">This table shows possible ways to recover the secret. For 
each policy, the challenges that must still be satisfied are listed.</property>
-                                                <property 
name="margin_start">5</property>
-                                                <property 
name="margin_end">5</property>
-                                                <property 
name="margin_top">5</property>
-                                                <property 
name="margin_bottom">5</property>
+                                                <property 
name="can-focus">False</property>
+                                                <property name="tooltip-text" 
translatable="yes">This table shows possible ways to recover the secret. For 
each policy, the challenges that must still be satisfied are listed.</property>
+                                                <property 
name="margin-start">5</property>
+                                                <property 
name="margin-end">5</property>
+                                                <property 
name="margin-top">5</property>
+                                                <property 
name="margin-bottom">5</property>
                                                 <property name="label" 
translatable="yes">Recovery policies:</property>
                                               </object>
                                             </child>
@@ -2543,11 +2540,11 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                 <child type="label">
                                   <object class="GtkLabel">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="margin_start">5</property>
-                                    <property name="margin_end">5</property>
-                                    <property name="margin_top">5</property>
-                                    <property name="margin_bottom">5</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="margin-start">5</property>
+                                    <property name="margin-end">5</property>
+                                    <property name="margin-top">5</property>
+                                    <property name="margin-bottom">5</property>
                                     <property name="label" 
translatable="yes">Select challenge to recover secret:</property>
                                     <attributes>
                                       <attribute name="weight" value="bold"/>
@@ -2563,48 +2560,48 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                             </child>
                             <child>
                               <object class="GtkFrame" 
id="anastasis_gtk_enter_secret_frame">
-                                <property name="can_focus">False</property>
-                                <property name="label_xalign">0</property>
-                                <property name="shadow_type">none</property>
+                                <property name="can-focus">False</property>
+                                <property name="label-xalign">0</property>
+                                <property name="shadow-type">none</property>
                                 <child>
                                   <object class="GtkScrolledWindow" 
id="secret_frame_scrolled_window">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
+                                    <property name="can-focus">True</property>
                                     <property name="vexpand">True</property>
                                     <property 
name="hadjustment">secret_box_adjustmenth</property>
                                     <property 
name="vadjustment">secret_box_adjustmentv</property>
-                                    <property name="shadow_type">in</property>
-                                    <property 
name="propagate_natural_width">True</property>
-                                    <property 
name="propagate_natural_height">True</property>
+                                    <property name="shadow-type">in</property>
+                                    <property 
name="propagate-natural-width">True</property>
+                                    <property 
name="propagate-natural-height">True</property>
                                     <child>
                                       <object class="GtkViewport" 
id="secret_frame_viewport">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
+                                        <property 
name="can-focus">False</property>
                                         <property 
name="hexpand">True</property>
                                         <property 
name="hadjustment">secret_box_adjustmenth</property>
                                         <property 
name="vadjustment">secret_box_adjustmentv</property>
                                         <child>
                                           <object class="GtkBox" 
id="secret_frame_main_vbox">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
+                                            <property 
name="can-focus">False</property>
                                             <property 
name="valign">start</property>
-                                            <property 
name="margin_start">10</property>
-                                            <property 
name="margin_end">10</property>
-                                            <property 
name="margin_top">5</property>
-                                            <property 
name="margin_bottom">5</property>
+                                            <property 
name="margin-start">10</property>
+                                            <property 
name="margin-end">10</property>
+                                            <property 
name="margin-top">5</property>
+                                            <property 
name="margin-bottom">5</property>
                                             <property 
name="orientation">vertical</property>
                                             <property 
name="spacing">5</property>
-                                            <property 
name="baseline_position">top</property>
+                                            <property 
name="baseline-position">top</property>
                                             <child>
                                               <object class="GtkBox" 
id="secret_name_vbox">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
+                                                <property 
name="can-focus">False</property>
                                                 <property 
name="orientation">vertical</property>
                                                 <property 
name="spacing">5</property>
                                                 <child>
                                                   <object class="GtkLabel">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="can-focus">False</property>
                                                     <property 
name="halign">start</property>
                                                     <property 
name="valign">start</property>
                                                     <property name="label" 
translatable="yes">Secret's name</property>
@@ -2619,8 +2616,8 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                                 <child>
                                                   <object class="GtkEntry" 
id="anastasis_gtk_secret_name_entry">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">True</property>
-                                                    <property 
name="has_focus">True</property>
+                                                    <property 
name="can-focus">True</property>
+                                                    <property 
name="has-focus">True</property>
                                                     <signal name="changed" 
handler="anastasis_gtk_enter_secret_name_entry_changed_cb" swapped="no"/>
                                                   </object>
                                                   <packing>
@@ -2633,7 +2630,7 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                                 <child>
                                                   <object class="GtkLabel" 
id="secret_name_explanation_label">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="can-focus">False</property>
                                                     <property 
name="halign">start</property>
                                                     <property name="label" 
translatable="yes">Names should be unique, so that you can easily
 identify your secret later.</property>
@@ -2656,16 +2653,16 @@ identify your secret later.</property>
                                             <child>
                                               <object class="GtkBox" 
id="secret_entry_vbox">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
+                                                <property 
name="can-focus">False</property>
                                                 <property 
name="orientation">vertical</property>
                                                 <child>
                                                   <object class="GtkBox">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="can-focus">False</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="secret_text_label">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">False</property>
+                                                        <property 
name="can-focus">False</property>
                                                         <property 
name="halign">start</property>
                                                         <property name="label" 
translatable="yes">Provide secret as text</property>
                                                       </object>
@@ -2686,20 +2683,20 @@ identify your secret later.</property>
                                                 <child>
                                                   <object class="GtkBox">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="can-focus">False</property>
                                                     <child>
                                                       <object class="GtkEntry" 
id="anastasis_gtk_enter_secret_entry">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">True</property>
+                                                        <property 
name="can-focus">True</property>
                                                         <property 
name="valign">start</property>
-                                                        <property 
name="margin_left">5</property>
-                                                        <property 
name="margin_right">5</property>
-                                                        <property 
name="margin_start">5</property>
-                                                        <property 
name="margin_end">5</property>
+                                                        <property 
name="margin-left">5</property>
+                                                        <property 
name="margin-right">5</property>
+                                                        <property 
name="margin-start">5</property>
+                                                        <property 
name="margin-end">5</property>
                                                         <property 
name="hexpand">True</property>
-                                                        <property 
name="primary_icon_stock">gtk-dialog-authentication</property>
-                                                        <property 
name="placeholder_text" translatable="yes">Type or paste your secret 
here</property>
-                                                        <property 
name="input_purpose">password</property>
+                                                        <property 
name="primary-icon-stock">gtk-dialog-authentication</property>
+                                                        <property 
name="placeholder-text" translatable="yes">Type or paste your secret 
here</property>
+                                                        <property 
name="input-purpose">password</property>
                                                         <signal name="changed" 
handler="anastasis_gtk_enter_secret_entry_changed_cb" swapped="no"/>
                                                       </object>
                                                       <packing>
@@ -2712,17 +2709,17 @@ identify your secret later.</property>
                                                     <child>
                                                       <object 
class="GtkButton" id="anastasis_gtk_secret_clear_text_button">
                                                         <property 
name="label">gtk-clear</property>
-                                                        <property 
name="can_focus">True</property>
-                                                        <property 
name="receives_default">True</property>
-                                                        <property 
name="use_stock">True</property>
-                                                        <property 
name="always_show_image">True</property>
+                                                        <property 
name="can-focus">True</property>
+                                                        <property 
name="receives-default">True</property>
+                                                        <property 
name="use-stock">True</property>
+                                                        <property 
name="always-show-image">True</property>
                                                         <signal name="clicked" 
handler="anastasis_gtk_secret_clear_button_clicked_cb" swapped="no"/>
                                                       </object>
                                                       <packing>
                                                         <property 
name="expand">False</property>
                                                         <property 
name="fill">True</property>
                                                         <property 
name="padding">5</property>
-                                                        <property 
name="pack_type">end</property>
+                                                        <property 
name="pack-type">end</property>
                                                         <property 
name="position">1</property>
                                                       </packing>
                                                     </child>
@@ -2737,19 +2734,19 @@ identify your secret later.</property>
                                                   <object class="GtkBox">
                                                     <property 
name="name">anastasis_gtk_enter_secret_file_box</property>
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
-                                                    <property 
name="margin_top">5</property>
-                                                    <property 
name="margin_bottom">5</property>
+                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="margin-top">5</property>
+                                                    <property 
name="margin-bottom">5</property>
                                                     <property 
name="spacing">10</property>
                                                     <child>
                                                       <object class="GtkBox" 
id="anastasis_gtk_secret_file_chooser_hbox">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">False</property>
+                                                        <property 
name="can-focus">False</property>
                                                         <property 
name="spacing">5</property>
                                                         <child>
                                                           <object 
class="GtkLabel" id="secret_by_file_label">
                                                             <property 
name="visible">True</property>
-                                                            <property 
name="can_focus">False</property>
+                                                            <property 
name="can-focus">False</property>
                                                             <property 
name="label" translatable="yes">Or provide secret as a file:</property>
                                                           </object>
                                                           <packing>
@@ -2763,11 +2760,11 @@ identify your secret later.</property>
                                                           <object 
class="GtkButton" id="anastasis_gtk_enter_secret_open_button">
                                                             <property 
name="label">Choose file</property>
                                                             <property 
name="visible">True</property>
-                                                            <property 
name="can_focus">True</property>
-                                                            <property 
name="can_default">True</property>
-                                                            <property 
name="receives_default">True</property>
+                                                            <property 
name="can-focus">True</property>
+                                                            <property 
name="can-default">True</property>
+                                                            <property 
name="receives-default">True</property>
                                                             <property 
name="image">open_file_image</property>
-                                                            <property 
name="always_show_image">True</property>
+                                                            <property 
name="always-show-image">True</property>
                                                             <signal 
name="clicked" handler="anastasis_gtk_enter_secret_open_button_clicked_cb" 
swapped="no"/>
                                                           </object>
                                                           <packing>
@@ -2787,12 +2784,12 @@ identify your secret later.</property>
                                                     </child>
                                                     <child>
                                                       <object class="GtkBox" 
id="anastasis_gtk_secret_file_name_hbox">
-                                                        <property 
name="can_focus">False</property>
+                                                        <property 
name="can-focus">False</property>
                                                         <property 
name="spacing">5</property>
                                                         <child>
                                                           <object 
class="GtkLabel" id="secret_file_name_label">
                                                             <property 
name="visible">True</property>
-                                                            <property 
name="can_focus">False</property>
+                                                            <property 
name="can-focus">False</property>
                                                             <property 
name="label" translatable="yes">Your secret file:</property>
                                                           </object>
                                                           <packing>
@@ -2805,7 +2802,7 @@ identify your secret later.</property>
                                                         <child>
                                                           <object 
class="GtkLabel" id="anastasis_gtk_secret_file_name_label">
                                                             <property 
name="visible">True</property>
-                                                            <property 
name="can_focus">False</property>
+                                                            <property 
name="can-focus">False</property>
                                                             <property 
name="label">DYNAMICALLY GENERATED</property>
                                                             <attributes>
                                                             <attribute 
name="weight" value="bold"/>
@@ -2820,17 +2817,17 @@ identify your secret later.</property>
                                                         <child>
                                                           <object 
class="GtkButton" id="anastasis_gtk_secret_clear_file_button">
                                                             <property 
name="label">gtk-clear</property>
-                                                            <property 
name="can_focus">True</property>
-                                                            <property 
name="receives_default">True</property>
-                                                            <property 
name="use_stock">True</property>
-                                                            <property 
name="always_show_image">True</property>
+                                                            <property 
name="can-focus">True</property>
+                                                            <property 
name="receives-default">True</property>
+                                                            <property 
name="use-stock">True</property>
+                                                            <property 
name="always-show-image">True</property>
                                                             <signal 
name="clicked" handler="anastasis_gtk_secret_clear_button_clicked_cb" 
swapped="no"/>
                                                           </object>
                                                           <packing>
                                                             <property 
name="expand">False</property>
                                                             <property 
name="fill">True</property>
                                                             <property 
name="padding">5</property>
-                                                            <property 
name="pack_type">end</property>
+                                                            <property 
name="pack-type">end</property>
                                                             <property 
name="position">2</property>
                                                           </packing>
                                                         </child>
@@ -2860,15 +2857,15 @@ identify your secret later.</property>
                                             <child>
                                               <object class="GtkBox" 
id="expiration_vbox">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
+                                                <property 
name="can-focus">False</property>
                                                 <property 
name="halign">start</property>
                                                 <property 
name="orientation">vertical</property>
                                                 <property 
name="spacing">5</property>
-                                                <property 
name="baseline_position">top</property>
+                                                <property 
name="baseline-position">top</property>
                                                 <child>
                                                   <object class="GtkLabel" 
id="recovery_expiration_label">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="can-focus">False</property>
                                                     <property name="label" 
translatable="yes">Your secret's recovery data expires on:</property>
                                                   </object>
                                                   <packing>
@@ -2881,11 +2878,11 @@ identify your secret later.</property>
                                                 <child>
                                                   <object class="GtkBox" 
id="expiration_hbox">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="can-focus">False</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="expiration_date_without_year_label">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">False</property>
+                                                        <property 
name="can-focus">False</property>
                                                         <property 
name="label">DYNAMICALLY SET</property>
                                                         <attributes>
                                                           <attribute 
name="weight" value="bold"/>
@@ -2900,11 +2897,11 @@ identify your secret later.</property>
                                                     <child>
                                                       <object 
class="GtkSpinButton" id="expiration_year_spin_button">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">True</property>
-                                                        <property 
name="max_length">4</property>
-                                                        <property 
name="width_chars">4</property>
-                                                        <property 
name="max_width_chars">4</property>
-                                                        <property 
name="input_purpose">digits</property>
+                                                        <property 
name="can-focus">True</property>
+                                                        <property 
name="max-length">4</property>
+                                                        <property 
name="width-chars">4</property>
+                                                        <property 
name="max-width-chars">4</property>
+                                                        <property 
name="input-purpose">digits</property>
                                                         <property 
name="adjustment">expiration_year_adjustment</property>
                                                         <property 
name="numeric">True</property>
                                                         <property 
name="value">9999</property>
@@ -2935,18 +2932,18 @@ identify your secret later.</property>
                                             <child>
                                               <object class="GtkBox" 
id="payment_info_vbox">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
+                                                <property 
name="can-focus">False</property>
                                                 <property 
name="orientation">vertical</property>
                                                 <property 
name="spacing">10</property>
                                                 <child>
                                                   <object class="GtkBox" 
id="backup_free_hbox">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="can-focus">False</property>
                                                     <property 
name="spacing">10</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="backup_fee_label">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">False</property>
+                                                        <property 
name="can-focus">False</property>
                                                         <property name="label" 
translatable="yes">Backup fee:</property>
                                                       </object>
                                                       <packing>
@@ -2959,7 +2956,7 @@ identify your secret later.</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="backup_fee_value_label">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">False</property>
+                                                        <property 
name="can-focus">False</property>
                                                         <property 
name="label">DYNAMICALLY SET</property>
                                                         <attributes>
                                                           <attribute 
name="weight" value="bold"/>
@@ -2983,7 +2980,7 @@ identify your secret later.</property>
                                                 <child>
                                                   <object class="GtkLabel" 
id="backup_fee_explainer_label">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="can-focus">False</property>
                                                     <property 
name="halign">start</property>
                                                     <property name="label" 
translatable="yes">You pay this fee to back up your secret.
 The fee may increase with the expiry
@@ -3013,11 +3010,11 @@ date of your secret's recovery data.</property>
                                 <child type="label">
                                   <object class="GtkLabel">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="margin_start">5</property>
-                                    <property name="margin_end">5</property>
-                                    <property name="margin_top">10</property>
-                                    <property 
name="margin_bottom">10</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="margin-start">5</property>
+                                    <property name="margin-end">5</property>
+                                    <property name="margin-top">10</property>
+                                    <property 
name="margin-bottom">10</property>
                                     <property name="label" 
translatable="yes">Provide secret to backup:</property>
                                     <attributes>
                                       <attribute name="weight" value="bold"/>
@@ -3034,29 +3031,29 @@ date of your secret's recovery data.</property>
                             </child>
                             <child>
                               <object class="GtkFrame" 
id="anastasis_gtk_pay_frame">
-                                <property name="can_focus">False</property>
-                                <property name="label_xalign">0</property>
-                                <property name="shadow_type">none</property>
+                                <property name="can-focus">False</property>
+                                <property name="label-xalign">0</property>
+                                <property name="shadow-type">none</property>
                                 <child>
                                   <object class="GtkAlignment">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="margin_top">5</property>
-                                    <property name="left_padding">12</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="margin-top">5</property>
+                                    <property name="left-padding">12</property>
                                     <child>
                                       <object class="GtkBox">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
+                                        <property 
name="can-focus">False</property>
                                         <property name="spacing">5</property>
                                         <child>
                                           <object class="GtkBox">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
+                                            <property 
name="can-focus">False</property>
                                             <property 
name="orientation">vertical</property>
                                             <child>
                                               <object class="GtkLabel">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
+                                                <property 
name="can-focus">False</property>
                                                 <property name="label" 
translatable="yes">Please pay with GNU Taler:</property>
                                               </object>
                                               <packing>
@@ -3069,22 +3066,22 @@ date of your secret's recovery data.</property>
                                             <child>
                                               <object class="GtkBox" 
id="anastasis_gtk_main_window_unpaid_box">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
-                                                <property 
name="margin_left">5</property>
-                                                <property 
name="margin_right">5</property>
-                                                <property 
name="margin_start">5</property>
-                                                <property 
name="margin_end">5</property>
-                                                <property 
name="margin_top">5</property>
-                                                <property 
name="margin_bottom">5</property>
+                                                <property 
name="can-focus">False</property>
+                                                <property 
name="margin-left">5</property>
+                                                <property 
name="margin-right">5</property>
+                                                <property 
name="margin-start">5</property>
+                                                <property 
name="margin-end">5</property>
+                                                <property 
name="margin-top">5</property>
+                                                <property 
name="margin-bottom">5</property>
                                                 <property 
name="orientation">vertical</property>
                                                 <property 
name="spacing">5</property>
                                                 <child>
                                                   <object class="GtkTreeView" 
id="unpaid_qr_treeview">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">True</property>
+                                                    <property 
name="can-focus">True</property>
                                                     <property 
name="model">unpaid_qrcodes_liststore</property>
-                                                    <property 
name="enable_search">False</property>
-                                                    <property 
name="search_column">1</property>
+                                                    <property 
name="enable-search">False</property>
+                                                    <property 
name="search-column">1</property>
                                                     <child 
internal-child="selection">
                                                       <object 
class="GtkTreeSelection" id="unpaid_qr_tree_selection">
                                                         <signal name="changed" 
handler="unpaid_qr_tree_selection_changed_cb" swapped="no"/>
@@ -3147,11 +3144,11 @@ date of your secret's recovery data.</property>
                                 <child type="label">
                                   <object class="GtkLabel">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="margin_start">5</property>
-                                    <property name="margin_end">5</property>
-                                    <property name="margin_top">10</property>
-                                    <property name="margin_bottom">5</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="margin-start">5</property>
+                                    <property name="margin-end">5</property>
+                                    <property name="margin-top">10</property>
+                                    <property name="margin-bottom">5</property>
                                     <property name="label" 
translatable="yes">Payment required:</property>
                                     <attributes>
                                       <attribute name="weight" value="bold"/>
@@ -3167,30 +3164,30 @@ date of your secret's recovery data.</property>
                             </child>
                             <child>
                               <object class="GtkFrame" 
id="anastasis_gtk_completed_frame">
-                                <property name="can_focus">False</property>
-                                <property name="label_xalign">0</property>
-                                <property name="shadow_type">none</property>
+                                <property name="can-focus">False</property>
+                                <property name="label-xalign">0</property>
+                                <property name="shadow-type">none</property>
                                 <child>
                                   <object class="GtkAlignment">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="margin_start">10</property>
-                                    <property name="margin_end">10</property>
-                                    <property name="margin_top">10</property>
-                                    <property 
name="margin_bottom">10</property>
-                                    <property name="left_padding">12</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="margin-start">10</property>
+                                    <property name="margin-end">10</property>
+                                    <property name="margin-top">10</property>
+                                    <property 
name="margin-bottom">10</property>
+                                    <property name="left-padding">12</property>
                                     <child>
                                       <object class="GtkBox" 
id="anastasis_gtk_success_box">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
+                                        <property 
name="can-focus">False</property>
                                         <child>
                                           <object class="GtkBox" 
id="anastasis_gtk_backup_complete_box">
                                             <property 
name="name">anastasis_gtk_backup_complete_box</property>
-                                            <property 
name="can_focus">False</property>
+                                            <property 
name="can-focus">False</property>
                                             <property 
name="orientation">vertical</property>
                                             <child>
                                               <object class="GtkLabel" 
id="anastasis_gtk_success_backup_label">
-                                                <property 
name="can_focus">False</property>
+                                                <property 
name="can-focus">False</property>
                                                 <property 
name="halign">start</property>
                                                 <property name="label" 
translatable="yes">Your backup is complete.</property>
                                                 <property 
name="justify">center</property>
@@ -3208,12 +3205,12 @@ date of your secret's recovery data.</property>
                                             <child>
                                               <object class="GtkBox" 
id="recovery_expiration_box">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
+                                                <property 
name="can-focus">False</property>
                                                 <property 
name="spacing">5</property>
                                                 <child>
                                                   <object class="GtkLabel" 
id="backup_expiration_label">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="can-focus">False</property>
                                                     <property 
name="halign">start</property>
                                                     <property name="label" 
translatable="yes">Your backup is valid until:</property>
                                                   </object>
@@ -3226,7 +3223,7 @@ date of your secret's recovery data.</property>
                                                 </child>
                                                 <child>
                                                   <object class="GtkLabel" 
id="backup_expiration_date_label">
-                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="can-focus">False</property>
                                                     <property 
name="label">DYNAMICALLY GENERATED</property>
                                                     <attributes>
                                                       <attribute name="weight" 
value="bold"/>
@@ -3249,11 +3246,11 @@ date of your secret's recovery data.</property>
                                             <child>
                                               <object class="GtkBox">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
+                                                <property 
name="can-focus">False</property>
                                                 <property 
name="orientation">vertical</property>
                                                 <child>
                                                   <object class="GtkLabel" 
id="anastasis_gtk_success_backup_version_label">
-                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="can-focus">False</property>
                                                     <property 
name="halign">start</property>
                                                     <property name="label" 
translatable="yes">Backups were made at the following providers:</property>
                                                   </object>
@@ -3267,14 +3264,14 @@ date of your secret's recovery data.</property>
                                                 <child>
                                                   <object 
class="GtkScrolledWindow">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">True</property>
-                                                    <property 
name="shadow_type">in</property>
+                                                    <property 
name="can-focus">True</property>
+                                                    <property 
name="shadow-type">in</property>
                                                     <child>
                                                       <object 
class="GtkTreeView" id="anastasis_gtk_backup_complete_treeview">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can_focus">True</property>
+                                                        <property 
name="can-focus">True</property>
                                                         <property 
name="model">backup_provider_liststore</property>
-                                                        <property 
name="search_column">0</property>
+                                                        <property 
name="search-column">0</property>
                                                         <child 
internal-child="selection">
                                                           <object 
class="GtkTreeSelection"/>
                                                         </child>
@@ -3345,12 +3342,12 @@ date of your secret's recovery data.</property>
                                         <child>
                                           <object class="GtkBox" 
id="anastasis_gtk_success_recovery_box">
                                             <property 
name="name">anastasis_gtk_success_recovery_box</property>
-                                            <property 
name="can_focus">False</property>
+                                            <property 
name="can-focus">False</property>
                                             <property 
name="orientation">vertical</property>
                                             <child>
                                               <object class="GtkLabel" 
id="anastasis_gtk_success_recovery_label">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
+                                                <property 
name="can-focus">False</property>
                                                 <property 
name="halign">start</property>
                                                 <property name="label" 
translatable="yes">Your secret was recovered.</property>
                                                 <attributes>
@@ -3367,11 +3364,11 @@ date of your secret's recovery data.</property>
                                             <child>
                                               <object class="GtkBox" 
id="recovery_secret_name_hbox">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
+                                                <property 
name="can-focus">False</property>
                                                 <child>
                                                   <object class="GtkLabel">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="can-focus">False</property>
                                                     <property name="label" 
translatable="yes">Secret name:</property>
                                                     <attributes>
                                                       <attribute name="weight" 
value="bold"/>
@@ -3387,7 +3384,7 @@ date of your secret's recovery data.</property>
                                                 <child>
                                                   <object class="GtkLabel" 
id="recovery_secret_name_value_label">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="can-focus">False</property>
                                                     <property 
name="label">DYNAMICALLY GENERATED</property>
                                                   </object>
                                                   <packing>
@@ -3407,15 +3404,15 @@ date of your secret's recovery data.</property>
                                             <child>
                                               <object class="GtkBox">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
+                                                <property 
name="can-focus">False</property>
                                                 <child>
                                                   <object class="GtkLabel" 
id="anastasis_gtk_secret_value_label">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
-                                                    <property 
name="tooltip_text" translatable="yes">The secret is shown here. You can also 
copy it to the clipboard or save it to a file.</property>
+                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="tooltip-text" translatable="yes">The secret is shown here. You can also 
copy it to the clipboard or save it to a file.</property>
                                                     <property name="label">THE 
SECRET TEXT</property>
                                                     <property 
name="wrap">True</property>
-                                                    <property 
name="wrap_mode">word-char</property>
+                                                    <property 
name="wrap-mode">word-char</property>
                                                     <property 
name="ellipsize">end</property>
                                                   </object>
                                                   <packing>
@@ -3429,12 +3426,12 @@ date of your secret's recovery data.</property>
                                                   <object class="GtkButton" 
id="anastasis_gtk_secret_copy_button">
                                                     <property 
name="label">gtk-copy</property>
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">True</property>
-                                                    <property 
name="can_default">True</property>
-                                                    <property 
name="receives_default">True</property>
-                                                    <property 
name="tooltip_text" translatable="yes">Copy secret to clipboard</property>
-                                                    <property 
name="use_stock">True</property>
-                                                    <property 
name="always_show_image">True</property>
+                                                    <property 
name="can-focus">True</property>
+                                                    <property 
name="can-default">True</property>
+                                                    <property 
name="receives-default">True</property>
+                                                    <property 
name="tooltip-text" translatable="yes">Copy secret to clipboard</property>
+                                                    <property 
name="use-stock">True</property>
+                                                    <property 
name="always-show-image">True</property>
                                                     <signal name="clicked" 
handler="anastasis_gtk_secret_copy_button_clicked_cb" swapped="no"/>
                                                   </object>
                                                   <packing>
@@ -3448,11 +3445,11 @@ date of your secret's recovery data.</property>
                                                   <object class="GtkButton" 
id="anastasis_gtk_secret_save_as_button">
                                                     <property 
name="label">gtk-save-as</property>
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">True</property>
-                                                    <property 
name="receives_default">True</property>
-                                                    <property 
name="tooltip_text" translatable="yes">Save secret to file</property>
-                                                    <property 
name="use_stock">True</property>
-                                                    <property 
name="always_show_image">True</property>
+                                                    <property 
name="can-focus">True</property>
+                                                    <property 
name="receives-default">True</property>
+                                                    <property 
name="tooltip-text" translatable="yes">Save secret to file</property>
+                                                    <property 
name="use-stock">True</property>
+                                                    <property 
name="always-show-image">True</property>
                                                     <signal name="clicked" 
handler="anastasis_gtk_secret_save_as_button_clicked_cb" swapped="no"/>
                                                   </object>
                                                   <packing>
@@ -3473,21 +3470,21 @@ date of your secret's recovery data.</property>
                                             <child>
                                               <object class="GtkViewport">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
+                                                <property 
name="can-focus">False</property>
                                                 <property 
name="hexpand">True</property>
                                                 <property 
name="vexpand">True</property>
                                                 <child>
                                                   <object class="GtkImage" 
id="anastasis_gtk_secret_qr_image">
-                                                    <property 
name="width_request">400</property>
-                                                    <property 
name="height_request">400</property>
+                                                    <property 
name="width-request">400</property>
+                                                    <property 
name="height-request">400</property>
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can_focus">False</property>
-                                                    <property 
name="margin_left">10</property>
-                                                    <property 
name="margin_right">10</property>
-                                                    <property 
name="margin_start">10</property>
-                                                    <property 
name="margin_end">10</property>
-                                                    <property 
name="margin_top">10</property>
-                                                    <property 
name="margin_bottom">10</property>
+                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="margin-left">10</property>
+                                                    <property 
name="margin-right">10</property>
+                                                    <property 
name="margin-start">10</property>
+                                                    <property 
name="margin-end">10</property>
+                                                    <property 
name="margin-top">10</property>
+                                                    <property 
name="margin-bottom">10</property>
                                                     <property 
name="hexpand">True</property>
                                                     <property 
name="vexpand">True</property>
                                                     <property 
name="stock">gtk-missing-image</property>
@@ -3518,11 +3515,11 @@ date of your secret's recovery data.</property>
                                 <child type="label">
                                   <object class="GtkLabel" 
id="anastasis_gtk_backup_success_label">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="margin_start">10</property>
-                                    <property name="margin_end">10</property>
-                                    <property name="margin_top">10</property>
-                                    <property 
name="margin_bottom">10</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="margin-start">10</property>
+                                    <property name="margin-end">10</property>
+                                    <property name="margin-top">10</property>
+                                    <property 
name="margin-bottom">10</property>
                                     <property name="label" 
translatable="yes">Success!</property>
                                     <attributes>
                                       <attribute name="weight" value="bold"/>
@@ -3539,32 +3536,32 @@ date of your secret's recovery data.</property>
                             </child>
                             <child>
                               <object class="GtkFrame" 
id="anastasis_gtk_select_secret_frame">
-                                <property name="can_focus">False</property>
-                                <property name="label_xalign">0</property>
-                                <property name="shadow_type">none</property>
+                                <property name="can-focus">False</property>
+                                <property name="label-xalign">0</property>
+                                <property name="shadow-type">none</property>
                                 <child>
                                   <object class="GtkAlignment">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="left_padding">12</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="left-padding">12</property>
                                     <child>
                                       <object class="GtkBox" 
id="anastasis_gtk_secret_select_vbox">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
+                                        <property 
name="can-focus">False</property>
                                         <property 
name="orientation">vertical</property>
                                         <property name="spacing">10</property>
                                         <child>
                                           <object class="GtkBox" 
id="provider_selection_vbox">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
+                                            <property 
name="can-focus">False</property>
                                             <property 
name="halign">start</property>
                                             <property 
name="orientation">vertical</property>
                                             <property 
name="spacing">5</property>
                                             <child>
                                               <object class="GtkLabel" 
id="anastasis_gtk_provider_url_label">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
-                                                <property name="tooltip_text" 
translatable="yes">This is the URL of the provider from which we downloaded the 
recovery document.</property>
+                                                <property 
name="can-focus">False</property>
+                                                <property name="tooltip-text" 
translatable="yes">This is the URL of the provider from which we downloaded the 
recovery document.</property>
                                                 <property 
name="halign">start</property>
                                                 <property name="label" 
translatable="yes">Select a provider</property>
                                               </object>
@@ -3578,21 +3575,21 @@ date of your secret's recovery data.</property>
                                             <child>
                                               <object class="GtkComboBoxText" 
id="anastasis_gtk_provider_url_combo_box_text">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
-                                                <property 
name="margin_left">5</property>
-                                                <property 
name="margin_right">5</property>
-                                                <property 
name="margin_start">5</property>
-                                                <property 
name="margin_end">5</property>
-                                                <property 
name="margin_top">5</property>
-                                                <property 
name="margin_bottom">5</property>
-                                                <property 
name="has_entry">True</property>
+                                                <property 
name="can-focus">False</property>
+                                                <property 
name="margin-left">5</property>
+                                                <property 
name="margin-right">5</property>
+                                                <property 
name="margin-start">5</property>
+                                                <property 
name="margin-end">5</property>
+                                                <property 
name="margin-top">5</property>
+                                                <property 
name="margin-bottom">5</property>
+                                                <property 
name="has-entry">True</property>
                                                 <child internal-child="entry">
                                                   <object class="GtkEntry" 
id="anastasis_gtk_provider_url_entry">
-                                                    <property 
name="can_focus">True</property>
-                                                    <property 
name="max_length">1024</property>
-                                                    <property 
name="width_chars">32</property>
-                                                    <property 
name="placeholder_text" translatable="yes">https://</property>
-                                                    <property 
name="input_purpose">url</property>
+                                                    <property 
name="can-focus">True</property>
+                                                    <property 
name="max-length">1024</property>
+                                                    <property 
name="width-chars">32</property>
+                                                    <property 
name="placeholder-text" translatable="yes">https://</property>
+                                                    <property 
name="input-purpose">url</property>
                                                     <signal name="changed" 
handler="anastasis_gtk_provider_url_entry_changed_cb" swapped="no"/>
                                                   </object>
                                                 </child>
@@ -3615,14 +3612,14 @@ date of your secret's recovery data.</property>
                                         <child>
                                           <object class="GtkBox" 
id="backup_version_selection_vbox">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
+                                            <property 
name="can-focus">False</property>
                                             <property 
name="halign">start</property>
                                             <property 
name="orientation">vertical</property>
                                             <child>
                                               <object class="GtkLabel" 
id="anastasis_gtk_backup_version_label">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
-                                                <property name="tooltip_text" 
translatable="yes">This is the version of the backup at the provider. By 
default, the latest available backup version is obtained.</property>
+                                                <property 
name="can-focus">False</property>
+                                                <property name="tooltip-text" 
translatable="yes">This is the version of the backup at the provider. By 
default, the latest available backup version is obtained.</property>
                                                 <property 
name="halign">start</property>
                                                 <property name="label" 
translatable="yes">Select a backup version</property>
                                               </object>
@@ -3635,13 +3632,13 @@ date of your secret's recovery data.</property>
                                             <child>
                                               <object class="GtkSpinButton" 
id="anastasis_gtk_policy_version_spin_button">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">True</property>
-                                                <property 
name="margin_right">5</property>
-                                                <property 
name="margin_end">5</property>
+                                                <property 
name="can-focus">True</property>
+                                                <property 
name="margin-right">5</property>
+                                                <property 
name="margin-end">5</property>
                                                 <property name="text" 
translatable="yes">0</property>
-                                                <property 
name="input_purpose">number</property>
+                                                <property 
name="input-purpose">number</property>
                                                 <property 
name="adjustment">policy_version_adjustment</property>
-                                                <property 
name="climb_rate">1</property>
+                                                <property 
name="climb-rate">1</property>
                                                 <property 
name="numeric">True</property>
                                                 <signal name="changed" 
handler="anastasis_gtk_policy_version_spin_button_changed_cb" swapped="no"/>
                                               </object>
@@ -3655,7 +3652,7 @@ date of your secret's recovery data.</property>
                                             <child>
                                               <object class="GtkLabel" 
id="backup_version_explainer_label">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
+                                                <property 
name="can-focus">False</property>
                                                 <property name="label" 
translatable="yes">To see other backup versions,
 choose a different provider.</property>
                                                 <attributes>
@@ -3680,14 +3677,14 @@ choose a different provider.</property>
                                         <child>
                                           <object class="GtkBox" 
id="anastasis_gtk_secret_identification_vbox">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
+                                            <property 
name="can-focus">False</property>
                                             <property 
name="halign">start</property>
                                             <property 
name="orientation">vertical</property>
                                             <property 
name="spacing">5</property>
                                             <child>
                                               <object class="GtkLabel" 
id="secret_name_explainer_label">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
+                                                <property 
name="can-focus">False</property>
                                                 <property 
name="halign">start</property>
                                                 <property name="label" 
translatable="yes">The secret name associated with this backup version 
is:</property>
                                               </object>
@@ -3701,7 +3698,7 @@ choose a different provider.</property>
                                             <child>
                                               <object class="GtkLabel" 
id="anastasis_gtk_secret_name_label">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
+                                                <property 
name="can-focus">False</property>
                                                 <property 
name="label">COMPUTATIONALLY GENERATED</property>
                                                 <attributes>
                                                   <attribute name="weight" 
value="bold"/>
@@ -3716,7 +3713,7 @@ choose a different provider.</property>
                                             <child>
                                               <object class="GtkLabel" 
id="secret_recovery_change_explainer_label">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can_focus">False</property>
+                                                <property 
name="can-focus">False</property>
                                                 <property 
name="halign">start</property>
                                                 <property name="label" 
translatable="yes">If this is not the secret you want to recover,
 select a different provider or backup version.</property>
@@ -3746,7 +3743,7 @@ select a different provider or backup version.</property>
                                 <child type="label">
                                   <object class="GtkLabel">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
+                                    <property name="can-focus">False</property>
                                     <property name="label" 
translatable="yes">Select secret to recover</property>
                                     <attributes>
                                       <attribute name="weight" value="bold"/>
@@ -3783,12 +3780,12 @@ select a different provider or backup 
version.</property>
             </child>
             <child>
               <object class="GtkBox" id="anastasis_gtk_illustration_vbox">
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="vexpand">True</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkImage" 
id="anastasis_gtk_continent_selection_image">
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="vexpand">True</property>
                     <property name="stock">gtk-missing-image</property>
                   </object>
@@ -3800,8 +3797,8 @@ select a different provider or backup version.</property>
                 </child>
                 <child>
                   <object class="GtkImage" 
id="anastasis_gtk_country_selection_image">
-                    <property name="width_request">100</property>
-                    <property name="can_focus">False</property>
+                    <property name="width-request">100</property>
+                    <property name="can-focus">False</property>
                     <property name="vexpand">True</property>
                     <property name="stock">gtk-missing-image</property>
                   </object>
@@ -3813,7 +3810,7 @@ select a different provider or backup version.</property>
                 </child>
                 <child>
                   <object class="GtkImage" 
id="anastasis_gtk_user_attributes_image">
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="vexpand">True</property>
                     <property name="stock">gtk-missing-image</property>
                   </object>
@@ -3825,7 +3822,7 @@ select a different provider or backup version.</property>
                 </child>
                 <child>
                   <object class="GtkImage" 
id="anastasis_gtk_b_authentication_methods_image">
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="vexpand">True</property>
                     <property name="stock">gtk-missing-image</property>
                   </object>
@@ -3837,7 +3834,7 @@ select a different provider or backup version.</property>
                 </child>
                 <child>
                   <object class="GtkImage" id="anastasis_gtk_b_policies_image">
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="vexpand">True</property>
                     <property name="stock">gtk-missing-image</property>
                   </object>
@@ -3849,7 +3846,7 @@ select a different provider or backup version.</property>
                 </child>
                 <child>
                   <object class="GtkImage" 
id="anastasis_gtk_enter_secret_image">
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="vexpand">True</property>
                     <property name="stock">gtk-missing-image</property>
                   </object>
@@ -3861,7 +3858,7 @@ select a different provider or backup version.</property>
                 </child>
                 <child>
                   <object class="GtkImage" id="anastasis_gtk_pay_image">
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="vexpand">True</property>
                     <property name="stock">gtk-missing-image</property>
                   </object>
@@ -3873,7 +3870,7 @@ select a different provider or backup version.</property>
                 </child>
                 <child>
                   <object class="GtkImage" id="anastasis_gtk_completed_image">
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="vexpand">True</property>
                     <property name="stock">gtk-missing-image</property>
                   </object>
@@ -3899,16 +3896,16 @@ select a different provider or backup 
version.</property>
         </child>
         <child>
           <object class="GtkBox" id="anastasis_gtk_main_control_vbox">
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <child>
               <object class="GtkButton" 
id="anastasis_gtk_main_window_prev_button">
                 <property name="label">gtk-go-back</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-                <property name="always_show_image">True</property>
+                <property name="can-focus">True</property>
+                <property name="can-default">True</property>
+                <property name="receives-default">True</property>
+                <property name="use-stock">True</property>
+                <property name="always-show-image">True</property>
                 <signal name="clicked" 
handler="anastasis_gtk_main_window_back_clicked" swapped="no"/>
               </object>
               <packing>
@@ -3921,12 +3918,12 @@ select a different provider or backup 
version.</property>
             <child>
               <object class="GtkButton" id="anastasis_gtk_restart_button">
                 <property name="label" translatable="yes">_Restart</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Go back to 
the beginning.</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
+                <property name="tooltip-text" translatable="yes">Go back to 
the beginning.</property>
                 <property name="image">restart_image</property>
-                <property name="use_underline">True</property>
-                <property name="always_show_image">True</property>
+                <property name="use-underline">True</property>
+                <property name="always-show-image">True</property>
                 <signal name="clicked" 
handler="anastasis_gtk_restart_button_clicked_cb" swapped="no"/>
               </object>
               <packing>
@@ -3938,7 +3935,7 @@ select a different provider or backup version.</property>
             <child>
               <object class="GtkSeparator">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -3950,11 +3947,11 @@ select a different provider or backup 
version.</property>
             <child>
               <object class="GtkButton" 
id="anastasis_gtk_main_window_quit_button">
                 <property name="label">gtk-quit</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-                <property name="always_show_image">True</property>
+                <property name="can-focus">True</property>
+                <property name="can-default">True</property>
+                <property name="receives-default">True</property>
+                <property name="use-stock">True</property>
+                <property name="always-show-image">True</property>
                 <signal name="clicked" 
handler="anastasis_gtk_main_window_quit_button_clicked_cb" swapped="no"/>
               </object>
               <packing>
@@ -3967,7 +3964,7 @@ select a different provider or backup version.</property>
             <child>
               <object class="GtkSeparator">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -3980,11 +3977,11 @@ select a different provider or backup 
version.</property>
               <object class="GtkButton" 
id="anastasis_gtk_main_window_save_as_button">
                 <property name="label">gtk-save-as</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-                <property name="always_show_image">True</property>
+                <property name="can-focus">True</property>
+                <property name="can-default">True</property>
+                <property name="receives-default">True</property>
+                <property name="use-stock">True</property>
+                <property name="always-show-image">True</property>
                 <signal name="clicked" 
handler="anastasis_gtk_main_window_save_as_button_clicked_cb" swapped="no"/>
               </object>
               <packing>
@@ -3999,12 +3996,12 @@ select a different provider or backup 
version.</property>
                 <property name="label">gtk-media-next</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
-                <property name="can_focus">False</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-                <property name="always_show_image">True</property>
+                <property name="can-focus">False</property>
+                <property name="can-default">True</property>
+                <property name="has-default">True</property>
+                <property name="receives-default">True</property>
+                <property name="use-stock">True</property>
+                <property name="always-show-image">True</property>
                 <signal name="clicked" 
handler="anastasis_gtk_main_window_forward_clicked" swapped="no"/>
               </object>
               <packing>
@@ -4024,7 +4021,7 @@ select a different provider or backup version.</property>
         <child>
           <object class="GtkStatusbar" id="anastasis_gtk_statusbar">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="orientation">vertical</property>
             <property name="spacing">8</property>
           </object>
diff --git a/contrib/anastasis_gtk_open_file_dialog.glade 
b/contrib/anastasis_gtk_open_file_dialog.glade
index b8be342..3dd68a7 100644
--- a/contrib/anastasis_gtk_open_file_dialog.glade
+++ b/contrib/anastasis_gtk_open_file_dialog.glade
@@ -1,38 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 -->
+<!-- Generated with glade 3.38.2 
+
+Copyright (C) 2019-2021 Anastasis SARL
+
+This file is part of anastasis-gtk.
+
+anastasis-gtk is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+anastasis-gtk is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with anastasis-gtk.  If not, see <http://www.gnu.org/licenses/>.
+
+Author: Christian Grothoff
+
+-->
 <interface>
   <requires lib="gtk+" version="3.6"/>
+  <!-- interface-license-type gplv3 -->
+  <!-- interface-name anastasis-gtk -->
+  <!-- interface-description key backup and recovery -->
+  <!-- interface-copyright 2019-2021 Anastasis SARL -->
+  <!-- interface-authors Christian Grothoff -->
   <object class="GtkFileFilter" id="anastasis_file_filter">
     <patterns>
       <pattern>*.ana</pattern>
     </patterns>
   </object>
   <object class="GtkFileChooserDialog" id="open_file_dialog">
-    <property name="can_focus">False</property>
-    <property name="can_default">True</property>
+    <property name="can-focus">False</property>
+    <property name="can-default">True</property>
     <property name="modal">True</property>
-    <property name="window_position">center</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="type_hint">dialog</property>
+    <property name="window-position">center</property>
+    <property name="destroy-with-parent">True</property>
+    <property name="type-hint">dialog</property>
     <property name="filter">anastasis_file_filter</property>
     <signal name="response" handler="open_directory_dialog_response_cb" 
swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkBox">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
+            <property name="can-focus">False</property>
+            <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="button2">
                 <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>
-                <property name="always_show_image">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
+                <property name="use-stock">True</property>
+                <property name="always-show-image">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -44,12 +70,12 @@
               <object class="GtkButton" id="button1">
                 <property name="label">gtk-open</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-                <property name="always_show_image">True</property>
+                <property name="can-focus">True</property>
+                <property name="can-default">True</property>
+                <property name="has-default">True</property>
+                <property name="receives-default">True</property>
+                <property name="use-stock">True</property>
+                <property name="always-show-image">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
diff --git a/contrib/anastasis_gtk_open_secret_dialog.glade 
b/contrib/anastasis_gtk_open_secret_dialog.glade
index 2943877..829b288 100644
--- a/contrib/anastasis_gtk_open_secret_dialog.glade
+++ b/contrib/anastasis_gtk_open_secret_dialog.glade
@@ -1,32 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 -->
+<!-- Generated with glade 3.38.2 
+
+Copyright (C) 2019-2021 Anastasis SARL
+
+This file is part of anastasis-gtk.
+
+anastasis-gtk is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+anastasis-gtk is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with anastasis-gtk.  If not, see <http://www.gnu.org/licenses/>.
+
+Author: Christian Grothoff
+
+-->
 <interface>
   <requires lib="gtk+" version="3.6"/>
+  <!-- interface-license-type gplv3 -->
+  <!-- interface-name anastasis-gtk -->
+  <!-- interface-description Key backup and recovery -->
+  <!-- interface-copyright 2019-2021 Anastasis SARL -->
+  <!-- interface-authors Christian Grothoff -->
   <object class="GtkFileChooserDialog" id="open_file_dialog">
-    <property name="can_focus">False</property>
-    <property name="can_default">True</property>
+    <property name="can-focus">False</property>
+    <property name="can-default">True</property>
     <property name="modal">True</property>
-    <property name="window_position">center</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="type_hint">dialog</property>
+    <property name="window-position">center</property>
+    <property name="destroy-with-parent">True</property>
+    <property name="type-hint">dialog</property>
     <signal name="response" handler="open_secret_dialog_response_cb" 
swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkBox">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
+            <property name="can-focus">False</property>
+            <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="button2">
                 <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>
-                <property name="always_show_image">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
+                <property name="use-stock">True</property>
+                <property name="always-show-image">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -38,12 +64,12 @@
               <object class="GtkButton" id="button1">
                 <property name="label">gtk-open</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-                <property name="always_show_image">True</property>
+                <property name="can-focus">True</property>
+                <property name="can-default">True</property>
+                <property name="has-default">True</property>
+                <property name="receives-default">True</property>
+                <property name="use-stock">True</property>
+                <property name="always-show-image">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
diff --git a/contrib/anastasis_gtk_save_file_dialog.glade 
b/contrib/anastasis_gtk_save_file_dialog.glade
index 950456d..42b6385 100644
--- a/contrib/anastasis_gtk_save_file_dialog.glade
+++ b/contrib/anastasis_gtk_save_file_dialog.glade
@@ -1,56 +1,62 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 
+<!-- Generated with glade 3.38.2 
 
-Copyright (C) 
+Copyright (C) 2019-2021 Anastasis SARL
 
-This file is part of .
+This file is part of anastasis-gtk.
 
- is free software: you can redistribute it and/or modify
+anastasis-gtk is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 
- is distributed in the hope that it will be useful,
+anastasis-gtk is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with .  If not, see <http://www.gnu.org/licenses/>.
+along with anastasis-gtk.  If not, see <http://www.gnu.org/licenses/>.
+
+Author: Christian Grothoff
 
 -->
 <interface>
   <requires lib="gtk+" version="3.6"/>
   <!-- interface-license-type gplv3 -->
+  <!-- interface-name anastasis-gtk -->
+  <!-- interface-description key backup and recovery -->
+  <!-- interface-copyright 2019-2021 Anastasis SARL -->
+  <!-- interface-authors Christian Grothoff -->
   <object class="GtkFileFilter" id="anastasis_file_filter">
     <patterns>
       <pattern>*.ana</pattern>
     </patterns>
   </object>
   <object class="GtkFileChooserDialog" id="save_file_dialog">
-    <property name="can_focus">False</property>
-    <property name="window_position">center</property>
-    <property name="type_hint">dialog</property>
+    <property name="can-focus">False</property>
+    <property name="window-position">center</property>
+    <property name="type-hint">dialog</property>
     <property name="action">save</property>
     <property name="filter">anastasis_file_filter</property>
     <signal name="response" handler="save_directory_dialog_response_cb" 
swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkBox">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
+            <property name="can-focus">False</property>
+            <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="button1">
                 <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>
-                <property name="always_show_image">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
+                <property name="use-stock">True</property>
+                <property name="always-show-image">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -62,12 +68,12 @@ along with .  If not, see <http://www.gnu.org/licenses/>.
               <object class="GtkButton" id="button2">
                 <property name="label">gtk-save</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-                <property name="always_show_image">True</property>
+                <property name="can-focus">True</property>
+                <property name="can-default">True</property>
+                <property name="has-default">True</property>
+                <property name="receives-default">True</property>
+                <property name="use-stock">True</property>
+                <property name="always-show-image">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
diff --git a/contrib/anastasis_gtk_save_secret_dialog.glade 
b/contrib/anastasis_gtk_save_secret_dialog.glade
index 4927e15..fff6fe6 100644
--- a/contrib/anastasis_gtk_save_secret_dialog.glade
+++ b/contrib/anastasis_gtk_save_secret_dialog.glade
@@ -1,56 +1,62 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 
+<!-- Generated with glade 3.38.2 
 
-Copyright (C) 
+Copyright (C) 2019-2021 Anastasis SARL
 
-This file is part of .
+This file is part of anastasis-gtk.
 
- is free software: you can redistribute it and/or modify
+anastasis-gtk is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 
- is distributed in the hope that it will be useful,
+anastasis-gtk is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with .  If not, see <http://www.gnu.org/licenses/>.
+along with anastasis-gtk.  If not, see <http://www.gnu.org/licenses/>.
+
+Author: Christian Grothoff
 
 -->
 <interface>
   <requires lib="gtk+" version="3.6"/>
   <!-- interface-license-type gplv3 -->
+  <!-- interface-name anastasis-gtk -->
+  <!-- interface-description key backup and recovery -->
+  <!-- interface-copyright 2019-2021 Anastasis SARL -->
+  <!-- interface-authors Christian Grothoff -->
   <object class="GtkFileFilter" id="anastasis_file_filter">
     <patterns>
       <pattern>*.secret</pattern>
     </patterns>
   </object>
   <object class="GtkFileChooserDialog" id="save_file_dialog">
-    <property name="can_focus">False</property>
-    <property name="window_position">center</property>
-    <property name="type_hint">dialog</property>
+    <property name="can-focus">False</property>
+    <property name="window-position">center</property>
+    <property name="type-hint">dialog</property>
     <property name="action">save</property>
     <property name="filter">anastasis_file_filter</property>
     <signal name="response" handler="save_secret_dialog_response_cb" 
swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkBox">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
+            <property name="can-focus">False</property>
+            <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="button1">
                 <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>
-                <property name="always_show_image">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
+                <property name="use-stock">True</property>
+                <property name="always-show-image">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -62,12 +68,12 @@ along with .  If not, see <http://www.gnu.org/licenses/>.
               <object class="GtkButton" id="button2">
                 <property name="label">gtk-save</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-                <property name="always_show_image">True</property>
+                <property name="can-focus">True</property>
+                <property name="can-default">True</property>
+                <property name="has-default">True</property>
+                <property name="receives-default">True</property>
+                <property name="use-stock">True</property>
+                <property name="always-show-image">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
diff --git a/contrib/get_version.sh b/contrib/get_version.sh
index 647064f..3ca8a02 100755
--- a/contrib/get_version.sh
+++ b/contrib/get_version.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# This file is in the public domain.
 # Gets the version number from VCS, or from the contents of the file $1
 version=
 if test -f "$1"
diff --git a/contrib/logo.png b/contrib/logo.png
new file mode 100644
index 0000000..008546f
Binary files /dev/null and b/contrib/logo.png differ
diff --git a/contrib/logo.svg b/contrib/logo.svg
deleted file mode 100644
index 48d9d93..0000000
--- a/contrib/logo.svg
+++ /dev/null
@@ -1,655 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/";
-   xmlns:cc="http://web.resource.org/cc/";
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
-   xmlns:svg="http://www.w3.org/2000/svg";
-   xmlns="http://www.w3.org/2000/svg";
-   xmlns:xlink="http://www.w3.org/1999/xlink";
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd";
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
-   inkscape:export-ydpi="600.00000"
-   inkscape:export-xdpi="600.00000"
-   inkscape:export-filename="/home/grothoff/GNUnet/logo.eps"
-   sodipodi:docname="logo.svg"
-   sodipodi:docbase="/home/grothoff/GNUnet"
-   inkscape:version="0.41"
-   sodipodi:version="0.32"
-   id="svg3668"
-   height="297mm"
-   width="210mm">
-  <defs
-     id="defs3" />
-  <sodipodi:namedview
-     inkscape:window-y="0"
-     inkscape:window-x="0"
-     inkscape:window-height="694"
-     inkscape:window-width="1016"
-     showgrid="true"
-     inkscape:current-layer="layer1"
-     inkscape:cy="1040.0000"
-     inkscape:cx="-308.57144"
-     inkscape:zoom="2.2627356"
-     inkscape:pageshadow="0"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.0"
-     bordercolor="#ffffff"
-     pagecolor="#ffffff"
-     id="base" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF
-       id="RDF5">
-      <cc:Work
-         id="Work6"
-         rdf:about="">
-        <dc:format
-           id="format7">image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage";
-           id="type9" />
-        <dc:title
-           id="title3745">GNUnet Logo</dc:title>
-        <dc:date
-           id="date3747">11.07.2005</dc:date>
-        <dc:creator
-           id="creator3749">
-          <cc:Agent
-             id="Agent3751">
-            <dc:title
-               id="title3753">Nicklas Larsson</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:contributor
-           id="contributor3755">
-          <cc:Agent
-             id="Agent3757">
-            <dc:title
-               id="title3759">The GNU head is a creation by Heckert.</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/";
-           id="license3761" />
-        <dc:subject
-           id="subject3777">
-          <rdf:Bag
-             id="Bag3779">
-            <rdf:li
-               id="li3857">GNU</rdf:li>
-            <rdf:li
-               id="li3859">GNUnet</rdf:li>
-            <rdf:li
-               id="li3861">logo</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:source
-           id="source3863"></dc:source>
-      </cc:Work>
-      <cc:License
-         id="License3763"
-         rdf:about="http://creativecommons.org/licenses/GPL/2.0/";>
-        <cc:permits
-           id="permits3765"
-           rdf:resource="http://web.resource.org/cc/Reproduction"; />
-        <cc:permits
-           id="permits3767"
-           rdf:resource="http://web.resource.org/cc/Distribution"; />
-        <cc:requires
-           id="requires3769"
-           rdf:resource="http://web.resource.org/cc/Notice"; />
-        <cc:permits
-           id="permits3771"
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks"; />
-        <cc:requires
-           id="requires3773"
-           rdf:resource="http://web.resource.org/cc/ShareAlike"; />
-        <cc:requires
-           id="requires3775"
-           rdf:resource="http://web.resource.org/cc/SourceCode"; />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       sodipodi:nodetypes="cs"
-       id="path1875"
-       d="M -307.33562,-100.00483 L -307.33562,11.972320"
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.0762973;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
 />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       sodipodi:nodetypes="cc"
-       id="path1877"
-       d="M -231.19112,-64.172140 L -307.33562,11.972320"
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.1426873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
 />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       sodipodi:nodetypes="cs"
-       id="path1879"
-       d="M -199.83762,11.972320 L -307.33562,11.972320"
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.1426873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
 />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       sodipodi:nodetypes="cc"
-       id="path1881"
-       d="M -230.44472,88.863300 L -307.33562,11.972320"
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.1426873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
 />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       sodipodi:nodetypes="cs"
-       id="path1883"
-       d="M -308.08222,11.972320 L -415.58022,11.972320"
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.1426873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
 />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       sodipodi:nodetypes="cc"
-       id="path1885"
-       d="M -383.48012,88.116790 L -307.33562,11.972320"
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.1426873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
 />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       sodipodi:nodetypes="cc"
-       id="path1887"
-       d="M -383.48012,-64.918660 L -307.33562,11.972320"
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.1426873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
 />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       sodipodi:nodetypes="cs"
-       id="path1889"
-       d="M -307.33562,11.972320 L -307.33562,124.69600"
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.1426873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
 />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       sodipodi:nodetypes="ccccccccc"
-       id="path1891"
-       d="M -307.41082,-99.894250 C -284.94032,-82.088490 
-258.06572,-71.179670 -231.19112,-64.172140 C -224.30352,-34.781700 
-213.27492,-12.963710 -199.83762,11.972320 C -217.75402,36.462950 
-226.71222,61.242280 -231.19112,88.116790 C -262.54472,92.595880 
-284.94032,106.03313 -307.33562,123.94949 C -329.73112,101.55406 
-347.64742,92.595880 -383.48012,88.116790 C -385.46802,61.242280 
-394.58292,36.908370 -414.83372,11.972320 C -395.13562,-21.872520 
-390.18642,-30.591330 -383.48012,-64.17 [...]
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.0762973;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
 />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.1426873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
-       d="M -307.36652,-73.062180 C -289.41932,-59.693060 
-269.86352,-50.734880 -249.10762,-46.255790"
-       id="path1893"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       sodipodi:nodetypes="cc"
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.1426873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
-       d="M -307.13772,-47.965830 C -293.89842,-37.297620 
-280.46122,-30.872610 -267.02392,-28.339450"
-       id="path1895" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.1426873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
-       d="M -284.94032,-10.423110 L -307.33562,-23.860370"
-       id="path1897"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       sodipodi:nodetypes="cc"
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.1426873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
-       d="M -307.33562,-73.062180 C -325.25202,-59.693060 
-345.28412,-52.986760 -365.59452,-46.255790"
-       id="path1899" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       sodipodi:nodetypes="cc"
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.1426873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
-       d="M -307.56442,-47.965830 C -318.26302,-39.196510 
-332.07972,-32.818540 -347.67822,-28.339450"
-       id="path1901" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.1426873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
-       d="M -329.85952,-10.407040 L -307.36652,-23.860370"
-       id="path1903" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.1426873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
-       d="M -307.33562,97.074970 C -289.41932,80.989770 -269.85332,72.477020 
-249.10762,70.200440"
-       id="path1905"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.1426873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
-       d="M -307.33562,70.200440 C -293.89842,59.328500 -284.94032,54.065870 
-267.02392,52.284110"
-       id="path1907"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.1426873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
-       d="M -284.94032,34.367750 L -307.33562,47.805020"
-       id="path1909"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.1426873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
-       d="M -307.33562,97.074970 C -329.73112,77.426230 -336.80022,74.679540 
-365.56382,70.200440"
-       id="path1911"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.1426873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
-       d="M -307.33562,70.200440 C -318.54572,56.763190 -332.42842,52.284110 
-347.64742,52.284110"
-       id="path1913"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.1426873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
-       d="M -329.73112,34.367750 L -307.33562,47.805020"
-       id="path1915"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.1426873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
-       d="M -365.56382,70.200440 C -370.04292,45.891240 -377.24402,29.888680 
-392.43832,11.972320"
-       id="path1917"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.1426873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
-       d="M -347.64742,52.284110 C -349.61062,36.174200 -356.60562,25.409580 
-365.56382,11.972320"
-       id="path1919"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.1426873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
-       d="M -343.16832,11.972320 L -329.73112,34.367750"
-       id="path1921"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.1426873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
-       d="M -249.10762,70.200440 C -244.62852,47.805020 -235.67032,29.888680 
-222.23302,11.972320"
-       id="path1923"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.1426873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
-       d="M -267.02392,52.284110 C -262.54472,34.367750 -258.06572,25.409580 
-249.10762,11.972320"
-       id="path1925"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.1426873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
-       d="M -271.50302,11.972320 C -277.76382,18.546600 -282.24292,25.409580 
-284.94032,34.367750"
-       id="path1927"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.1426873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
-       d="M -249.10762,-46.255790 C -242.06552,-19.381270 
-233.96712,-5.9440199 -222.23302,11.972320"
-       id="path1929"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.1426873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
-       d="M -267.02392,-28.339450 C -264.16992,-13.120420 
-258.06572,-1.4649399 -249.10762,11.972320"
-       id="path1931"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.1426873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
-       d="M -271.50302,11.972320 L -284.94032,-10.423110"
-       id="path1933"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.1426873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
-       d="M -365.56382,-46.255790 C -370.04292,-25.955540 
-379.00102,-5.9440199 -392.43832,11.972320"
-       id="path1935"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.1426873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
-       d="M -347.64742,-28.339450 C -352.12652,-14.902190 
-356.60562,-1.4649399 -365.56382,11.972320"
-       id="path1937"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="opacity:0.19909503;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.1426873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker-start:none;marker-mid:none;marker-end:none"
-       d="M -343.16832,11.972320 L -329.73112,-10.423110"
-       id="path1939"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       sodipodi:nodetypes="cs"
-       id="path1941"
-       d="M -310.11942,-100.86192 L -310.11942,11.115240"
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:2.9860575;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
 />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       sodipodi:nodetypes="cc"
-       id="path1943"
-       d="M -233.97502,-65.029230 L -310.11942,11.115240"
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.0251098;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
 />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       sodipodi:nodetypes="cs"
-       id="path1945"
-       d="M -202.62142,11.115240 L -310.11942,11.115240"
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.0251098;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
 />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       sodipodi:nodetypes="cc"
-       id="path1947"
-       d="M -233.22852,88.006220 L -310.11942,11.115240"
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.0251098;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
 />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       sodipodi:nodetypes="cs"
-       id="path1949"
-       d="M -310.86602,11.115240 L -418.36402,11.115240"
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.0251098;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
 />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       sodipodi:nodetypes="cc"
-       id="path1951"
-       d="M -386.26392,87.259710 L -310.11942,11.115240"
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.0251098;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
 />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       sodipodi:nodetypes="cc"
-       id="path1953"
-       d="M -386.26392,-65.775750 L -310.11942,11.115240"
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.0251098;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
 />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       sodipodi:nodetypes="cs"
-       id="path1955"
-       d="M -310.11942,11.115240 L -310.11942,123.83891"
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.0251098;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
 />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       sodipodi:nodetypes="ccccccccc"
-       id="path1957"
-       d="M -310.19462,-100.75134 C -287.72402,-82.945570 
-260.84942,-72.036750 -233.97502,-65.029230 C -227.08732,-35.638790 
-216.05872,-13.820810 -202.62142,11.115240 C -220.53772,35.605860 
-229.49582,60.385190 -233.97502,87.259710 C -265.32862,91.738800 
-287.72402,105.17605 -310.11942,123.09240 C -332.51482,100.69697 
-350.43122,91.738800 -386.26392,87.259710 C -388.25182,60.385190 
-397.36662,36.051280 -417.61752,11.115240 C -397.91942,-22.729610 
-392.97022,-31.448410 -386.26392,-65.02 [...]
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:2.9860575;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
 />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.0251098;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       d="M -310.15022,-73.919280 C -292.20312,-60.550140 
-272.64722,-51.591970 -251.89132,-47.112880"
-       id="path1959"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       sodipodi:nodetypes="cc"
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.0251098;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       d="M -309.92152,-48.822910 C -296.68212,-38.154710 
-283.24492,-31.729700 -269.80772,-29.196550"
-       id="path1961" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.0251098;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       d="M -287.72402,-11.280190 L -310.11942,-24.717460"
-       id="path1963"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       sodipodi:nodetypes="cc"
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.0251098;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       d="M -310.11942,-73.919280 C -328.03572,-60.550140 
-348.06782,-53.843840 -368.37832,-47.112880"
-       id="path1965" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       sodipodi:nodetypes="cc"
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.0251098;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       d="M -310.34812,-48.822910 C -321.04682,-40.053590 
-334.86342,-33.675620 -350.46192,-29.196550"
-       id="path1967" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.0251098;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       d="M -332.64322,-11.264130 L -310.15022,-24.717460"
-       id="path1969" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.0251098;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       d="M -310.11942,96.217870 C -292.20312,80.132680 -272.63702,71.619930 
-251.89132,69.343350"
-       id="path1971"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.0251098;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       d="M -310.11942,69.343350 C -296.68212,58.471410 -287.72402,53.208770 
-269.80772,51.427020"
-       id="path1973"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.0251098;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       d="M -287.72402,33.510670 L -310.11942,46.947920"
-       id="path1975"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.0251098;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       d="M -310.11942,96.217870 C -332.51482,76.569140 -339.58392,73.822450 
-368.34752,69.343350"
-       id="path1977"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.0251098;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       d="M -310.11942,69.343350 C -321.32942,55.906110 -335.21212,51.427020 
-350.43122,51.427020"
-       id="path1979"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.0251098;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       d="M -332.51482,33.510670 L -310.11942,46.947920"
-       id="path1981"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.0251098;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       d="M -368.34752,69.343350 C -372.82662,45.034150 -380.02772,29.031590 
-395.22212,11.115240"
-       id="path1983"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.0251098;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       d="M -350.43122,51.427020 C -352.39442,35.317120 -359.38942,24.552500 
-368.34752,11.115240"
-       id="path1985"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.0251098;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       d="M -345.95212,11.115240 L -332.51482,33.510670"
-       id="path1987"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.0251098;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       d="M -251.89132,69.343350 C -247.41222,46.947920 -238.45412,29.031590 
-225.01682,11.115240"
-       id="path1989"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.0251098;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       d="M -269.80772,51.427020 C -265.32862,33.510670 -260.84942,24.552500 
-251.89132,11.115240"
-       id="path1991"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.0251098;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       d="M -274.28682,11.115240 C -280.54762,17.689510 -285.02672,24.552500 
-287.72402,33.510670"
-       id="path1993"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.0251098;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       d="M -251.89132,-47.112880 C -244.84932,-20.238370 
-236.75082,-6.8011099 -225.01682,11.115240"
-       id="path1995"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.0251098;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       d="M -269.80772,-29.196550 C -266.95372,-13.977510 
-260.84942,-2.3220299 -251.89132,11.115240"
-       id="path1997"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.0251098;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       d="M -274.28682,11.115240 L -287.72402,-11.280190"
-       id="path1999"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.0251098;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       d="M -368.34752,-47.112880 C -372.82662,-26.812630 
-381.78482,-6.8011099 -395.22212,11.115240"
-       id="path2001"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.0251098;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       d="M -350.43122,-29.196550 C -354.91032,-15.759280 
-359.38942,-2.3220299 -368.34752,11.115240"
-       id="path2003"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:export-ydpi="90.000000"
-       inkscape:export-xdpi="90.000000"
-       
inkscape:export-filename="/home/larsson/Dokument/GNUnet/old_net_as_svg.png"
-       
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.0251098;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       d="M -345.95212,11.115240 L -332.51482,-11.280190"
-       id="path2005"
-       sodipodi:nodetypes="cc" />
-    <image
-       xlink:href="heckert.png"
-       sodipodi:absref="heckert.png"
-       width="104.98078"
-       height="102.62041"
-       id="image2102"
-       x="-366.08850"
-       y="-40.621075"
-       inkscape:export-xdpi="90.000000"
-       inkscape:export-ydpi="90.000000" />
-  </g>
-</svg>
diff --git a/contrib/pogen.sh b/contrib/pogen.sh
index 53cca8e..62e1662 100755
--- a/contrib/pogen.sh
+++ b/contrib/pogen.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
+# This file is in the public domain.
 find src -name "*.c" | sort  > po/POTFILES.in
 find contrib -name "*.glade" | sort >> po/POTFILES.in
diff --git a/contrib/this_stays_private.glade b/contrib/this_stays_private.glade
index b07970c..650c3e4 100644
--- a/contrib/this_stays_private.glade
+++ b/contrib/this_stays_private.glade
@@ -1,22 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 -->
+<!-- Generated with glade 3.38.2 
+
+Copyright (C) 2020-2021 Anastasis SARL
+
+This file is part of anastasis-gtk.
+
+anastasis-gtk is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+anastasis-gtk is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with anastasis-gtk.  If not, see <http://www.gnu.org/licenses/>.
+
+Author: Belen Pena
+
+-->
 <interface>
   <requires lib="gtk+" version="3.20"/>
+  <!-- interface-license-type gplv3 -->
+  <!-- interface-name anastasis-gtk -->
+  <!-- interface-description Key backup and recovery -->
+  <!-- interface-copyright 2020-2021 Anastasis SARL -->
+  <!-- interface-authors Belen Pena -->
   <object class="GtkWindow" id="private_dummy_window">
-    <property name="can_focus">False</property>
-    <child type="titlebar">
-      <placeholder/>
-    </child>
+    <property name="can-focus">False</property>
     <child>
       <object class="GtkBox" id="private_hbox">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_left">10</property>
-        <property name="margin_right">10</property>
+        <property name="can-focus">False</property>
+        <property name="margin-left">10</property>
+        <property name="margin-right">10</property>
         <child>
           <object class="GtkLabel" id="privacy_label">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="label" translatable="yes">This stays 
private</property>
           </object>
           <packing>
@@ -28,10 +51,10 @@
         </child>
         <child>
           <object class="GtkImage" id="blindfold_image">
-            <property name="width_request">24</property>
-            <property name="height_request">24</property>
+            <property name="width-request">24</property>
+            <property name="height-request">24</property>
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="pixbuf">noun_blindfold_3574196.svg</property>
           </object>
           <packing>
diff --git a/src/anastasis/anastasis-gtk_about.c 
b/src/anastasis/anastasis-gtk_about.c
index b090324..d1c0a61 100644
--- a/src/anastasis/anastasis-gtk_about.c
+++ b/src/anastasis/anastasis-gtk_about.c
@@ -27,6 +27,18 @@
 #include <gnunet-gtk/gnunet_gtk.h>
 
 
+void
+ANASTASIS_GTK_about_close_response (GtkDialog *dialog,
+                                    gint response_id,
+                                    gpointer user_data)
+{
+  GtkBuilder *builder = user_data;
+
+  gtk_widget_destroy (dialog);
+  g_object_unref (G_OBJECT (builder));
+}
+
+
 /**
  * This displays an about window
  */
@@ -34,7 +46,19 @@ void
 anastasis_gtk_about_imagemenuitem_activate_cb (GtkWidget *dummy,
                                                gpointer data)
 {
-  GNUNET_GTK_display_about ("anastasis_gtk_about_window.glade");
+  GtkBuilder *builder;
+  GtkWidget *diag;
+
+  builder = GNUNET_GTK_get_new_builder ("anastasis_gtk_about_window.glade",
+                                        NULL);
+  if (NULL == builder)
+  {
+    GNUNET_break (0);
+    return;
+  }
+  diag = GTK_WIDGET (gtk_builder_get_object (builder,
+                                             "about_window"));
+  gtk_widget_show (diag);
 }
 
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]