diff --git a/src/pw3270/common.h b/src/pw3270/common.h
index 705a9c2..501bc66 100644
--- a/src/pw3270/common.h
+++ b/src/pw3270/common.h
@@ -60,7 +60,8 @@
 	LIB3270_EXPORT void		  pw3270_session_config_load(const gchar *filename);
 	LIB3270_EXPORT void		  pw3270_session_config_save();
 	LIB3270_EXPORT void		  pw3270_session_config_free(void);
-	LIB3270_EXPORT GKeyFile * pw3270_session_config_get(gboolean create);
+	LIB3270_EXPORT GKeyFile	* pw3270_session_config_get(gboolean create);
+	LIB3270_EXPORT void		  pw3270_session_save_terminal(GtkWidget *terminal);
 
 	gchar		* get_string_from_config(const gchar *group, const gchar *key, const gchar *def);
 	gboolean	  get_boolean_from_config(const gchar *group, const gchar *key, gboolean def);
@@ -79,11 +80,10 @@
 	void		  restore_window_from_config(const gchar *group, const gchar *key, GtkWidget *hwnd);
 
 	#ifdef ENABLE_WINDOWS_REGISTRY
-		gboolean	  get_registry_handle(const gchar *group, HKEY *hKey, REGSAM samDesired);
+		gboolean	  pw3270_win32_registry_open(const gchar *group, HKEY *hKey, REGSAM samDesired);
+		void 		  pw3270_win32_registry_foreach(HKEY parent, const gchar *name,void (*cbk)(const gchar *key, const gchar *val, gpointer *user_data), gpointer *user_data);
+
 		HKEY		  get_application_registry(REGSAM samDesired);
-		void		  registry_foreach(HKEY parent, const gchar *name,void (*cbk)(const gchar *key, const gchar *val, gpointer *user_data), gpointer *user_data);
-		void 		  registry_set_double(HKEY hKey, const gchar *key, gdouble value);
-		gboolean	  registry_get_double(HKEY hKey, const gchar *key, gdouble *value);
 	#endif // ENABLE_WINDOWS_REGISTRY
 
 
diff --git a/src/pw3270/linux/config.c b/src/pw3270/linux/config.c
index fc79b64..5a320e0 100644
--- a/src/pw3270/linux/config.c
+++ b/src/pw3270/linux/config.c
@@ -435,3 +435,15 @@ void restore_window_from_config(const gchar *group, const gchar *key, GtkWidget 
 
 }
 
+void pw3270_session_save_terminal(GtkWidget *terminal)
+{
+	GKeyFile * keyfile = pw3270_session_config_get(TRUE);
+
+ 	debug("%s keyfile=%p",__FUNCTION__,keyfile);
+	if(keyfile)
+	{
+		v3270_to_key_file(widget, keyfile, "terminal");
+		pw3270_session_config_save();
+	}
+
+}
diff --git a/src/pw3270/window.c b/src/pw3270/window.c
index 0885052..c7ec944 100644
--- a/src/pw3270/window.c
+++ b/src/pw3270/window.c
@@ -407,7 +407,6 @@ static GtkWidget * trace_window = NULL;
 
 	GKeyFile * keyfile = pw3270_session_config_get(FALSE);
 
