diff --git a/README b/README
index 7a7c8bb..e8d3f97 100644
--- a/README
+++ b/README
@@ -68,7 +68,7 @@ Tomb is an evolution of the 'mknest' tool developed for the dyne:bolic
 GNU/Linux distribution, which is used by its 'nesting' mechanism to
 encrypt the Home directory of users, a system implemented already in
 2001. Since then, the same shell routines kept being maintained and in
-2007 they were adapted to work on Debian and Arch distributions.
+2007 they were adapted to work on various other GNU/Linux distributions.
 
 As of today, Tomb is a well stable tool also used in mission critical
 situations by a number of activists in endangered zones. It has been
@@ -93,3 +93,4 @@ http://lists.dyne.org or via IRC on https://irc.dyne.org channel #dyne
 Some enthusiastic ideas are in the TODO file.
 
 Information on developers involved is found in the AUTHORS file.
+
diff --git a/extras/gtk-tray/Makefile b/extras/gtk-tray/Makefile
new file mode 100644
index 0000000..cc582ac
--- /dev/null
+++ b/extras/gtk-tray/Makefile
@@ -0,0 +1,7 @@
+
+all:
+	gcc -I. `pkg-config --cflags libnotify gtk+-2.0` $(CFLAGS) -c tomb-gtk-tray.c
+	gcc tomb-gtk-tray.o `pkg-config --libs  libnotify gtk+-2.0` -o tomb-gtk-tray
+
+clean:
+	rm *.o tomb-gtk-tray
diff --git a/extras/monmort.xpm b/extras/gtk-tray/monmort.xpm
similarity index 100%
rename from extras/monmort.xpm
rename to extras/gtk-tray/monmort.xpm
diff --git a/extras/tomb-status.c b/extras/gtk-tray/tomb-gtk-tray.c
similarity index 97%
rename from extras/tomb-status.c
rename to extras/gtk-tray/tomb-gtk-tray.c
index cdfac90..6266c35 100644
--- a/extras/tomb-status.c
+++ b/extras/gtk-tray/tomb-gtk-tray.c
@@ -83,7 +83,7 @@ int main(int argc, char **argv) {
   else snprintf(mountpoint,255, "%s", argv[3]);
 
   // libnotify
-  notify_init(PACKAGE);
+  notify_init("Tomb");
 
   // set and show the status icon
   pb_monmort = gdk_pixbuf_new_from_xpm_data(monmort);
@@ -293,10 +293,10 @@ gboolean cb_about(GtkWidget *w, GdkEvent *e) {
 			    "Asbesto Molesto - http://freaknet.org/asbesto",
 			    NULL};
   GtkWidget *dialog = gtk_about_dialog_new();
-  gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(dialog), PACKAGE);
-  gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(dialog), VERSION); 
+  gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(dialog), "Tomb GTK Tray");
+  gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(dialog), "1.4"); 
   gtk_about_dialog_set_copyright(GTK_ABOUT_DIALOG(dialog), 
-				 "(C)2007-2011 Jaromil @ Dyne.org Foundation");
+				 "(C)2007-2013 Jaromil @ Dyne.org Foundation");
   gtk_about_dialog_set_artists(GTK_ABOUT_DIALOG(dialog), artists);
   gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(dialog), authors);
 
@@ -309,7 +309,7 @@ gboolean cb_about(GtkWidget *w, GdkEvent *e) {
 "Tomb also encourages users to separate keys from data, for instance storing them on USB.\n"
 "\n"
 );
-  gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(dialog), PACKAGE_URL);
+  gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(dialog), "http://tomb.dyne.org");
   gtk_about_dialog_set_logo(GTK_ABOUT_DIALOG(dialog), pb_monmort);
   gtk_about_dialog_set_logo_icon_name(GTK_ABOUT_DIALOG(dialog), "monmort");
   // this below is active since gtk 3.0 so too early for it now
diff --git a/extras/kdf/.gitignore b/extras/kdf-keys/.gitignore
similarity index 100%
rename from extras/kdf/.gitignore
rename to extras/kdf-keys/.gitignore
diff --git a/extras/kdf/Makefile b/extras/kdf-keys/Makefile
similarity index 100%
rename from extras/kdf/Makefile
rename to extras/kdf-keys/Makefile
diff --git a/extras/kdf/README b/extras/kdf-keys/README
similarity index 100%
rename from extras/kdf/README
rename to extras/kdf-keys/README
diff --git a/extras/kdf/benchmark.c b/extras/kdf-keys/benchmark.c
similarity index 100%
rename from extras/kdf/benchmark.c
rename to extras/kdf-keys/benchmark.c
diff --git a/extras/kdf/gen_salt.c b/extras/kdf-keys/gen_salt.c
similarity index 100%
rename from extras/kdf/gen_salt.c
rename to extras/kdf-keys/gen_salt.c
diff --git a/extras/kdf/hexencode.c b/extras/kdf-keys/hexencode.c
similarity index 100%
rename from extras/kdf/hexencode.c
rename to extras/kdf-keys/hexencode.c
diff --git a/extras/kdf/pbkdf2.c b/extras/kdf-keys/pbkdf2.c
similarity index 100%
rename from extras/kdf/pbkdf2.c
rename to extras/kdf-keys/pbkdf2.c
diff --git a/extras/kdf/test.sh b/extras/kdf-keys/test.sh
similarity index 100%
rename from extras/kdf/test.sh
rename to extras/kdf-keys/test.sh
diff --git a/extras/kdf/test.txt b/extras/kdf-keys/test.txt
similarity index 100%
rename from extras/kdf/test.txt
rename to extras/kdf-keys/test.txt
diff --git a/tomb b/tomb
index 758b65c..4d8132b 100755
--- a/tomb
+++ b/tomb
@@ -40,7 +40,7 @@
 
 # {{{ Global variables
 
-VERSION=1.3.1
+VERSION=1.4
 DATE="Jun/2013"
 TOMBEXEC=$0
 typeset -a OLDARGS