Merge branch 'master' of https://github.com/mate-desktop/mate-control-center

14 files changed, 3626 insertions, 2709 deletions

diff --git a/capplets/default-applications/Makefile.am b/capplets/default-applications/Makefile.am
index b6487ec7..8ad7740d 100644
--- a/capplets/default-applications/Makefile.am
+++ b/capplets/default-applications/Makefile.am
@@ -45,30 +45,6 @@ INCLUDES = \
 	-DMATECC_UI_DIR=\""$(uidir)"\" \
 	-DMATECC_APPS_DIR=\""$(xmldatadir)"\"
 
-icons16dir = $(datadir)/icons/mate/16x16/apps
-dist_icons16_DATA = icons/16x16/preferences-desktop-default-applications.png
-icons22dir = $(datadir)/icons/mate/22x22/apps
-dist_icons22_DATA = icons/22x22/preferences-desktop-default-applications.png
-icons24dir = $(datadir)/icons/mate/24x24/apps
-dist_icons24_DATA = icons/24x24/preferences-desktop-default-applications.png
-icons32dir = $(datadir)/icons/mate/32x32/apps
-dist_icons32_DATA = icons/32x32/preferences-desktop-default-applications.png
-icons48dir = $(datadir)/icons/mate/48x48/apps
-dist_icons48_DATA = icons/48x48/preferences-desktop-default-applications.png
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-uninstall-hook: update-icon-cache
-install-data-hook: update-icon-cache
-update-icon-cache:
-	@-if test -z "$(DESTDIR)"; then \
-		echo "Updating Gtk icon cache."; \
-		$(gtk_update_icon_cache); \
-	else \
-		echo "*** Icon cache not updated.  After install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)"; \
-	fi
-
-
 CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) $(xmldata_DATA) $(autostart_DATA) $(bin_SCRIPTS)
 EXTRA_DIST = $(xmldata_in_files) mate-default-applications.pc.in
 
diff --git a/capplets/default-applications/icons/16x16/preferences-desktop-default-applications.png b/capplets/default-applications/icons/16x16/preferences-desktop-default-applications.png
deleted file mode 100644
index 41a765aa..00000000
--- a/capplets/default-applications/icons/16x16/preferences-desktop-default-applications.png
+++ /dev/null
diff --git a/capplets/default-applications/icons/22x22/preferences-desktop-default-applications.png b/capplets/default-applications/icons/22x22/preferences-desktop-default-applications.png
deleted file mode 100644
index 83b6826c..00000000
--- a/capplets/default-applications/icons/22x22/preferences-desktop-default-applications.png
+++ /dev/null
diff --git a/capplets/default-applications/icons/24x24/preferences-desktop-default-applications.png b/capplets/default-applications/icons/24x24/preferences-desktop-default-applications.png
deleted file mode 100644
index 630ea040..00000000
--- a/capplets/default-applications/icons/24x24/preferences-desktop-default-applications.png
+++ /dev/null
diff --git a/capplets/default-applications/icons/32x32/preferences-desktop-default-applications.png b/capplets/default-applications/icons/32x32/preferences-desktop-default-applications.png
deleted file mode 100644
index 23718f78..00000000
--- a/capplets/default-applications/icons/32x32/preferences-desktop-default-applications.png
+++ /dev/null
diff --git a/capplets/default-applications/icons/48x48/preferences-desktop-default-applications.png b/capplets/default-applications/icons/48x48/preferences-desktop-default-applications.png
deleted file mode 100644
index ac25569d..00000000
--- a/capplets/default-applications/icons/48x48/preferences-desktop-default-applications.png
+++ /dev/null
diff --git a/capplets/default-applications/mate-da-capplet.c b/capplets/default-applications/mate-da-capplet.c
index 37a01359..69061efd 100644
--- a/capplets/default-applications/mate-da-capplet.c
+++ b/capplets/default-applications/mate-da-capplet.c
@@ -3,6 +3,7 @@
  *
  *  Copyright 2005-2006 Luca Cavalli
  *  Copyright 2008 Thomas Wood <[email protected]>
+ *  Copyright 2010 Perberos <[email protected]>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of version 2 of the GNU General Public License
@@ -20,7 +21,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+	#include <config.h>
 #endif
 
 #include <string.h>
@@ -43,60 +44,91 @@ static void close_cb(GtkWidget* window, gint response, gpointer user_data)
 {
 	if (response == GTK_RESPONSE_HELP)
 	{
-		capplet_help (GTK_WINDOW (window), "prefs-preferredapps");
+		capplet_help(GTK_WINDOW (window), "prefs-preferredapps");
 	}
 	else
 	{
-		gtk_widget_destroy (window);
-		gtk_main_quit ();
+		gtk_widget_destroy(window);
+		gtk_main_quit();
 	}
 }
 
-static void set_icon (GtkImage* image, GtkIconTheme* theme, const char* name)
+static void web_radiobutton_toggled_cb(GtkWidget* togglebutton, MateDACapplet* capplet)
 {
-    GdkPixbuf* pixbuf;
+	gint index;
+	MateDAWebItem* item;
+	const gchar* command;
+	GError* error = NULL;
+
+	index = gtk_combo_box_get_active(GTK_COMBO_BOX(capplet->web_combo_box));
 
-	if ((pixbuf = gtk_icon_theme_load_icon(theme, name, 48, 0, NULL)))
+	if (index == -1)
 	{
-		gtk_image_set_from_pixbuf(image, pixbuf);
-		g_object_unref(pixbuf);
+		return;
 	}
-}
 
-static void web_radiobutton_toggled_cb(GtkWidget* togglebutton, MateDACapplet* capplet)
-{
-    gint index;
-    MateDAWebItem *item;
-    const gchar *command;
-    GError *error = NULL;
+	item = (MateDAWebItem*) g_list_nth_data(capplet->web_browsers, index);
 
-    index = gtk_combo_box_get_active (GTK_COMBO_BOX (capplet->web_combo_box));
+	if (item == NULL)
+	{
+		return;
+	}
 
-    if (index == -1)
-	return;
+	if (togglebutton == capplet->new_win_radiobutton)
+	{
+		command = item->win_command;
+	}
+	else if (togglebutton == capplet->new_tab_radiobutton)
+	{
+		command = item->tab_command;
+	}
+	else
+	{
+		command = item->generic.command;
+	}
 
-    item = (MateDAWebItem *) g_list_nth_data (capplet->web_browsers, index);
-    if (item == NULL)
-	return;
+	mateconf_client_set_string(capplet->mateconf, DEFAULT_APPS_KEY_HTTP_EXEC, command, &error);
 
-    if (togglebutton == capplet->new_win_radiobutton) {
-	command = item->win_command;
-    }
-    else if (togglebutton == capplet->new_tab_radiobutton) {
-	command = item->tab_command;
-    }
-    else {
-	command = item->generic.command;
-    }
+	if (error != NULL)
+	{
+		g_warning(_("Error saving configuration: %s"), error->message);
+		g_error_free(error);
+	}
 
-    mateconf_client_set_string (capplet->mateconf, DEFAULT_APPS_KEY_HTTP_EXEC, command, &error);
+	/* Para obtener la lista de elementos, y si está en la lista, agregar ese
+	 * item.
+	 * De lo contrario, se crea un elemento especial. */
+	GList* recommended = g_app_info_get_recommended_for_type("x-scheme-handler/http");
 
-    gtk_entry_set_text (GTK_ENTRY (capplet->web_browser_command_entry), command);
+	if (recommended!= NULL)
+	{
+		GList* app;
 
-    if (error != NULL) {
-	g_warning (_("Error saving configuration: %s"), error->message);
-	g_error_free (error);
-    }
+		for (app = recommended; app != NULL; app = app->next)
+		{
+			/* nice hack bro */
+			if (strcmp(item->generic.executable, g_app_info_get_executable((GAppInfo*) app->data)) == 0)
+			{
+				/* establecemos el item */
+				g_app_info_set_as_default_for_type((GAppInfo*) app->data, "x-scheme-handler/http", NULL);
+				g_app_info_set_as_default_for_type((GAppInfo*) app->data, "x-scheme-handler/https", NULL);
+
+				/* about:config es usado por mozilla firefox y algunos otros con
+				 * webtoolkit */
+				g_app_info_set_as_default_for_type((GAppInfo*) app->data, "x-scheme-handler/about", NULL);
+			}
+		}
+
+		g_list_free_full(recommended, g_object_unref);
+	}
+
+	gtk_entry_set_text(GTK_ENTRY(capplet->web_browser_command_entry), command);
+
+	if (error != NULL)
+	{
+		g_warning(_("Error saving configuration: %s"), error->message);
+		g_error_free(error);
+	}
 }
 
 static void web_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet)
@@ -104,41 +136,51 @@ static void web_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet)
     guint current_index;
     gboolean is_custom_active;
     gboolean has_net_remote;
-    MateDAWebItem *item;
-    GtkWidget *active = NULL;
+    MateDAWebItem* item;
+    GtkWidget* active = NULL;
 
-    current_index = gtk_combo_box_get_active (combo);
-
-    if (current_index < g_list_length (capplet->web_browsers)) {
-
-	item = (MateDAWebItem*) g_list_nth_data (capplet->web_browsers, current_index);
-	has_net_remote = item->netscape_remote;
-	is_custom_active = FALSE;
+    current_index = gtk_combo_box_get_active(combo);
 
+    if (current_index < g_list_length(capplet->web_browsers))
+    {
+		item = (MateDAWebItem*) g_list_nth_data(capplet->web_browsers, current_index);
+		has_net_remote = item->netscape_remote;
+		is_custom_active = FALSE;
     }
-    else {
+    else
+    {
         has_net_remote = FALSE;
         is_custom_active = TRUE;
     }
-    gtk_widget_set_sensitive (capplet->default_radiobutton, has_net_remote);
-    gtk_widget_set_sensitive (capplet->new_win_radiobutton, has_net_remote);
-    gtk_widget_set_sensitive (capplet->new_tab_radiobutton, has_net_remote);
 
-    gtk_widget_set_sensitive (capplet->web_browser_command_entry, is_custom_active);
-    gtk_widget_set_sensitive (capplet->web_browser_command_label, is_custom_active);
-    gtk_widget_set_sensitive (capplet->web_browser_terminal_checkbutton, is_custom_active);
+	/* Si, aun falta para poder crear personalizables... */
+	has_net_remote = FALSE;
+	is_custom_active = FALSE;
+    gtk_widget_set_sensitive(capplet->default_radiobutton, has_net_remote);
+    gtk_widget_set_sensitive(capplet->new_win_radiobutton, has_net_remote);
+    gtk_widget_set_sensitive(capplet->new_tab_radiobutton, has_net_remote);
 
-    if (has_net_remote) {
+    gtk_widget_set_sensitive(capplet->web_browser_command_entry, is_custom_active);
+    gtk_widget_set_sensitive(capplet->web_browser_command_label, is_custom_active);
+    gtk_widget_set_sensitive(capplet->web_browser_terminal_checkbutton, is_custom_active);
 
-        if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (capplet->new_win_radiobutton)))
+    if (has_net_remote)
+    {
+        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(capplet->new_win_radiobutton)))
+        {
             active = capplet->new_win_radiobutton;
-        else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (capplet->new_tab_radiobutton)))
+		}
+        else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(capplet->new_tab_radiobutton)))
+        {
             active = capplet->new_tab_radiobutton;
+		}
         else
+        {
             active = capplet->default_radiobutton;
+		}
     }
 
-    web_radiobutton_toggled_cb (active, capplet);
+    web_radiobutton_toggled_cb(active, capplet);
 }
 
 /* FIXME: Refactor these two functions below into one... */
@@ -147,12 +189,134 @@ static void mail_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet)
     guint current_index;
     gboolean is_custom_active;
 
-    current_index = gtk_combo_box_get_active (combo);
-    is_custom_active = (current_index >= g_list_length (capplet->mail_readers));
+    current_index = gtk_combo_box_get_active(combo);
+    is_custom_active = (current_index >= g_list_length(capplet->mail_readers));
+
+	if (current_index != -1)
+	{
+		MateDAItem* item = (MateDAItem*) g_list_nth_data(capplet->mail_readers, current_index);
 
-    gtk_widget_set_sensitive (capplet->mail_reader_command_entry, is_custom_active);
-    gtk_widget_set_sensitive (capplet->mail_reader_command_label, is_custom_active);
-    gtk_widget_set_sensitive (capplet->mail_reader_terminal_checkbutton, is_custom_active);
+		if (item != NULL)
+		{
+			/* Para obtener la lista de elementos, y si está en la lista, agregar ese
+			 * item.
+			 * De lo contrario, se crea un elemento especial. */
+			GList* recommended = g_app_info_get_recommended_for_type("x-scheme-handler/mailto");
+
+			if (recommended!= NULL)
+			{
+				GList* app;
+
+				for (app = recommended; app != NULL; app = app->next)
+				{
+					/* nice hack bro */
+					if (strcmp(item->executable, g_app_info_get_executable((GAppInfo*) app->data)) == 0)
+					{
+						/* por alguna extraña razon, solo se usa mailto, en vez de mail. */
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "x-scheme-handler/mailto", NULL);
+					}
+				}
+
+				g_list_free_full(recommended, g_object_unref);
+			}
+		}
+	}
+
+	/* Si, aun falta para poder crear personalizables... */
+	is_custom_active = FALSE;
+    gtk_widget_set_sensitive(capplet->mail_reader_command_entry, is_custom_active);
+    gtk_widget_set_sensitive(capplet->mail_reader_command_label, is_custom_active);
+    gtk_widget_set_sensitive(capplet->mail_reader_terminal_checkbutton, is_custom_active);
+}
+
+static void file_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet)
+{
+    guint current_index;
+    gboolean is_custom_active;
+
+    current_index = gtk_combo_box_get_active(combo);
+    is_custom_active = (current_index >= g_list_length(capplet->file_managers));
+
+	if (current_index != -1)
+	{
+		MateDAItem* item = (MateDAItem*) g_list_nth_data(capplet->file_managers, current_index);
+
+		if (item != NULL)
+		{
+			/* Para obtener la lista de elementos, y si está en la lista, agregar ese
+			 * item.
+			 * De lo contrario, se crea un elemento especial. */
+			GList* recommended = g_app_info_get_recommended_for_type("inode/directory");
+
+			if (recommended!= NULL)
+			{
+				GList* app;
+
+				for (app = recommended; app != NULL; app = app->next)
+				{
+					/* nice hack bro */
+					if (strcmp(item->executable, g_app_info_get_executable((GAppInfo*) app->data)) == 0)
+					{
+						/* falta agregar más mime-types */
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "inode/directory", NULL);
+					}
+				}
+
+				g_list_free_full(recommended, g_object_unref);
+			}
+		}
+	}
+
+	/* Si, aun falta para poder crear personalizables... */
+	is_custom_active = FALSE;
+	gtk_widget_set_sensitive(capplet->file_manager_command_entry, is_custom_active);
+	gtk_widget_set_sensitive(capplet->file_manager_command_label, is_custom_active);
+	gtk_widget_set_sensitive(capplet->file_manager_terminal_checkbutton, is_custom_active);
+}
+
+static void text_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet)
+{
+    guint current_index;
+    gboolean is_custom_active;
+
+    current_index = gtk_combo_box_get_active(combo);
+    is_custom_active = (current_index >= g_list_length(capplet->text_editors));
+
+	if (current_index != -1)
+	{
+		MateDAItem* item = (MateDAItem*) g_list_nth_data(capplet->text_editors, current_index);
+
+		if (item != NULL)
+		{
+			/* Para obtener la lista de elementos, y si está en la lista, agregar ese
+			 * item.
+			 * De lo contrario, se crea un elemento especial. */
+			GList* recommended = g_app_info_get_recommended_for_type("text/plain");
+
+			if (recommended!= NULL)
+			{
+				GList* app;
+
+				for (app = recommended; app != NULL; app = app->next)
+				{
+					/* nice hack bro */
+					if (strcmp(item->executable, g_app_info_get_executable((GAppInfo*) app->data)) == 0)
+					{
+						/* falta agregar más mime-types */
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "text/plain", NULL);
+					}
+				}
+
+				g_list_free_full(recommended, g_object_unref);
+			}
+		}
+	}
+
+	/* Si, aun falta para poder crear personalizables... */
+	is_custom_active = FALSE;
+    gtk_widget_set_sensitive(capplet->text_editor_command_entry, is_custom_active);
+    gtk_widget_set_sensitive(capplet->text_editor_command_label, is_custom_active);
+    gtk_widget_set_sensitive(capplet->text_editor_terminal_checkbutton, is_custom_active);
 }
 
 static void media_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet)
@@ -161,25 +325,115 @@ static void media_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet)
     gboolean is_custom_active;
 
     current_index = gtk_combo_box_get_active (combo);
-    is_custom_active = (current_index >= g_list_length (capplet->media_players));
+    is_custom_active = (current_index >= g_list_length(capplet->media_players));
+
+	if (current_index != -1)
+	{
+		MateDAItem* item = (MateDAItem*) g_list_nth_data(capplet->media_players, current_index);
 
-    gtk_widget_set_sensitive (capplet->media_player_command_entry, is_custom_active);
-    gtk_widget_set_sensitive (capplet->media_player_command_label, is_custom_active);
-    gtk_widget_set_sensitive (capplet->media_player_terminal_checkbutton, is_custom_active);
+		if (item != NULL)
+		{
+			/* Para obtener la lista de elementos, y si está en la lista, agregar ese
+			 * item.
+			 * De lo contrario, se crea un elemento especial. */
+			GList* recommended = g_app_info_get_recommended_for_type("audio/x-vorbis+ogg");
+
+			if (recommended!= NULL)
+			{
+				GList* app;
+
+				for (app = recommended; app != NULL; app = app->next)
+				{
+					/* nice hack bro */
+					if (strcmp(item->executable, g_app_info_get_executable((GAppInfo*) app->data)) == 0)
+					{
+						/* por alguna extraña razon, solo se usa mailto, en vez de mail. */
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "audio/x-vorbis+ogg", NULL);
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "audio/x-scpls", NULL);
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "audio/mpeg", NULL);
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "audio/x-wav", NULL);
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "audio/x-mpegurl", NULL);
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "video/webm", NULL);
+					}
+				}
+
+				g_list_free_full(recommended, g_object_unref);
+			}
+		}
+	}
+
+	/* Si, aun falta para poder crear personalizables... */
+	is_custom_active = FALSE;
+    gtk_widget_set_sensitive(capplet->media_player_command_entry, is_custom_active);
+    gtk_widget_set_sensitive(capplet->media_player_command_label, is_custom_active);
+    gtk_widget_set_sensitive(capplet->media_player_terminal_checkbutton, is_custom_active);
 }
 
-static void terminal_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet)
+static void video_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet)
 {
     guint current_index;
     gboolean is_custom_active;
 
     current_index = gtk_combo_box_get_active (combo);
-    is_custom_active = (current_index >= g_list_length (capplet->terminals));
+    is_custom_active = (current_index >= g_list_length(capplet->video_players));
+
+	if (current_index != -1)
+	{
+		MateDAItem* item = (MateDAItem*) g_list_nth_data(capplet->video_players, current_index);
+
+		if (item != NULL)
+		{
+			/* Para obtener la lista de elementos, y si está en la lista, agregar ese
+			 * item.
+			 * De lo contrario, se crea un elemento especial. */
+			GList* recommended = g_app_info_get_recommended_for_type("video/x-ogm+ogg");
+
+			if (recommended!= NULL)
+			{
+				GList* app;
+
+				for (app = recommended; app != NULL; app = app->next)
+				{
+					/* nice hack bro */
+					if (strcmp(item->executable, g_app_info_get_executable((GAppInfo*) app->data)) == 0)
+					{
+						/* por alguna extraña razon, solo se usa mailto, en vez de mail. */
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "video/mpeg", NULL);
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "video/x-mpeg", NULL);
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "video/msvideo", NULL);
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "video/quicktime", NULL);
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "video/x-avi", NULL);
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "video/x-ogm+ogg", NULL);
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "video/x-matroska", NULL);
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "video/webm", NULL);
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "video/mp4", NULL);
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "video/x-flv", NULL);
+					}
+				}
+
+				g_list_free_full(recommended, g_object_unref);
+			}
+		}
+	}
+
+	/* Si, aun falta para poder crear personalizables... */
+	is_custom_active = FALSE;
+    gtk_widget_set_sensitive(capplet->video_player_command_entry, is_custom_active);
+    gtk_widget_set_sensitive(capplet->video_player_command_label, is_custom_active);
+    gtk_widget_set_sensitive(capplet->video_player_terminal_checkbutton, is_custom_active);
+}
+static void terminal_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet)
+{
+    guint current_index;
+    gboolean is_custom_active;
+
+    current_index = gtk_combo_box_get_active(combo);
+    is_custom_active = (current_index >= g_list_length(capplet->terminals));
 
-    gtk_widget_set_sensitive (capplet->terminal_command_entry, is_custom_active);
-    gtk_widget_set_sensitive (capplet->terminal_command_label, is_custom_active);
-    gtk_widget_set_sensitive (capplet->terminal_exec_flag_entry, is_custom_active);
-    gtk_widget_set_sensitive (capplet->terminal_exec_flag_label, is_custom_active);
+    gtk_widget_set_sensitive(capplet->terminal_command_entry, is_custom_active);
+    gtk_widget_set_sensitive(capplet->terminal_command_label, is_custom_active);
+    gtk_widget_set_sensitive(capplet->terminal_exec_flag_entry, is_custom_active);
+    gtk_widget_set_sensitive(capplet->terminal_exec_flag_label, is_custom_active);
 }
 
 static void visual_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet)
@@ -187,11 +441,11 @@ static void visual_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet)
     guint current_index;
     gboolean is_custom_active;
 
-    current_index = gtk_combo_box_get_active (combo);
-    is_custom_active = (current_index >= g_list_length (capplet->visual_ats));
+    current_index = gtk_combo_box_get_active(combo);
+    is_custom_active = (current_index >= g_list_length(capplet->visual_ats));
 
-    gtk_widget_set_sensitive (capplet->visual_command_entry, is_custom_active);
-    gtk_widget_set_sensitive (capplet->visual_command_label, is_custom_active);
+    gtk_widget_set_sensitive(capplet->visual_command_entry, is_custom_active);
+    gtk_widget_set_sensitive(capplet->visual_command_label, is_custom_active);
 }
 
 static void mobility_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet)
@@ -206,6 +460,53 @@ static void mobility_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet
     gtk_widget_set_sensitive (capplet->mobility_command_label, is_custom_active);
 }
 
+static void image_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet)
+{
+    guint current_index;
+    gboolean is_custom_active;
+
+    current_index = gtk_combo_box_get_active(combo);
+    is_custom_active = (current_index >= g_list_length(capplet->image_viewers));
+
+	if (current_index != -1)
+	{
+		MateDAItem* item = (MateDAItem*) g_list_nth_data(capplet->image_viewers, current_index);
+
+		if (item != NULL)
+		{
+			/* Para obtener la lista de elementos, y si está en la lista, agregar ese
+			 * item.
+			 * De lo contrario, se crea un elemento especial. */
+			GList* recommended = g_app_info_get_recommended_for_type("image/png");
+
+			if (recommended!= NULL)
+			{
+				GList* app;
+
+				for (app = recommended; app != NULL; app = app->next)
+				{
+					/* nice hack bro */
+					if (strcmp(item->executable, g_app_info_get_executable((GAppInfo*) app->data)) == 0)
+					{
+						/* por alguna extraña razon, solo se usa mailto, en vez de mail. */
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "image/png", NULL);
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "image/jpeg", NULL);
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "image/gif", NULL);
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "image/bmp", NULL);
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "image/tiff", NULL);
+					}
+				}
+
+				g_list_free_full(recommended, g_object_unref);
+			}
+		}
+	}
+
+    gtk_widget_set_sensitive(capplet->image_viewer_command_entry, is_custom_active);
+    gtk_widget_set_sensitive(capplet->image_viewer_command_label, is_custom_active);
+    gtk_widget_set_sensitive(capplet->image_viewer_terminal_checkbutton, is_custom_active);
+}
+
 static void refresh_combo_box_icons(GtkIconTheme* theme, GtkComboBox* combo_box, GList* app_list)
 {
     GList *entry;
@@ -233,41 +534,48 @@ static void refresh_combo_box_icons(GtkIconTheme* theme, GtkComboBox* combo_box,
 }
 
 static struct {
-	const gchar* name;
-	const gchar* icon;
+	const char* name;
+	const char* icon;
 } icons[] = {
-	{"web_browser_image", "web-browser"},
-	{"mail_reader_image", "emblem-mail"},
-	{"media_player_image", "applications-multimedia"},
-	{"visual_image",      "zoom-best-fit"},
-	{"mobility_image",    "preferences-desktop-accessibility"},
-	/*
-	{"messenger_image",   "im"},
-	{"file_manager_image",   "file-manager"},
-	{"image_image",       "image-viewer"},
-	{"video_image",       "mate-multimedia"},
-	{"text_image",        "text-editor"},
-	*/
-	{"terminal_image",    "mate-terminal"}
+	{"web_browser_image",  "web-browser"},
+	{"mail_reader_image",  "emblem-mail"},
+	{"media_player_image", "audio-x-generic"}, /* applications-multimedia */
+	{"visual_image",       "zoom-best-fit"},
+	{"mobility_image",     "preferences-desktop-accessibility"},
+	{"messenger_image",    "user-idle"},
+	{"filemanager_image",  "file-manager"},
+	{"imageviewer_image",  "eog"}, /* no hay otra... */
+	{"video_image",        "video-x-generic"},
+	{"text_image",         "text-editor"},
+	{"terminal_image",     "terminal"},
 };
 
 static void theme_changed_cb(GtkIconTheme* theme, MateDACapplet* capplet)
 {
-	GObject *icon;
+	GObject* icon;
 	gint i;
 
-	for (i = 0; i < G_N_ELEMENTS (icons); i++)
+	for (i = 0; i < G_N_ELEMENTS(icons); i++)
 	{
-		icon = gtk_builder_get_object (capplet->builder, icons[i].name);
-		set_icon (GTK_IMAGE (icon), theme, icons[i].icon);
+		icon = gtk_builder_get_object(capplet->builder, icons[i].name);
+
+		GdkPixbuf* pixbuf = gtk_icon_theme_load_icon(theme, icons[i].icon, 48, 0, NULL);
+
+		if (pixbuf)
+		{
+			gtk_image_set_from_pixbuf(GTK_IMAGE(icon), pixbuf);
+			g_object_unref(pixbuf);
+		}
 	}
 
-	refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers);
-	refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers);
-	refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->media_combo_box), capplet->media_players);
-	refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->term_combo_box), capplet->terminals);
-	refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->visual_combo_box), capplet->visual_ats);
-	refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->mobility_combo_box), capplet->mobility_ats);
+	refresh_combo_box_icons(theme, GTK_COMBO_BOX(capplet->web_combo_box), capplet->web_browsers);
+	refresh_combo_box_icons(theme, GTK_COMBO_BOX(capplet->mail_combo_box), capplet->mail_readers);
+	refresh_combo_box_icons(theme, GTK_COMBO_BOX(capplet->media_combo_box), capplet->media_players);
+	refresh_combo_box_icons(theme, GTK_COMBO_BOX(capplet->term_combo_box), capplet->terminals);
+	refresh_combo_box_icons(theme, GTK_COMBO_BOX(capplet->visual_combo_box), capplet->visual_ats);
+	refresh_combo_box_icons(theme, GTK_COMBO_BOX(capplet->mobility_combo_box), capplet->mobility_ats);
+	refresh_combo_box_icons(theme, GTK_COMBO_BOX(capplet->file_combo_box), capplet->file_managers);
+	refresh_combo_box_icons(theme, GTK_COMBO_BOX(capplet->text_combo_box), capplet->text_editors);
 }
 
 static void screen_changed_cb(GtkWidget* widget, GdkScreen* screen, MateDACapplet* capplet)