- 	debug("%s keyfile=%p",__FUNCTION__,keyfile);
 	if(keyfile)
 	{
 		v3270_to_key_file(widget, keyfile, "terminal");
@@ -418,7 +417,7 @@ static GtkWidget * trace_window = NULL;
 	{
 		HKEY hKey;
 
-		if(get_registry_handle(NULL, &hKey, KEY_SET_VALUE))
+		if(pw3270_win32_registry_open(NULL, &hKey, KEY_SET_VALUE))
 		{
 			v3270_to_registry(widget, hKey, "terminal");
 			RegCloseKey(hKey);
@@ -872,7 +871,7 @@ static GtkWidget * trace_window = NULL;
 	g_signal_connect(widget->terminal,"field_clicked",G_CALLBACK(field_clicked),widget);
 	g_signal_connect(widget->terminal,"toggle_changed",G_CALLBACK(toggle_changed),widget);
 	g_signal_connect(widget->terminal,"session_changed",G_CALLBACK(session_changed),widget);
-	g_signal_connect(widget->terminal,"save_settings",G_CALLBACK(save_terminal_settings),widget);
+	g_signal_connect(widget->terminal,"save_settings",G_CALLBACK(pw3270_session_save_terminal),NULL);
 
 	//g_signal_connect(widget->terminal,"print",G_CALLBACK(print_all),widget);
 
diff --git a/src/pw3270/windows/config.c b/src/pw3270/windows/config.c
index cf7f30a..6fb769d 100644
--- a/src/pw3270/windows/config.c
+++ b/src/pw3270/windows/config.c
@@ -24,51 +24,36 @@
  *
  * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
  * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
- * licinio@bb.com.br		(Licínio Luis Branco)
- * kraucer@bb.com.br		(Kraucer Fernandes Mazuco)
  *
  */
 
-#ifdef _WIN32
-	#include <windows.h>
-#endif // _WIN32
+ #include <windows.h>
 
  #include "../pw3270/private.h"
 
- #include "common.h"
+ #include "../common.h"
  #include <stdarg.h>
  #include <glib/gstdio.h>
+ #include <v3270/settings.h>
 
-#ifdef _WIN32
+ #ifndef KEY_WOW64_64KEY
+	#define KEY_WOW64_64KEY 0x0100
+ #endif // KEY_WOW64_64KEY
 
-	#include <windows.h>
-
-	#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
+ #ifndef KEY_WOW64_32KEY
+	#define KEY_WOW64_32KEY	0x0200
+ #endif // KEY_WOW64_64KEY
 
 /*--[ Globals ]--------------------------------------------------------------------------------------*/
 
-#ifdef ENABLE_WINDOWS_REGISTRY
-
- 	static const gchar	* registry_path = "SOFTWARE";
-
-#else
+ static GKeyFile	* keyfile 		= NULL;
+ static gchar		* keyfilename	= NULL;
+ static const HKEY	  predefined[] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE };
 
-	static GKeyFile		* program_config = NULL;
-
-#endif // ENABLE_WINDOWS_REGISTRY
+ #define WINDOWS_REGISTRY_PATH "software"
 
 /*--[ Implement ]------------------------------------------------------------------------------------*/
 
-#ifdef ENABLE_WINDOWS_REGISTRY
-
  enum REG_KEY
  {
 	REG_KEY_USER,
@@ -76,53 +61,46 @@
 	REG_KEY_INEXISTENT
  };
 
- static enum REG_KEY registry_query(const gchar *group, const gchar *key, HKEY *hKey)
+ /// @brief Open registry for read-only access.
+ static enum REG_KEY search_for_registry_key(const gchar *group, const gchar *key, HKEY *hKey)
  {
- 	static HKEY	  predefined[] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE };
-	gchar		* path = g_strdup_printf("%s\\%s\\%s",registry_path,g_get_application_name(),group);
-	int			  f;
+	g_autofree gchar	* path = g_strdup_printf("%s\\%s\\%s",WINDOWS_REGISTRY_PATH,g_get_application_name(),group);
+	size_t				  ix;
 
-	for(f=0;f<G_N_ELEMENTS(predefined);f++)
+	for(ix=0;ix < G_N_ELEMENTS(predefined);ix++)
 	{
-		if(RegOpenKeyEx(predefined[f],path,0,KEY_READ,hKey) == ERROR_SUCCESS)
+		if(RegOpenKeyEx(predefined[ix],path,0,KEY_READ,hKey) == ERROR_SUCCESS)
 		{
 			if(RegQueryValueExA(*hKey,key,NULL,NULL,NULL,NULL) == ERROR_SUCCESS)
 			{
-				trace("Key\"%s\\%s\" found at id %d",path,key,f);
-				g_free(path);
-				return f;
+				trace("Key\"%s\\%s\" found at id %d",path,key,ix);
+				return (enum REG_KEY) ix;
 			}
 			RegCloseKey(*hKey);
 		}
 	}
 
-	trace("Key \"%s\\%s\""" not found",path,key,f);
-	g_free(path);
+	trace("Key \"%s\\%s\""" not found",path,key);
 
-	return -1;
+	return REG_KEY_INEXISTENT;
  }
 
- static BOOL registry_open_key(const gchar *group, const gchar *key, REGSAM samDesired, HKEY *hKey)
+ gboolean pw3270_win32_registry_open(const gchar *group, HKEY *hKey, REGSAM samDesired)
  {
- 	static HKEY	  predefined[] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE };
- 	int			  f;
-	gchar		* path = g_strdup_printf("%s\\%s\\%s",registry_path,g_get_application_name(),group);
+ 	size_t				  ix;
+	g_autofree gchar	* path = g_strdup_printf("%s\\%s\\%s",WINDOWS_REGISTRY_PATH,g_get_application_name(),group);
 
-	for(f=0;f<G_N_ELEMENTS(predefined);f++)
+	for(ix=0;ix < G_N_ELEMENTS(predefined);ix++)
 	{
-		if(RegOpenKeyEx(predefined[f],path,0,samDesired,hKey) == ERROR_SUCCESS)
-		{
-			g_free(path);
+		if(RegOpenKeyEx(predefined[ix],path,0,samDesired,hKey) == ERROR_SUCCESS)
 			return TRUE;
-		}
 	}
 
-	g_free(path);
-
 	return FALSE;
+
  }
 
- void registry_foreach(HKEY parent, const gchar *name,void (*cbk)(const gchar *key, const gchar *val, gpointer *user_data), gpointer *user_data)
+ void pw3270_win32_registry_foreach(HKEY parent, const gchar *name,void (*cbk)(const gchar *key, const gchar *val, gpointer *user_data), gpointer *user_data)
  {
 	HKEY hKey = 0;
 
@@ -152,218 +130,94 @@
 	}
  }
 
- void registry_set_double(HKEY hKey, const gchar *key, gdouble value)
- {
-	// Reference: http://git.gnome.org/browse/glib/tree/glib/gkeyfile.c
-	gchar result[G_ASCII_DTOSTR_BUF_SIZE];
-	g_ascii_dtostr (result, sizeof (result), value);
-
-	RegSetValueEx(hKey,key,0,REG_SZ,(const BYTE *) result,strlen(result)+1);
- }
 
