diff --git a/src/gtk/common/config.c b/src/gtk/common/config.c
index 53a5ce8..61ed912 100644
--- a/src/gtk/common/config.c
+++ b/src/gtk/common/config.c
@@ -35,8 +35,18 @@
  #include <glib/gstdio.h>
 
 #ifdef WIN32
+
 	#include <windows.h>
 	#define WIN_REGISTRY_ENABLED 1
+
+	#ifndef KEY_WOW64_64KEY
+		#define KEY_WOW64_64KEY 0x0100
+	#endif // KEY_WOW64_64KEY
+
+	#ifndef KEY_WOW64_32KEY
+		#define KEY_WOW64_32KEY	0x0200
+	#endif // KEY_WOW64_64KEY
+
 #endif // WIN32
 
 /*--[ Globals ]--------------------------------------------------------------------------------------*/
@@ -469,13 +479,53 @@ void configuration_deinit(void)
 
 gchar * build_data_filename(const gchar *first_element, ...)
 {
-	va_list			  args;
-	GString 		* result;
-	const gchar 	* element;
+	static const gchar	* datadir	= NULL;
+	const gchar *		  appname[]	= { g_get_application_name(), PACKAGE_NAME };
+	GString			 	* result	= NULL;
+	const gchar			* element;
+	va_list				  args;
+
+	if(datadir)
+		result = g_string_new(datadir);
 
 #if defined( WIN_REGISTRY_ENABLED )
+	if(!result)
+	{
+		// No predefined datadir, search registry
+		int p;
+
+		for(p=0;p<G_N_ELEMENTS(appname) && !result;p++)
+		{
+			gchar	* path	= g_strconcat("SOFTWARE\\",appname[p],"\\datadir",NULL);
+			HKEY	  hKey	= 0;
+			LONG	  rc 	= 0;
+
+			// Note: This could be needed: http://support.microsoft.com/kb/556009
+			// http://msdn.microsoft.com/en-us/library/windows/desktop/aa384129(v=vs.85).aspx
+
+			rc = RegOpenKeyEx(HKEY_LOCAL_MACHINE,path,0,KEY_QUERY_VALUE|KEY_WOW64_64KEY,&hKey);
+			SetLastError(rc);
 
-	static const gchar *reg_datadir = "SOFTWARE\\"PACKAGE_NAME"\\datadir";
+			if(rc == ERROR_SUCCESS)
+			{
+				char			data[4096];
+				unsigned long	datalen	= sizeof(data);		// data field length(in), data returned length(out)
+				unsigned long	datatype;					// #defined in winnt.h (predefined types 0-11)
+
+				if(RegQueryValueExA(hKey,NULL,NULL,&datatype,(LPBYTE) data,&datalen) == ERROR_SUCCESS)
+					result = g_string_new(g_strchomp(data));
+				RegCloseKey(hKey);
+			}
+
+			g_free(path);
+		}
+	}
+#endif // WIN_REGISTRY_ENABLED
+
+/*
+#if defined( WIN_REGISTRY_ENABLED )
+
+	gchar *reg_datadir = g_strconcat("SOFTWARE\\",g_get_application_name(),"\\datadir",NULL);
 
  	HKEY	hKey = 0;
  	LONG	rc = 0;
@@ -483,14 +533,6 @@ gchar * build_data_filename(const gchar *first_element, ...)
 	// Note: This could be needed: http://support.microsoft.com/kb/556009
 	// http://msdn.microsoft.com/en-us/library/windows/desktop/aa384129(v=vs.85).aspx
 
-#ifndef KEY_WOW64_64KEY
-	#define KEY_WOW64_64KEY 0x0100
-#endif // KEY_WOW64_64KEY
-
-#ifndef KEY_WOW64_32KEY
-	#define KEY_WOW64_32KEY	0x0200
-#endif // KEY_WOW64_64KEY
-
 	rc = RegOpenKeyEx(HKEY_LOCAL_MACHINE,reg_datadir,0,KEY_QUERY_VALUE|KEY_WOW64_64KEY,&hKey);
 	SetLastError(rc);
 
@@ -554,35 +596,37 @@ gchar * build_data_filename(const gchar *first_element, ...)
 
 	result = g_string_new(APPDATA);
 
-#else
+#endif
 
-	static const gchar *datadir = NULL;
+*/
 
-	if(!datadir)
+	if(!result)
 	{
+		// Search for application folder on system data dirs
 		const gchar * const * dir = g_get_system_data_dirs();
-		int f;
+		int p;
 
-		for(f=0;dir[f] && !datadir;f++)
+		for(p=0;p<G_N_ELEMENTS(appname) && !datadir;p++)
 		{
-			gchar *name = g_build_filename(dir[f],PACKAGE_NAME,NULL);
-			if(g_file_test(name,G_FILE_TEST_IS_DIR))
-				datadir = name;
-			else
-				g_free(name);
-		}
+			int f;
 
-		if(!datadir)
-		{
-			datadir = g_get_current_dir();
-			g_warning("Unable to find application datadir, using %s",datadir);
+			for(f=0;dir[f] && !datadir;f++)
+			{
+				gchar *name = g_build_filename(dir[f],appname[p],NULL);
+				if(g_file_test(name,G_FILE_TEST_IS_DIR))
+					datadir = name;
+				else
+					g_free(name);
+			}
 		}
 
 	}
 
-	result = g_string_new(datadir);
-
-#endif
+	if(!result)
+	{
+		result = g_string_new(g_get_current_dir());
+		g_warning("Unable to find application datadir, using %s",result->str);
+	}
 
 	va_start(args, first_element);
 
diff --git a/ui/00default.xml b/ui/00default.xml
index f02429a..b48e2f0 100644
--- a/ui/00default.xml
+++ b/ui/00default.xml
@@ -37,7 +37,7 @@
 				Extended attributes for 'save' actions:
 
 				* overwrite='yes' to always overwrite file
-				* filename='PATH' to save to a predefined file (no user save dialog)
+				* filename='PATH' to save to a predefined file whithout user interaction
 
 			--->
 			<menuitem action='save' src='all' group='online' label='Save screen' />
@@ -45,7 +45,7 @@
 			<menuitem action='save' src='copy' group='clipboard' label='Save copy' />
 
 			<separator/>
-			<menuitem action='print' src='all' key='Print' icon='print' label='Print' />
+			<menuitem action='print' src='all' group='online' key='Print' icon='print' label='Print' />
 			<menuitem action='print' src='selected' group='selection' label='Print selected' />
 			<menuitem action='print' src='copy' group='clipboard' label='Print copy' />
 			<separator/>
--
libgit2 0.21.2