@@ -287,29 +595,36 @@ static void screen_changed_cb(GtkWidget* widget, GdkScreen* screen, MateDACapple
 	capplet->icon_theme = theme;
 }
 
-static gint generic_item_comp(gconstpointer list_item, gconstpointer command)
+static gint generic_item_comp(const void* list_item, const void* command)
 {
-	return (strcmp (((MateDAItem *) list_item)->command, (gchar *) command));
+	return (strcmp(((MateDAItem*) list_item)->command, (char*) command));
 }
 
-static gint web_item_comp(gconstpointer item, gconstpointer command)
+static int web_item_comp(const void* item, const void* command)
 {
-    MateDAWebItem *web_list_item;
+    MateDAWebItem* web_list_item;
 
-    web_list_item = (MateDAWebItem *) item;
+    web_list_item = (MateDAWebItem*) item;
 
-    if (strcmp (web_list_item->generic.command, (gchar *) command) == 0)
-	return 0;
+    if (strcmp (web_list_item->generic.command, (char*) command) == 0)
+    {
+		return 0;
+	}
 
-    if (web_list_item->netscape_remote) {
-	if (strcmp (web_list_item->tab_command, (gchar *) command) == 0)
-	    return 0;
+    if (web_list_item->netscape_remote)
+    {
+		if (strcmp (web_list_item->tab_command, (char*) command) == 0)
+		{
+			return 0;
+		}
 
-	if (strcmp (web_list_item->win_command, (gchar *) command) == 0)
-	    return 0;
+		if (strcmp (web_list_item->win_command, (char*) command) == 0)
+		{
+			return 0;
+		}
     }
 
-    return (strcmp (web_list_item->generic.command, (gchar *) command));
+    return (strcmp(web_list_item->generic.command, (char*) command));
 }
 
 static void web_mateconf_changed_cb(MateConfPropertyEditor* peditor, gchar* key, MateConfValue* value, MateDACapplet* capplet)
@@ -322,63 +637,65 @@ static void web_mateconf_changed_cb(MateConfPropertyEditor* peditor, gchar* key,
      * should also use the same value as HTTP
      */
 
-    if (strcmp (key, DEFAULT_APPS_KEY_HTTP_EXEC) == 0) {
-	gchar *short_browser, *pos;
-	const gchar *value_str = mateconf_value_get_string (value);
+    if (strcmp (key, DEFAULT_APPS_KEY_HTTP_EXEC) == 0)
+    {
+		gchar *short_browser, *pos;
+		const gchar *value_str = mateconf_value_get_string (value);
 
-	cs = mateconf_change_set_new ();
+		cs = mateconf_change_set_new ();
 
-	mateconf_change_set_set (cs, DEFAULT_APPS_KEY_HTTPS_EXEC, value);
-	mateconf_change_set_set (cs, DEFAULT_APPS_KEY_UNKNOWN_EXEC, value);
-	mateconf_change_set_set (cs, DEFAULT_APPS_KEY_ABOUT_EXEC, value);
-	pos = strstr (value_str, " ");
-	if (pos == NULL)
-	    short_browser = g_strdup (value_str);
-	else
-	    short_browser = g_strndup (value_str, pos - value_str);
-	mateconf_change_set_set_string (cs, DEFAULT_APPS_KEY_BROWSER_EXEC, short_browser);
-	g_free (short_browser);
+		mateconf_change_set_set (cs, DEFAULT_APPS_KEY_HTTPS_EXEC, value);
+		mateconf_change_set_set (cs, DEFAULT_APPS_KEY_UNKNOWN_EXEC, value);
+		mateconf_change_set_set (cs, DEFAULT_APPS_KEY_ABOUT_EXEC, value);
+		pos = strstr (value_str, " ");
+		if (pos == NULL)
+			short_browser = g_strdup (value_str);
+		else
+			short_browser = g_strndup (value_str, pos - value_str);
+		mateconf_change_set_set_string (cs, DEFAULT_APPS_KEY_BROWSER_EXEC, short_browser);
+		g_free (short_browser);
 
-	list_entry = g_list_find_custom (capplet->web_browsers,
-					 value_str,
-					 (GCompareFunc) web_item_comp);
+		list_entry = g_list_find_custom (capplet->web_browsers,
+						 value_str,
+						 (GCompareFunc) web_item_comp);
 
-	if (list_entry) {
-	    MateDAWebItem *item = (MateDAWebItem *) list_entry->data;
+		if (list_entry) {
+			MateDAWebItem *item = (MateDAWebItem *) list_entry->data;
 
-	    mateconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_BROWSER_NREMOTE, item->netscape_remote);
-	}
+			mateconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_BROWSER_NREMOTE, item->netscape_remote);
+		}
 
-	mateconf_client_commit_change_set (capplet->mateconf, cs, TRUE, &error);
+		mateconf_client_commit_change_set (capplet->mateconf, cs, TRUE, &error);
 
-	if (error != NULL) {
-	    g_warning (_("Error saving configuration: %s"), error->message);
-	    g_error_free (error);
-	    error = NULL;
-	}
+		if (error != NULL) {
+			g_warning (_("Error saving configuration: %s"), error->message);
+			g_error_free (error);
+			error = NULL;
+		}
 
-	mateconf_change_set_unref (cs);
+		mateconf_change_set_unref (cs);
     }
-    else if (strcmp (key, DEFAULT_APPS_KEY_HTTP_NEEDS_TERM) == 0) {
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->web_browser_terminal_checkbutton),
-				      mateconf_value_get_bool (value));
+    else if (strcmp (key, DEFAULT_APPS_KEY_HTTP_NEEDS_TERM) == 0)
+    {
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->web_browser_terminal_checkbutton),
+						  mateconf_value_get_bool (value));
 
-	cs = mateconf_change_set_new ();
+		cs = mateconf_change_set_new ();
 
-	mateconf_change_set_set (cs, DEFAULT_APPS_KEY_HTTPS_NEEDS_TERM, value);
-	mateconf_change_set_set (cs, DEFAULT_APPS_KEY_UNKNOWN_NEEDS_TERM, value);
-	mateconf_change_set_set (cs, DEFAULT_APPS_KEY_ABOUT_NEEDS_TERM, value);
-	mateconf_change_set_set (cs, DEFAULT_APPS_KEY_BROWSER_NEEDS_TERM, value);
+		mateconf_change_set_set (cs, DEFAULT_APPS_KEY_HTTPS_NEEDS_TERM, value);
+		mateconf_change_set_set (cs, DEFAULT_APPS_KEY_UNKNOWN_NEEDS_TERM, value);
+		mateconf_change_set_set (cs, DEFAULT_APPS_KEY_ABOUT_NEEDS_TERM, value);
+		mateconf_change_set_set (cs, DEFAULT_APPS_KEY_BROWSER_NEEDS_TERM, value);
 
-	mateconf_client_commit_change_set (capplet->mateconf, cs, TRUE, &error);
+		mateconf_client_commit_change_set (capplet->mateconf, cs, TRUE, &error);
 
-	if (error != NULL) {
-	    g_warning (_("Error saving configuration: %s"), error->message);
-	    g_error_free (error);
-	    error = NULL;
-	}
+		if (error != NULL) {
+			g_warning (_("Error saving configuration: %s"), error->message);
+			g_error_free (error);
+			error = NULL;
+		}
 
-	mateconf_change_set_unref (cs);
+		mateconf_change_set_unref (cs);
     }
 }
 
@@ -429,37 +746,42 @@ static void web_browser_update_radio_buttons(MateDACapplet* capplet, const gchar
 
 static MateConfValue* web_combo_conv_to_widget (MateConfPropertyEditor *peditor, const MateConfValue *value)
 {
-    MateConfValue *ret;
-    GList *entry, *handlers;
-    const gchar *command;
-    gint index;
-    MateDACapplet *capplet;
+	MateConfValue *ret;
+	GList *entry, *handlers;
+	const gchar *command;
+	gint index;
+	MateDACapplet *capplet;
 
-    g_object_get (G_OBJECT (peditor), "data", &capplet, NULL);
+	g_object_get (G_OBJECT (peditor), "data", &capplet, NULL);
 
-    command = mateconf_value_get_string (value);
-    handlers = capplet->web_browsers;
+	command = mateconf_value_get_string (value);
+	handlers = capplet->web_browsers;
 
-    if (handlers)
-    {
-      entry = g_list_find_custom (handlers, command, (GCompareFunc) web_item_comp);
-      if (entry)
-          index = g_list_position (handlers, entry);
-      else
-          index = g_list_length (handlers) + 1;
-    }
-    else
-    {
-      /* if the item has no handlers lsit then select the Custom item */
-      index = 1;
-    }
+	if (handlers)
+	{
+		entry = g_list_find_custom (handlers, command, (GCompareFunc) web_item_comp);
 
-    web_browser_update_radio_buttons (capplet, command);
+		if (entry)
+		{
+			index = g_list_position (handlers, entry);
+		}
+		else
+		{
+			index = g_list_length (handlers) + 1;
+		}
+	}
+	else
+	{
+		/* if the item has no handlers lsit then select the Custom item */
+		index = 1;
+	}
 
-    ret = mateconf_value_new (MATECONF_VALUE_INT);
-    mateconf_value_set_int (ret, index);
+	web_browser_update_radio_buttons (capplet, command);
 
-    return ret;
+	ret = mateconf_value_new (MATECONF_VALUE_INT);
+	mateconf_value_set_int (ret, index);
+
+	return ret;
 }
 
 static MateConfValue* web_combo_conv_from_widget (MateConfPropertyEditor *peditor, const MateConfValue *value)
@@ -592,346 +914,459 @@ static MateConfValue* combo_conv_from_widget_term_flag (MateConfPropertyEditor *
     }
 }
 
-static MateConfValue* combo_conv_to_widget_term_flag (MateConfPropertyEditor *peditor, const MateConfValue *value)
+static MateConfValue* combo_conv_to_widget_term_flag(MateConfPropertyEditor* peditor, const MateConfValue* value)
 {
-    MateConfValue *ret;
-    GtkComboBox *combo;
+	GtkComboBox* combo = GTK_COMBO_BOX(mateconf_property_editor_get_ui_control(peditor));
 
-    combo = GTK_COMBO_BOX (mateconf_property_editor_get_ui_control (peditor));
+	MateConfValue* ret = mateconf_value_new(MATECONF_VALUE_INT);
 
-    ret = mateconf_value_new (MATECONF_VALUE_INT);
-    mateconf_value_set_int (ret, gtk_combo_box_get_active (combo));
-    return ret;
+	mateconf_value_set_int(ret, gtk_combo_box_get_active (combo));
+
+	return ret;
 }
 
-static gboolean is_separator (GtkTreeModel *model, GtkTreeIter *iter, gpointer sep_index)
+static gboolean is_separator(GtkTreeModel* model, GtkTreeIter* iter, gpointer sep_index)
 {
-    GtkTreePath *path;
-    gboolean result;
+    GtkTreePath* path = gtk_tree_model_get_path(model, iter);
+
+    gboolean result = gtk_tree_path_get_indices(path)[0] == GPOINTER_TO_INT(sep_index);
 
-    path = gtk_tree_model_get_path (model, iter);
-    result = gtk_tree_path_get_indices (path)[0] == GPOINTER_TO_INT (sep_index);
-    gtk_tree_path_free (path);
+    gtk_tree_path_free(path);
 
     return result;
 }
 
-static void fill_combo_box (GtkIconTheme *theme, GtkComboBox *combo_box, GList *app_list)
+static void fill_combo_box (GtkIconTheme* theme, GtkComboBox* combo_box, GList* app_list)
 {
-    GList *entry;
-    GtkTreeModel *model;
-    GtkCellRenderer *renderer;
-    GtkTreeIter iter;
-    GdkPixbuf *pixbuf;
+	GList* entry;
+	GtkTreeModel* model;
+	GtkCellRenderer* renderer;
+	GtkTreeIter iter;
+	GdkPixbuf* pixbuf;
 
-    if (theme == NULL) {
-	theme = gtk_icon_theme_get_default ();
-    }
+	if (theme == NULL)
+	{
+		theme = gtk_icon_theme_get_default();
+	}
 
-    gtk_combo_box_set_row_separator_func (combo_box, is_separator,
-					  GINT_TO_POINTER (g_list_length (app_list)), NULL);
+	gtk_combo_box_set_row_separator_func(combo_box, is_separator, GINT_TO_POINTER(g_list_length(app_list)), NULL);
 
-    model = GTK_TREE_MODEL (gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING));
-    gtk_combo_box_set_model (combo_box, model);
+	model = GTK_TREE_MODEL(gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING));
+	gtk_combo_box_set_model(combo_box, model);
 
-    renderer = gtk_cell_renderer_pixbuf_new ();
+	renderer = gtk_cell_renderer_pixbuf_new ();
 
-    /* not all cells have a pixbuf, this prevents the combo box to shrink */
-    gtk_cell_renderer_set_fixed_size (renderer, -1, 22);
-    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), renderer, FALSE);
-    gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), renderer,
-				    "pixbuf", PIXBUF_COL,
-				    NULL);
+	/* not all cells have a pixbuf, this prevents the combo box to shrink */
+	gtk_cell_renderer_set_fixed_size(renderer, -1, 22);
+	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo_box), renderer, FALSE);
+	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo_box), renderer,
+		"pixbuf", PIXBUF_COL,
+		NULL);
 
-    renderer = gtk_cell_renderer_text_new ();
-    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), renderer, TRUE);
-    gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), renderer,
-				    "text", TEXT_COL,
-				    NULL);
+	renderer = gtk_cell_renderer_text_new();
 
-    for (entry = app_list; entry != NULL; entry = g_list_next (entry)) {
-	MateDAItem *item;
-	item = (MateDAItem *) entry->data;
+	gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), renderer, TRUE);
+	gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), renderer,
+		"text", TEXT_COL,
+		NULL);
 
-	pixbuf = gtk_icon_theme_load_icon (theme, item->icon_name, 22, 0, NULL);
+	for (entry = app_list; entry != NULL; entry = g_list_next (entry))
+	{
+		MateDAItem* item = (MateDAItem*) entry->data;
 
-	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
-	gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-			    PIXBUF_COL, pixbuf,
-			    TEXT_COL, item->name,
-			    -1);
+		pixbuf = gtk_icon_theme_load_icon(theme, item->icon_name, 22, 0, NULL);
 
-	item->icon_path = gtk_tree_model_get_string_from_iter (model, &iter);
+		gtk_list_store_append(GTK_LIST_STORE(model), &iter);
+		gtk_list_store_set(GTK_LIST_STORE(model), &iter,
+			PIXBUF_COL, pixbuf,
+			TEXT_COL, item->name,
+			-1);
 
-	if (pixbuf)
-	    g_object_unref (pixbuf);
-    }
+		item->icon_path = gtk_tree_model_get_string_from_iter(model, &iter);
 
-    gtk_list_store_append (GTK_LIST_STORE (model), &iter);
-    gtk_list_store_set (GTK_LIST_STORE (model), &iter, -1);
-    gtk_list_store_append (GTK_LIST_STORE (model), &iter);
-    gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-			PIXBUF_COL, NULL,
-			TEXT_COL, _("Custom"),
-			-1);
+		if (pixbuf)
+		{
+			g_object_unref(pixbuf);
+		}
+	}
+
+	gtk_list_store_append(GTK_LIST_STORE(model), &iter);
+	gtk_list_store_set(GTK_LIST_STORE(model), &iter, -1);
+	gtk_list_store_append(GTK_LIST_STORE(model), &iter);
+	gtk_list_store_set(GTK_LIST_STORE(model), &iter,
+		PIXBUF_COL, NULL,
+		TEXT_COL, _("Custom"),
+		-1);
 }
 
-static GtkWidget* _gtk_builder_get_widget (GtkBuilder *builder, const gchar *name)
+/* not used
+static GtkWidget* _gtk_builder_get_widget(GtkBuilder* builder, const gchar* name)
 {
-    return GTK_WIDGET (gtk_builder_get_object (builder, name));
-}
+    return GTK_WIDGET(gtk_builder_get_object(builder, name));
+}*/
 
 
-static void show_dialog (MateDACapplet* capplet, const gchar* start_page)
+static void show_dialog(MateDACapplet* capplet, const gchar* start_page)
 {
-    GObject *obj;
-    GtkBuilder *builder;
-    guint builder_result;
+	#define get_widget(name) GTK_WIDGET(gtk_builder_get_object(builder, name))
 
-    capplet->builder = builder = gtk_builder_new ();
+	GObject* obj;
+	GtkBuilder* builder;
+	guint builder_result;
 
-    if (g_file_test (MATECC_UI_DIR "/mate-default-applications-properties.ui", G_FILE_TEST_EXISTS) != FALSE) {
-	builder_result = gtk_builder_add_from_file (builder, MATECC_UI_DIR "/mate-default-applications-properties.ui", NULL);
-    }
-    else {
-	builder_result = gtk_builder_add_from_file (builder, "./mate-default-applications-properties.ui", NULL);
-    }
+	capplet->builder = builder = gtk_builder_new ();
 
-    if (builder_result == 0) {
-	GtkWidget *dialog;
-
-	dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
-					 _("Could not load the main interface"));
-	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-						  _("Please make sure that the applet "
-						    "is properly installed"));
-	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
-	gtk_dialog_run (GTK_DIALOG (dialog));
-	gtk_widget_destroy (dialog);
-	exit (EXIT_FAILURE);
-    }
+	if (g_file_test(MATECC_UI_DIR "/mate-default-applications-properties.ui", G_FILE_TEST_EXISTS) != FALSE)
+	{
+		builder_result = gtk_builder_add_from_file(builder, MATECC_UI_DIR "/mate-default-applications-properties.ui", NULL);
+	}
+	else
+	{
+		builder_result = gtk_builder_add_from_file(builder, "./mate-default-applications-properties.ui", NULL);
+	}
 
-    capplet->window = _gtk_builder_get_widget (builder,"preferred_apps_dialog");
-    g_signal_connect (capplet->window, "response", G_CALLBACK (close_cb), NULL);
-
-    capplet->web_browser_command_entry = _gtk_builder_get_widget (builder, "web_browser_command_entry");
-    capplet->web_browser_command_label = _gtk_builder_get_widget (builder, "web_browser_command_label");
-    capplet->web_browser_terminal_checkbutton = _gtk_builder_get_widget(builder, "web_browser_terminal_checkbutton");
-    capplet->default_radiobutton = _gtk_builder_get_widget (builder, "web_browser_default_radiobutton");
-    capplet->new_win_radiobutton = _gtk_builder_get_widget (builder, "web_browser_new_win_radiobutton");
-    capplet->new_tab_radiobutton = _gtk_builder_get_widget (builder, "web_browser_new_tab_radiobutton");
-
-    capplet->mail_reader_command_entry = _gtk_builder_get_widget (builder, "mail_reader_command_entry");
-    capplet->mail_reader_command_label = _gtk_builder_get_widget (builder, "mail_reader_command_label");
-    capplet->mail_reader_terminal_checkbutton = _gtk_builder_get_widget (builder, "mail_reader_terminal_checkbutton");
-
-    capplet->terminal_command_entry = _gtk_builder_get_widget (builder, "terminal_command_entry");
-    capplet->terminal_command_label = _gtk_builder_get_widget (builder, "terminal_command_label");
-    capplet->terminal_exec_flag_entry = _gtk_builder_get_widget (builder, "terminal_exec_flag_entry");
-    capplet->terminal_exec_flag_label = _gtk_builder_get_widget (builder, "terminal_exec_flag_label");
-
-    capplet->media_player_command_entry = _gtk_builder_get_widget (builder, "media_player_command_entry");
-    capplet->media_player_command_label = _gtk_builder_get_widget (builder, "media_player_command_label");
-    capplet->media_player_terminal_checkbutton = _gtk_builder_get_widget (builder, "media_player_terminal_checkbutton");
-
-    capplet->visual_command_entry = _gtk_builder_get_widget (builder, "visual_command_entry");
-    capplet->visual_command_label = _gtk_builder_get_widget (builder, "visual_command_label");
-    capplet->visual_startup_checkbutton = _gtk_builder_get_widget (builder, "visual_start_checkbutton");
-
-    capplet->mobility_command_entry = _gtk_builder_get_widget (builder, "mobility_command_entry");
-    capplet->mobility_command_label = _gtk_builder_get_widget (builder, "mobility_command_label");
-    capplet->mobility_startup_checkbutton = _gtk_builder_get_widget (builder, "mobility_start_checkbutton");
-
-    capplet->web_combo_box = _gtk_builder_get_widget (builder, "web_browser_combobox");
-    capplet->mail_combo_box = _gtk_builder_get_widget (builder, "mail_reader_combobox");
-    capplet->term_combo_box = _gtk_builder_get_widget (builder, "terminal_combobox");
-    capplet->media_combo_box = _gtk_builder_get_widget (builder, "media_player_combobox");
-    capplet->visual_combo_box = _gtk_builder_get_widget (builder, "visual_combobox");
-    capplet->mobility_combo_box = _gtk_builder_get_widget (builder, "mobility_combobox");
-
-    g_signal_connect (capplet->window, "screen-changed", G_CALLBACK (screen_changed_cb), capplet);
-    screen_changed_cb (capplet->window, gdk_screen_get_default (), capplet);
-
-    fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers);
-    fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers);
-    fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->term_combo_box), capplet->terminals);
-    fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->media_combo_box), capplet->media_players);
-    fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->visual_combo_box), capplet->visual_ats);
-    fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mobility_combo_box), capplet->mobility_ats);
-
-    g_signal_connect (capplet->web_combo_box, "changed", G_CALLBACK (web_combo_changed_cb), capplet);
-    g_signal_connect (capplet->mail_combo_box, "changed", G_CALLBACK (mail_combo_changed_cb), capplet);
-    g_signal_connect (capplet->term_combo_box, "changed", G_CALLBACK (terminal_combo_changed_cb), capplet);
-    g_signal_connect (capplet->media_combo_box, "changed", G_CALLBACK (media_combo_changed_cb), capplet);
-    g_signal_connect (capplet->visual_combo_box, "changed", G_CALLBACK (visual_combo_changed_cb), capplet);
-    g_signal_connect (capplet->mobility_combo_box, "changed", G_CALLBACK (mobility_combo_changed_cb), capplet);
-
-
-    g_signal_connect (capplet->default_radiobutton, "toggled", G_CALLBACK (web_radiobutton_toggled_cb), capplet);
-    g_signal_connect (capplet->new_win_radiobutton, "toggled", G_CALLBACK (web_radiobutton_toggled_cb), capplet);
-    g_signal_connect (capplet->new_tab_radiobutton, "toggled", G_CALLBACK (web_radiobutton_toggled_cb), capplet);
-
-    /* Setup MateConfPropertyEditors */
-
-    /* Web Browser */
-    mateconf_peditor_new_combo_box (NULL,
-        DEFAULT_APPS_KEY_HTTP_EXEC,
-        capplet->web_combo_box,
-        "conv-from-widget-cb", web_combo_conv_from_widget,
-        "conv-to-widget-cb", web_combo_conv_to_widget,
-        "data", capplet,
-        NULL);
-
-    obj = mateconf_peditor_new_string (NULL,
-        DEFAULT_APPS_KEY_HTTP_EXEC,
-        capplet->web_browser_command_entry,
-        NULL);
-    g_signal_connect (obj, "value-changed", G_CALLBACK (web_mateconf_changed_cb), capplet);
-
-    obj = mateconf_peditor_new_boolean (NULL,
-        DEFAULT_APPS_KEY_HTTP_NEEDS_TERM,
-        capplet->web_browser_terminal_checkbutton,
-        NULL);
-    g_signal_connect (obj, "value-changed", G_CALLBACK (web_mateconf_changed_cb), capplet);
-
-    /* Mailer */
-    mateconf_peditor_new_combo_box (NULL,
-        DEFAULT_APPS_KEY_MAILER_EXEC,
-        capplet->mail_combo_box,
-        "conv-from-widget-cb", combo_conv_from_widget,
-        "conv-to-widget-cb", combo_conv_to_widget,
-        "data", capplet->mail_readers,
-        NULL);
-
-    mateconf_peditor_new_string (NULL,
-        DEFAULT_APPS_KEY_MAILER_EXEC,
-        capplet->mail_reader_command_entry,
-        NULL);
-
-    mateconf_peditor_new_boolean (NULL,
-        DEFAULT_APPS_KEY_MAILER_NEEDS_TERM,
-        capplet->mail_reader_terminal_checkbutton,
-        NULL);
-
-    /* Media player */
-    mateconf_peditor_new_combo_box (NULL,
-        DEFAULT_APPS_KEY_MEDIA_EXEC,
-        capplet->media_combo_box,
-        "conv-from-widget-cb", combo_conv_from_widget,
-        "conv-to-widget-cb", combo_conv_to_widget,
-        "data", capplet->media_players,
-        NULL);
-
-    mateconf_peditor_new_string (NULL,
-        DEFAULT_APPS_KEY_MEDIA_EXEC,
-        capplet->media_player_command_entry,
-        NULL);
-
-    mateconf_peditor_new_boolean (NULL,
-        DEFAULT_APPS_KEY_MEDIA_NEEDS_TERM,
-        capplet->media_player_terminal_checkbutton,
-        NULL);
-
-    /* Terminal */
-    mateconf_peditor_new_combo_box (NULL,
-        DEFAULT_APPS_KEY_TERMINAL_EXEC,
-        capplet->term_combo_box,
-        "conv-from-widget-cb", combo_conv_from_widget,
-        "conv-to-widget-cb", combo_conv_to_widget,
-        "data", capplet->terminals,
-        NULL);
-
-    mateconf_peditor_new_combo_box (NULL,
-        DEFAULT_APPS_KEY_TERMINAL_EXEC_ARG,
-        capplet->term_combo_box,
-        "conv-from-widget-cb", combo_conv_from_widget_term_flag,
-        "conv-to-widget-cb", combo_conv_to_widget_term_flag,
-        "data", capplet->terminals,
-        NULL);
-
-    mateconf_peditor_new_string (NULL,
-        DEFAULT_APPS_KEY_TERMINAL_EXEC,
-        capplet->terminal_command_entry,
-        NULL);
-    mateconf_peditor_new_string (NULL,
-        DEFAULT_APPS_KEY_TERMINAL_EXEC_ARG,
-        capplet->terminal_exec_flag_entry,
-        NULL);
-
-
-    /* Visual */
-    mateconf_peditor_new_combo_box (NULL,
-        DEFAULT_APPS_KEY_VISUAL_EXEC,
-        capplet->visual_combo_box,
-        "conv-from-widget-cb", combo_conv_from_widget,
-        "conv-to-widget-cb", combo_conv_to_widget,
-        "data", capplet->visual_ats,
-        NULL);
-
-    mateconf_peditor_new_string (NULL,
-        DEFAULT_APPS_KEY_VISUAL_EXEC,
-        capplet->visual_command_entry,
-        NULL);
-
-    mateconf_peditor_new_boolean (NULL,
-        DEFAULT_APPS_KEY_VISUAL_STARTUP,
-        capplet->visual_startup_checkbutton,
-        NULL);
-
-
-    /* Mobility */
-    mateconf_peditor_new_combo_box (NULL,
-        DEFAULT_APPS_KEY_MOBILITY_EXEC,
-        capplet->mobility_combo_box,
-        "conv-from-widget-cb", combo_conv_from_widget,
-        "conv-to-widget-cb", combo_conv_to_widget,
-        "data", capplet->mobility_ats,
-        NULL);
-
-    mateconf_peditor_new_string (NULL,
-        DEFAULT_APPS_KEY_MOBILITY_EXEC,
-        capplet->mobility_command_entry,
-        NULL);
-
-    mateconf_peditor_new_boolean (NULL,
-        DEFAULT_APPS_KEY_MOBILITY_STARTUP,
-        capplet->mobility_startup_checkbutton,
-        NULL);
-
-    gtk_window_set_icon_name (GTK_WINDOW (capplet->window),
-			      "preferences-desktop-default-applications");
-
-    if (start_page != NULL) {
-        gchar *page_name;
-        GtkWidget *w;
-
-        page_name = g_strconcat (start_page, "_vbox", NULL);
-
-        w = _gtk_builder_get_widget (builder, page_name);
-        if (w != NULL) {
-            GtkNotebook *nb;
-            gint pindex;
-
-            nb = GTK_NOTEBOOK (_gtk_builder_get_widget (builder,
-                                                        "preferred_apps_notebook"));
-            pindex = gtk_notebook_page_num (nb, w);
-            if (pindex != -1)
-                gtk_notebook_set_current_page (nb, pindex);
-        }
-        g_free (page_name);
-    }
+	if (builder_result == 0)
+	{
+		GtkWidget* dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Could not load the main interface"));
+		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), _("Please make sure that the applet is properly installed"));
+		gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+
+		gtk_dialog_run(GTK_DIALOG(dialog));
+
+		gtk_widget_destroy(dialog);
+		exit(EXIT_FAILURE);
+	}
 