- gboolean registry_get_double(HKEY hKey, const gchar *key, gdouble *value)
+ /*
+ static BOOL registry_open_key(const gchar *group, const gchar *key, REGSAM samDesired, HKEY *hKey)
  {
-//	GError			* error = NULL;
-	BYTE			  data[4096];
-	unsigned long	  datatype;
-	unsigned long	  datalen 	= sizeof(data);
-	gchar 			* end_of_valid_d;
-
-	if(RegQueryValueExA(hKey,key,NULL,&datatype,data,&datalen) != ERROR_SUCCESS)
-		return FALSE;
-
-	data[datalen] = 0;
-
-	* value = g_ascii_strtod((const gchar *) data, &end_of_valid_d);
+ 	static HKEY	  predefined[] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE };
+ 	int			  f;
+	gchar		* path = g_strdup_printf("%s\\%s\\%s",registry_path,g_get_application_name(),group);
 
-	if(*end_of_valid_d != '\0' || end_of_valid_d == ((gchar *) data))
+	for(f=0;f<G_N_ELEMENTS(predefined);f++)
 	{
-		g_warning("Key %s on registry isnt a valid double value",key);
-		return FALSE;
+		if(RegOpenKeyEx(predefined[f],path,0,samDesired,hKey) == ERROR_SUCCESS)
+		{
+			g_free(path);
+			return TRUE;
+		}
 	}
 
- 	return TRUE;
- }
-
+	g_free(path);
 
+	return FALSE;
+ }
+ */
 
-#else
 
- static gchar * search_for_ini(void)
+ gboolean get_boolean_from_config(const gchar *group, const gchar *key, gboolean def)
  {
- 	static const gchar * (*dir[])(void) =
- 	{
- 		g_get_user_config_dir,
- 		g_get_user_data_dir,
- 		g_get_home_dir,
-	};
-
-	size_t f;
-	g_autofree gchar * name = g_strconcat(g_get_application_name(),".conf",NULL);
-
-	//
-	// First search the user data
-	//
-
- 	for(f=0;f<G_N_ELEMENTS(dir);f++)
-	{
-		gchar *filename = g_build_filename(dir[f](),name,NULL);
-
-		trace("Checking for %s",filename);
-
-		if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
-			return filename;
-		g_free(filename);
-
-	}
+	HKEY hKey;
 
-#ifdef DATADIR
-	//
-	// Search the application DATADIR
-	//
+	if(keyfile)
 	{
-		gchar *filename = g_build_filename(DATAROOTDIR,G_STRINGIFY(PRODUCT_NAME),name,NULL);
-
-		trace("Checking for default config \"%s\"",filename);
-
-		if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
-			return filename;
-
-		g_message("Can't find default config (%s)",filename);
-
-		g_free(filename);
-
-	}
-#endif // DATADIR
-
-	//
-	// Search the system config folders
-	//
-	const gchar * const * sysconfig = g_get_system_config_dirs();
- 	for(f=0;sysconfig[f];f++)
-	{
-		gchar *filename = g_build_filename(sysconfig[f],name,NULL);
-		trace("Checking for %s",filename);
-		if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
-			return filename;
-		g_free(filename);
-	}
-
-	//
-	// Search the system data folders
-	//
-	const gchar * const * sysdata = g_get_system_data_dirs();
- 	for(f=0;sysdata[f];f++)
-	{
-		gchar *filename;
-
-		// Check for product dir
-		filename = g_build_filename(sysdata[f],G_STRINGIFY(PRODUCT_NAME),name,NULL);
-		trace("Checking for system data \"%s\"",filename);
-		if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
-			return filename;
-		g_free(filename);
-
-		// Check for file
-		filename = g_build_filename(sysdata[f],name,NULL);
-		trace("Checking for system data \"%s\"",filename);
-		if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
-			return filename;
-		g_free(filename);
-
-
-
+		GError		* err = NULL;
+		gboolean	  val = g_key_file_get_boolean(keyfile,group,key,&err);
+		if(err)
+			g_error_free(err);
+		else
+			return val;
 	}
-
-	//
-	// Can't find, use user config dir
-	//
-	g_message("No config, defaulting to %s/%s",g_get_user_config_dir(),name);
- 	return g_build_filename(g_get_user_config_dir(),name,NULL);
-
- }
-#endif  //  #ifdef ENABLE_WINDOWS_REGISTRY
-
- gboolean get_boolean_from_config(const gchar *group, const gchar *key, gboolean def)
- {
-#ifdef ENABLE_WINDOWS_REGISTRY
-	gboolean	ret 		= def;
-	HKEY 		hKey;
-
-	if(registry_query(group,key,&hKey) != REG_KEY_INEXISTENT)
+	else if(search_for_registry_key(group,key,&hKey) != REG_KEY_INEXISTENT)
 	{
-		DWORD			  data;
-		unsigned long	  datalen	= sizeof(data);
-		unsigned long	  datatype;
+		DWORD			data;
+		unsigned long	datalen	= sizeof(data);
+		unsigned long	datatype;
 
 		if(RegQueryValueExA(hKey,key,NULL,&datatype,(BYTE *) &data,&datalen) == ERROR_SUCCESS)
 		{
 			if(datatype == REG_DWORD)
-				ret = data ? TRUE : FALSE;
+				def = data ? TRUE : FALSE;
 			else
-				g_warning("Unexpected registry data type in %s\\%s\\%s\\%s",registry_path,g_get_application_name(),group,key);
+				g_warning("Unexpected registry data type in %s\\%s\\%s\\%s",WINDOWS_REGISTRY_PATH,g_get_application_name(),group,key);
 		}
 
 		RegCloseKey(hKey);
+
 	}
 
-	return ret;
+	return def;
+ }
 
-#else
+ gint get_integer_from_config(const gchar *group, const gchar *key, gint def)
+ {
+	HKEY hKey;
 
-	if(program_config)
+	if(keyfile)
 	{
-		GError		* err = NULL;
-		gboolean	  val = g_key_file_get_boolean(program_config,group,key,&err);
+		GError	* err = NULL;
+		gint	  val = g_key_file_get_integer(keyfile,group,key,&err);
 		if(err)
 			g_error_free(err);
 		else
 			return val;
 	}
-#endif // ENABLE_WINDOWS_REGISTRY
-
-	return def;
- }
-
- gint get_integer_from_config(const gchar *group, const gchar *key, gint def)
- {
-#ifdef ENABLE_WINDOWS_REGISTRY
-
-	HKEY key_handle;
-
-	if(registry_open_key(group,key,KEY_READ,&key_handle))
+	else if(search_for_registry_key(group,key,&hKey) != REG_KEY_INEXISTENT)
 	{
 		DWORD			data;
 		gint			ret = def;
 		unsigned long	datalen	= sizeof(data);
 		unsigned long	datatype;
 
-		if(RegQueryValueExA(key_handle,key,NULL,&datatype,(BYTE *) &data,&datalen) == ERROR_SUCCESS)
+		if(RegQueryValueExA(hKey,key,NULL,&datatype,(BYTE *) &data,&datalen) == ERROR_SUCCESS)
 		{
 			if(datatype == REG_DWORD)
-				ret = (gint) data;
+				def = (gint) data;
 			else
-				g_warning("Unexpected registry data type in %s\\%s\\%s\\%s",registry_path,g_get_application_name(),group,key);
+				g_warning("Unexpected registry data type in %s\\%s\\%s\\%s",WINDOWS_REGISTRY_PATH,g_get_application_name(),group,key);
 		}
 
-		RegCloseKey(key_handle);
-
-		return ret;
-
-	}
-
-#else
-
-	if(program_config)
-	{
-		GError	* err = NULL;
-		gint	  val = g_key_file_get_integer(program_config,group,key,&err);
-		if(err)
-			g_error_free(err);
-		else
-			return val;
+		RegCloseKey(hKey);
 	}
-#endif // ENABLE_WINDOWS_REGISTRY
 
 	return def;
  }
@@ -371,46 +225,28 @@
 
  gchar * get_string_from_config(const gchar *group, const gchar *key, const gchar *def)
  {
-#ifdef ENABLE_WINDOWS_REGISTRY
-
-	HKEY key_handle;
-	unsigned long	  datalen 	= 4096;
-	unsigned long	  datatype;
-	gchar 			* ret		= NULL;
-	BYTE			* data;
-
-	if(!registry_open_key(group,key,KEY_READ,&key_handle))
-	{
-		if(def)
-			return g_strdup(def);
-		return NULL;
-	}
+	HKEY hKey;
 
-	data = (BYTE *) g_malloc0(datalen+2);
-
-	if(RegQueryValueExA(key_handle,key,NULL,&datatype,data,&datalen) == ERROR_SUCCESS)
+	if(keyfile)
 	{
-		data[datalen+1] = 0;
-		ret = g_strdup((const gchar *) data);
+		gchar *ret = g_key_file_get_string(keyfile,group,key,NULL);
+		if(ret)
+			return ret;
 	}
-	else if(def)
+	else if(search_for_registry_key(group,key,&hKey) != REG_KEY_INEXISTENT)
 	{
-		ret = g_strdup(def);
-	}
-
-	g_free(data);
+		unsigned long		  datalen 	= 4096;
+		g_autofree gchar	* data = g_malloc0(datalen+2);
+		unsigned long		  datatype;
 
-	RegCloseKey(key_handle);
-
-	return ret;
-
-#else
+		if(RegQueryValueExA(hKey,key,NULL,&datatype,data,&datalen) == ERROR_SUCCESS)
+		{
+			RegCloseKey(hKey);
+			data[datalen+1] = 0;
+			return g_strdup((const gchar *) data);
+		}
 
-	if(program_config)
-	{
-		gchar *ret = g_key_file_get_string(program_config,group,key,NULL);
-		if(ret)
-			return ret;
+		RegCloseKey(hKey);
 	}
 
 	if(def)
@@ -418,207 +254,128 @@
 
 	return NULL;
 
-#endif // ENABLE_WINDOWS_REGISTRY
  }
 
-void configuration_init(void)
+void pw3270_session_config_load(const gchar *filename)
 {
-#ifndef ENABLE_WINDOWS_REGISTRY
-	gchar *filename = search_for_ini();
-
-	if(program_config)
-		g_key_file_free(program_config);
+	if(keyfilename)
+	{
+		g_free(keyfilename);
+		keyfilename = NULL;
+	}
 
-	program_config = g_key_file_new();
+	if(keyfile)
+	{
+		g_key_file_free(keyfile);
+		keyfile = NULL;
+	}
 
 	if(filename)
 	{
+		// Has file name, load it.
 		g_message(_("Loading %s"),filename);
-		g_key_file_load_from_file(program_config,filename,G_KEY_FILE_NONE,NULL);
-		g_free(filename);
+		keyfile = g_key_file_new();
+		g_key_file_load_from_file(keyfile,filename,G_KEY_FILE_NONE,NULL);
+		keyfilename = g_strdup(filename);
 	}
 
-#endif // ENABLE_WINDOWS_REGISTRY
 }
 