-    gtk_widget_show (capplet->window);
+	capplet->window = get_widget("preferred_apps_dialog");
+
+	g_signal_connect(capplet->window, "response", G_CALLBACK(close_cb), NULL);
+
+	capplet->web_browser_command_entry = get_widget("web_browser_command_entry");
+	capplet->web_browser_command_label = get_widget("web_browser_command_label");
+	capplet->web_browser_terminal_checkbutton = get_widget("web_browser_terminal_checkbutton");
+	capplet->default_radiobutton = get_widget("web_browser_default_radiobutton");
+	capplet->new_win_radiobutton = get_widget("web_browser_new_win_radiobutton");
+	capplet->new_tab_radiobutton = get_widget("web_browser_new_tab_radiobutton");
+
+	capplet->mail_reader_command_entry = get_widget("mail_reader_command_entry");
+	capplet->mail_reader_command_label = get_widget("mail_reader_command_label");
+	capplet->mail_reader_terminal_checkbutton = get_widget("mail_reader_terminal_checkbutton");
+
+	capplet->terminal_command_entry = get_widget("terminal_command_entry");
+	capplet->terminal_command_label = get_widget("terminal_command_label");
+	capplet->terminal_exec_flag_entry = get_widget("terminal_exec_flag_entry");
+	capplet->terminal_exec_flag_label = get_widget("terminal_exec_flag_label");
+
+	capplet->media_player_command_entry = get_widget("media_player_command_entry");
+	capplet->media_player_command_label = get_widget("media_player_command_label");
+	capplet->media_player_terminal_checkbutton = get_widget("media_player_terminal_checkbutton");
+
+	capplet->video_player_command_entry = get_widget("video_command_entry");
+	capplet->video_player_command_label = get_widget("video_command_label");
+	capplet->video_player_terminal_checkbutton = get_widget("video_terminal_checkbox");
+
+	capplet->visual_command_entry = get_widget("visual_command_entry");
+	capplet->visual_command_label = get_widget("visual_command_label");
+	capplet->visual_startup_checkbutton = get_widget("visual_start_checkbutton");
+
+	capplet->image_viewer_command_entry = get_widget("image_command_entry");
+	capplet->image_viewer_command_label = get_widget("image_command_label");
+	capplet->image_viewer_terminal_checkbutton = get_widget("image_terminal_checkbox");
+
+	capplet->text_editor_command_entry = get_widget("text_command_entry");
+	capplet->text_editor_command_label = get_widget("text_command_label");
+	capplet->text_editor_terminal_checkbutton = get_widget("text_terminal_checkbox");
+
+	capplet->file_manager_command_entry = get_widget("filemanager_command_entry");
+	capplet->file_manager_command_label = get_widget("filemanager_command_label");
+	capplet->file_manager_terminal_checkbutton = get_widget("filemanager_terminal_checkbox");
+
+	capplet->mobility_command_entry = get_widget("mobility_command_entry");
+	capplet->mobility_command_label = get_widget("mobility_command_label");
+	capplet->mobility_startup_checkbutton = get_widget("mobility_start_checkbutton");
+
+	capplet->web_combo_box = get_widget("web_browser_combobox");
+	capplet->mail_combo_box = get_widget("mail_reader_combobox");
+	capplet->term_combo_box = get_widget("terminal_combobox");
+	capplet->media_combo_box = get_widget("media_player_combobox");
+	capplet->video_combo_box = get_widget("video_combobox");
+	capplet->visual_combo_box = get_widget("visual_combobox");
+	capplet->mobility_combo_box = get_widget("mobility_combobox");
+	capplet->text_combo_box = get_widget("text_combobox");
+	capplet->file_combo_box = get_widget("filemanager_combobox");
+	capplet->image_combo_box = get_widget("image_combobox");
+
+
+	g_signal_connect(capplet->window, "screen-changed", G_CALLBACK(screen_changed_cb), capplet);
+	screen_changed_cb(capplet->window, gdk_screen_get_default(), capplet);
+
+	fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->web_combo_box), capplet->web_browsers);
+	fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->mail_combo_box), capplet->mail_readers);
+	fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->term_combo_box), capplet->terminals);
+	fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->media_combo_box), capplet->media_players);
+	fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->video_combo_box), capplet->video_players);
+	fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->visual_combo_box), capplet->visual_ats);
+	fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->mobility_combo_box), capplet->mobility_ats);
+	fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->image_combo_box), capplet->image_viewers);
+	fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->text_combo_box), capplet->text_editors);
+	fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->file_combo_box), capplet->file_managers);
+
+	g_signal_connect(capplet->web_combo_box, "changed", G_CALLBACK(web_combo_changed_cb), capplet);
+	g_signal_connect(capplet->mail_combo_box, "changed", G_CALLBACK(mail_combo_changed_cb), capplet);
+	g_signal_connect(capplet->term_combo_box, "changed", G_CALLBACK(terminal_combo_changed_cb), capplet);
+	g_signal_connect(capplet->media_combo_box, "changed", G_CALLBACK(media_combo_changed_cb), capplet);
+	g_signal_connect(capplet->video_combo_box, "changed", G_CALLBACK(video_combo_changed_cb), capplet);
+	g_signal_connect(capplet->visual_combo_box, "changed", G_CALLBACK(visual_combo_changed_cb), capplet);
+	g_signal_connect(capplet->mobility_combo_box, "changed", G_CALLBACK(mobility_combo_changed_cb), capplet);
+	g_signal_connect(capplet->image_combo_box, "changed", G_CALLBACK(image_combo_changed_cb), capplet);
+	g_signal_connect(capplet->text_combo_box, "changed", G_CALLBACK(text_combo_changed_cb), capplet);
+	g_signal_connect(capplet->file_combo_box, "changed", G_CALLBACK(file_combo_changed_cb), capplet);
+
+
+	g_signal_connect(capplet->default_radiobutton, "toggled", G_CALLBACK(web_radiobutton_toggled_cb), capplet);
+	g_signal_connect(capplet->new_win_radiobutton, "toggled", G_CALLBACK(web_radiobutton_toggled_cb), capplet);
+	g_signal_connect(capplet->new_tab_radiobutton, "toggled", G_CALLBACK(web_radiobutton_toggled_cb), capplet);
+
+	/* Setup MateConfPropertyEditors */
+
+	/* Web Browser */
+	mateconf_peditor_new_combo_box (NULL,
+		DEFAULT_APPS_KEY_HTTP_EXEC,
+		capplet->web_combo_box,
+		"conv-from-widget-cb", web_combo_conv_from_widget,
+		"conv-to-widget-cb", web_combo_conv_to_widget,
+		"data", capplet,
+		NULL);
+
+	obj = mateconf_peditor_new_string (NULL,
+		DEFAULT_APPS_KEY_HTTP_EXEC,
+		capplet->web_browser_command_entry,
+		NULL);
+	g_signal_connect (obj, "value-changed", G_CALLBACK (web_mateconf_changed_cb), capplet);
+
+	obj = mateconf_peditor_new_boolean (NULL,
+		DEFAULT_APPS_KEY_HTTP_NEEDS_TERM,
+		capplet->web_browser_terminal_checkbutton,
+		NULL);
+	g_signal_connect (obj, "value-changed", G_CALLBACK (web_mateconf_changed_cb), capplet);
+
+	/* Mailer */
+	mateconf_peditor_new_combo_box (NULL,
+		DEFAULT_APPS_KEY_MAILER_EXEC,
+		capplet->mail_combo_box,
+		"conv-from-widget-cb", combo_conv_from_widget,
+		"conv-to-widget-cb", combo_conv_to_widget,
+		"data", capplet->mail_readers,
+		NULL);
+
+	mateconf_peditor_new_string (NULL,
+		DEFAULT_APPS_KEY_MAILER_EXEC,
+		capplet->mail_reader_command_entry,
+		NULL);
+
+	mateconf_peditor_new_boolean (NULL,
+		DEFAULT_APPS_KEY_MAILER_NEEDS_TERM,
+		capplet->mail_reader_terminal_checkbutton,
+		NULL);
+
+	/* Media player */
+	mateconf_peditor_new_combo_box (NULL,
+		DEFAULT_APPS_KEY_MEDIA_EXEC,
+		capplet->media_combo_box,
+		"conv-from-widget-cb", combo_conv_from_widget,
+		"conv-to-widget-cb", combo_conv_to_widget,
+		"data", capplet->media_players,
+		NULL);
+
+	mateconf_peditor_new_string (NULL,
+		DEFAULT_APPS_KEY_MEDIA_EXEC,
+		capplet->media_player_command_entry,
+		NULL);
+
+	mateconf_peditor_new_boolean (NULL,
+		DEFAULT_APPS_KEY_MEDIA_NEEDS_TERM,
+		capplet->media_player_terminal_checkbutton,
+		NULL);
+
+	/* Video player */
+	mateconf_peditor_new_combo_box (NULL,
+		DEFAULT_APPS_KEY_VIDEO_EXEC,
+		capplet->video_combo_box,
+		"conv-from-widget-cb", combo_conv_from_widget,
+		"conv-to-widget-cb", combo_conv_to_widget,
+		"data", capplet->video_players,
+		NULL);
+
+	mateconf_peditor_new_string (NULL,
+		DEFAULT_APPS_KEY_VIDEO_EXEC,
+		capplet->video_player_command_entry,
+		NULL);
+
+	mateconf_peditor_new_boolean (NULL,
+		DEFAULT_APPS_KEY_VIDEO_NEEDS_TERM,
+		capplet->video_player_terminal_checkbutton,
+		NULL);
+
+	/* Image viewer */
+	mateconf_peditor_new_combo_box(NULL,
+		DEFAULT_APPS_KEY_IMAGE_EXEC,
+		capplet->image_combo_box,
+		"conv-from-widget-cb", combo_conv_from_widget,
+		"conv-to-widget-cb", combo_conv_to_widget,
+		"data", capplet->image_viewers,
+		NULL);
+
+	mateconf_peditor_new_string (NULL,
+		DEFAULT_APPS_KEY_IMAGE_EXEC,
+		capplet->image_viewer_command_entry,
+		NULL);
+
+	mateconf_peditor_new_boolean (NULL,
+		DEFAULT_APPS_KEY_IMAGE_NEEDS_TERM,
+		capplet->image_viewer_terminal_checkbutton,
+		NULL);
+
+	/* File manager */
+	mateconf_peditor_new_combo_box(NULL,
+		DEFAULT_APPS_KEY_FILE_EXEC,
+		capplet->file_combo_box,
+		"conv-from-widget-cb", combo_conv_from_widget,
+		"conv-to-widget-cb", combo_conv_to_widget,
+		"data", capplet->file_managers,
+		NULL);
+
+	mateconf_peditor_new_string (NULL,
+		DEFAULT_APPS_KEY_FILE_EXEC,
+		capplet->file_manager_command_entry,
+		NULL);
+
+	mateconf_peditor_new_boolean (NULL,
+		DEFAULT_APPS_KEY_FILE_NEEDS_TERM,
+		capplet->file_manager_terminal_checkbutton,
+		NULL);
+
+
+	/* Text editors */
+	mateconf_peditor_new_combo_box(NULL,
+		DEFAULT_APPS_KEY_TEXT_EXEC,
+		capplet->text_combo_box,
+		"conv-from-widget-cb", combo_conv_from_widget,
+		"conv-to-widget-cb", combo_conv_to_widget,
+		"data", capplet->text_editors,
+		NULL);
+
+	mateconf_peditor_new_string (NULL,
+		DEFAULT_APPS_KEY_TEXT_EXEC,
+		capplet->text_editor_command_entry,
+		NULL);
+
+	mateconf_peditor_new_boolean (NULL,
+		DEFAULT_APPS_KEY_TEXT_NEEDS_TERM,
+		capplet->text_editor_terminal_checkbutton,
+		NULL);
+
+
+	/* Terminal */
+	mateconf_peditor_new_combo_box (NULL,
+		DEFAULT_APPS_KEY_TERMINAL_EXEC,
+		capplet->term_combo_box,
+		"conv-from-widget-cb", combo_conv_from_widget,
+		"conv-to-widget-cb", combo_conv_to_widget,
+		"data", capplet->terminals,
+		NULL);
+
+	mateconf_peditor_new_combo_box (NULL,
+		DEFAULT_APPS_KEY_TERMINAL_EXEC_ARG,
+		capplet->term_combo_box,
+		"conv-from-widget-cb", combo_conv_from_widget_term_flag,
+		"conv-to-widget-cb", combo_conv_to_widget_term_flag,
+		"data", capplet->terminals,
+		NULL);
+
+	mateconf_peditor_new_string (NULL,
+		DEFAULT_APPS_KEY_TERMINAL_EXEC,
+		capplet->terminal_command_entry,
+		NULL);
+	mateconf_peditor_new_string (NULL,
+		DEFAULT_APPS_KEY_TERMINAL_EXEC_ARG,
+		capplet->terminal_exec_flag_entry,
+		NULL);
+
+
+	/* Visual */
+	mateconf_peditor_new_combo_box (NULL,
+		DEFAULT_APPS_KEY_VISUAL_EXEC,
+		capplet->visual_combo_box,
+		"conv-from-widget-cb", combo_conv_from_widget,
+		"conv-to-widget-cb", combo_conv_to_widget,
+		"data", capplet->visual_ats,
+		NULL);
+
+	mateconf_peditor_new_string (NULL,
+		DEFAULT_APPS_KEY_VISUAL_EXEC,
+		capplet->visual_command_entry,
+		NULL);
+
+	mateconf_peditor_new_boolean (NULL,
+		DEFAULT_APPS_KEY_VISUAL_STARTUP,
+		capplet->visual_startup_checkbutton,
+		NULL);
+
+
+	/* Mobility */
+	mateconf_peditor_new_combo_box (NULL,
+		DEFAULT_APPS_KEY_MOBILITY_EXEC,
+		capplet->mobility_combo_box,
+		"conv-from-widget-cb", combo_conv_from_widget,
+		"conv-to-widget-cb", combo_conv_to_widget,
+		"data", capplet->mobility_ats,
+		NULL);
+
+	mateconf_peditor_new_string (NULL,
+		DEFAULT_APPS_KEY_MOBILITY_EXEC,
+		capplet->mobility_command_entry,
+		NULL);
+
+	mateconf_peditor_new_boolean (NULL,
+		DEFAULT_APPS_KEY_MOBILITY_STARTUP,
+		capplet->mobility_startup_checkbutton,
+		NULL);
+
+	gtk_window_set_icon_name(GTK_WINDOW (capplet->window), "preferences-desktop-default-applications");
+
+	if (start_page != NULL)
+	{
+		gchar* page_name;
+		GtkWidget* w;
+
+		page_name = g_strconcat (start_page, "_vbox", NULL);
+
+		w = get_widget(page_name);
+
+		if (w != NULL)
+		{
+			GtkNotebook *nb;
+			gint pindex;
+
+			nb = GTK_NOTEBOOK (get_widget("preferred_apps_notebook"));
+			pindex = gtk_notebook_page_num (nb, w);
+			if (pindex != -1)
+				gtk_notebook_set_current_page (nb, pindex);
+		}
+
+		g_free(page_name);
+	}
+
+	gtk_widget_show(capplet->window);
+
+	#undef get_widget
 }
 
-int main (int argc, char** argv)
+int main(int argc, char** argv)
 {
-    MateDACapplet* capplet;
-
-    gchar* start_page = NULL;
+	gchar* start_page = NULL;
 
-    GOptionContext* context;
-    GOptionEntry option_entries[] = {
+	GOptionEntry option_entries[] = {
 		{
 			"show-page",
 			'p',
@@ -943,28 +1378,28 @@ int main (int argc, char** argv)
 			N_("page")
 		},
 		{NULL}
-    };
+	};
 
-    context = g_option_context_new(_("- MATE Default Applications"));
-    g_option_context_add_main_entries (context, option_entries, GETTEXT_PACKAGE);
+	GOptionContext* context = g_option_context_new(_("- MATE Default Applications"));
+	g_option_context_add_main_entries(context, option_entries, GETTEXT_PACKAGE);
 
-    capplet_init (context, &argc, &argv);
+	capplet_init (context, &argc, &argv);
 
-    capplet = g_new0(MateDACapplet, 1);
-    capplet->mateconf = mateconf_client_get_default();
-    mateconf_client_add_dir(capplet->mateconf, "/desktop/mate/url-handlers", MATECONF_CLIENT_PRELOAD_RECURSIVE, NULL);
-    mateconf_client_add_dir(capplet->mateconf, "/desktop/mate/applications", MATECONF_CLIENT_PRELOAD_RECURSIVE, NULL);
+	MateDACapplet* capplet = g_new0(MateDACapplet, 1);
+	capplet->mateconf = mateconf_client_get_default();
+	mateconf_client_add_dir(capplet->mateconf, "/desktop/mate/url-handlers", MATECONF_CLIENT_PRELOAD_RECURSIVE, NULL);
+	mateconf_client_add_dir(capplet->mateconf, "/desktop/mate/applications", MATECONF_CLIENT_PRELOAD_RECURSIVE, NULL);
 
-    mate_da_xml_load_list(capplet);
+	mate_da_xml_load_list(capplet);
 
-    show_dialog(capplet, start_page);
-    g_free(start_page);
+	show_dialog(capplet, start_page);
+	g_free(start_page);
 
-    gtk_main();
+	gtk_main();
 
-    g_object_unref(capplet->mateconf);
+	g_object_unref(capplet->mateconf);
 
-    mate_da_xml_free(capplet);
+	mate_da_xml_free(capplet);
 
-    return 0;
+	return 0;
 }
diff --git a/capplets/default-applications/mate-da-capplet.h b/capplets/default-applications/mate-da-capplet.h
index 3ce72955..2dc7487f 100644
--- a/capplets/default-applications/mate-da-capplet.h
+++ b/capplets/default-applications/mate-da-capplet.h
@@ -2,6 +2,7 @@
  *  Authors: Luca Cavalli <[email protected]>
  *
  *  Copyright 2005-2006 Luca Cavalli
+ *  Copyright 2010 Perberos <[email protected]>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of version 2 of the GNU General Public License
@@ -61,6 +62,22 @@
 #define DEFAULT_APPS_KEY_MEDIA_EXEC        DEFAULT_APPS_KEY_MEDIA_PATH"/exec"
 #define DEFAULT_APPS_KEY_MEDIA_NEEDS_TERM  DEFAULT_APPS_KEY_MEDIA_PATH"/needs_term"
 
+#define DEFAULT_APPS_KEY_VIDEO_PATH        "/desktop/mate/applications/video"
+#define DEFAULT_APPS_KEY_VIDEO_EXEC        DEFAULT_APPS_KEY_VIDEO_PATH"/exec"
+#define DEFAULT_APPS_KEY_VIDEO_NEEDS_TERM  DEFAULT_APPS_KEY_VIDEO_PATH"/needs_term"
+
+#define DEFAULT_APPS_KEY_IMAGE_PATH        "/desktop/mate/applications/image"
+#define DEFAULT_APPS_KEY_IMAGE_EXEC        DEFAULT_APPS_KEY_IMAGE_PATH"/exec"
+#define DEFAULT_APPS_KEY_IMAGE_NEEDS_TERM  DEFAULT_APPS_KEY_IMAGE_PATH"/needs_term"
+
+#define DEFAULT_APPS_KEY_TEXT_PATH        "/desktop/mate/applications/text"
+#define DEFAULT_APPS_KEY_TEXT_EXEC        DEFAULT_APPS_KEY_TEXT_PATH"/exec"
+#define DEFAULT_APPS_KEY_TEXT_NEEDS_TERM  DEFAULT_APPS_KEY_TEXT_PATH"/needs_term"
+
+#define DEFAULT_APPS_KEY_FILE_PATH        "/desktop/mate/applications/file"
+#define DEFAULT_APPS_KEY_FILE_EXEC        DEFAULT_APPS_KEY_FILE_PATH"/exec"
+#define DEFAULT_APPS_KEY_FILE_NEEDS_TERM  DEFAULT_APPS_KEY_FILE_PATH"/needs_term"
+
 #define DEFAULT_APPS_KEY_VISUAL_PATH  "/desktop/mate/applications/at/visual"
 #define DEFAULT_APPS_KEY_VISUAL_EXEC  DEFAULT_APPS_KEY_VISUAL_PATH"/exec"
 #define DEFAULT_APPS_KEY_VISUAL_STARTUP DEFAULT_APPS_KEY_VISUAL_PATH"/startup"
@@ -69,9 +86,7 @@
 #define DEFAULT_APPS_KEY_MOBILITY_EXEC  DEFAULT_APPS_KEY_MOBILITY_PATH"/exec"
 #define DEFAULT_APPS_KEY_MOBILITY_STARTUP DEFAULT_APPS_KEY_MOBILITY_PATH"/startup"
 