-static void set_string(const gchar *group, const gchar *key, const gchar *fmt, va_list args)
-{
-	gchar * value = g_strdup_vprintf(fmt,args);
-
-#ifdef ENABLE_WINDOWS_REGISTRY
-
-	gchar * path = g_strdup_printf("%s\\%s\\%s",registry_path,g_get_application_name(),group);
- 	HKEY	hKey;
- 	DWORD	disp;
-
-	if(RegCreateKeyEx(HKEY_CURRENT_USER,path,0,NULL,REG_OPTION_NON_VOLATILE,KEY_SET_VALUE,NULL,&hKey,&disp) == ERROR_SUCCESS)
-	{
-		RegSetValueEx(hKey,key,0,REG_SZ,(const BYTE *) value,strlen(value)+1);
-		RegCloseKey(hKey);
-	}
-
-	g_free(path);
-
-#else
-
-	g_key_file_set_string(program_config,group,key,value);
-
-#endif
-
-	g_free(value);
-}
 
 void set_string_to_config(const gchar *group, const gchar *key, const gchar *fmt, ...)
 {
+	HKEY hKey;
+	g_autofree gchar * str = NULL;
+
 	if(fmt)
 	{
 		va_list args;
 		va_start(args, fmt);
-		set_string(group,key,fmt,args);
+		str = g_strdup_vprintf(fmt,args);
 		va_end(args);
 	}
-#ifdef ENABLE_WINDOWS_REGISTRY
-	else
-	{
 
-		gchar * path = g_strdup_printf("%s\\%s\\%s",registry_path,g_get_application_name(),group);
-		HKEY	hKey;
-		DWORD	disp;
-
-		if(RegOpenKeyEx(HKEY_CURRENT_USER, path, 0, KEY_ALL_ACCESS, &hKey) == ERROR_SUCCESS)
+	if(keyfile)
+	{
+		// Update keyfile
+		if(str)
 		{
-			RegDeleteKey(hKey,key);
-			RegCloseKey(hKey);
+			g_key_file_set_string(keyfile,group,key,str);
+		}
+		else
+		{
+			g_key_file_remove_key(keyfile,group,key,NULL);
 		}
 
-		g_free(path);
-
-	}
-#else
-	else if(g_key_file_has_key(program_config,group,key,NULL))
-	{
-		g_key_file_remove_key(program_config,group,key,NULL);
 	}
-#endif
+
+
 }
 
 void set_boolean_to_config(const gchar *group, const gchar *key, gboolean val)
 {
-#ifdef ENABLE_WINDOWS_REGISTRY
-
- 	HKEY	hKey;
- 	DWORD	disp;
-	gchar * path = g_strdup_printf("%s\\%s\\%s",registry_path,g_get_application_name(),group);
-
-//	trace("Creating key %s",path);
-	if(RegCreateKeyEx(HKEY_CURRENT_USER,path,0,NULL,REG_OPTION_NON_VOLATILE,KEY_SET_VALUE,NULL,&hKey,&disp) == ERROR_SUCCESS)
-	{
-		DWORD	value = val ? 1 : 0;
-		LONG	rc = RegSetValueEx(hKey, key, 0, REG_DWORD,(const BYTE *) &value,sizeof(value));
+	HKEY hKey;
 
-		SetLastError(rc);
-
-		if(rc != ERROR_SUCCESS)
-		{
-			gchar *msg = g_win32_error_message(GetLastError());
-			g_warning("Error \"%s\" when setting key HKCU\\%s\\%s",msg,path,key);
-			g_free(msg);
-		}
-		RegCloseKey(hKey);
-	}
-	else
+	if(keyfile)
 	{
-		gchar *msg = g_win32_error_message(GetLastError());
-		g_warning("Error \"%s\" when creating key HKCU\\%s",msg,path);
-		g_free(msg);
+		g_key_file_set_boolean(keyfile,group,key,val);
 	}
 
-	g_free(path);
-
-#else
-
-	if(program_config)
-		g_key_file_set_boolean(program_config,group,key,val);
-
-#endif // ENABLE_WINDOWS_REGISTRY
-
 }
 
 void set_integer_to_config(const gchar *group, const gchar *key, gint val)
 {
-#ifdef ENABLE_WINDOWS_REGISTRY
+	HKEY hKey;
 
- 	HKEY	hKey;
- 	DWORD	disp;
-	gchar * path = g_strdup_printf("%s\\%s\\%s",registry_path,g_get_application_name(),group);
-
-	trace("Creating key %s",path);
-	if(RegCreateKeyEx(HKEY_CURRENT_USER,path,0,NULL,REG_OPTION_NON_VOLATILE,KEY_SET_VALUE,NULL,&hKey,&disp) == ERROR_SUCCESS)
-	{
-		DWORD	value = (DWORD) val;
-		LONG	rc = RegSetValueEx(hKey, key, 0, REG_DWORD,(const BYTE *) &value,sizeof(value));
-
-		SetLastError(rc);
-
-		if(rc != ERROR_SUCCESS)
-		{
-			gchar *msg = g_win32_error_message(GetLastError());
-			g_warning("Error \"%s\" when setting key HKCU\\%s\\%s",msg,path,key);
-			g_free(msg);
-		}
-		RegCloseKey(hKey);
-	}
-	else
+	if(keyfile)
 	{
-		gchar *msg = g_win32_error_message(GetLastError());
-		g_warning("Error \"%s\" when creating key HKCU\\%s",msg,path);
-		g_free(msg);
+		g_key_file_set_integer(keyfile,group,key,val);
 	}
 
-	g_free(path);
-
-#else
-
-	if(program_config)
-		g_key_file_set_integer(program_config,group,key,val);
-
-#endif // ENABLE_WINDOWS_REGISTRY
-
 }
 
-void configuration_deinit(void)
+void pw3270_session_config_save()
 {
-#if !defined(ENABLE_WINDOWS_REGISTRY)
-
-	if(!program_config)
+	if(!keyfile)
 		return;
 
-	g_autofree gchar * text = g_key_file_to_data(program_config,NULL,NULL);
+	g_autofree gchar * text = g_key_file_to_data(keyfile,NULL,NULL);
 
 	if(text)
 	{
 		GError * error = NULL;
 
-		g_autofree gchar * name = g_strconcat(g_get_application_name(),".conf",NULL);
-		g_autofree gchar * filename = g_build_filename(g_get_user_config_dir(),name,NULL);
-
-		g_mkdir_with_parents(g_get_user_config_dir(),S_IRUSR|S_IWUSR);
-
-		g_message( _("Saving %s"), filename);
+		if(keyfilename)
+		{
+			g_message( _("Saving %s"), keyfilename);
+			g_file_set_contents(keyfilename,text,-1,&error);
+		}
+		else
+		{
+			g_autofree gchar * name = g_strconcat(g_get_application_name(),".conf",NULL);
+			g_autofree gchar * filename = g_build_filename(g_get_user_config_dir(),name,NULL);
+			g_mkdir_with_parents(g_get_user_config_dir(),S_IRUSR|S_IWUSR);
+			g_file_set_contents(filename,text,-1,&error);
+		}
 
-		g_file_set_contents(filename,text,-1,&error);
 
 		if(error) {
-			g_message( _( "Can't save \"%s\": %s" ), filename, error->message);
+			g_message( _( "Can't save session settings: %s" ), error->message);
 			g_error_free(error);
 		}
 
 	}
 
-	g_key_file_free(program_config);
-	program_config = NULL;
+}
 
-#endif // ENABLE_WINDOWS_REGISTRY
+void pw3270_session_config_free(void)
+{
+	if(keyfile)
+	{
+		pw3270_session_config_save();
+		g_key_file_free(keyfile);
+		keyfile = NULL;
+	}
 }
 
 gchar * build_data_filename(const gchar *first_element, ...)
@@ -648,52 +405,6 @@ gchar * filename_from_va(const gchar *first_element, va_list args)
 
 	g_autofree gchar * suffix = g_string_free(result, FALSE);
 
-#if defined( ENABLE_WINDOWS_REGISTRY )
-	for(p=0;p<G_N_ELEMENTS(appname) && !result;p++)
-	{
-		g_autofree gchar * path	= g_strconcat("Software\\",appname[p],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,&hKey);
-		SetLastError(rc);
-
-		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)
-
-			rc = RegQueryValueExA(hKey,"datadir",NULL,&datatype,(LPBYTE) data,&datalen);
-			if(rc == ERROR_SUCCESS)
-			{
-				gchar * path = g_build_filename(data,appname[p],suffix,NULL);
-				trace("searching \"%s\"",path);
-				if(g_file_test(path,G_FILE_TEST_EXISTS))
-					return path;
-				g_free(path);
-			}
-			RegCloseKey(hKey);
-		}
-
-	}
-#endif // ENABLE_WINDOWS_REGISTRY
-
-#ifdef _WIN32
-	for(p=0;p<G_N_ELEMENTS(appname) && !result;p++)
-	{
-		gchar * path = g_build_filename(g_win32_get_package_installation_directory_of_module(NULL),appname[p],suffix,NULL);
-		trace("searching \"%s\"",path);
-		if(g_file_test(path,G_FILE_TEST_EXISTS))
-			return path;
-		g_free(path);
-	}
-#endif // _WIN32
-
 	// Check system data dirs
 	const gchar * const * system_data_dirs = g_get_system_data_dirs();
 	for(p=0;p<G_N_ELEMENTS(appname);p++)
@@ -722,36 +433,12 @@ gchar * filename_from_va(const gchar *first_element, va_list args)
 	return g_build_filename(".",suffix,NULL);
 }
 
-#ifdef ENABLE_WINDOWS_REGISTRY
-gboolean get_registry_handle(const gchar *group, HKEY *hKey, REGSAM samDesired)
-{
-	gboolean	  ret;
-	gchar		* path;
- 	DWORD		  disp;
-
- 	if(group)
-		path = g_strdup_printf("%s\\%s\\%s",registry_path,g_get_application_name(),group);
-	else
-		path = g_strdup_printf("%s\\%s",registry_path,g_get_application_name());
-
-	if(RegCreateKeyEx(HKEY_CURRENT_USER,path,0,NULL,REG_OPTION_NON_VOLATILE,samDesired,NULL,hKey,&disp) == ERROR_SUCCESS)
-		ret = TRUE;
-	else
-		ret = FALSE;
-
-	g_free(path);
-
-	return ret;
-}
-#else
-#error Replace it!
-GKeyFile * get_application_keyfile(void)
+GKeyFile * pw3270_session_config_get(gboolean create)
 {
-	if(!program_config)
-		configuration_init();
-	return program_config;
+	if(!keyfile && create)
+		pw3270_session_config_load(NULL);
+	return keyfile;
 }