-typedef struct _MateDACapplet MateDACapplet;
-
-struct _MateDACapplet {
+typedef struct _MateDACapplet {
 	GtkBuilder* builder;
 
 	GtkIconTheme* icon_theme;
@@ -82,11 +97,16 @@ struct _MateDACapplet {
 	GtkWidget* mail_combo_box;
 	GtkWidget* term_combo_box;
 	GtkWidget* media_combo_box;
+	GtkWidget* video_combo_box;
 	GtkWidget* visual_combo_box;
 	GtkWidget* mobility_combo_box;
 	/* Para el File Manager */
-	/*GtkWidget* filemanager_combo_box;*/
+	GtkWidget* file_combo_box;
+	GtkWidget* text_combo_box;
+	GtkWidget* image_combo_box;
 
+	/* navegador web
+	 * por el momento default,new_win,new_tab no se utilizan */
 	GtkWidget* web_browser_command_entry;
 	GtkWidget* web_browser_command_label;
 	GtkWidget* web_browser_terminal_checkbutton;
@@ -95,45 +115,64 @@ struct _MateDACapplet {
 	GtkWidget* new_tab_radiobutton;
 
 	/* Para el File Manager */
-	/*GtkWidget* file_manager_command_entry;
+	GtkWidget* file_manager_command_entry;
 	GtkWidget* file_manager_command_label;
 	GtkWidget* file_manager_terminal_checkbutton;
-	GtkWidget* file_manager_default_radiobutton;
-	GtkWidget* file_manager_new_win_radiobutton;
-	GtkWidget* file_manager_new_tab_radiobutton;*/
 
+	/* editor de texto */
+	GtkWidget* text_editor_command_entry;
+	GtkWidget* text_editor_command_label;
+	GtkWidget* text_editor_terminal_checkbutton;
 
+	/* cliente de correo */
 	GtkWidget* mail_reader_command_entry;
 	GtkWidget* mail_reader_command_label;
 	GtkWidget* mail_reader_terminal_checkbutton;
 
+	/* terminal */
 	GtkWidget* terminal_command_entry;
 	GtkWidget* terminal_command_label;
 	GtkWidget* terminal_exec_flag_entry;
 	GtkWidget* terminal_exec_flag_label;
 
+	/* visor de imagenes */
+	GtkWidget* image_viewer_command_entry;
+	GtkWidget* image_viewer_command_label;
+	GtkWidget* image_viewer_terminal_checkbutton;
+
+	/* reproductor de musica */
 	GtkWidget* media_player_command_entry;
 	GtkWidget* media_player_command_label;
 	GtkWidget* media_player_terminal_checkbutton;
 
+	/* reproductor de videos */
+	GtkWidget* video_player_command_entry;
+	GtkWidget* video_player_command_label;
+	GtkWidget* video_player_terminal_checkbutton;
+
+	/* accesibilidad visual */
 	GtkWidget* visual_command_entry;
 	GtkWidget* visual_command_label;
 	GtkWidget* visual_startup_checkbutton;
 
+	/* accesibilidad motriz */
 	GtkWidget* mobility_command_entry;
 	GtkWidget* mobility_command_label;
 	GtkWidget* mobility_startup_checkbutton;
 
+
 	MateConfClient* mateconf;
 
 	GList* web_browsers;
 	GList* mail_readers;
 	GList* terminals;
 	GList* media_players;
+	GList* video_players;
 	GList* visual_ats;
 	GList* mobility_ats;
-	/* Para el File Manager */
-	/*GList* file_managers;*/
-};
+	GList* file_managers;
+	GList* text_editors;
+	GList* image_viewers;
+} MateDACapplet;
 
 #endif
diff --git a/capplets/default-applications/mate-da-item.c b/capplets/default-applications/mate-da-item.c
index 06bda549..ab3803de 100644
--- a/capplets/default-applications/mate-da-item.c
+++ b/capplets/default-applications/mate-da-item.c
@@ -21,128 +21,176 @@
 #include "mate-da-capplet.h"
 #include "mate-da-item.h"
 
-MateDAWebItem*
-mate_da_web_item_new (void)
+MateDAWebItem* mate_da_web_item_new(void)
 {
-    MateDAWebItem *item = NULL;
+	MateDAWebItem* item = g_new0(MateDAWebItem, 1);
 
-    item = g_new0 (MateDAWebItem, 1);
-
-    return item;
+	return item;
 }
 
-MateDASimpleItem*
-mate_da_simple_item_new (void)
+MateDASimpleItem* mate_da_simple_item_new(void)
 {
-    MateDASimpleItem *item = NULL;
-
-    item = g_new0 (MateDASimpleItem, 1);
+	MateDASimpleItem* item = g_new0(MateDASimpleItem, 1);
 
-    return item;
+	return item;
 }
 
-MateDATermItem*
-mate_da_term_item_new (void)
+MateDATermItem* mate_da_term_item_new(void)
 {
-    MateDATermItem *item = NULL;
-
-    item = g_new0 (MateDATermItem, 1);
+	MateDATermItem* item = g_new0(MateDATermItem, 1);
 
-    return item;
+	return item;
 }
 
-MateDAVisualItem*
-mate_da_visual_item_new (void)
+MateDAVisualItem* mate_da_visual_item_new(void)
 {
-    MateDAVisualItem *item = NULL;
+	MateDAVisualItem* item = g_new0(MateDAVisualItem, 1);
 
-    item = g_new0 (MateDAVisualItem, 1);
-
-    return item;
+	return item;
 }
 
-MateDAMobilityItem*
-mate_da_mobility_item_new (void)
+MateDAImageItem* mate_da_image_item_new(void)
 {
-    MateDAMobilityItem *item = NULL;
-
-    item = g_new0 (MateDAMobilityItem, 1);
+	MateDAImageItem* item = g_new0(MateDAImageItem, 1);
 
-    return item;
+	return item;
 }
 
-void
-mate_da_web_item_free (MateDAWebItem *item)
+MateDATextItem* mate_da_text_item_new(void)
 {
-    g_return_if_fail (item != NULL);
+	MateDATextItem* item = g_new0(MateDATextItem, 1);
 
-    g_free (item->generic.name);
-    g_free (item->generic.executable);
-    g_free (item->generic.command);
-    g_free (item->generic.icon_name);
-    g_free (item->generic.icon_path);
-
-    g_free (item->tab_command);
-    g_free (item->win_command);
-
-    g_free (item);
+	return item;
 }
 
-void
-mate_da_simple_item_free (MateDASimpleItem *item)
+MateDAFileItem* mate_da_file_item_new(void)
 {
-    g_return_if_fail (item != NULL);
-
-    g_free (item->generic.name);
-    g_free (item->generic.executable);
-    g_free (item->generic.command);
-    g_free (item->generic.icon_name);
-    g_free (item->generic.icon_path);
+	MateDAFileItem* item = g_new0(MateDAFileItem, 1);
 
-    g_free (item);
+	return item;
 }
 
-void
-mate_da_term_item_free (MateDATermItem *item)
+MateDAMobilityItem* mate_da_mobility_item_new(void)
 {
-    g_return_if_fail (item != NULL);
+	MateDAMobilityItem* item = g_new0(MateDAMobilityItem, 1);
 
-    g_free (item->generic.name);
-    g_free (item->generic.executable);
-    g_free (item->generic.command);
-    g_free (item->generic.icon_name);
-    g_free (item->generic.icon_path);
+	return item;
+}
 
-    g_free (item->exec_flag);
+void mate_da_web_item_free(MateDAWebItem* item)
+{
+	if (item != NULL)
+	{
+		g_free(item->generic.name);
+		g_free(item->generic.executable);
+		g_free(item->generic.command);
+		g_free(item->generic.icon_name);
+		g_free(item->generic.icon_path);
+
+		g_free(item->tab_command);
+		g_free(item->win_command);
+
+		g_free(item);
+	}
+}
 
-    g_free (item);
+void mate_da_simple_item_free(MateDASimpleItem* item)
+{
+	if (item != NULL)
+	{
+		g_free(item->generic.name);
+		g_free(item->generic.executable);
+		g_free(item->generic.command);
+		g_free(item->generic.icon_name);
+		g_free(item->generic.icon_path);
+
+		g_free(item);
+	}
 }
 
-void
-mate_da_visual_item_free (MateDAVisualItem *item)
+void mate_da_image_item_free(MateDAImageItem* item)
 {
-    g_return_if_fail (item != NULL);
+	if (item != NULL)
+	{
+		g_free(item->generic.name);
+		g_free(item->generic.executable);
+		g_free(item->generic.command);
+		g_free(item->generic.icon_name);
+		g_free(item->generic.icon_path);
+
+		g_free(item);
+	}
+}
 
-    g_free (item->generic.name);
-    g_free (item->generic.executable);
-    g_free (item->generic.command);
-    g_free (item->generic.icon_name);
-    g_free (item->generic.icon_path);
+void mate_da_text_item_free(MateDATextItem* item)
+{
+	if (item != NULL)
+	{
+		g_free(item->generic.name);
+		g_free(item->generic.executable);
+		g_free(item->generic.command);
+		g_free(item->generic.icon_name);
+		g_free(item->generic.icon_path);
+
+		g_free(item);
+	}
+}
 
-    g_free (item);
+void mate_da_file_item_free(MateDAFileItem* item)
+{
+	if (item != NULL)
+	{
+		g_free(item->generic.name);
+		g_free(item->generic.executable);
+		g_free(item->generic.command);
+		g_free(item->generic.icon_name);
+		g_free(item->generic.icon_path);
+
+		g_free(item);
+	}
 }
 
-void
-mate_da_mobility_item_free (MateDAMobilityItem *item)
+void mate_da_term_item_free(MateDATermItem* item)
 {
-    g_return_if_fail (item != NULL);
+	if (item != NULL)
+	{
+		g_free(item->generic.name);
+		g_free(item->generic.executable);
+		g_free(item->generic.command);
+		g_free(item->generic.icon_name);
+		g_free(item->generic.icon_path);
+
+		g_free(item->exec_flag);
+
+		g_free(item);
+	}
+}
 
-    g_free (item->generic.name);
-    g_free (item->generic.executable);
-    g_free (item->generic.command);
-    g_free (item->generic.icon_name);
-    g_free (item->generic.icon_path);
+void mate_da_visual_item_free(MateDAVisualItem* item)
+{
+	if (item != NULL)
+	{
+		g_free(item->generic.name);
+		g_free(item->generic.executable);
+		g_free(item->generic.command);
+		g_free(item->generic.icon_name);
+		g_free(item->generic.icon_path);
+
+		g_free(item);
+	}
+}
 
-    g_free (item);
+void mate_da_mobility_item_free (MateDAMobilityItem *item)
+{
+	if (item != NULL)
+	{
+		g_free(item->generic.name);
+		g_free(item->generic.executable);
+		g_free(item->generic.command);
+		g_free(item->generic.icon_name);
+		g_free(item->generic.icon_path);
+
+		g_free(item);
+	}
 }
 
diff --git a/capplets/default-applications/mate-da-item.h b/capplets/default-applications/mate-da-item.h
index 81223f4e..b6a3b573 100644
--- a/capplets/default-applications/mate-da-item.h
+++ b/capplets/default-applications/mate-da-item.h
@@ -23,59 +23,79 @@
 
 #include <glib.h>
 
-typedef struct _MateDAItem MateDAItem;
-
-typedef struct _MateDAWebItem MateDAWebItem;
-typedef struct _MateDATermItem MateDATermItem;
-typedef struct _MateDASimpleItem MateDASimpleItem;
-typedef struct _MateDAVisualItem MateDAVisualItem;
-typedef struct _MateDAMobilityItem MateDAMobilityItem;
-
-struct _MateDAItem {
-    gchar *name;
-    gchar *executable;
-    gchar *command;
-    gchar *icon_name;
-    gchar *icon_path;
-};
-
-struct _MateDAWebItem {
-    MateDAItem generic;
-    gboolean run_in_terminal;
-    gboolean netscape_remote;
-    gchar *tab_command;
-    gchar *win_command;
-};
-
-struct _MateDASimpleItem {
-    MateDAItem generic;
-    gboolean run_in_terminal;
-};
-
-struct _MateDATermItem {
-    MateDAItem generic;
-    gchar *exec_flag;
-};
-
-struct _MateDAVisualItem {
-    MateDAItem generic;
-    gboolean run_at_startup;
-};
-
-struct _MateDAMobilityItem {
-    MateDAItem generic;
-    gboolean run_at_startup;
-};
-
-MateDAWebItem* mate_da_web_item_new (void);
-MateDATermItem* mate_da_term_item_new (void);
-MateDASimpleItem* mate_da_simple_item_new (void);
-MateDAVisualItem* mate_da_visual_item_new (void);
-MateDAMobilityItem* mate_da_mobility_item_new (void);
-void mate_da_web_item_free (MateDAWebItem *item);
-void mate_da_term_item_free (MateDATermItem *item);
-void mate_da_simple_item_free (MateDASimpleItem *item);
-void mate_da_visual_item_free (MateDAVisualItem *item);
-void mate_da_mobility_item_free (MateDAMobilityItem *item);
+typedef struct _MateDAItem {
+	gchar* name;
+	gchar* executable;
+	gchar* command;
+	gchar* icon_name;
+	gchar* icon_path;
+} MateDAItem;
+
+typedef struct _MateDAWebItem {
+	MateDAItem generic;
+	gboolean run_in_terminal;
+	gboolean netscape_remote;
+	gchar* tab_command;
+	gchar* win_command;
+} MateDAWebItem;
+
+typedef struct _MateDASimpleItem {
+	MateDAItem generic;
+	gboolean run_in_terminal;
+} MateDASimpleItem;
+
+typedef struct _MateDAImageItem {
+	MateDAItem generic;
+	gboolean run_in_terminal;
+} MateDAImageItem;
+
+typedef struct _MateDATextItem {
+	MateDAItem generic;
+	gboolean run_in_terminal;
+} MateDATextItem;
+
+typedef struct _MateDAFileItem {
+	MateDAItem generic;
+	gboolean run_in_terminal;
+} MateDAFileItem;
+
+typedef struct _MateDATermItem {
+	MateDAItem generic;
+	gchar* exec_flag;
+} MateDATermItem;
+
+typedef struct _MateDAVisualItem {
+	MateDAItem generic;
+	gboolean run_at_startup;
+} MateDAVisualItem;
+
+typedef struct _MateDAMobilityItem {
+	MateDAItem generic;
+	gboolean run_at_startup;
+} MateDAMobilityItem;
+
+MateDAWebItem* mate_da_web_item_new(void);
+void mate_da_web_item_free(MateDAWebItem* item);
+
+MateDATermItem* mate_da_term_item_new(void);
+void mate_da_term_item_free(MateDATermItem* item);
+
+MateDASimpleItem* mate_da_simple_item_new(void);
+void mate_da_simple_item_free(MateDASimpleItem* item);
+
+MateDAVisualItem* mate_da_visual_item_new(void);
+void mate_da_visual_item_free(MateDAVisualItem* item);
+
+MateDAImageItem* mate_da_image_item_new(void);
+void mate_da_image_item_free(MateDAImageItem* item);
+
+MateDATextItem* mate_da_text_item_new(void);
+void mate_da_text_item_free(MateDATextItem* item);
+
+MateDAFileItem* mate_da_file_item_new(void);
+void mate_da_file_item_free(MateDAFileItem* item);
+
+MateDAMobilityItem* mate_da_mobility_item_new(void);
+void mate_da_mobility_item_free(MateDAMobilityItem* item);
 
 #endif
diff --git a/capplets/default-applications/mate-da-xml.c b/capplets/default-applications/mate-da-xml.c
index 288495c7..46b31789 100644
--- a/capplets/default-applications/mate-da-xml.c
+++ b/capplets/default-applications/mate-da-xml.c
@@ -2,6 +2,7 @@
  *  Authors: Luca Cavalli <[email protected]>
  *
  *  Copyright 2005-2006 Luca Cavalli
+ *  Copyright 2010 Perberos <[email protected]>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of version 2 of the GNU General Public License
@@ -28,256 +29,427 @@
 #include "mate-da-item.h"
 
 
-static gboolean
-mate_da_xml_get_bool (const xmlNode *parent, const gchar *val_name)
+static gboolean mate_da_xml_get_bool(const xmlNode* parent, const gchar* val_name)
 {
-    xmlNode *element;
+    xmlNode* element;
     gboolean ret_val = FALSE;
-    xmlChar *xml_val_name;
+    xmlChar* xml_val_name;
     gint len;
 
-    g_return_val_if_fail (parent != NULL, FALSE);
-    g_return_val_if_fail (parent->children != NULL, ret_val);
-    g_return_val_if_fail (val_name != NULL, FALSE);
-
-    xml_val_name = xmlCharStrdup (val_name);
-    len = xmlStrlen (xml_val_name);
-
-    for (element = parent->children; element != NULL; element = element->next) {
-	if (!xmlStrncmp (element->name, xml_val_name, len)) {
-	    xmlChar *cont = xmlNodeGetContent (element);
+	if (parent != NULL && parent->children != NULL && val_name == NULL)
+	{
+		xml_val_name = xmlCharStrdup(val_name);
+		len = xmlStrlen(xml_val_name);
 
-	    if (!xmlStrcasecmp (cont, "true") || !xmlStrcasecmp (cont, "1"))
-		ret_val = TRUE;
-	    else
-		ret_val = FALSE;
+		for (element = parent->children; element != NULL; element = element->next)
+		{
+			if (!xmlStrncmp(element->name, xml_val_name, len))
+			{
+				xmlChar* cont = xmlNodeGetContent(element);
+
+				if (!xmlStrcasecmp(cont, (const xmlChar*) "true") || !xmlStrcasecmp(cont, (const xmlChar*) "1"))
+				{
+					ret_val = TRUE;
+				}
+				else
+				{
+					ret_val = FALSE;
+				}
+
+				xmlFree(cont);
+			}
+		}
 
-	    xmlFree (cont);
+		xmlFree(xml_val_name);
 	}
-    }
 
-    xmlFree (xml_val_name);
     return ret_val;
 }
 
-static gchar*
-mate_da_xml_get_string (const xmlNode *parent, const gchar *val_name)
+static gchar* mate_da_xml_get_string(const xmlNode* parent, const gchar* val_name)
 {
-    const gchar * const *sys_langs;
-    xmlChar *node_lang;
-    xmlNode *element;
-    gchar *ret_val = NULL;
-    xmlChar *xml_val_name;
-    gint len;
-    gint i;
-
-    g_return_val_if_fail (parent != NULL, ret_val);
-    g_return_val_if_fail (parent->children != NULL, ret_val);
-    g_return_val_if_fail (val_name != NULL, ret_val);
-
-#if GLIB_CHECK_VERSION (2, 6, 0)
-    sys_langs = g_get_language_names ();
-#endif
-
-    xml_val_name = xmlCharStrdup (val_name);
-    len = xmlStrlen (xml_val_name);
-
-    for (element = parent->children; element != NULL; element = element->next) {
-	if (!xmlStrncmp (element->name, xml_val_name, len)) {
-	    node_lang = xmlNodeGetLang (element);
-
-	    if (node_lang == NULL) {
-		ret_val = (gchar *) xmlNodeGetContent (element);
-	    }
-	    else {
-		for (i = 0; sys_langs[i] != NULL; i++) {
-		    if (!strcmp (sys_langs[i], node_lang)) {
-			ret_val = (gchar *) xmlNodeGetContent (element);
-			/* since sys_langs is sorted from most desirable to
-			 * least desirable, exit at first match
-			 */
-			break;
-		    }
+	const gchar* const* sys_langs;
+	xmlChar* node_lang;
+	xmlNode* element;
+	gchar* ret_val = NULL;
+	xmlChar* xml_val_name;
+	gint len;
+	gint i;
+
+	if (parent != NULL && parent->children != NULL && val_name != NULL)
+	{
+		#if GLIB_CHECK_VERSION (2, 6, 0)
+			sys_langs = g_get_language_names();
+		#endif
+
+		xml_val_name = xmlCharStrdup(val_name);
+		len = xmlStrlen(xml_val_name);
+
+		for (element = parent->children; element != NULL; element = element->next)
+		{
+			if (!xmlStrncmp(element->name, xml_val_name, len))
+			{
+				node_lang = xmlNodeGetLang(element);
+
+				if (node_lang == NULL)
+				{
+					ret_val = (gchar *) xmlNodeGetContent(element);
+				}
+				else
+				{
+					for (i = 0; sys_langs[i] != NULL; i++)
+					{
+						if (!strcmp(sys_langs[i], (char*) node_lang))
+						{
+							ret_val = (gchar*) xmlNodeGetContent(element);
+							/* since sys_langs is sorted from most desirable to
+							 * least desirable, exit at first match */
+							break;
+						}
+					}
+				}
+
+				xmlFree(node_lang);
+			}
 		}
-	    }
-	    xmlFree (node_lang);
+
+		xmlFree(xml_val_name);
 	}
-    }
 
-    xmlFree (xml_val_name);
-    return ret_val;
+	return ret_val;
 }
 
-static gboolean
-is_executable_valid (gchar *executable)
+static gboolean is_executable_valid(gchar* executable)
 {
-    gchar *path;
+	gchar* path = g_find_program_in_path(executable);
 
-    path = g_find_program_in_path (executable);
-
-    if (path) {
-	g_free (path);
-	return TRUE;
-    }
+	if (path)
+	{
+		g_free (path);
+		return TRUE;
+	}
 
-    return FALSE;
+	return FALSE;
 }
 
-static void
-mate_da_xml_load_xml (MateDACapplet *capplet, const gchar * filename)
+static void mate_da_xml_load_xml(MateDACapplet* capplet, const gchar* filename)
 {
-    xmlDoc *xml_doc;
-    xmlNode *root, *section, *element;
-    gchar *executable;
-    MateDAWebItem *web_item;
-    MateDASimpleItem *mail_item;
-    MateDASimpleItem *media_item;
-    MateDATermItem *term_item;
-    MateDAVisualItem *visual_item;
-    MateDAMobilityItem *mobility_item;
-
-    xml_doc = xmlParseFile (filename);
-
-    if (!xml_doc)
-	return;
-
-    root = xmlDocGetRootElement (xml_doc);
-
-    for (section = root->children; section != NULL; section = section->next) {
-	if (!xmlStrncmp (section->name, "web-browsers", 12)) {
-	    for (element = section->children; element != NULL; element = element->next) {
-		if (!xmlStrncmp (element->name, "web-browser", 11)) {
-		    executable = mate_da_xml_get_string (element, "executable");
-		    if (is_executable_valid (executable)) {
-			web_item = mate_da_web_item_new ();
-
-			web_item->generic.name = mate_da_xml_get_string (element, "name");
-			web_item->generic.executable = executable;
-			web_item->generic.command = mate_da_xml_get_string (element, "command");
-			web_item->generic.icon_name = mate_da_xml_get_string (element, "icon-name");
-
-			web_item->run_in_terminal = mate_da_xml_get_bool (element, "run-in-terminal");
-			web_item->netscape_remote = mate_da_xml_get_bool (element, "netscape-remote");
-			if (web_item->netscape_remote) {
-			    web_item->tab_command = mate_da_xml_get_string (element, "tab-command");
-			    web_item->win_command = mate_da_xml_get_string (element, "win-command");
-			}
+	xmlDoc* xml_doc;
+	xmlNode* root;
+	xmlNode* section;
+	xmlNode* element;
+	gchar* executable;
+	MateDAWebItem* web_item;
+	MateDASimpleItem* mail_item;
+	MateDASimpleItem* media_item;
+	MateDATermItem* term_item;
+	MateDAVisualItem* visual_item;
+	MateDAMobilityItem* mobility_item;
+	MateDAImageItem* image_item;
+	MateDATextItem* text_item;
+	MateDAFileItem* file_item;
+	MateDASimpleItem* video_item;
+
+	xml_doc = xmlParseFile(filename);
+
+	if (!xml_doc)
+	{
+		return;
+	}
 
-			capplet->web_browsers = g_list_append (capplet->web_browsers, web_item);
-		    }
-		    else
-			g_free (executable);
+	root = xmlDocGetRootElement(xml_doc);
+
+	for (section = root->children; section != NULL; section = section->next)
+	{
+		if (!xmlStrncmp(section->name, (const xmlChar*) "web-browsers", strlen("web-browsers")))
+		{
+			for (element = section->children; element != NULL; element = element->next)
+			{
+				if (!xmlStrncmp (element->name, (const xmlChar*) "web-browser", strlen("web-browser")))
+				{
+					executable = mate_da_xml_get_string (element, "executable");
+
+					if (is_executable_valid (executable))
+					{
+						web_item = mate_da_web_item_new();
+
+						web_item->generic.name = mate_da_xml_get_string(element, "name");
+						web_item->generic.executable = executable;
+						web_item->generic.command = mate_da_xml_get_string(element, "command");
+						web_item->generic.icon_name = mate_da_xml_get_string(element, "icon-name");
+
+						web_item->run_in_terminal = mate_da_xml_get_bool(element, "run-in-terminal");
+						web_item->netscape_remote = mate_da_xml_get_bool(element, "netscape-remote");
+						if (web_item->netscape_remote)
+						{
+							web_item->tab_command = mate_da_xml_get_string(element, "tab-command");
+							web_item->win_command = mate_da_xml_get_string(element, "win-command");
+						}
+
+						capplet->web_browsers = g_list_append(capplet->web_browsers, web_item);
+					}
+					else
+					{
+						g_free(executable);
+					}
+				}
+			}
 		}
-	    }
-	}
-	else if (!xmlStrncmp (section->name, "mail-readers", 12)) {
-	    for (element = section->children; element != NULL; element = element->next) {
-		if (!xmlStrncmp (element->name, "mail-reader", 11)) {
-		    executable = mate_da_xml_get_string (element, "executable");
-		    if (is_executable_valid (executable)) {
-			mail_item = mate_da_simple_item_new ();
-
-			mail_item->generic.name = mate_da_xml_get_string (element, "name");
-			mail_item->generic.executable = executable;
-			mail_item->generic.command = mate_da_xml_get_string (element, "command");
-			mail_item->generic.icon_name = mate_da_xml_get_string (element, "icon-name");
-
-			mail_item->run_in_terminal = mate_da_xml_get_bool (element, "run-in-terminal");
-
-			capplet->mail_readers = g_list_append (capplet->mail_readers, mail_item);
-		    }
-		    else
-			g_free (executable);
+		else if (!xmlStrncmp(section->name, (const xmlChar*) "mail-readers", strlen("mail-readers")))
+		{
+			for (element = section->children; element != NULL; element = element->next)
+			{
+				if (!xmlStrncmp (element->name, (const xmlChar*) "mail-reader", strlen("mail-reader")))
+				{
+					executable = mate_da_xml_get_string(element, "executable");
+
+					if (is_executable_valid(executable))
+					{
+						mail_item = mate_da_simple_item_new();
+
+						mail_item->generic.name = mate_da_xml_get_string(element, "name");
+						mail_item->generic.executable = executable;
+						mail_item->generic.command = mate_da_xml_get_string(element, "command");
+						mail_item->generic.icon_name = mate_da_xml_get_string(element, "icon-name");
+
+						mail_item->run_in_terminal = mate_da_xml_get_bool(element, "run-in-terminal");
+
+						capplet->mail_readers = g_list_append(capplet->mail_readers, mail_item);
+					}
+					else
+					{
+						g_free (executable);
+					}
+				}
+			}
 		}
-	    }
-	}
-	else if (!xmlStrncmp (section->name, "terminals", 9)) {
-	    for (element = section->children; element != NULL; element = element->next) {
-		if (!xmlStrncmp (element->name, "terminal", 8)) {
-		    executable = mate_da_xml_get_string (element, "executable");
-		    if (is_executable_valid (executable)) {
-			term_item = mate_da_term_item_new ();
-
-			term_item->generic.name = mate_da_xml_get_string (element, "name");
-			term_item->generic.executable = executable;
-			term_item->generic.command = mate_da_xml_get_string (element, "command");
-			term_item->generic.icon_name = mate_da_xml_get_string (element, "icon-name");
-
-			term_item->exec_flag = mate_da_xml_get_string (element, "exec-flag");
-
-			capplet->terminals = g_list_append (capplet->terminals, term_item);
-		    }
-		    else
-			g_free (executable);
+		else if (!xmlStrncmp(section->name, (const xmlChar*) "terminals", strlen("terminals")))
+		{
+			for (element = section->children; element != NULL; element = element->next)
+			{
+				if (!xmlStrncmp (element->name, (const xmlChar*) "terminal", strlen("terminal")))
+				{
+					executable = mate_da_xml_get_string(element, "executable");
+
+					if (is_executable_valid(executable))
+					{
+						term_item = mate_da_term_item_new();
+
+						term_item->generic.name = mate_da_xml_get_string(element, "name");
+						term_item->generic.executable = executable;
+						term_item->generic.command = mate_da_xml_get_string(element, "command");
+						term_item->generic.icon_name = mate_da_xml_get_string(element, "icon-name");
+
+						term_item->exec_flag = mate_da_xml_get_string(element, "exec-flag");
+
+						capplet->terminals = g_list_append(capplet->terminals, term_item);
+					}
+					else
+					{
+						g_free(executable);
+					}
+				}
+			}
 		}
-	    }
-	}
-	else if (!xmlStrncmp (section->name, "media-players", 13)) {
-	    for (element = section->children; element != NULL; element = element->next) {
-		if (!xmlStrncmp (element->name, "media-player", 12)) {
-		    executable = mate_da_xml_get_string (element, "executable");
-		    if (is_executable_valid (executable)) {
-			media_item = mate_da_simple_item_new ();
-
-			media_item->generic.name = mate_da_xml_get_string (element, "name");
-			media_item->generic.executable = executable;
-			media_item->generic.command = mate_da_xml_get_string (element, "command");
-			media_item->generic.icon_name = mate_da_xml_get_string (element, "icon-name");
-
-			media_item->run_in_terminal = mate_da_xml_get_bool (element, "run-in-terminal");
-
-			capplet->media_players = g_list_append (capplet->media_players, media_item);
-		    }
-		    else
-			g_free (executable);
+		else if (!xmlStrncmp(section->name, (const xmlChar*) "music-players", strlen("music-players")))
+		{
+			for (element = section->children; element != NULL; element = element->next)
+			{
+				if (!xmlStrncmp (element->name, (const xmlChar*) "music-player", strlen("music-player")))
+				{
+					executable = mate_da_xml_get_string(element, "executable");
+
+					if (is_executable_valid(executable))
+					{
+						media_item = mate_da_simple_item_new();
+
+						media_item->generic.name = mate_da_xml_get_string (element, "name");
+						media_item->generic.executable = executable;
+						media_item->generic.command = mate_da_xml_get_string (element, "command");
+						media_item->generic.icon_name = mate_da_xml_get_string (element, "icon-name");
+
+						media_item->run_in_terminal = mate_da_xml_get_bool (element, "run-in-terminal");
+
+						capplet->media_players = g_list_append (capplet->media_players, media_item);
+					}
+					else
+					{
+						g_free(executable);
+					}
+				}
+			}
 		}
-	    }
-	}
-	else if (!xmlStrncmp (section->name, "a11y-visual", 11)) {
-	    for (element = section->children; element != NULL; element = element->next) {
-		if (!xmlStrncmp (element->name, "visual", 6)) {
-		    executable = mate_da_xml_get_string (element,"executable");
-		    if (is_executable_valid (executable)) {
-			visual_item = mate_da_visual_item_new ();
-
-			visual_item->generic.name = mate_da_xml_get_string (element, "name");
-			visual_item->generic.executable = executable;
-			visual_item->generic.command = mate_da_xml_get_string (element, "command");
-			visual_item->generic.icon_name = mate_da_xml_get_string (element, "icon-name");
-
-			visual_item->run_at_startup = mate_da_xml_get_bool (element, "run-at-startup");
-
-			capplet->visual_ats = g_list_append (capplet->visual_ats, visual_item);
-		    }
-                    else
-                        g_free (executable);
+		else if (!xmlStrncmp(section->name, (const xmlChar*) "video-players", strlen("video-players")))
+		{
+			for (element = section->children; element != NULL; element = element->next)
+			{
+				if (!xmlStrncmp (element->name, (const xmlChar*) "video-player", strlen("video-player")))
+				{
+					executable = mate_da_xml_get_string(element, "executable");
+
+					if (is_executable_valid(executable))
+					{
+						video_item = mate_da_simple_item_new();
+
+						video_item->generic.name = mate_da_xml_get_string (element, "name");
+						video_item->generic.executable = executable;
+						video_item->generic.command = mate_da_xml_get_string (element, "command");
+						video_item->generic.icon_name = mate_da_xml_get_string (element, "icon-name");
+
+						video_item->run_in_terminal = mate_da_xml_get_bool (element, "run-in-terminal");
+
+						capplet->video_players = g_list_append (capplet->video_players, video_item);
+					}
+					else
+					{
+						g_free(executable);
+					}
+				}
+			}
 		}
-	    }
-	}
-	else if (!xmlStrncmp (section->name, "a11y-mobility", 13)) {
-	    for (element = section->children; element != NULL; element = element->next) {
-		if (!xmlStrncmp (element->name, "mobility", 8)) {
-		    executable = mate_da_xml_get_string (element,"executable");
-		    if (is_executable_valid (executable)) {
-			mobility_item = mate_da_mobility_item_new ();
-
-			mobility_item->generic.name = mate_da_xml_get_string (element, "name");
-			mobility_item->generic.executable = executable;
-			mobility_item->generic.command = mate_da_xml_get_string (element, "command");
-			mobility_item->generic.icon_name = mate_da_xml_get_string (element, "icon-name");
-
-			mobility_item->run_at_startup = mate_da_xml_get_bool (element, "run-at-startup");
-
-			capplet->mobility_ats = g_list_append (capplet->mobility_ats, mobility_item);
-		    }
-                    else
-                        g_free (executable);
+		else if (!xmlStrncmp(section->name, (const xmlChar*) "image-viewers", strlen("image-viewers")))
+		{
+			for (element = section->children; element != NULL; element = element->next)
+			{
+				if (!xmlStrncmp(element->name, (const xmlChar*) "image-viewer", strlen("image-viewer")))
+				{
+					executable = mate_da_xml_get_string(element, "executable");
+
+					if (is_executable_valid(executable))
+					{
+						image_item = mate_da_image_item_new();
+
+						image_item->generic.name = mate_da_xml_get_string(element, "name");
+						image_item->generic.executable = executable;
+						image_item->generic.command = mate_da_xml_get_string(element, "command");
+						image_item->generic.icon_name = mate_da_xml_get_string(element, "icon-name");
+
+						image_item->run_in_terminal = mate_da_xml_get_bool(element, "run-in-terminal");
+
+						capplet->image_viewers = g_list_append(capplet->image_viewers, image_item);
+					}
+					else
+					{
+						g_free(executable);
+					}
+				}
+			}
+		}
+		else if (!xmlStrncmp(section->name, (const xmlChar*) "text-editors", strlen("text-editors")))
+		{
+			for (element = section->children; element != NULL; element = element->next)
+			{
+				if (!xmlStrncmp(element->name, (const xmlChar*) "text-editor", strlen("text-editor")))
+				{
+					executable = mate_da_xml_get_string(element, "executable");
+
+					if (is_executable_valid(executable))
+					{
+						text_item = mate_da_text_item_new();
+
+						text_item->generic.name = mate_da_xml_get_string(element, "name");
+						text_item->generic.executable = executable;
+						text_item->generic.command = mate_da_xml_get_string(element, "command");
+						text_item->generic.icon_name = mate_da_xml_get_string(element, "icon-name");
+
+						text_item->run_in_terminal = mate_da_xml_get_bool(element, "run-in-terminal");
+
+						capplet->text_editors = g_list_append(capplet->text_editors, text_item);
+					}
+					else
+					{
+						g_free(executable);
+					}
+				}
+			}
+		}
+		else if (!xmlStrncmp(section->name, (const xmlChar*) "file-managers", strlen("file-managers")))
+		{
+			for (element = section->children; element != NULL; element = element->next)
+			{
+				if (!xmlStrncmp(element->name, (const xmlChar*) "file-manager", strlen("file-manager")))
+				{
+					executable = mate_da_xml_get_string(element, "executable");
+
+					if (is_executable_valid(executable))
+					{
+						file_item = mate_da_file_item_new();
+
+						file_item->generic.name = mate_da_xml_get_string(element, "name");
+						file_item->generic.executable = executable;
+						file_item->generic.command = mate_da_xml_get_string(element, "command");
+						file_item->generic.icon_name = mate_da_xml_get_string(element, "icon-name");
+
+						file_item->run_in_terminal = mate_da_xml_get_bool(element, "run-in-terminal");
+
+						capplet->file_managers = g_list_append(capplet->file_managers, file_item);
+					}
+					else
+					{
+						g_free(executable);
+					}
+				}
+			}
+		}
+		else if (!xmlStrncmp(section->name, (const xmlChar*) "a11y-visual", strlen("a11y-visual")))
+		{
+			for (element = section->children; element != NULL; element = element->next)
+			{
+				if (!xmlStrncmp (element->name, (const xmlChar*) "visual", strlen("visual")))
+				{
+					executable = mate_da_xml_get_string (element,"executable");
+
+					if (is_executable_valid (executable))
+					{
+						visual_item = mate_da_visual_item_new();
+
+						visual_item->generic.name = mate_da_xml_get_string(element, "name");
+						visual_item->generic.executable = executable;
+						visual_item->generic.command = mate_da_xml_get_string(element, "command");
+						visual_item->generic.icon_name = mate_da_xml_get_string(element, "icon-name");
+
+						visual_item->run_at_startup = mate_da_xml_get_bool(element, "run-at-startup");
+
+						capplet->visual_ats = g_list_append(capplet->visual_ats, visual_item);
+					}
+					else
+					{
+						g_free(executable);
+					}
+				}
+			}
+		}
+		else if (!xmlStrncmp(section->name, (const xmlChar*) "a11y-mobility", strlen("a11y-mobility")))
+		{
+			for (element = section->children; element != NULL; element = element->next)
+			{
+				if (!xmlStrncmp(element->name, (const xmlChar*) "mobility", strlen("mobility")))
+				{
+					executable = mate_da_xml_get_string(element,"executable");
+
+					if (is_executable_valid (executable))
+					{
+						mobility_item = mate_da_mobility_item_new ();
+
+						mobility_item->generic.name = mate_da_xml_get_string (element, "name");
+						mobility_item->generic.executable = executable;
+						mobility_item->generic.command = mate_da_xml_get_string (element, "command");
+						mobility_item->generic.icon_name = mate_da_xml_get_string (element, "icon-name");
+
+						mobility_item->run_at_startup = mate_da_xml_get_bool (element, "run-at-startup");
+
+						capplet->mobility_ats = g_list_append (capplet->mobility_ats, mobility_item);
+					}
+					else
+					{
+						g_free (executable);
+					}
+				}
+			}
 		}
-	    }
 	}
-    }
 
-    xmlFreeDoc (xml_doc);
+	xmlFreeDoc(xml_doc);
 }
 
 void mate_da_xml_load_list(MateDACapplet* capplet)
@@ -305,23 +477,30 @@ void mate_da_xml_load_list(MateDACapplet* capplet)
 	}
 }
 
-void
-mate_da_xml_free (MateDACapplet *capplet)
+void mate_da_xml_free(MateDACapplet* capplet)
 {
-    g_list_foreach (capplet->web_browsers, (GFunc) mate_da_web_item_free, NULL);
-    g_list_foreach (capplet->mail_readers, (GFunc) mate_da_simple_item_free, NULL);
-    g_list_foreach (capplet->terminals, (GFunc) mate_da_term_item_free, NULL);
-    g_list_foreach (capplet->media_players, (GFunc) mate_da_simple_item_free, NULL);
-    g_list_foreach (capplet->visual_ats, (GFunc) mate_da_visual_item_free, NULL);
-    g_list_foreach (capplet->mobility_ats, (GFunc) mate_da_mobility_item_free, NULL);
-
-    g_list_free (capplet->web_browsers);
-    g_list_free (capplet->mail_readers);
-    g_list_free (capplet->terminals);
-    g_list_free (capplet->media_players);
-    g_list_free (capplet->visual_ats);
-    g_list_free (capplet->mobility_ats);
-
-    g_object_unref (capplet->builder);
-    g_free (capplet);
+	g_list_foreach(capplet->web_browsers, (GFunc) mate_da_web_item_free, NULL);
+	g_list_foreach(capplet->mail_readers, (GFunc) mate_da_simple_item_free, NULL);
+	g_list_foreach(capplet->terminals, (GFunc) mate_da_term_item_free, NULL);
+	g_list_foreach(capplet->media_players, (GFunc) mate_da_simple_item_free, NULL);
+	g_list_foreach(capplet->video_players, (GFunc) mate_da_simple_item_free, NULL);
+	g_list_foreach(capplet->visual_ats, (GFunc) mate_da_visual_item_free, NULL);
+	g_list_foreach(capplet->mobility_ats, (GFunc) mate_da_mobility_item_free, NULL);
+	g_list_foreach(capplet->image_viewers, (GFunc) mate_da_image_item_free, NULL);
+	g_list_foreach(capplet->text_editors, (GFunc) mate_da_text_item_free, NULL);
+	g_list_foreach(capplet->file_managers, (GFunc) mate_da_file_item_free, NULL);
+
+	g_list_free(capplet->web_browsers);
+	g_list_free(capplet->mail_readers);
+	g_list_free(capplet->terminals);
+	g_list_free(capplet->media_players);
+	g_list_free(capplet->video_players);
+	g_list_free(capplet->visual_ats);
+	g_list_free(capplet->mobility_ats);
+	g_list_free(capplet->image_viewers);
+	g_list_free(capplet->text_editors);
+	g_list_free(capplet->file_managers);
+
+	g_object_unref(capplet->builder);
+	g_free(capplet);
 }
diff --git a/capplets/default-applications/mate-da-xml.h b/capplets/default-applications/mate-da-xml.h
index b209355c..2016b930 100644
--- a/capplets/default-applications/mate-da-xml.h
+++ b/capplets/default-applications/mate-da-xml.h
@@ -21,7 +21,7 @@
 #ifndef _MATE_DA_XML_H_
 #define _MATE_DA_XML_H_
 
-void mate_da_xml_load_list (MateDACapplet *capplet);
-void mate_da_xml_free (MateDACapplet *capplet);
+void mate_da_xml_load_list(MateDACapplet* capplet);
+void mate_da_xml_free(MateDACapplet* capplet);
 
 #endif
diff --git a/capplets/default-applications/mate-default-applications-properties.ui b/capplets/default-applications/mate-default-applications-properties.ui
index 4edc2968..0da56bc6 100644
--- a/capplets/default-applications/mate-default-applications-properties.ui
+++ b/capplets/default-applications/mate-default-applications-properties.ui
@@ -1,1196 +1,1477 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkDialog" id="preferred_apps_dialog">
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Preferred Applications</property>
-    <property name="resizable">False</property>
-    <property name="type_hint">dialog</property>
-    <property name="has_separator">False</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox">
-        <property name="visible">True</property>
-        <child>
-          <object class="GtkNotebook" id="preferred_apps_notebook">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="border_width">5</property>
-            <child>
-              <object class="GtkVBox" id="internet_vbox">
-                <property name="visible">True</property>
-                <property name="border_width">12</property>
-                <property name="spacing">18</property>
-                <child>
-                  <object class="GtkVBox" id="web_browser_vbox">
-                    <property name="visible">True</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="web_browser_label">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Web Browser</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkHBox" id="web_browser_hbox">
-                        <property name="visible">True</property>
-                        <property name="spacing">12</property>
-                        <child>
-                          <object class="GtkImage" id="web_browser_image">
-                            <property name="visible">True</property>
-                            <property name="yalign">0</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkVBox" id="web_browser_options_vbox">
-                            <property name="visible">True</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkComboBox" id="web_browser_combobox">
-                                <property name="visible">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkTable" id="web_browser_options_table">
-                                <property name="visible">True</property>
-                                <property name="n_rows">4</property>
-                                <property name="n_columns">3</property>
-                                <property name="column_spacing">12</property>
-                                <property name="row_spacing">6</property>
-                                <child>
-                                  <object class="GtkEntry" id="web_browser_command_entry">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">3</property>
-                                    <property name="bottom_attach">4</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkCheckButton" id="web_browser_terminal_checkbutton">
-                                    <property name="label" translatable="yes">Run in t_erminal</property>
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="draw_indicator">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="right_attach">3</property>
-                                    <property name="top_attach">3</property>
-                                    <property name="bottom_attach">4</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkRadioButton" id="web_browser_default_radiobutton">
-                                    <property name="label" translatable="yes">Open link with web browser _default</property>
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="active">True</property>
-                                    <property name="draw_indicator">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="right_attach">3</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkRadioButton" id="web_browser_new_tab_radiobutton">
-                                    <property name="label" translatable="yes">Open link in new _tab</property>
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="draw_indicator">True</property>
-                                    <property name="group">web_browser_default_radiobutton</property>
-                                  </object>
-                                  <packing>
-                                    <property name="right_attach">3</property>
-                                    <property name="top_attach">2</property>
-                                    <property name="bottom_attach">3</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkRadioButton" id="web_browser_new_win_radiobutton">
-                                    <property name="label" translatable="yes">Open link in new _window</property>
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="draw_indicator">True</property>
-                                    <property name="group">web_browser_default_radiobutton</property>
-                                  </object>
-                                  <packing>
-                                    <property name="right_attach">3</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="web_browser_command_label">
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">C_ommand:</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">web_browser_command_entry</property>
-                                  </object>
-                                  <packing>
-                                    <property name="top_attach">3</property>
-                                    <property name="bottom_attach">4</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkVBox" id="mail_reader_vbox">
-                    <property name="visible">True</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="mail_reader_label">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Mail Reader</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkHBox" id="mail_reader_hbox">
-                        <property name="visible">True</property>
-                        <property name="spacing">12</property>
-                        <child>
-                          <object class="GtkImage" id="mail_reader_image">
-                            <property name="visible">True</property>
-                            <property name="yalign">0</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkVBox" id="mail_reader_options_vbox">
-                            <property name="visible">True</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkComboBox" id="mail_reader_combobox">
-                                <property name="visible">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkTable" id="mail_reader_options_table">
-                                <property name="visible">True</property>
-                                <property name="n_columns">3</property>
-                                <property name="column_spacing">12</property>
-                                <property name="row_spacing">6</property>
-                                <child>
-                                  <object class="GtkLabel" id="mail_reader_command_label">
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Co_mmand:</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">mail_reader_command_entry</property>
-                                  </object>
-                                  <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkEntry" id="mail_reader_command_entry">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkCheckButton" id="mail_reader_terminal_checkbutton">
-                                    <property name="label" translatable="yes">Run in t_erminal</property>
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="draw_indicator">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="right_attach">3</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkVBox" id="messenger_vbox">
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="messenger_label">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Instant Messenger</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkHBox" id="messenger_hbox">
-                        <property name="visible">True</property>
-                        <property name="spacing">12</property>
-                        <child>
-                          <object class="GtkImage" id="messenger_image">
-                            <property name="visible">True</property>
-                            <property name="yalign">0</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkVBox" id="messenger_options_vbox">
-                            <property name="visible">True</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkComboBox" id="messenger_combobox">
-                                <property name="visible">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkTable" id="messenger_options_table">
-                                <property name="visible">True</property>
-                                <property name="n_columns">3</property>
-                                <property name="column_spacing">12</property>
-                                <property name="row_spacing">6</property>
-                                <child>
-                                  <object class="GtkLabel" id="messenger_command_label">
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Co_mmand:</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">messenger_command_entry</property>
-                                  </object>
-                                  <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkEntry" id="messenger_command_entry">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkCheckButton" id="messenger_terminal_checkbutton">
-                                    <property name="label" translatable="yes">Run in t_erminal</property>
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="draw_indicator">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="right_attach">3</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="internet_apps_label">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Internet</property>
-              </object>
-              <packing>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkVBox" id="multimedia_vbox">
-                <property name="visible">True</property>
-                <property name="border_width">12</property>
-                <property name="spacing">18</property>
-                <child>
-                  <object class="GtkVBox" id="image_vbox">
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="image_label">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Image Viewer</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkHBox" id="image_hbox">
-                        <property name="visible">True</property>
-                        <property name="spacing">12</property>
-                        <child>
-                          <object class="GtkImage" id="image_image">
-                            <property name="visible">True</property>
-                            <property name="yalign">0</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkVBox" id="image_options_vbox">
-                            <property name="visible">True</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkComboBox" id="image_combobox">
-                                <property name="visible">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkTable" id="image_options_table">
-                                <property name="visible">True</property>
-                                <property name="n_columns">3</property>
-                                <property name="column_spacing">12</property>
-                                <property name="row_spacing">6</property>
-                                <child>
-                                  <object class="GtkLabel" id="image_command_label">
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Co_mmand:</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">image_command_entry</property>
-                                  </object>
-                                  <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkEntry" id="image_command_entry">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkCheckButton" id="image_terminal_checkbox">
-                                    <property name="label" translatable="yes">Run in t_erminal</property>
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="draw_indicator">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="right_attach">3</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkVBox" id="media_player_vbox">
-                    <property name="visible">True</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="media_player_label">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Multimedia Player</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkHBox" id="media_player_hbox">
-                        <property name="visible">True</property>
-                        <property name="spacing">12</property>
-                        <child>
-                          <object class="GtkImage" id="media_player_image">
-                            <property name="visible">True</property>
-                            <property name="yalign">0</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkVBox" id="media_player_options_vbox">
-                            <property name="visible">True</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkComboBox" id="media_player_combobox">
-                                <property name="visible">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkTable" id="media_player_options_table">
-                                <property name="visible">True</property>
-                                <property name="n_columns">3</property>
-                                <property name="column_spacing">12</property>
-                                <property name="row_spacing">6</property>
-                                <child>
-                                  <object class="GtkLabel" id="media_player_command_label">
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Co_mmand:</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">media_player_command_entry</property>
-                                  </object>
-                                  <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkEntry" id="media_player_command_entry">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkCheckButton" id="media_player_terminal_checkbutton">
-                                    <property name="label" translatable="yes">Run in t_erminal</property>
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="draw_indicator">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="right_attach">3</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkVBox" id="video_vbox">
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="video_label">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Video Player</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkHBox" id="video_hbox">
-                        <property name="visible">True</property>
-                        <property name="spacing">12</property>
-                        <child>
-                          <object class="GtkImage" id="video_image">
-                            <property name="visible">True</property>
-                            <property name="yalign">0</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkVBox" id="video_options_vbox">
-                            <property name="visible">True</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkComboBox" id="video_combobox">
-                                <property name="visible">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkTable" id="video_options_table">
-                                <property name="visible">True</property>
-                                <property name="n_columns">3</property>
-                                <property name="column_spacing">12</property>
-                                <property name="row_spacing">6</property>
-                                <child>
-                                  <object class="GtkLabel" id="video_command_label">
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Co_mmand:</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">video_command_entry</property>
-                                  </object>
-                                  <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkEntry" id="video_command_entry">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkCheckButton" id="video_terminal_checkbox">
-                                    <property name="label" translatable="yes">Run in t_erminal</property>
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="draw_indicator">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="right_attach">3</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="multimedia_label">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Multimedia</property>
-              </object>
-              <packing>
-                <property name="position">1</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkVBox" id="system_vbox">
-                <property name="visible">True</property>
-                <property name="border_width">12</property>
-                <property name="spacing">18</property>
-                <child>
-                  <object class="GtkVBox" id="text_vbox">
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="text_label">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Text Editor</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkHBox" id="text_hbox">
-                        <property name="visible">True</property>
-                        <property name="spacing">12</property>
-                        <child>
-                          <object class="GtkImage" id="text_image">
-                            <property name="visible">True</property>
-                            <property name="yalign">0</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkVBox" id="text_options_vbox">
-                            <property name="visible">True</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkComboBox" id="text_combobox">
-                                <property name="visible">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkTable" id="text_options_table">
-                                <property name="visible">True</property>
-                                <property name="n_columns">3</property>
-                                <property name="column_spacing">12</property>
-                                <property name="row_spacing">6</property>
-                                <child>
-                                  <object class="GtkLabel" id="text_command_label">
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Co_mmand:</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">text_command_entry</property>
-                                  </object>
-                                  <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkEntry" id="text_command_entry">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkCheckButton" id="text_terminal_checkbox">
-                                    <property name="label" translatable="yes">Run in t_erminal</property>
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="draw_indicator">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="right_attach">3</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkVBox" id="terminal_vbox">
-                    <property name="visible">True</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="terminal_label">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Terminal Emulator</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkHBox" id="terminal_hbox">
-                        <property name="visible">True</property>
-                        <property name="spacing">12</property>
-                        <child>
-                          <object class="GtkImage" id="terminal_image">
-                            <property name="visible">True</property>
-                            <property name="yalign">0</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkVBox" id="terminal_options_vbox">
-                            <property name="visible">True</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkComboBox" id="terminal_combobox">
-                                <property name="visible">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkTable" id="terminal_options_table">
-                                <property name="visible">True</property>
-                                <property name="n_rows">2</property>
-                                <property name="n_columns">2</property>
-                                <property name="column_spacing">12</property>
-                                <property name="row_spacing">6</property>
-                                <child>
-                                  <object class="GtkLabel" id="terminal_command_label">
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Co_mmand:</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">terminal_command_entry</property>
-                                  </object>
-                                  <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkEntry" id="terminal_command_entry">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="terminal_exec_flag_label">
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">E_xecute flag:</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">terminal_exec_flag_entry</property>
-                                  </object>
-                                  <packing>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkEntry" id="terminal_exec_flag_entry">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-
-			<!-- el file manager -- >
+	<requires lib="gtk+" version="2.16" />
+	<!-- interface-naming-policy toplevel-contextual -->
+	<object class="GtkDialog" id="preferred_apps_dialog">
+		<property name="border_width">5</property>
+		<property name="title" translatable="yes">Preferred Applications</property>
+		<property name="resizable">False</property>
+		<property name="type_hint">dialog</property>
+		<property name="has_separator">False</property>
+		<child internal-child="vbox">
+			<object class="GtkVBox" id="dialog-vbox">
+				<property name="visible">True</property>
 				<child>
-					<object class="GtkVBox" id="filemanager_vbox">
+					<object class="GtkNotebook" id="preferred_apps_notebook">
 						<property name="visible">True</property>
-						<property name="spacing">6</property>
+						<property name="can_focus">True</property>
+						<property name="border_width">5</property>
 						<child>
-							<object class="GtkLabel" id="filemanager_label">
+							<object class="GtkVBox" id="internet_vbox">
 								<property name="visible">True</property>
-								<property name="xalign">0</property>
-								<property name="label" translatable="yes">File Manager</property>
-								<attributes>
-									<attribute name="weight" value="bold"/>
-								</attributes>
+								<property name="border_width">12</property>
+								<property name="spacing">18</property>
+								<child>
+									<object class="GtkVBox" id="web_browser_vbox">
+										<property name="visible">True</property>
+										<property name="spacing">6</property>
+										<child>
+											<object class="GtkLabel" id="web_browser_label">
+												<property name="visible">True</property>
+												<property name="xalign">0</property>
+												<property name="label" translatable="yes">Web Browser</property>
+												<attributes>
+													<attribute name="weight" value="bold" />
+												</attributes>
+											</object>
+											<packing>
+												<property name="expand">False</property>
+												<property name="fill">False</property>
+												<property name="position">0</property>
+											</packing>
+										</child>
+										<child>
+											<object class="GtkHBox" id="web_browser_hbox">
+												<property name="visible">True</property>
+												<property name="spacing">12</property>
+												<child>
+													<object class="GtkImage" id="web_browser_image">
+														<property name="visible">True</property>
+														<property name="yalign">0</property>
+													</object>
+													<packing>
+														<property name="expand">False</property>
+														<property name="fill">False</property>
+														<property name="position">0</property>
+													</packing>
+												</child>
+												<child>
+													<object class="GtkVBox" id="web_browser_options_vbox">
+														<property name="visible">True</property>
+														<property name="spacing">6</property>
+														<child>
+															<object class="GtkComboBox" id="web_browser_combobox">
+																<property name="visible">True</property>
+															</object>
+															<packing>
+																<property name="expand">False</property>
+																<property name="position">0</property>
+															</packing>
+														</child>
+														<child>
+															<object class="GtkTable" id="web_browser_options_table">
+																<property name="visible">True</property>
+																<property name="n_rows">4</property>
+																<property name="n_columns">3</property>
+																<property name="column_spacing">12</property>
+																<property name="row_spacing">6</property>
+																<child>
+																	<object class="GtkEntry" id="web_browser_command_entry">
+																		<property name="visible">True</property>
+																		<property name="can_focus">True</property>
+																		<property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
+																	</object>
+																	<packing>
+																		<property name="left_attach">1</property>
+																		<property name="right_attach">2</property>
+																		<property name="top_attach">3</property>
+																		<property name="bottom_attach">4</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+																<child>
+																	<object class="GtkCheckButton" id="web_browser_terminal_checkbutton">
+																		<property name="label" translatable="yes">Run in t_erminal</property>
+																		<property name="visible">True</property>
+																		<property name="sensitive">False</property>
+																		<property name="can_focus">True</property>
+																		<property name="receives_default">False</property>
+																		<property name="use_underline">True</property>
+																		<property name="draw_indicator">True</property>
+																	</object>
+																	<packing>
+																		<property name="left_attach">2</property>
+																		<property name="right_attach">3</property>
+																		<property name="top_attach">3</property>
+																		<property name="bottom_attach">4</property>
+																		<property name="x_options">GTK_FILL</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+																<child>
+																	<object class="GtkRadioButton" id="web_browser_default_radiobutton">
+																		<property name="label" translatable="yes">Open link with web browser _default</property>
+																		<property name="visible">True</property>
+																		<property name="sensitive">False</property>
+																		<property name="can_focus">True</property>
+																		<property name="receives_default">False</property>
+																		<property name="use_underline">True</property>
+																		<property name="active">True</property>
+																		<property name="draw_indicator">True</property>
+																	</object>
+																	<packing>
+																		<property name="right_attach">3</property>
+																		<property name="x_options">GTK_FILL</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+																<child>
+																	<object class="GtkRadioButton" id="web_browser_new_tab_radiobutton">
+																		<property name="label" translatable="yes">Open link in new _tab</property>
+																		<property name="visible">True</property>
+																		<property name="sensitive">False</property>
+																		<property name="can_focus">True</property>
+																		<property name="receives_default">False</property>
+																		<property name="use_underline">True</property>
+																		<property name="draw_indicator">True</property>
+																		<property name="group">web_browser_default_radiobutton</property>
+																	</object>
+																	<packing>
+																		<property name="right_attach">3</property>
+																		<property name="top_attach">2</property>
+																		<property name="bottom_attach">3</property>
+																		<property name="x_options">GTK_FILL</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+																<child>
+																	<object class="GtkRadioButton" id="web_browser_new_win_radiobutton">
+																		<property name="label" translatable="yes">Open link in new _window</property>
+																		<property name="visible">True</property>
+																		<property name="sensitive">False</property>
+																		<property name="can_focus">True</property>
+																		<property name="receives_default">False</property>
+																		<property name="use_underline">True</property>
+																		<property name="draw_indicator">True</property>
+																		<property name="group">web_browser_default_radiobutton</property>
+																	</object>
+																	<packing>
+																		<property name="right_attach">3</property>
+																		<property name="top_attach">1</property>
+																		<property name="bottom_attach">2</property>
+																		<property name="x_options">GTK_FILL</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+																<child>
+																	<object class="GtkLabel" id="web_browser_command_label">
+																		<property name="visible">True</property>
+																		<property name="sensitive">False</property>
+																		<property name="xalign">0</property>
+																		<property name="label" translatable="yes">C_ommand:</property>
+																		<property name="use_underline">True</property>
+																		<property name="mnemonic_widget">web_browser_command_entry</property>
+																	</object>
+																	<packing>
+																		<property name="top_attach">3</property>
+																		<property name="bottom_attach">4</property>
+																		<property name="x_options">GTK_FILL</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+															</object>
+															<packing>
+																<property name="expand">False</property>
+																<property name="fill">False</property>
+																<property name="position">1</property>
+															</packing>
+														</child>
+													</object>
+													<packing>
+														<property name="position">1</property>
+													</packing>
+												</child>
+											</object>
+											<packing>
+												<property name="position">1</property>
+											</packing>
+										</child>
+									</object>
+									<packing>
+										<property name="expand">False</property>
+										<property name="position">0</property>
+									</packing>
+								</child>
+								<child>
+									<object class="GtkVBox" id="mail_reader_vbox">
+										<property name="visible">True</property>
+										<property name="spacing">6</property>
+										<child>
+											<object class="GtkLabel" id="mail_reader_label">
+												<property name="visible">True</property>
+												<property name="xalign">0</property>
+												<property name="label" translatable="yes">Mail Reader</property>
+												<attributes>
+													<attribute name="weight" value="bold" />
+												</attributes>
+											</object>
+											<packing>
+												<property name="expand">False</property>
+												<property name="fill">False</property>
+												<property name="position">0</property>
+											</packing>
+										</child>
+										<child>
+											<object class="GtkHBox" id="mail_reader_hbox">
+												<property name="visible">True</property>
+												<property name="spacing">12</property>
+												<child>
+													<object class="GtkImage" id="mail_reader_image">
+														<property name="visible">True</property>
+														<property name="yalign">0</property>
+													</object>
+													<packing>
+														<property name="expand">False</property>
+														<property name="fill">False</property>
+														<property name="position">0</property>
+													</packing>
+												</child>
+												<child>
+													<object class="GtkVBox" id="mail_reader_options_vbox">
+														<property name="visible">True</property>
+														<property name="spacing">6</property>
+														<child>
+															<object class="GtkComboBox" id="mail_reader_combobox">
+																<property name="visible">True</property>
+															</object>
+															<packing>
+																<property name="expand">False</property>
+																<property name="position">0</property>
+															</packing>
+														</child>
+														<child>
+															<object class="GtkTable" id="mail_reader_options_table">
+																<property name="visible">True</property>
+																<property name="n_columns">3</property>
+																<property name="column_spacing">12</property>
+																<property name="row_spacing">6</property>
+																<child>
+																	<object class="GtkLabel" id="mail_reader_command_label">
+																		<property name="visible">True</property>
+																		<property name="sensitive">False</property>
+																		<property name="xalign">0</property>
+																		<property name="label" translatable="yes">Co_mmand:</property>
+																		<property name="use_underline">True</property>
+																		<property name="mnemonic_widget">mail_reader_command_entry</property>
+																	</object>
+																	<packing>
+																		<property name="x_options">GTK_FILL</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+																<child>
+																	<object class="GtkEntry" id="mail_reader_command_entry">
+																		<property name="visible">True</property>
+																		<property name="can_focus">True</property>
+																		<property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
+																	</object>
+																	<packing>
+																		<property name="left_attach">1</property>
+																		<property name="right_attach">2</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+																<child>
+																	<object class="GtkCheckButton" id="mail_reader_terminal_checkbutton">
+																		<property name="label" translatable="yes">Run in t_erminal</property>
+																		<property name="visible">True</property>
+																		<property name="sensitive">False</property>
+																		<property name="can_focus">True</property>
+																		<property name="receives_default">False</property>
+																		<property name="use_underline">True</property>
+																		<property name="draw_indicator">True</property>
+																	</object>
+																	<packing>
+																		<property name="left_attach">2</property>
+																		<property name="right_attach">3</property>
+																		<property name="x_options">GTK_FILL</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+															</object>
+															<packing>
+																<property name="position">1</property>
+															</packing>
+														</child>
+													</object>
+													<packing>
+														<property name="position">1</property>
+													</packing>
+												</child>
+											</object>
+											<packing>
+												<property name="position">1</property>
+											</packing>
+										</child>
+									</object>
+									<packing>
+										<property name="expand">False</property>
+										<property name="position">1</property>
+									</packing>
+								</child>
+								<child>
+									<object class="GtkVBox" id="messenger_vbox">
+										<!-- <property name="visible">True</property> -->
+										<property name="spacing">6</property>
+										<child>
+											<object class="GtkLabel" id="messenger_label">
+												<property name="visible">True</property>
+												<property name="xalign">0</property>
+												<property name="label" translatable="yes">Instant Messenger</property>
+												<attributes>
+													<attribute name="weight" value="bold" />
+												</attributes>
+											</object>
+											<packing>
+												<property name="expand">False</property>
+												<property name="fill">False</property>
+												<property name="position">0</property>
+											</packing>
+										</child>
+										<child>
+											<object class="GtkHBox" id="messenger_hbox">
+												<property name="visible">True</property>
+												<property name="spacing">12</property>
+												<child>
+													<object class="GtkImage" id="messenger_image">
+														<property name="visible">True</property>
+														<property name="yalign">0</property>
+													</object>
+													<packing>
+														<property name="expand">False</property>
+														<property name="fill">False</property>
+														<property name="position">0</property>
+													</packing>
+												</child>
+												<child>
+													<object class="GtkVBox" id="messenger_options_vbox">
+														<property name="visible">True</property>
+														<property name="spacing">6</property>
+														<child>
+															<object class="GtkComboBox" id="messenger_combobox">
+																<property name="visible">True</property>
+															</object>
+															<packing>
+																<property name="expand">False</property>
+																<property name="position">0</property>
+															</packing>
+														</child>
+														<child>
+															<object class="GtkTable" id="messenger_options_table">
+																<property name="visible">True</property>
+																<property name="n_columns">3</property>
+																<property name="column_spacing">12</property>
+																<property name="row_spacing">6</property>
+																<child>
+																	<object class="GtkLabel" id="messenger_command_label">
+																		<property name="visible">True</property>
+																		<property name="sensitive">False</property>
+																		<property name="xalign">0</property>
+																		<property name="label" translatable="yes">Co_mmand:</property>
+																		<property name="use_underline">True</property>
+																		<property name="mnemonic_widget">messenger_command_entry</property>
+																	</object>
+																	<packing>
+																		<property name="x_options">GTK_FILL</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+																<child>
+																	<object class="GtkEntry" id="messenger_command_entry">
+																		<property name="visible">True</property>
+																		<property name="sensitive">False</property>
+																		<property name="can_focus">True</property>
+																		<property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
+																	</object>
+																	<packing>
+																		<property name="left_attach">1</property>
+																		<property name="right_attach">2</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+																<child>
+																	<object class="GtkCheckButton" id="messenger_terminal_checkbutton">
+																		<property name="label" translatable="yes">Run in t_erminal</property>
+																		<property name="visible">True</property>
+																		<property name="sensitive">False</property>
+																		<property name="can_focus">True</property>
+																		<property name="receives_default">False</property>
+																		<property name="use_underline">True</property>
+																		<property name="draw_indicator">True</property>
+																	</object>
+																	<packing>
+																		<property name="left_attach">2</property>
+																		<property name="right_attach">3</property>
+																		<property name="x_options">GTK_FILL</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+															</object>
+															<packing>
+																<property name="position">1</property>
+															</packing>
+														</child>
+													</object>
+													<packing>
+														<property name="position">1</property>
+													</packing>
+												</child>
+											</object>
+											<packing>
+												<property name="position">1</property>
+											</packing>
+										</child>
+									</object>
+									<packing>
+										<property name="expand">False</property>
+										<property name="position">2</property>
+									</packing>
+								</child>
+							</object>
+						</child>
+						<child type="tab">
+							<object class="GtkLabel" id="internet_apps_label">
+								<property name="visible">True</property>
+								<property name="label" translatable="yes">Internet</property>
 							</object>
 							<packing>
-								<property name="expand">False</property>
-								<property name="fill">False</property>
-								<property name="position">0</property>
+								<property name="tab_fill">False</property>
+							</packing>
+						</child>
+						<child>
+							<object class="GtkVBox" id="multimedia_vbox">
+								<property name="visible">True</property>
+								<property name="border_width">12</property>
+								<property name="spacing">18</property>
+
+
+								<!-- visor de imagenes -->
+								<child>
+									<object class="GtkVBox" id="image_vbox">
+										<property name="visible">True</property>
+										<property name="spacing">6</property>
+										<child>
+											<object class="GtkLabel" id="image_label">
+												<property name="visible">True</property>
+												<property name="xalign">0</property>
+												<property name="label" translatable="yes">Image Viewer</property>
+												<attributes>
+													<attribute name="weight" value="bold" />
+												</attributes>
+											</object>
+											<packing>
+												<property name="expand">False</property>
+												<property name="fill">False</property>
+												<property name="position">0</property>
+											</packing>
+										</child>
+										<child>
+											<object class="GtkHBox" id="image_hbox">
+												<property name="visible">True</property>
+												<property name="spacing">12</property>
+												<child>
+													<object class="GtkImage" id="imageviewer_image">
+														<property name="visible">True</property>
+														<property name="yalign">0</property>
+													</object>
+													<packing>
+														<property name="expand">False</property>
+														<property name="fill">False</property>
+														<property name="position">0</property>
+													</packing>
+												</child>
+												<child>
+													<object class="GtkVBox" id="image_options_vbox">
+														<property name="visible">True</property>
+														<property name="spacing">6</property>
+														<child>
+															<object class="GtkComboBox" id="image_combobox">
+																<property name="visible">True</property>
+															</object>
+															<packing>
+																<property name="expand">False</property>
+																<property name="position">0</property>
+															</packing>
+														</child>
+														<child>
+															<object class="GtkTable" id="image_options_table">
+																<property name="visible">True</property>
+																<property name="n_columns">3</property>
+																<property name="column_spacing">12</property>
+																<property name="row_spacing">6</property>
+																<child>
+																	<object class="GtkLabel" id="image_command_label">
+																		<property name="visible">True</property>
+																		<property name="sensitive">False</property>
+																		<property name="xalign">0</property>
+																		<property name="label" translatable="yes">Co_mmand:</property>
+																		<property name="use_underline">True</property>
+																		<property name="mnemonic_widget">image_command_entry</property>
+																	</object>
+																	<packing>
+																		<property name="x_options">GTK_FILL</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+																<child>
+																	<object class="GtkEntry" id="image_command_entry">
+																		<property name="visible">True</property>
+																		<property name="sensitive">False</property>
+																		<property name="can_focus">True</property>
+																		<property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
+																	</object>
+																	<packing>
+																		<property name="left_attach">1</property>
+																		<property name="right_attach">2</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+																<child>
+																	<object class="GtkCheckButton" id="image_terminal_checkbox">
+																		<property name="label" translatable="yes">Run in t_erminal</property>
+																		<property name="visible">True</property>
+																		<property name="sensitive">False</property>
+																		<property name="can_focus">True</property>
+																		<property name="receives_default">False</property>
+																		<property name="use_underline">True</property>
+																		<property name="draw_indicator">True</property>
+																	</object>
+																	<packing>
+																		<property name="left_attach">2</property>
+																		<property name="right_attach">3</property>
+																		<property name="x_options">GTK_FILL</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+															</object>
+															<packing>
+																<property name="position">1</property>
+															</packing>
+														</child>
+													</object>
+													<packing>
+														<property name="position">1</property>
+													</packing>
+												</child>
+											</object>
+											<packing>
+												<property name="position">1</property>
+											</packing>
+										</child>
+									</object>
+									<packing>
+										<property name="expand">False</property>
+										<property name="position">0</property>
+									</packing>
+								</child>
+								<!-- / visor de imagenes -->
+
+								<!-- / reproductor de musica -->
+								<child>
+									<object class="GtkVBox" id="media_player_vbox">
+										<property name="visible">True</property>
+										<property name="spacing">6</property>
+										<child>
+											<object class="GtkLabel" id="media_player_label">
+												<property name="visible">True</property>
+												<property name="xalign">0</property>
+												<property name="label" translatable="yes">Multimedia Player</property> <!-- should be Music Player -->
+												<attributes>
+													<attribute name="weight" value="bold" />
+												</attributes>
+											</object>
+											<packing>
+												<property name="expand">False</property>
+												<property name="fill">False</property>
+												<property name="position">0</property>
+											</packing>
+										</child>
+										<child>
+											<object class="GtkHBox" id="media_player_hbox">
+												<property name="visible">True</property>
+												<property name="spacing">12</property>
+												<child>
+													<object class="GtkImage" id="media_player_image">
+														<property name="visible">True</property>
+														<property name="yalign">0</property>
+													</object>
+													<packing>
+														<property name="expand">False</property>
+														<property name="fill">False</property>
+														<property name="position">0</property>
+													</packing>
+												</child>
+												<child>
+													<object class="GtkVBox" id="media_player_options_vbox">
+														<property name="visible">True</property>
+														<property name="spacing">6</property>
+														<child>
+															<object class="GtkComboBox" id="media_player_combobox">
+																<property name="visible">True</property>
+															</object>
+															<packing>
+																<property name="expand">False</property>
+																<property name="position">0</property>
+															</packing>
+														</child>
+														<child>
+															<object class="GtkTable" id="media_player_options_table">
+																<property name="visible">True</property>
+																<property name="n_columns">3</property>
+																<property name="column_spacing">12</property>
+																<property name="row_spacing">6</property>
+																<child>
+																	<object class="GtkLabel" id="media_player_command_label">
+																		<property name="visible">True</property>
+																		<property name="sensitive">False</property>
+																		<property name="xalign">0</property>
+																		<property name="label" translatable="yes">Co_mmand:</property>
+																		<property name="use_underline">True</property>
+																		<property name="mnemonic_widget">media_player_command_entry</property>
+																	</object>
+																	<packing>
+																		<property name="x_options">GTK_FILL</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+																<child>
+																	<object class="GtkEntry" id="media_player_command_entry">
+																		<property name="visible">True</property>
+																		<property name="can_focus">True</property>
+																		<property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
+																	</object>
+																	<packing>
+																		<property name="left_attach">1</property>
+																		<property name="right_attach">2</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+																<child>
+																	<object class="GtkCheckButton" id="media_player_terminal_checkbutton">
+																		<property name="label" translatable="yes">Run in t_erminal</property>
+																		<property name="visible">True</property>
+																		<property name="sensitive">False</property>
+																		<property name="can_focus">True</property>
+																		<property name="receives_default">False</property>
+																		<property name="use_underline">True</property>
+																		<property name="draw_indicator">True</property>
+																	</object>
+																	<packing>
+																		<property name="left_attach">2</property>
+																		<property name="right_attach">3</property>
+																		<property name="x_options">GTK_FILL</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+															</object>
+															<packing>
+																<property name="position">1</property>
+															</packing>
+														</child>
+													</object>
+													<packing>
+														<property name="position">1</property>
+													</packing>
+												</child>
+											</object>
+											<packing>
+												<property name="position">1</property>
+											</packing>
+										</child>
+									</object>
+									<packing>
+										<property name="expand">False</property>
+										<property name="position">1</property>
+									</packing>
+								</child>
+								<!-- / reproductor de musica -->
+
+								<!-- / reproductor de videos -->
+								<child>
+									<object class="GtkVBox" id="video_vbox">
+										<property name="visible">True</property>
+										<property name="spacing">6</property>
+										<child>
+											<object class="GtkLabel" id="video_label">
+												<property name="visible">True</property>
+												<property name="xalign">0</property>
+												<property name="label" translatable="yes">Video Player</property>
+												<attributes>
+													<attribute name="weight" value="bold" />
+												</attributes>
+											</object>
+											<packing>
+												<property name="expand">False</property>
+												<property name="fill">False</property>
+												<property name="position">0</property>
+											</packing>
+										</child>
+										<child>
+											<object class="GtkHBox" id="video_hbox">
+												<property name="visible">True</property>
+												<property name="spacing">12</property>
+												<child>
+													<object class="GtkImage" id="video_image">
+														<property name="visible">True</property>
+														<property name="yalign">0</property>
+													</object>
+													<packing>
+														<property name="expand">False</property>
+														<property name="fill">False</property>
+														<property name="position">0</property>
+													</packing>
+												</child>
+												<child>
+													<object class="GtkVBox" id="video_options_vbox">
+														<property name="visible">True</property>
+														<property name="spacing">6</property>
+														<child>
+															<object class="GtkComboBox" id="video_combobox">
+																<property name="visible">True</property>
+															</object>
+															<packing>
+																<property name="expand">False</property>
+																<property name="position">0</property>
+															</packing>
+														</child>
+														<child>
+															<object class="GtkTable" id="video_options_table">
+																<property name="visible">True</property>
+																<property name="n_columns">3</property>
+																<property name="column_spacing">12</property>
+																<property name="row_spacing">6</property>
+																<child>
+																	<object class="GtkLabel" id="video_command_label">
+																		<property name="visible">True</property>
+																		<property name="sensitive">False</property>
+																		<property name="xalign">0</property>
+																		<property name="label" translatable="yes">Co_mmand:</property>
+																		<property name="use_underline">True</property>
+																		<property name="mnemonic_widget">video_command_entry</property>
+																	</object>
+																	<packing>
+																		<property name="x_options">GTK_FILL</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+																<child>
+																	<object class="GtkEntry" id="video_command_entry">
+																		<property name="visible">True</property>
+																		<property name="sensitive">False</property>
+																		<property name="can_focus">True</property>
+																		<property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
+																	</object>
+																	<packing>
+																		<property name="left_attach">1</property>
+																		<property name="right_attach">2</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+																<child>
+																	<object class="GtkCheckButton" id="video_terminal_checkbox">
+																		<property name="label" translatable="yes">Run in t_erminal</property>
+																		<property name="visible">True</property>
+																		<property name="sensitive">False</property>
+																		<property name="can_focus">True</property>
+																		<property name="receives_default">False</property>
+																		<property name="use_underline">True</property>
+																		<property name="draw_indicator">True</property>
+																	</object>
+																	<packing>
+																		<property name="left_attach">2</property>
+																		<property name="right_attach">3</property>
+																		<property name="x_options">GTK_FILL</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+															</object>
+															<packing>
+																<property name="position">1</property>
+															</packing>
+														</child>
+													</object>
+													<packing>
+														<property name="position">1</property>
+													</packing>
+												</child>
+											</object>
+											<packing>
+												<property name="position">1</property>
+											</packing>
+										</child>
+									</object>
+									<packing>
+										<property name="expand">False</property>
+										<property name="position">2</property>
+									</packing>
+								</child>
+								<!-- / reproductor de videos -->
+
+							</object>
+							<packing>
+								<property name="position">1</property>
+							</packing>
+						</child>
+						<child type="tab">
+							<object class="GtkLabel" id="multimedia_label">
+								<property name="visible">True</property>
+								<property name="label" translatable="yes">Multimedia</property>
+							</object>
+							<packing>
+								<property name="position">1</property>
+								<property name="tab_fill">False</property>
 							</packing>
 						</child>
 						<child>
-							<object class="GtkHBox" id="filemanager_hbox">
+							<object class="GtkVBox" id="system_vbox">
 								<property name="visible">True</property>
-								<property name="spacing">12</property>
+								<property name="border_width">12</property>
+								<property name="spacing">18</property>
+
+								<!-- editor de texto -->
 								<child>
-									<object class="GtkImage" id="filemanager_image">
+									<object class="GtkVBox" id="text_vbox">
 										<property name="visible">True</property>
-										<property name="yalign">0</property>
+										<property name="spacing">6</property>
+										<child>
+											<object class="GtkLabel" id="text_label">
+												<property name="visible">True</property>
+												<property name="xalign">0</property>
+												<property name="label" translatable="yes">Text Editor</property>
+												<attributes>
+													<attribute name="weight" value="bold" />
+												</attributes>
+											</object>
+											<packing>
+												<property name="expand">False</property>
+												<property name="fill">False</property>
+												<property name="position">0</property>
+											</packing>
+										</child>
+										<child>
+											<object class="GtkHBox" id="text_hbox">
+												<property name="visible">True</property>
+												<property name="spacing">12</property>
+												<child>
+													<object class="GtkImage" id="text_image">
+														<property name="visible">True</property>
+														<property name="yalign">0</property>
+													</object>
+													<packing>
+														<property name="expand">False</property>
+														<property name="fill">False</property>
+														<property name="position">0</property>
+													</packing>
+												</child>
+												<child>
+													<object class="GtkVBox" id="text_options_vbox">
+														<property name="visible">True</property>
+														<property name="spacing">6</property>
+														<child>
+															<object class="GtkComboBox" id="text_combobox">
+																<property name="visible">True</property>
+															</object>
+															<packing>
+																<property name="expand">False</property>
+																<property name="position">0</property>
+															</packing>
+														</child>
+														<child>
+															<object class="GtkTable" id="text_options_table">
+																<property name="visible">True</property>
+																<property name="n_columns">3</property>
+																<property name="column_spacing">12</property>
+																<property name="row_spacing">6</property>
+																<child>
+																	<object class="GtkLabel" id="text_command_label">
+																		<property name="visible">True</property>
+																		<property name="sensitive">False</property>
+																		<property name="xalign">0</property>
+																		<property name="label" translatable="yes">Co_mmand:</property>
+																		<property name="use_underline">True</property>
+																		<property name="mnemonic_widget">text_command_entry</property>
+																	</object>
+																	<packing>
+																		<property name="x_options">GTK_FILL</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+																<child>
+																	<object class="GtkEntry" id="text_command_entry">
+																		<property name="visible">True</property>
+																		<property name="sensitive">False</property>
+																		<property name="can_focus">True</property>
+																		<property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
+																	</object>
+																	<packing>
+																		<property name="left_attach">1</property>
+																		<property name="right_attach">2</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+																<child>
+																	<object class="GtkCheckButton" id="text_terminal_checkbox">
+																		<property name="label" translatable="yes">Run in t_erminal</property>
+																		<property name="visible">True</property>
+																		<property name="sensitive">False</property>
+																		<property name="can_focus">True</property>
+																		<property name="receives_default">False</property>
+																		<property name="use_underline">True</property>
+																		<property name="draw_indicator">True</property>
+																	</object>
+																	<packing>
+																		<property name="left_attach">2</property>
+																		<property name="right_attach">3</property>
+																		<property name="x_options">GTK_FILL</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+															</object>
+															<packing>
+																<property name="position">1</property>
+															</packing>
+														</child>
+													</object>
+													<packing>
+														<property name="position">1</property>
+													</packing>
+												</child>
+											</object>
+											<packing>
+												<property name="position">1</property>
+											</packing>
+										</child>
 									</object>
 									<packing>
 										<property name="expand">False</property>
-										<property name="fill">False</property>
 										<property name="position">0</property>
 									</packing>
 								</child>
+								<!-- / editor de texto -->
+
+								<!-- terminal -->
 								<child>
-									<object class="GtkVBox" id="filemanager_options_vbox">
+									<object class="GtkVBox" id="terminal_vbox">
 										<property name="visible">True</property>
 										<property name="spacing">6</property>
 										<child>
-											<object class="GtkComboBox" id="filemanager_combobox">
+											<object class="GtkLabel" id="terminal_label">
 												<property name="visible">True</property>
+												<property name="xalign">0</property>
+												<property name="label" translatable="yes">Terminal Emulator</property>
+												<attributes>
+													<attribute name="weight" value="bold" />
+												</attributes>
 											</object>
 											<packing>
 												<property name="expand">False</property>
+												<property name="fill">False</property>
 												<property name="position">0</property>
 											</packing>
 										</child>
 										<child>
-											<object class="GtkTable" id="filemanager_options_table">
+											<object class="GtkHBox" id="terminal_hbox">
 												<property name="visible">True</property>
-												<property name="n_rows">2</property>
-												<property name="n_columns">2</property>
-												<property name="column_spacing">12</property>
-												<property name="row_spacing">6</property>
+												<property name="spacing">12</property>
 												<child>
-													<object class="GtkLabel" id="filemanager_command_label">
+													<object class="GtkImage" id="terminal_image">
 														<property name="visible">True</property>
-														<property name="sensitive">False</property>
-														<property name="xalign">0</property>
-														<property name="label" translatable="yes">Co_mmand:</property>
-														<property name="use_underline">True</property>
-														<property name="mnemonic_widget">filemanager_command_entry</property>
+														<property name="yalign">0</property>
 													</object>
 													<packing>
-														<property name="x_options">GTK_FILL</property>
-														<property name="y_options"></property>
+														<property name="expand">False</property>
+														<property name="fill">False</property>
+														<property name="position">0</property>
 													</packing>
 												</child>
 												<child>
-													<object class="GtkEntry" id="filemanager_command_entry">
+													<object class="GtkVBox" id="terminal_options_vbox">
 														<property name="visible">True</property>
-														<property name="can_focus">True</property>
-														<property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
+														<property name="spacing">6</property>
+														<child>
+															<object class="GtkComboBox" id="terminal_combobox">
+																<property name="visible">True</property>
+															</object>
+															<packing>
+																<property name="expand">False</property>
+																<property name="position">0</property>
+															</packing>
+														</child>
+														<child>
+															<object class="GtkTable" id="terminal_options_table">
+																<property name="visible">True</property>
+																<property name="n_rows">2</property>
+																<property name="n_columns">2</property>
+																<property name="column_spacing">12</property>
+																<property name="row_spacing">6</property>
+																<child>
+																	<object class="GtkLabel" id="terminal_command_label">
+																		<property name="visible">True</property>
+																		<property name="sensitive">False</property>
+																		<property name="xalign">0</property>
+																		<property name="label" translatable="yes">Co_mmand:</property>
+																		<property name="use_underline">True</property>
+																		<property name="mnemonic_widget">terminal_command_entry</property>
+																	</object>
+																	<packing>
+																		<property name="x_options">GTK_FILL</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+																<child>
+																	<object class="GtkEntry" id="terminal_command_entry">
+																		<property name="visible">True</property>
+																		<property name="can_focus">True</property>
+																		<property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
+																	</object>
+																	<packing>
+																		<property name="left_attach">1</property>
+																		<property name="right_attach">2</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+																<child>
+																	<object class="GtkLabel" id="terminal_exec_flag_label">
+																		<property name="visible">True</property>
+																		<property name="sensitive">False</property>
+																		<property name="xalign">0</property>
+																		<property name="label" translatable="yes">E_xecute flag:</property>
+																		<property name="use_underline">True</property>
+																		<property name="mnemonic_widget">terminal_exec_flag_entry</property>
+																	</object>
+																	<packing>
+																		<property name="top_attach">1</property>
+																		<property name="bottom_attach">2</property>
+																		<property name="x_options">GTK_FILL</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+																<child>
+																	<object class="GtkEntry" id="terminal_exec_flag_entry">
+																		<property name="visible">True</property>
+																		<property name="can_focus">True</property>
+																	</object>
+																	<packing>
+																		<property name="left_attach">1</property>
+																		<property name="right_attach">2</property>
+																		<property name="top_attach">1</property>
+																		<property name="bottom_attach">2</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+															</object>
+															<packing>
+																<property name="position">1</property>
+															</packing>
+														</child>
 													</object>
 													<packing>
-														<property name="left_attach">1</property>
-														<property name="right_attach">2</property>
-														<property name="y_options"></property>
+														<property name="position">1</property>
 													</packing>
 												</child>
+											</object>
+											<packing>
+												<property name="position">1</property>
+											</packing>
+										</child>
+									</object>
+									<packing>
+										<property name="expand">False</property>
+										<property name="position">1</property>
+									</packing>
+								</child>
+								<!-- / terminal -->
+
+
+								<!-- el file manager -->
+								<child>
+									<object class="GtkVBox" id="filemanager_vbox">
+										<property name="visible">True</property>
+										<property name="spacing">6</property>
+										<child>
+											<object class="GtkLabel" id="filemanager_label">
+												<property name="visible">True</property>
+												<property name="xalign">0</property>
+												<property name="label" translatable="yes">File Manager</property>
+												<attributes>
+													<attribute name="weight" value="bold" />
+												</attributes>
+											</object>
+											<packing>
+												<property name="expand">False</property>
+												<property name="fill">False</property>
+												<property name="position">0</property>
+											</packing>
+										</child>
+										<child>
+											<object class="GtkHBox" id="filemanager_hbox">
+												<property name="visible">True</property>
+												<property name="spacing">12</property>
 												<child>
-													<object class="GtkLabel" id="filemanager_exec_flag_label">
+													<object class="GtkImage" id="filemanager_image">
 														<property name="visible">True</property>
-														<property name="sensitive">False</property>
-														<property name="xalign">0</property>
-														<property name="label" translatable="yes">E_xecute flag:</property>
-														<property name="use_underline">True</property>
-														<property name="mnemonic_widget">filemanager_exec_flag_entry</property>
+														<property name="yalign">0</property>
 													</object>
 													<packing>
-														<property name="top_attach">1</property>
-														<property name="bottom_attach">2</property>
-														<property name="x_options">GTK_FILL</property>
-														<property name="y_options"></property>
+														<property name="expand">False</property>
+														<property name="fill">False</property>
+														<property name="position">0</property>
 													</packing>
 												</child>
 												<child>
-													<object class="GtkEntry" id="filemanager_exec_flag_entry">
+													<object class="GtkVBox" id="filemanager_options_vbox">
 														<property name="visible">True</property>
-														<property name="can_focus">True</property>
+														<property name="spacing">6</property>
+														<child>
+															<object class="GtkComboBox" id="filemanager_combobox">
+																<property name="visible">True</property>
+															</object>
+															<packing>
+																<property name="expand">False</property>
+																<property name="position">0</property>
+															</packing>
+														</child>
+														<child>
+															<object class="GtkTable" id="filemanager_options_table">
+																<property name="visible">True</property>
+																<property name="n_columns">3</property>
+																<property name="column_spacing">12</property>
+																<property name="row_spacing">6</property>
+																<child>
+																	<object class="GtkLabel" id="filemanager_command_label">
+																		<property name="visible">True</property>
+																		<property name="sensitive">False</property>
+																		<property name="xalign">0</property>
+																		<property name="label" translatable="yes">Co_mmand:</property>
+																		<property name="use_underline">True</property>
+																		<property name="mnemonic_widget">filemanager_command_entry</property>
+																	</object>
+																	<packing>
+																		<property name="x_options">GTK_FILL</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+																<child>
+																	<object class="GtkEntry" id="filemanager_command_entry">
+																		<property name="visible">True</property>
+																		<property name="sensitive">False</property>
+																		<property name="can_focus">True</property>
+																		<property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
+																	</object>
+																	<packing>
+																		<property name="left_attach">1</property>
+																		<property name="right_attach">2</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+																<child>
+																	<object class="GtkCheckButton" id="filemanager_terminal_checkbox">
+																		<property name="label" translatable="yes">Run in t_erminal</property>
+																		<property name="visible">True</property>
+																		<property name="sensitive">False</property>
+																		<property name="can_focus">True</property>
+																		<property name="receives_default">False</property>
+																		<property name="use_underline">True</property>
+																		<property name="draw_indicator">True</property>
+																	</object>
+																	<packing>
+																		<property name="left_attach">2</property>
+																		<property name="right_attach">3</property>
+																		<property name="x_options">GTK_FILL</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+															</object>
+															<packing>
+																<property name="position">1</property>
+															</packing>
+														</child>
 													</object>
 													<packing>
-														<property name="left_attach">1</property>
-														<property name="right_attach">2</property>
-														<property name="top_attach">1</property>
-														<property name="bottom_attach">2</property>
-														<property name="y_options"></property>
+														<property name="position">1</property>
 													</packing>
 												</child>
 											</object>
-										<packing>
-											<property name="position">1</property>
-										</packing>
-									</child>
-								</object>
-								<packing>
-									<property name="position">1</property>
-								</packing>
-							</child>
-						</object>
-						<packing>
-							<property name="position">1</property>
-						</packing>
+											<packing>
+												<property name="position">1</property>
+											</packing>
+										</child>
+									</object>
+									<packing>
+										<property name="expand">False</property>
+										<property name="position">2</property>
+									</packing>
+								</child>
+								<!-- / el file manager -->
+							</object>
+							<packing>
+								<property name="position">2</property>
+							</packing>
+						</child>
+						<child type="tab">
+							<object class="GtkLabel" id="system_label">
+								<property name="visible">True</property>
+								<property name="label" translatable="yes">System</property>
+							</object>
+							<packing>
+								<property name="position">2</property>
+								<property name="tab_fill">False</property>
+							</packing>
+						</child>
+						<child>
+							<object class="GtkVBox" id="a11y_vbox">
+								<property name="visible">True</property>
+								<property name="border_width">12</property>
+								<property name="spacing">18</property>
+								<child>
+									<object class="GtkVBox" id="visual_vbox">
+										<property name="visible">True</property>
+										<property name="spacing">6</property>
+										<child>
+											<object class="GtkLabel" id="visual_label">
+												<property name="visible">True</property>
+												<property name="xalign">0</property>
+												<property name="label" translatable="yes">Visual</property>
+												<attributes>
+													<attribute name="weight" value="bold" />
+												</attributes>
+											</object>
+											<packing>
+												<property name="expand">False</property>
+												<property name="fill">False</property>
+												<property name="position">0</property>
+											</packing>
+										</child>
+										<child>
+											<object class="GtkHBox" id="visual_hbox">
+												<property name="visible">True</property>
+												<property name="spacing">12</property>
+												<child>
+													<object class="GtkImage" id="visual_image">
+														<property name="visible">True</property>
+														<property name="yalign">0</property>
+													</object>
+													<packing>
+														<property name="expand">False</property>
+														<property name="fill">False</property>
+														<property name="position">0</property>
+													</packing>
+												</child>
+												<child>
+													<object class="GtkVBox" id="visual_options_vbox">
+														<property name="visible">True</property>
+														<property name="spacing">6</property>
+														<child>
+															<object class="GtkComboBox" id="visual_combobox">
+																<property name="visible">True</property>
+															</object>
+															<packing>
+																<property name="expand">False</property>
+																<property name="position">0</property>
+															</packing>
+														</child>
+														<child>
+															<object class="GtkCheckButton" id="visual_start_checkbutton">
+																<property name="label" translatable="yes">_Run at start</property>
+																<property name="visible">True</property>
+																<property name="can_focus">True</property>
+																<property name="receives_default">False</property>
+																<property name="use_underline">True</property>
+																<property name="draw_indicator">True</property>
+															</object>
+															<packing>
+																<property name="position">1</property>
+															</packing>
+														</child>
+														<child>
+															<object class="GtkTable" id="visual_options_table">
+																<property name="visible">True</property>
+																<property name="n_columns">2</property>
+																<property name="column_spacing">12</property>
+																<property name="row_spacing">6</property>
+																<child>
+																	<object class="GtkLabel" id="visual_command_label">
+																		<property name="visible">True</property>
+																		<property name="sensitive">False</property>
+																		<property name="xalign">0</property>
+																		<property name="label" translatable="yes">C_ommand:</property>
+																		<property name="use_underline">True</property>
+																		<property name="mnemonic_widget">image_command_entry</property>
+																	</object>
+																	<packing>
+																		<property name="x_options">GTK_FILL</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+																<child>
+																	<object class="GtkEntry" id="visual_command_entry">
+																		<property name="visible">True</property>
+																		<property name="can_focus">True</property>
+																		<property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
+																	</object>
+																	<packing>
+																		<property name="left_attach">1</property>
+																		<property name="right_attach">2</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+															</object>
+															<packing>
+																<property name="position">2</property>
+															</packing>
+														</child>
+													</object>
+													<packing>
+														<property name="position">1</property>
+													</packing>
+												</child>
+											</object>
+											<packing>
+												<property name="position">1</property>
+											</packing>
+										</child>
+									</object>
+									<packing>
+										<property name="expand">False</property>
+										<property name="position">0</property>
+									</packing>
+								</child>
+								<child>
+									<object class="GtkVBox" id="mobility_vbox">
+										<property name="visible">True</property>
+										<property name="spacing">6</property>
+										<child>
+											<object class="GtkLabel" id="mobility_label">
+												<property name="visible">True</property>
+												<property name="xalign">0</property>
+												<property name="label" translatable="yes">Mobility</property>
+												<attributes>
+													<attribute name="weight" value="bold" />
+												</attributes>
+											</object>
+											<packing>
+												<property name="expand">False</property>
+												<property name="fill">False</property>
+												<property name="position">0</property>
+											</packing>
+										</child>
+										<child>
+											<object class="GtkHBox" id="mobility_hbox">
+												<property name="visible">True</property>
+												<property name="spacing">12</property>
+												<child>
+													<object class="GtkImage" id="mobility_image">
+														<property name="visible">True</property>
+														<property name="yalign">0</property>
+													</object>
+													<packing>
+														<property name="expand">False</property>
+														<property name="fill">False</property>
+														<property name="position">0</property>
+													</packing>
+												</child>
+												<child>
+													<object class="GtkVBox" id="mobility_options_vbox">
+														<property name="visible">True</property>
+														<property name="spacing">6</property>
+														<child>
+															<object class="GtkComboBox" id="mobility_combobox">
+																<property name="visible">True</property>
+															</object>
+															<packing>
+																<property name="expand">False</property>
+																<property name="position">0</property>
+															</packing>
+														</child>
+														<child>
+															<object class="GtkCheckButton" id="mobility_start_checkbutton">
+																<property name="label" translatable="yes">Run at st_art</property>
+																<property name="visible">True</property>
+																<property name="can_focus">True</property>
+																<property name="receives_default">False</property>
+																<property name="use_underline">True</property>
+																<property name="draw_indicator">True</property>
+															</object>
+															<packing>
+																<property name="position">1</property>
+															</packing>
+														</child>
+														<child>
+															<object class="GtkTable" id="mobility_options_table">
+																<property name="visible">True</property>
+																<property name="n_columns">2</property>
+																<property name="column_spacing">12</property>
+																<property name="row_spacing">6</property>
+																<child>
+																	<object class="GtkLabel" id="mobility_command_label">
+																		<property name="visible">True</property>
+																		<property name="sensitive">False</property>
+																		<property name="xalign">0</property>
+																		<property name="label" translatable="yes">Co_mmand:</property>
+																		<property name="use_underline">True</property>
+																	</object>
+																	<packing>
+																		<property name="x_options">GTK_FILL</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+																<child>
+																	<object class="GtkEntry" id="mobility_command_entry">
+																		<property name="visible">True</property>
+																		<property name="can_focus">True</property>
+																		<property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
+																	</object>
+																	<packing>
+																		<property name="left_attach">1</property>
+																		<property name="right_attach">2</property>
+																		<property name="y_options"></property>
+																	</packing>
+																</child>
+															</object>
+															<packing>
+																<property name="position">2</property>
+															</packing>
+														</child>
+													</object>
+													<packing>
+														<property name="position">1</property>
+													</packing>
+												</child>
+											</object>
+											<packing>
+												<property name="position">1</property>
+											</packing>
+										</child>
+									</object>
+									<packing>
+										<property name="expand">False</property>
+										<property name="position">1</property>
+									</packing>
+								</child>
+							</object>
+							<packing>
+								<property name="position">3</property>
+							</packing>
+						</child>
+						<child type="tab">
+							<object class="GtkLabel" id="a11y_apps_label">
+								<property name="visible">True</property>
+								<property name="label" translatable="yes">Accessibility</property>
+							</object>
+							<packing>
+								<property name="position">3</property>
+								<property name="tab_fill">False</property>
+							</packing>
 						</child>
 					</object>
 					<packing>
@@ -1198,321 +1479,52 @@
 						<property name="position">1</property>
 					</packing>
 				</child>
-
-			< ! -- / el file manager -->
-
-              </object>
-              <packing>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="system_label">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">System</property>
-              </object>
-              <packing>
-                <property name="position">2</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkVBox" id="a11y_vbox">
-                <property name="visible">True</property>
-                <property name="border_width">12</property>
-                <property name="spacing">18</property>
-                <child>
-                  <object class="GtkVBox" id="visual_vbox">
-                    <property name="visible">True</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="visual_label">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Visual</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkHBox" id="visual_hbox">
-                        <property name="visible">True</property>
-                        <property name="spacing">12</property>
-                        <child>
-                          <object class="GtkImage" id="visual_image">
-                            <property name="visible">True</property>
-                            <property name="yalign">0</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkVBox" id="visual_options_vbox">
-                            <property name="visible">True</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkComboBox" id="visual_combobox">
-                                <property name="visible">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkCheckButton" id="visual_start_checkbutton">
-                                <property name="label" translatable="yes">_Run at start</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkTable" id="visual_options_table">
-                                <property name="visible">True</property>
-                                <property name="n_columns">2</property>
-                                <property name="column_spacing">12</property>
-                                <property name="row_spacing">6</property>
-                                <child>
-                                  <object class="GtkLabel" id="visual_command_label">
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">C_ommand:</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">image_command_entry</property>
-                                  </object>
-                                  <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkEntry" id="visual_command_entry">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkVBox" id="mobility_vbox">
-                    <property name="visible">True</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="mobility_label">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Mobility</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkHBox" id="mobility_hbox">
-                        <property name="visible">True</property>
-                        <property name="spacing">12</property>
-                        <child>
-                          <object class="GtkImage" id="mobility_image">
-                            <property name="visible">True</property>
-                            <property name="yalign">0</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkVBox" id="mobility_options_vbox">
-                            <property name="visible">True</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkComboBox" id="mobility_combobox">
-                                <property name="visible">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkCheckButton" id="mobility_start_checkbutton">
-                                <property name="label" translatable="yes">Run at st_art</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkTable" id="mobility_options_table">
-                                <property name="visible">True</property>
-                                <property name="n_columns">2</property>
-                                <property name="column_spacing">12</property>
-                                <property name="row_spacing">6</property>
-                                <child>
-                                  <object class="GtkLabel" id="mobility_command_label">
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Co_mmand:</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkEntry" id="mobility_command_entry">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">3</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="a11y_apps_label">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Accessibility</property>
-              </object>
-              <packing>
-                <property name="position">3</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="helpbutton1">
-                <property name="label">gtk-help</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="closebutton1">
-                <property name="label">gtk-close</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-11">helpbutton1</action-widget>
-      <action-widget response="-7">closebutton1</action-widget>
-    </action-widgets>
-  </object>
+				<child internal-child="action_area">
+					<object class="GtkHButtonBox" id="dialog-action_area">
+						<property name="visible">True</property>
+						<property name="layout_style">end</property>
+						<child>
+							<object class="GtkButton" id="helpbutton1">
+								<property name="label">gtk-help</property>
+								<property name="visible">True</property>
+								<property name="can_focus">True</property>
+								<property name="can_default">True</property>
+								<property name="receives_default">False</property>
+								<property name="use_stock">True</property>
+							</object>
+							<packing>
+								<property name="expand">False</property>
+								<property name="fill">False</property>
+								<property name="position">0</property>
+							</packing>
+						</child>
+						<child>
+							<object class="GtkButton" id="closebutton1">
+								<property name="label">gtk-close</property>
+								<property name="visible">True</property>
+								<property name="can_focus">True</property>
+								<property name="can_default">True</property>
+								<property name="receives_default">False</property>
+								<property name="use_stock">True</property>
+							</object>
+							<packing>
+								<property name="expand">False</property>
+								<property name="fill">False</property>
+								<property name="position">1</property>
+							</packing>
+						</child>
+					</object>
+					<packing>
+						<property name="expand">False</property>
+						<property name="pack_type">end</property>
+						<property name="position">0</property>
+					</packing>
+				</child>
+			</object>
+		</child>
+		<action-widgets>
+			<action-widget response="-11">helpbutton1</action-widget>
+			<action-widget response="-7">closebutton1</action-widget>
+		</action-widgets>
+	</object>
 </interface>
diff --git a/capplets/default-applications/mate-default-applications.xml.in b/capplets/default-applications/mate-default-applications.xml.in
index 4bd2f8b9..43438ae2 100644
--- a/capplets/default-applications/mate-default-applications.xml.in
+++ b/capplets/default-applications/mate-default-applications.xml.in
@@ -4,249 +4,289 @@
 
 <!-- Remember to never use the same string for <command>, <tab-command> and <win-command> entries -->
 
-  <web-browsers>
-    <web-browser>
-      <_name>Opera</_name>
-      <executable>opera</executable>
-      <command>opera %s</command>
-      <icon-name>opera</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>true</netscape-remote>
-      <tab-command>opera -newpage %s</tab-command>
-      <win-command>opera -newwindow %s</win-command>
-    </web-browser>
-    <web-browser>
-      <_name>Debian Sensible Browser</_name>
-      <executable>sensible-browser</executable>
-      <command>sensible-browser %s</command>
-      <icon-name></icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>false</netscape-remote>
-    </web-browser>
-    <web-browser>
-      <_name>Epiphany Web Browser</_name>
-      <executable>epiphany</executable>
-      <command>epiphany %s</command>
-      <icon-name>web-browser</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>true</netscape-remote>
-      <tab-command>epiphany --new-tab %s</tab-command>
-      <win-command>epiphany --new-window %s</win-command>
-    </web-browser>
-    <web-browser>
-      <_name>Galeon</_name>
-      <executable>galeon</executable>
-      <command>galeon %s</command>
-      <icon-name>galeon</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>true</netscape-remote>
-      <tab-command>galeon -n %s</tab-command>
-      <win-command>galeon -w %s</win-command>
-    </web-browser>
-    <web-browser>
-      <_name>Encompass</_name>
-      <executable>encompass</executable>
-      <command>encompass %s</command>
-      <icon-name>encompass</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>false</netscape-remote>
-    </web-browser>
-    <web-browser>
-      <_name>Firebird</_name>
-      <executable>mozilla-firebird</executable>
-      <command>mozilla-firebird %s</command>
-      <icon-name></icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>true</netscape-remote>
-      <tab-command>mozilla-firebird -remote "openurl(%s,new-tab)"</tab-command>
-      <win-command>mozilla-firebird -remote "openurl(%s,new-window)"</win-command>
-    </web-browser>
-    <web-browser>
-      <_name>Firefox</_name>
-      <executable>firefox</executable>
-      <command>firefox %s</command>
-      <icon-name>firefox</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>true</netscape-remote>
-      <tab-command>firefox -new-tab "%s"</tab-command>
-      <win-command>firefox -new-window "%s"</win-command>
-    </web-browser>
-    <web-browser>
-      <_name>Iceweasel</_name>
-      <executable>iceweasel</executable>
-      <command>iceweasel %s</command>
-      <icon-name>iceweasel</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>true</netscape-remote>
-      <tab-command>iceweasel -new-tab "%s"</tab-command>
-      <win-command>iceweasel -new-window "%s"</win-command>
-    </web-browser>
-    <web-browser>
-      <_name>Mozilla 1.6</_name>
-      <executable>mozilla-1.6</executable>
-      <command>mozilla-1.6 %s</command>
-      <icon-name>mozilla-icon</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>true</netscape-remote>
-      <tab-command>mozilla-1.6 -remote "openurl(%s,new-tab)"</tab-command>
-      <win-command>mozilla-1.6 -remote "openurl(%s,new-window)"</win-command>
-    </web-browser>
-    <web-browser>
-      <_name>Mozilla</_name>
-      <executable>mozilla</executable>
-      <command>mozilla %s</command>
-      <icon-name>mozilla-icon</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>true</netscape-remote>
-      <tab-command>mozilla -remote "openurl(%s,new-tab)"</tab-command>
-      <win-command>mozilla -remote "openurl(%s,new-window)"</win-command>
-    </web-browser>
-    <web-browser>
-      <_name>SeaMonkey</_name>
-      <executable>seamonkey</executable>
-      <command>seamonkey %s</command>
-      <icon-name>seamonkey</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>true</netscape-remote>
-      <tab-command>seamonkey -remote "openurl(%s,new-tab)"</tab-command>
-      <win-command>seamonkey -remote "openurl(%s,new-window)"</win-command>
-    </web-browser>
-    <web-browser>
-      <_name>Iceape</_name>
-      <executable>iceape</executable>
-      <command>iceape %s</command>
-      <icon-name>iceape</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>true</netscape-remote>
-      <tab-command>iceape -remote "openurl(%s,new-tab)"</tab-command>
-      <win-command>iceape -remote "openurl(%s,new-window)"</win-command>
-    </web-browser>
-    <web-browser>
-      <_name>Netscape Communicator</_name>
-      <executable>netscape</executable>
-      <command>netscape %s</command>
-      <icon-name>netscape</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>true</netscape-remote>
-      <tab-command>netscape -remote "openurl(%s,new-tab)"</tab-command>
-      <win-command>netscape -remote "openurl(%s,new-window)"</win-command>
-    </web-browser>
-    <web-browser>
-      <_name>Konqueror</_name>
-      <executable>konqueror</executable>
-      <command>konqueror %s</command>
-      <icon-name>konqueror</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>false</netscape-remote>
-    </web-browser>
-    <web-browser>
-      <_name>Midori</_name>
-      <executable>midori</executable>
-      <command>midori %s</command>
-      <icon-name>web-browser</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>false</netscape-remote>
-    </web-browser>
-  </web-browsers>
-
-  <mail-readers>
-    <mail-reader>
-      <_name>Evolution Mail Reader</_name>
-      <executable>evolution</executable>
-      <command>evolution %s</command>
-      <icon-name>evolution</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </mail-reader>
-    <mail-reader>
-      <_name>Balsa</_name>
-      <executable>balsa</executable>
-      <command>balsa -m %s</command>
-      <icon-name>mate-balsa2</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </mail-reader>
-    <mail-reader>
-      <_name>KMail</_name>
-      <executable>kmail</executable>
-      <command>kmail %s</command>
-      <icon-name>kmail</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </mail-reader>
-    <mail-reader>
-      <_name>Icedove</_name>
-      <executable>icedove</executable>
-      <command>icedove %s</command>
-      <icon-name>icedove</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </mail-reader>
-    <mail-reader>
-      <_name>Thunderbird</_name>
-      <executable>thunderbird</executable>
-      <command>thunderbird %s</command>
-      <icon-name>thunderbird</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </mail-reader>
-    <mail-reader>
-      <_name>Mozilla Thunderbird</_name>
-      <executable>mozilla-thunderbird</executable>
-      <command>mozilla-thunderbird %s</command>
-      <icon-name>thunderbird</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </mail-reader>
-    <mail-reader>
-      <_name>Mozilla Mail</_name>
-      <executable>mozilla</executable>
-      <command>mozilla -mail %s</command>
-      <icon-name>mozilla-mail-icon</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </mail-reader>
-    <mail-reader>
-      <_name>SeaMonkey Mail</_name>
-      <executable>seamonkey</executable>
-      <command>seamonkey -mail %s</command>
-      <icon-name>seamonkey</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </mail-reader>
-    <mail-reader>
-      <_name>Iceape Mail</_name>
-      <executable>iceape</executable>
-      <command>iceape -mail %s</command>
-      <icon-name>iceape</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </mail-reader>
-    <mail-reader>
-      <_name>Mutt</_name>
-      <executable>mutt</executable>
-      <command>mutt %s</command>
-      <icon-name>mate-mime-application-x-executable</icon-name>
-      <run-in-terminal>true</run-in-terminal>
-    </mail-reader>
-    <mail-reader>
-      <_name>Claws Mail</_name>
-      <executable>claws-mail</executable>
-      <command>claws-mail --compose %s</command>
-      <icon-name>claws-mail</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </mail-reader>
-    <mail-reader>
-      <_name>Sylpheed-Claws</_name>
-      <executable>sylpheed-claws</executable>
-      <command>sylpheed-claws --compose %s</command>
-      <icon-name>sylpheed</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </mail-reader>
-    <mail-reader>
-      <_name>Sylpheed</_name>
-      <executable>sylpheed</executable>
-      <command>sylpheed --compose %s</command>
-      <icon-name>sylpheed</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </mail-reader>
-  </mail-readers>
+	<web-browsers>
+
+		<web-browser>
+			<_name>Opera</_name>
+			<executable>opera</executable>
+			<command>opera %s</command>
+			<icon-name>opera</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>true</netscape-remote>
+			<tab-command>opera -newpage %s</tab-command>
+			<win-command>opera -newwindow %s</win-command>
+		</web-browser>
+
+		<web-browser>
+			<_name>Debian Sensible Browser</_name>
+			<executable>sensible-browser</executable>
+			<command>sensible-browser %s</command>
+			<icon-name></icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>false</netscape-remote>
+		</web-browser>
+
+		<web-browser>
+			<_name>Epiphany Web Browser</_name>
+			<executable>epiphany</executable>
+			<command>epiphany %s</command>
+			<icon-name>web-browser</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>true</netscape-remote>
+			<tab-command>epiphany --new-tab %s</tab-command>
+			<win-command>epiphany --new-window %s</win-command>
+		</web-browser>
+
+		<web-browser>
+			<_name>Galeon</_name>
+			<executable>galeon</executable>
+			<command>galeon %s</command>
+			<icon-name>galeon</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>true</netscape-remote>
+			<tab-command>galeon -n %s</tab-command>
+			<win-command>galeon -w %s</win-command>
+		</web-browser>
+
+		<web-browser>
+			<_name>Encompass</_name>
+			<executable>encompass</executable>
+			<command>encompass %s</command>
+			<icon-name>encompass</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>false</netscape-remote>
+		</web-browser>
+
+		<web-browser>
+			<_name>Firebird</_name>
+			<executable>mozilla-firebird</executable>
+			<command>mozilla-firebird %s</command>
+			<icon-name></icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>true</netscape-remote>
+			<tab-command>mozilla-firebird -remote "openurl(%s,new-tab)"</tab-command>
+			<win-command>mozilla-firebird -remote "openurl(%s,new-window)"</win-command>
+		</web-browser>
+
+		<web-browser>
+			<_name>Firefox</_name>
+			<executable>firefox</executable>
+			<command>firefox %s</command>
+			<icon-name>firefox</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>true</netscape-remote>
+			<tab-command>firefox -new-tab "%s"</tab-command>
+			<win-command>firefox -new-window "%s"</win-command>
+		</web-browser>
+
+		<web-browser>
+			<_name>Iceweasel</_name>
+			<executable>iceweasel</executable>
+			<command>iceweasel %s</command>
+			<icon-name>iceweasel</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>true</netscape-remote>
+			<tab-command>iceweasel -new-tab "%s"</tab-command>
+			<win-command>iceweasel -new-window "%s"</win-command>
+		</web-browser>
+
+		<web-browser>
+			<_name>Mozilla 1.6</_name>
+			<executable>mozilla-1.6</executable>
+			<command>mozilla-1.6 %s</command>
+			<icon-name>mozilla-icon</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>true</netscape-remote>
+			<tab-command>mozilla-1.6 -remote "openurl(%s,new-tab)"</tab-command>
+			<win-command>mozilla-1.6 -remote "openurl(%s,new-window)"</win-command>
+		</web-browser>
+
+		<web-browser>
+			<_name>Mozilla</_name>
+			<executable>mozilla</executable>
+			<command>mozilla %s</command>
+			<icon-name>mozilla-icon</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>true</netscape-remote>
+			<tab-command>mozilla -remote "openurl(%s,new-tab)"</tab-command>
+			<win-command>mozilla -remote "openurl(%s,new-window)"</win-command>
+		</web-browser>
+
+		<web-browser>
+			<_name>SeaMonkey</_name>
+			<executable>seamonkey</executable>
+			<command>seamonkey %s</command>
+			<icon-name>seamonkey</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>true</netscape-remote>
+			<tab-command>seamonkey -remote "openurl(%s,new-tab)"</tab-command>
+			<win-command>seamonkey -remote "openurl(%s,new-window)"</win-command>
+		</web-browser>
+
+		<web-browser>
+			<_name>Iceape</_name>
+			<executable>iceape</executable>
+			<command>iceape %s</command>
+			<icon-name>iceape</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>true</netscape-remote>
+			<tab-command>iceape -remote "openurl(%s,new-tab)"</tab-command>
+			<win-command>iceape -remote "openurl(%s,new-window)"</win-command>
+		</web-browser>
+
+		<web-browser>
+			<_name>Netscape Communicator</_name>
+			<executable>netscape</executable>
+			<command>netscape %s</command>
+			<icon-name>netscape</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>true</netscape-remote>
+			<tab-command>netscape -remote "openurl(%s,new-tab)"</tab-command>
+			<win-command>netscape -remote "openurl(%s,new-window)"</win-command>
+		</web-browser>
+
+		<web-browser>
+			<_name>Konqueror</_name>
+			<executable>konqueror</executable>
+			<command>konqueror %s</command>
+			<icon-name>konqueror</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>false</netscape-remote>
+		</web-browser>
+
+		<web-browser>
+			<_name>Midori</_name>
+			<executable>midori</executable>
+			<command>midori %s</command>
+			<icon-name>midori</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>false</netscape-remote>
+		</web-browser>
+
+		<web-browser>
+			<_name>Chromium</_name>
+			<executable>chromium</executable>
+			<command>chromium %s</command>
+			<icon-name>chromium</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>false</netscape-remote>
+		</web-browser>
+
+		<web-browser>
+			<_name>Google Chrome</_name>
+			<executable>google-chrome</executable>
+			<command>google-chrome %s</command>
+			<icon-name>google-chrome</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>false</netscape-remote>
+		</web-browser>
+
+	</web-browsers>
+
+	<mail-readers>
+
+		<mail-reader>
+			<_name>Thunderbird</_name>
+			<executable>thunderbird</executable>
+			<command>thunderbird %s</command>
+			<icon-name>thunderbird</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</mail-reader>
+
+		<mail-reader>
+			<_name>Evolution Mail Reader</_name>
+			<executable>evolution</executable>
+			<command>evolution %s</command>
+			<icon-name>evolution</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</mail-reader>
+
+		<mail-reader>
+			<_name>Balsa</_name>
+			<executable>balsa</executable>
+			<command>balsa -m %s</command>
+			<icon-name>mate-balsa2</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</mail-reader>
+
+		<mail-reader>
+			<_name>KMail</_name>
+			<executable>kmail</executable>
+			<command>kmail %s</command>
+			<icon-name>kmail</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</mail-reader>
+
+		<mail-reader>
+			<_name>Icedove</_name>
+			<executable>icedove</executable>
+			<command>icedove %s</command>
+			<icon-name>icedove</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</mail-reader>
+
+		<mail-reader>
+			<_name>Mozilla Thunderbird</_name>
+			<executable>mozilla-thunderbird</executable>
+			<command>mozilla-thunderbird %s</command>
+			<icon-name>thunderbird</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</mail-reader>
+
+		<mail-reader>
+			<_name>Mozilla Mail</_name>
+			<executable>mozilla</executable>
+			<command>mozilla -mail %s</command>
+			<icon-name>mozilla-mail-icon</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</mail-reader>
+
+		<mail-reader>
+			<_name>SeaMonkey Mail</_name>
+			<executable>seamonkey</executable>
+			<command>seamonkey -mail %s</command>
+			<icon-name>seamonkey</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</mail-reader>
+
+		<mail-reader>
+			<_name>Iceape Mail</_name>
+			<executable>iceape</executable>
+			<command>iceape -mail %s</command>
+			<icon-name>iceape</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</mail-reader>
+
+		<mail-reader>
+			<_name>Mutt</_name>
+			<executable>mutt</executable>
+			<command>mutt %s</command>
+			<icon-name>application-x-executable</icon-name>
+			<run-in-terminal>true</run-in-terminal>
+		</mail-reader>
+
+		<mail-reader>
+			<_name>Claws Mail</_name>
+			<executable>claws-mail</executable>
+			<command>claws-mail --compose %s</command>
+			<icon-name>claws-mail</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</mail-reader>
+
+		<mail-reader>
+			<_name>Sylpheed</_name>
+			<executable>sylpheed</executable>
+			<command>sylpheed --compose %s</command>
+			<icon-name>sylpheed</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</mail-reader>
+
+	</mail-readers>
 
 	<!-- agregando para los ... -->
 	<file-managers>
 		<file-manager>
-			<_name>Mate File Manager</_name>
+			<_name>MATE file manager</_name>
 			<executable>caja</executable>
 			<run-in-terminal>false</run-in-terminal>
 			<command>caja %s</command>
@@ -263,85 +303,95 @@
 
 		<file-manager>
 			<_name>Thunar</_name>
-			<executable>thunar</executable>
+			<executable>Thunar</executable>
 			<run-in-terminal>false</run-in-terminal>
 			<command>thunar %s</command>
-			<icon-name>thunar</icon-name>
+			<icon-name>Thunar</icon-name>
 		</file-manager>
 
 	</file-managers>
 
-  <terminals>
-    <terminal>
-      <_name>Debian Terminal Emulator</_name>
-      <executable>x-terminal-emulator</executable>
-      <command>x-terminal-emulator</command>
-      <icon-name>mate-mime-application-x-executable</icon-name>
-      <exec-flag>-e</exec-flag>
-    </terminal>
-    <terminal>
-      <_name>MATE Terminal</_name>
-      <executable>mate-terminal</executable>
-      <command>mate-terminal</command>
-      <icon-name>utilities-terminal</icon-name>
-      <exec-flag>-x</exec-flag>
-    </terminal>
-    <terminal>
-      <_name>GNOME Terminal</_name>
-      <executable>gnome-terminal</executable>
-      <command>gnome-terminal</command>
-      <icon-name>gnome-terminal</icon-name>
-      <exec-flag>-x</exec-flag>
-    </terminal>
-    <terminal>
-      <_name>Terminator</_name>
-      <executable>terminator</executable>
-      <command>terminator</command>
-      <icon-name>terminator</icon-name>
-      <exec-flag>-x</exec-flag>
-    </terminal>
-    <terminal>
-      <_name>Standard XTerminal</_name>
-      <executable>xterm</executable>
-      <command>xterm</command>
-      <icon-name>mate-mime-application-x-executable</icon-name>
-      <exec-flag>-e</exec-flag>
-    </terminal>
-    <terminal>
-      <_name>NXterm</_name>
-      <executable>nxterm</executable>
-      <command>nxterm</command>
-      <icon-name>mate-mime-application-x-executable</icon-name>
-      <exec-flag>-e</exec-flag>
-    </terminal>
-    <terminal>
-      <_name>RXVT</_name>
-      <executable>rxvt</executable>
-      <command>rxvt</command>
-      <icon-name>mate-mime-application-x-executable</icon-name>
-      <exec-flag>-e</exec-flag>
-    </terminal>
-    <terminal>
-      <_name>aterm</_name>
-      <executable>aterm</executable>
-      <command>aterm</command>
-      <icon-name>mate-mime-application-x-executable</icon-name>
-      <exec-flag>-e</exec-flag>
-    </terminal>
-    <terminal>
-      <_name>ETerm</_name>
-      <executable>ETerm</executable>
-      <command>ETerm</command>
-      <icon-name>mate-mime-application-x-executable</icon-name>
-      <exec-flag>-e</exec-flag>
-    </terminal>
-    <terminal>
-       <_name>Konsole</_name>
-       <executable>konsole</executable>
-       <command>konsole</command>
-       <icon-name>konsole</icon-name>
-       <exec-flag>-e</exec-flag>
-     </terminal>
+	<terminals>
+		<terminal>
+			<_name>Debian Terminal Emulator</_name>
+			<executable>x-terminal-emulator</executable>
+			<command>x-terminal-emulator</command>
+			<icon-name>application-x-executable</icon-name>
+			<exec-flag>-e</exec-flag>
+		</terminal>
+
+		<terminal>
+			<_name>MATE Terminal</_name>
+			<executable>mate-terminal</executable>
+			<command>mate-terminal</command>
+			<icon-name>utilities-terminal</icon-name>
+			<exec-flag>-x</exec-flag>
+		</terminal>
+
+		<terminal>
+			<_name>GNOME Terminal</_name>
+			<executable>gnome-terminal</executable>
+			<command>gnome-terminal</command>
+			<icon-name>gnome-terminal</icon-name>
+			<exec-flag>-x</exec-flag>
+		</terminal>
+
+		<terminal>
+			<_name>Terminator</_name>
+			<executable>terminator</executable>
+			<command>terminator</command>
+			<icon-name>terminator</icon-name>
+			<exec-flag>-x</exec-flag>
+		</terminal>
+
+		<terminal>
+			<_name>Standard XTerminal</_name>
+			<executable>xterm</executable>
+			<command>xterm</command>
+			<icon-name>application-x-executable</icon-name>
+			<exec-flag>-e</exec-flag>
+		</terminal>
+
+		<terminal>
+			<_name>NXterm</_name>
+			<executable>nxterm</executable>
+			<command>nxterm</command>
+			<icon-name>application-x-executable</icon-name>
+			<exec-flag>-e</exec-flag>
+		</terminal>
+
+		<terminal>
+			<_name>RXVT</_name>
+			<executable>rxvt</executable>
+			<command>rxvt</command>
+			<icon-name>application-x-executable</icon-name>
+			<exec-flag>-e</exec-flag>
+		</terminal>
+
+		<terminal>
+			<_name>aterm</_name>
+			<executable>aterm</executable>
+			<command>aterm</command>
+			<icon-name>application-x-executable</icon-name>
+			<exec-flag>-e</exec-flag>
+		</terminal>
+
+		<terminal>
+			<_name>ETerm</_name>
+			<executable>ETerm</executable>
+			<command>ETerm</command>
+			<icon-name>application-x-executable</icon-name>
+			<exec-flag>-e</exec-flag>
+		</terminal>
+
+		<terminal>
+			<_name>Konsole</_name>
+			<executable>konsole</executable>
+			<command>konsole</command>
+			<icon-name>konsole</icon-name>
+			<exec-flag>-e</exec-flag>
+		</terminal>
+
 		<terminal>
 			<_name>Terminal</_name>
 			<executable>terminal</executable>
@@ -349,6 +399,7 @@
 			<icon-name>utilities-terminal</icon-name>
 			<exec-flag>-e</exec-flag>
 		</terminal>
+
 		<terminal>
 			<_name>Sakura</_name>
 			<executable>sakura</executable>
@@ -356,45 +407,202 @@
 			<icon-name>terminal-tango</icon-name>
 			<exec-flag>-e</exec-flag>
 		</terminal>
-  </terminals>
-
-  <media-players>
-    <media-player>
-      <_name>Banshee Music Player</_name>
-      <executable>banshee</executable>
-      <command>banshee</command>
-      <icon-name>music-player-banshee</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </media-player>
-    <media-player>
-      <_name>Muine Music Player</_name>
-      <executable>muine</executable>
-      <command>muine</command>
-      <icon-name>muine</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-	</media-player>
-    <media-player>
-      <_name>Rhythmbox Music Player</_name>
-      <executable>rhythmbox</executable>
-      <command>rhythmbox</command>
-      <icon-name>rhythmbox</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </media-player>
-    <media-player>
-      <_name>Totem Movie Player</_name>
-      <executable>totem</executable>
-      <command>totem</command>
-      <icon-name>totem</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </media-player>
-    <media-player>
-      <_name>Listen</_name>
-      <executable>listen</executable>
-      <command>listen</command>
-      <icon-name>listen</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </media-player>
-   </media-players>
+	</terminals>
+
+	<image-viewers>
+
+		<image-viewer>
+			<_name>MATE image viewer</_name>
+			<executable>eom</executable>
+			<command>eog %s</command>
+			<icon-name>eom</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</image-viewer>
+
+		<image-viewer>
+			<_name>Eye of GNOME</_name>
+			<executable>eog</executable>
+			<command>eog %s</command>
+			<icon-name>eog</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</image-viewer>
+
+		<image-viewer>
+			<_name>Shotwell</_name>
+			<executable>shotwell</executable>
+			<command>shotwell %s</command>
+			<icon-name>shotwell</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</image-viewer>
+
+		<image-viewer>
+			<_name>MComix</_name>
+			<executable>mcomix</executable>
+			<command>mcomix %s</command>
+			<icon-name>mcomix</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</image-viewer>
+
+		<image-viewer>
+			<_name>gThumb</_name>
+			<executable>gthumb</executable>
+			<command>gthumb %s</command>
+			<icon-name>gthumb</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</image-viewer>
+
+		<image-viewer>
+			<_name>Gwenview</_name>
+			<executable>gwenview</executable>
+			<command>gwenview %s</command>
+			<icon-name>gwenview</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</image-viewer>
+
+		<image-viewer>
+			<_name>Ristretto</_name>
+			<executable>ristretto</executable>
+			<command>ristretto %s</command>
+			<icon-name>ristretto</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</image-viewer>
+
+		<!-- se necesita agregar los otros visores -->
+	</image-viewers>
+
+	<music-players>
+
+		<music-player>
+			<_name>DeaDBeeF</_name>
+			<executable>deadbeef</executable>
+			<command>deadbeef %s</command>
+			<icon-name>deadbeef</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</music-player>
+
+		<music-player>
+			<_name>VLC</_name>
+			<executable>vlc</executable>
+			<command>vlc %s</command>
+			<icon-name>vlc</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</music-player>
+
+		<music-player>
+			<_name>Rhythmbox Music Player</_name>
+			<executable>rhythmbox</executable>
+			<command>rhythmbox</command>
+			<icon-name>rhythmbox</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</music-player>
+
+		<music-player>
+			<_name>Totem Movie Player</_name>
+			<executable>totem</executable>
+			<command>totem</command>
+			<icon-name>totem</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</music-player>
+
+		<music-player>
+			<_name>Banshee Music Player</_name>
+			<executable>banshee</executable>
+			<command>banshee</command>
+			<icon-name>music-player-banshee</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</music-player>
+
+		<music-player>
+			<_name>Muine Music Player</_name>
+			<executable>muine</executable>
+			<command>muine</command>
+			<icon-name>muine</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</music-player>
+
+
+		<music-player>
+			<_name>Listen</_name>
+			<executable>listen</executable>
+			<command>listen</command>
+			<icon-name>listen</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</music-player>
+
+		<!-- se necesita agregar los otros reproductores de musica -->
+	</music-players>
+
+	<video-players>
+
+		<video-player>
+			<_name>VLC</_name>
+			<executable>vlc</executable>
+			<command>vlc %s</command>
+			<icon-name>vlc</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</video-player>
+
+		<video-player>
+			<_name>Totem Movie Player</_name>
+			<executable>totem</executable>
+			<command>totem</command>
+			<icon-name>totem</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</video-player>
+
+	</video-players>
+
+	<text-editors>
+
+		<text-editor>
+			<_name>Gedit</_name>
+			<executable>gedit</executable>
+			<command>gedit %s</command>
+			<icon-name>accessories-text-editor</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</text-editor>
+
+		<text-editor>
+			<_name>MATE text editor</_name>
+			<executable>pluma</executable>
+			<command>pluma %s</command>
+			<icon-name>accessories-text-editor</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</text-editor>
+
+		<!-- <text-editor>
+			<_name>Geany</_name>
+			<executable>geany</executable>
+			<command>geany %s</command>
+			<icon-name>geany</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</text-editor> -->
+
+		<text-editor>
+			<_name>leafpad</_name>
+			<executable>leafpad</executable>
+			<command>leafpad %s</command>
+			<icon-name>leafpad</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</text-editor>
+
+		<!-- <text-editor>
+			<_name>mousepad</_name>
+			<executable>mousepad</executable>
+			<command>mousepad %s</command>
+			<icon-name>mousepad</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</text-editor> -->
+
+		<!-- <text-editor>
+			<_name>GNU nano</_name>
+			<executable>nano</executable>
+			<command>nano %s</command>
+			<icon-name>application-x-executable</icon-name>
+			<run-in-terminal>true</run-in-terminal>
+		</text-editor> -->
+
+	</text-editors>
 
   <a11y-visual>
     <visual>