-#endif // ENABLE_WINDOWS_REGISTRY
 
  static const struct _WindowState
  {
@@ -765,175 +452,33 @@ GKeyFile * get_application_keyfile(void)
         { "Sticky",		GDK_WINDOW_STATE_STICKY,	gtk_window_stick                }
  };
 
-void save_window_state_to_config(const gchar *group, const gchar *key, GdkWindowState CurrentState)
-{
-#if defined( ENABLE_WINDOWS_REGISTRY )
-
-        gchar * path = g_strdup_printf("%s\\%s\\%s\\%s",registry_path,g_get_application_name(),group,key);
-
-        HKEY    hKey;
-        DWORD   disp;
-
-		if(RegCreateKeyEx(HKEY_CURRENT_USER,path,0,NULL,REG_OPTION_NON_VOLATILE,KEY_SET_VALUE,NULL,&hKey,&disp) == ERROR_SUCCESS)
-		{
-			int f;
-			for(f=0;f<G_N_ELEMENTS(WindowState);f++)
-			{
-				DWORD value = (CurrentState & WindowState[f].flag) ? 1 : 0;
-//				trace("%s=%s",WindowState[f].name,value ? "Yes" : "No");
-				RegSetValueEx(hKey, WindowState[f].name, 0, REG_DWORD,(const BYTE *) &value,sizeof(value));
-			}
-
-			RegCloseKey(hKey);
-		}
-
-		g_free(path);
-
-#else
-		int			  f;
-		GKeyFile	* conf 	= get_application_keyfile();
-		gchar		* id	= g_strconcat(group,".",key,NULL);
-
-		for(f=0;f<G_N_ELEMENTS(WindowState);f++)
-			g_key_file_set_boolean(conf,id,WindowState[f].name,CurrentState & WindowState[f].flag);
-
-		g_free(id);
-
-#endif // ENABLE_WINDOWS_REGISTRY
-}
-
-void save_window_size_to_config(const gchar *group, const gchar *key, GtkWidget *hwnd)
-{
-#if defined( ENABLE_WINDOWS_REGISTRY )
-
-        gchar * path = g_strdup_printf("%s\\%s\\%s\\%s",registry_path,g_get_application_name(),group,key);
-
-        HKEY    hKey;
-        DWORD   disp;
-
-		if(RegCreateKeyEx(HKEY_CURRENT_USER,path,0,NULL,REG_OPTION_NON_VOLATILE,KEY_SET_VALUE,NULL,&hKey,&disp) == ERROR_SUCCESS)
-		{
-			int pos[2];
-
-			gtk_window_get_size(GTK_WINDOW(hwnd),&pos[0],&pos[1]);
-
-			RegSetValueEx(hKey, "Size", 0, REG_BINARY,(const BYTE *) pos,sizeof(pos));
-
-			RegCloseKey(hKey);
-		}
-
-		g_free(path);
-
-#else
-		int 		  pos[2];
-		GKeyFile	* conf 	= get_application_keyfile();
-		gchar		* id	= g_strconcat(group,".",key,NULL);
-
-        gtk_window_get_size(GTK_WINDOW(hwnd),&pos[0],&pos[1]);
-        g_key_file_set_integer_list(conf,id,"size",pos,2);
-
-		g_free(id);
-
-#endif // ENABLE_WINDOWS_REGISTRY
-}
-
-#if defined( ENABLE_WINDOWS_REGISTRY )
-static void restore_window_from_regkey(GtkWidget *hwnd, HKEY hKey, const gchar *path)
-{
-	int 			f;
-	int 			pos[2];
-	unsigned long	datalen;
-	unsigned long	datatype;
-
-
-	datalen = sizeof(pos);
-	if(RegQueryValueExA(hKey,"Size",NULL,&datatype,(BYTE *) pos,&datalen) == ERROR_SUCCESS)
-	{
-		if(datatype == REG_BINARY && datalen == sizeof(pos))
-		{
-			gtk_window_resize(GTK_WINDOW(hwnd),pos[0],pos[1]);
-		}
-		else
-		{
-			g_warning("Unexpected registry data in %s\\Size",path);
-		}
-	}
-
-
-	for(f=0;f<G_N_ELEMENTS(WindowState);f++)
-	{
-		DWORD			data;
-
-		datalen       = sizeof(data);
-
-		if(RegQueryValueExA(hKey,WindowState[f].name,NULL,&datatype,(BYTE *) &data,&datalen) == ERROR_SUCCESS)
-		{
-			if(datatype == REG_DWORD)
-			{
-				if(data)
-					WindowState[f].activate(GTK_WINDOW(hwnd));
-
-			}
-			else
-			{
-				g_warning("Unexpected registry data type in %s\\%s",path,WindowState[f].name);
-			}
-		}
-	}
-
-
-}
-#endif // ENABLE_WINDOWS_REGISTRY
-
-void restore_window_from_config(const gchar *group, const gchar *key, GtkWidget *hwnd)
-{
-#if defined( ENABLE_WINDOWS_REGISTRY )
+ void pw3270_session_save_terminal(GtkWidget *terminal)
+ {
+	HKEY hKey;
 
-	gchar * path = g_strdup_printf("%s\\%s\\%s\\%s",registry_path,g_get_application_name(),group,key);
-	HKEY    hKey;
+	GKeyFile * keyfile = pw3270_session_config_get(FALSE);
 
-	if(RegOpenKeyEx(HKEY_CURRENT_USER,path,0,KEY_READ,&hKey) == ERROR_SUCCESS)
-	{
-		// Load user settings
-		restore_window_from_regkey(hwnd,hKey,path);
-		RegCloseKey(hKey);
-	}
-	else if(RegOpenKeyEx(HKEY_LOCAL_MACHINE,path,0,KEY_READ,&hKey) == ERROR_SUCCESS)
+	if(keyfile)
 	{
-		// Load system defaults
-		restore_window_from_regkey(hwnd,hKey,path);
-		RegCloseKey(hKey);
+		v3270_to_key_file(terminal, keyfile, "terminal");
+		pw3270_session_config_save();
 	}
 
-	g_free(path);
-
-#else
-	gchar		* id	= g_strconcat(group,".",key,NULL);
-	GKeyFile	* conf 	= get_application_keyfile();
 
-	if(g_key_file_has_key(conf,id,"size",NULL))
-	{
-		gsize	  sz	= 2;
-		gint	* vlr	=  g_key_file_get_integer_list(conf,id,"size",&sz,NULL);
-		int		  f;
+ }
 
-		if(vlr)
-		{
-			gtk_window_resize(GTK_WINDOW(hwnd),vlr[0],vlr[1]);
-			g_free(vlr);
-		}
+ void save_window_state_to_config(const gchar *group, const gchar *key, GdkWindowState CurrentState)
+ {
 
-		for(f=0;f<G_N_ELEMENTS(WindowState);f++)
-		{
-			if(g_key_file_get_boolean(conf,id,WindowState[f].name,NULL))
-				WindowState[f].activate(GTK_WINDOW(hwnd));
-		}
+ }
 
-	}
+ void save_window_size_to_config(const gchar *group, const gchar *key, GtkWidget *hwnd)
+ {
 
-	g_free(id);
+ }
 
-#endif // ENABLE_WINDOWS_REGISTRY
+ void restore_window_from_config(const gchar *group, const gchar *key, GtkWidget *hwnd)
+ {
 
-}
+ }
 
diff --git a/src/pw3270/windows/print.c b/src/pw3270/windows/print.c
index 0493f06..bce9574 100644
--- a/src/pw3270/windows/print.c
+++ b/src/pw3270/windows/print.c
@@ -100,6 +100,29 @@ static gchar * enum_to_string(GType type, guint enum_value)
     }
  }
 
+ gboolean registry_get_double(HKEY hKey, const gchar *key, gdouble *value)
+ {
+	BYTE			  data[4096];
+	unsigned long	  datatype;
+	unsigned long	  datalen 	= sizeof(data);
+	gchar 			* end_of_valid_d;
+
+	if(RegQueryValueExA(hKey,key,NULL,&datatype,data,&datalen) != ERROR_SUCCESS)
+		return FALSE;
+
+	data[datalen] = 0;
+
+	* value = g_ascii_strtod((const gchar *) data, &end_of_valid_d);
+
+	if(*end_of_valid_d != '\0' || end_of_valid_d == ((gchar *) data))
+	{
+		g_warning("Key %s on registry isnt a valid double value",key);
+		return FALSE;
+	}
+
+ 	return TRUE;
+ }
+
  void load_print_operation_settings(GtkPrintOperation * operation)
  {
 	GtkPrintSettings 	* settings	= gtk_print_settings_new();
@@ -122,12 +145,12 @@ static gchar * enum_to_string(GType type, guint enum_value)
 
 	HKEY registry;
 
-	if(get_registry_handle("print",&registry,KEY_READ))
+	if(pw3270_win32_registry_open("print",&registry,KEY_READ))
 	{
 		HKEY 	  hKey;
 		DWORD	  disp;
 
-		registry_foreach(registry,"settings",update_settings,(gpointer) settings);
+		pw3270_win32_registry_foreach(registry,"settings",update_settings,(gpointer) settings);
 
 		if(RegCreateKeyEx(registry,"pagesetup",0,NULL,REG_OPTION_NON_VOLATILE,KEY_READ,NULL,&hKey,&disp) == ERROR_SUCCESS)
 		{
@@ -234,6 +257,15 @@ static gchar * enum_to_string(GType type, guint enum_value)
 
  }
 
+ static void registry_set_double(HKEY hKey, const gchar *key, gdouble value)
+ {
+	// Reference: http://git.gnome.org/browse/glib/tree/glib/gkeyfile.c
+	gchar result[G_ASCII_DTOSTR_BUF_SIZE];
+	g_ascii_dtostr (result, sizeof (result), value);
+
+	RegSetValueEx(hKey,key,0,REG_SZ,(const BYTE *) result,strlen(result)+1);
+ }
+
  void save_print_operation_settings(GtkPrintOperation * operation)
  {
 	// Save settings
@@ -246,7 +278,7 @@ static gchar * enum_to_string(GType type, guint enum_value)
 #ifdef ENABLE_WINDOWS_REGISTRY
 	HKEY registry;
 
-	if(get_registry_handle("print",&registry,KEY_SET_VALUE))
+	if(pw3270_win32_registry_open("print",&registry,KEY_SET_VALUE))
 	{
 		HKEY	hKey;
 		DWORD	disp;
--
libgit2 0.21.2