Merge lp:~arthurborsboom/xpad/xpad-4.3 into lp:xpad

[Arthur Borsboom]

- Migration from GTK2 to GTK3
- Resolving compiler warnings

[Arthur Borsboom (arthurborsboom)]

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2013-10-21 18:52:10 +0000
+++ configure.ac	2013-11-01 20:03:38 +0000
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 
 # Sets up autoconf.
-AC_INIT([Xpad],[4.2],[[e-mail]])
+AC_INIT([Xpad],[4.3],[[e-mail]])
 AC_CONFIG_SRCDIR(src/xpad-app.c)
 AC_CONFIG_HEADERS([config.h:config.h.in])
 
@@ -15,9 +15,18 @@
 AC_PROG_MAKE_SET
 AC_PROG_INTLTOOL([0.31], [no-xml])
 
-# Checks for libraries.
 AC_PATH_XTRA
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.12 gio-2.0)
+
+# Checks for GTK+ 3.0
+PKG_CHECK_MODULES(GTK, gtk+-3.0 gio-2.0)
+AM_CONDITIONAL(GTK, test -n "$GTK_LIBS")
+# ensure that only allowed headers are included
+GTK_CFLAGS+="-DGTK_DISABLE_SINGLE_INCLUDES "
+# ensure that no gtk deprecated symbols are used
+GTK_CFLAGS+="-DGDK_DISABLE_DEPRECATED "
+GTK_CFLAGS+="-DGTK_DISABLE_DEPRECATED "
+# ensure use of accessors
+GTK_CFLAGS+="-DGSEAL_ENABLE "
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
@@ -25,6 +34,18 @@
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
+PKG_CHECK_MODULES(PANGO, pango >= 1.32)
+AC_SUBST(PANGO_LIBS)
+AC_SUBST(PANGO_CFLAGS)
+
+PKG_CHECK_MODULES(PIXBUF, gdk-pixbuf-2.0 >= 2.28)
+AC_SUBST(PIXBUF_LIBS)
+AC_SUBST(PIXBUF_CFLAGS)
+
+PKG_CHECK_MODULES(ATK, atk >= 2.8 atk-bridge-2.0)
+AC_SUBST(ATK_LIBS)
+AC_SUBST(ATK_CFLAGS)
+
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_SIZE_T
 
=== modified file 'src/fio.c'
--- src/fio.c	2011-11-14 17:10:03 +0000
+++ src/fio.c	2013-11-01 20:03:38 +0000
@@ -57,14 +57,14 @@
 gchar *str_replace_tokens (gchar **string, gchar obj, gchar *replacement)
 {
 	gchar *p;
-	gint rsize = strlen (replacement);
-	gint osize = 1;
-	gint diff = rsize - osize;
+	gsize rsize = strlen (replacement);
+	gsize osize = 1;
+	gsize diff = rsize - osize;
 	
 	p = *string;
 	while ((p = strchr (p, obj)))
 	{
-		gint offset = p - *string;
+		long offset = p - *string;
 		*string = g_realloc (*string, strlen (*string) + diff + 1);
 		p = *string + offset;
 		g_memmove (p + rsize, p + osize, strlen (p + osize) + 1);
@@ -188,7 +188,7 @@
 		gchar *fullitem;
 		gint *value;
 		gchar *where;
-		gint size;
+		gsize size;
 		gchar type;
 		
 		type = item[0];
@@ -316,4 +316,3 @@
 	g_file_delete (file, NULL, NULL);
 	g_object_unref (file);
 }
-
 
=== modified file 'src/help.c'
--- src/help.c	2013-10-18 18:31:20 +0000
+++ src/help.c	2013-11-01 20:03:38 +0000
@@ -40,27 +40,30 @@
 	gchar *helptextbuf;
 	
 	/* Create the widgets */
-	
 	dialog = gtk_dialog_new ();
 	helptext = gtk_label_new ("");
 	
-	/* we use g_strdup_printf because C89 has size limits on static strings */
-	helptextbuf = g_strdup_printf ("%s\n\n%s\n\n%s\n\n%s\n\n%s\n\n%s",
-_("Each xpad session consists of one or more open pads.  "
-"These pads are basically sticky notes on your desktop in which "
-"you can write memos."),
-_("<b>To move a pad</b>, left drag on the toolbar, right drag "
-"on the resizer in the bottom right, or hold down CTRL "
-"while left dragging anywhere on the pad."),
-_("<b>To resize a pad</b>, left drag on the resizer or hold down "
-"CTRL while right dragging anywhere on the pad."),
-_("<b>To change color settings</b>, right click on a pad "
-"and choose Edit->Preferences."),
-_("Most actions are available throught the popup menu "
-"that appears when you right click on a pad.  Try it out and "
-"enjoy."),
-_("Please send ideas or bug reports to\n"
-"https://bugs.launchpad.net/xpad/+filebug"));
+	if (page == 0) {
+		/* we use g_strdup_printf because C89 has size limits on static strings */
+		helptextbuf = g_strdup_printf ("%s\n\n%s\n\n%s\n\n%s\n\n%s\n\n%s",
+		_("Each xpad session consists of one or more open pads.  "
+		"These pads are basically sticky notes on your desktop in which "
+		"you can write memos."),
+		_("<b>To move a pad</b>, left drag on the toolbar, right drag "
+		"on the resizer in the bottom right, or hold down CTRL "
+		"while left dragging anywhere on the pad."),
+		_("<b>To resize a pad</b>, left drag on the resizer or hold down "
+		"CTRL while right dragging anywhere on the pad."),
+		_("<b>To change color settings</b>, right click on a pad "
+		"and choose Edit->Preferences."),
+		_("Most actions are available throught the popup menu "
+		"that appears when you right click on a pad.  Try it out and "
+		"enjoy."),
+		_("Please send ideas or bug reports to\n"
+		"https://bugs.launchpad.net/xpad/+filebug"));
+	}
+	else
+		helptextbuf = g_strdup_printf("Unknown help page requested");
 	
 	gtk_label_set_markup (GTK_LABEL (helptext), helptextbuf);
 	
@@ -73,14 +76,14 @@
 	gtk_window_set_title (GTK_WINDOW (dialog), _("Help"));
 	
 	/* Add the label, and show everything we've added to the dialog. */
-	gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox), helptext);
+	gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), helptext);
 	button = gtk_dialog_add_button (GTK_DIALOG(dialog), "gtk-close", 1);
 	
 	gtk_window_set_position (GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
 	
-	g_signal_connect (GTK_OBJECT (dialog), "destroy", 
+	g_signal_connect (GTK_WINDOW (dialog), "destroy",
 		G_CALLBACK (help_close), NULL);
-	g_signal_connect_swapped (GTK_OBJECT (button), "clicked", 
+	g_signal_connect_swapped (GTK_BUTTON (button), "clicked",
 		G_CALLBACK (gtk_widget_destroy), dialog);
 	
 	gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
 
=== modified file 'src/prefix.c'
--- src/prefix.c	2008-09-21 00:03:40 +0000
+++ src/prefix.c	2013-11-01 20:03:38 +0000
@@ -397,7 +397,7 @@
 
 	while (end > path && *end == '/')
 		end--;
-	result = br_strndup ((char *) path, end - path + 1);
+	result = br_strndup ((char *) path, ((size_t) (end - path + 1)));
 	if (!*result)
 	{
 		free (result);
@@ -431,7 +431,7 @@
 	end = strrchr (path, '/');
 	if (!end) return strdup (path);
 
-	tmp = br_strndup ((char *) path, end - path);
+	tmp = br_strndup ((char *) path, ((size_t) (end - path)));
 	if (!*tmp)
 	{
 		free (tmp);
@@ -440,7 +440,7 @@
 	end = strrchr (tmp, '/');
 	if (!end) return tmp;
 
-	result = br_strndup (tmp, end - tmp);
+	result = br_strndup (tmp, ((size_t) (end - tmp)));
 	free (tmp);
 
 	if (!*result)
 
=== modified file 'src/xpad-app.c'
--- src/xpad-app.c	2013-10-18 18:31:20 +0000
+++ src/xpad-app.c	2013-11-01 20:03:38 +0000
@@ -1,6 +1,7 @@
 /**
  * Copyright (c) 2004-2007 Michael Terry
  * Copyright (c) 2009 Paul Ivanov
+ * Copyright (c) 2013 Arthur Borsboom
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,16 +22,17 @@
 /* define _GNU_SOURCE here because that makes our sockets work nice
  Unfortunately, we lose portability... */
 #define _GNU_SOURCE	1
+#include "../config.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/un.h>
 #include <sys/socket.h>
 #include <sys/select.h>
+#include <errno.h>
 
 #include <string.h>
 #include <stdlib.h> /* for exit */
 
-#include "../config.h"
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
@@ -77,21 +79,21 @@
 static gchar *server_filename;
 static gint server_fd;
 static FILE *output;
-static gboolean xpad_translucent = FALSE;
 static XpadPadGroup *pad_group;
 static gint pads_loaded_on_start = 0;
-
-static gboolean  process_local_args         (gint *argc, gchar **argv[]);
-static gboolean  process_remote_args        (gint *argc, gchar **argv[], gboolean have_gtk);
-
-static gboolean  config_dir_exists          (void);
-static gchar    *make_config_dir            (void);
-static void      register_stock_icons       (void);
-static gint      xpad_app_load_pads         (void);
-static gboolean  xpad_app_quit_if_no_pads   (XpadPadGroup *group);
-static gboolean  xpad_app_first_idle_check  (XpadPadGroup *group);
-static gboolean  xpad_app_pass_args         (void);
-static gboolean  xpad_app_open_proc_file    (void);
+XpadSettings *xpad_global_settings;
+
+static gboolean		process_local_args          (gint *argc, gchar **argv[]);
+static gboolean		process_remote_args         (gint *argc, gchar **argv[], gboolean have_gtk);
+
+static gboolean		config_dir_exists           (void);
+static gchar		*make_config_dir            (void);
+static void			register_stock_icons        (void);
+static gint			xpad_app_load_pads          (void);
+static gboolean		xpad_app_quit_if_no_pads    (XpadPadGroup *group);
+static gboolean		xpad_app_first_idle_check   (XpadPadGroup *group);
+static gboolean		xpad_app_pass_args          (void);
+static gboolean		xpad_app_open_proc_file     (void);
 
 
 static void
@@ -99,17 +101,15 @@
 {
 	gboolean first_time;
 	gboolean have_gtk;
-	// GdkVisual *visual;
 
-	/* Set up i18n */
+	/* Set up support different languages */
 #ifdef ENABLE_NLS
-	gtk_set_locale ();
 	bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
 	bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 #endif
 
-	have_gtk = gtk_init_check (&argc, &argv);
+	have_gtk = gtk_init_check (&argc, &argv); // Leaves 135 referenced objects behind. No idea how to unref. Total up to here 135.
 	xpad_argc = argc;
 	xpad_argv = argv;
 	output = stdout;
@@ -137,18 +137,9 @@
 	
 	g_set_application_name (_("Xpad"));
 	gdk_set_program_class (PACKAGE);
-	
-	/* Set up translucency. */
-/*	visual = gdk_visual_get_best_with_depth (32);
-	if (visual)
-	{
-		GdkColormap *colormap;
-		colormap = gdk_colormap_new (visual, TRUE);
-		gtk_widget_set_default_colormap (colormap);
-		xpad_translucent = TRUE;
-	}*/
-	
+
 	/* Set up program path. */
+
 	if (xpad_argc > 0)
 		program_path = g_find_program_in_path (xpad_argv[0]);
 	else
@@ -158,26 +149,28 @@
 	
 	if (xpad_app_pass_args ())
 		exit (0);
-	
+
 	/* Race condition here, between calls */
 	xpad_app_open_proc_file ();
 	
-	register_stock_icons ();
+	register_stock_icons (); // Leaves 1039 referenced objects behind. No idea how to unref, except 1. Total up to here 1173.
 	gtk_window_set_default_icon_name (PACKAGE);
 	
-	pad_group = xpad_pad_group_new();
+	pad_group = xpad_pad_group_new(); // Creates 1 referenced object; but does get unrefferenced. Total 1173.
 	process_remote_args (&xpad_argc, &xpad_argv, TRUE);
 	
-	xpad_tray_open ();
+	xpad_tray_open (); // Creates 34 referenced objects; but only 14 get unrefferenced. Total 1193.
 	xpad_session_manager_init ();
 
+	xpad_global_settings = xpad_settings_new (); // Creates 1 reference, 1 reference gets cleaned up. Total 1193
+
 	/* Initialize Xpad-periodic module */
 	Xpad_periodic_init();
 	Xpad_periodic_set_callback("save-content", (XpadPeriodicFunc) xpad_pad_save_content);
 	Xpad_periodic_set_callback("save-info", (XpadPeriodicFunc) xpad_pad_save_info);
 	
 	/* load all pads */
-	pads_loaded_on_start = xpad_app_load_pads ();
+	pads_loaded_on_start = xpad_app_load_pads (); // each pad creates 333 references and leaves about 100 references behind. Total 1268.
 	if (pads_loaded_on_start == 0 && !option_new) {
 		if (!option_nonew) {
 			GtkWidget *pad = xpad_pad_new (pad_group);
@@ -194,19 +187,15 @@
 	server_filename = NULL;
 }
 
-
 gint main (gint argc, gchar **argv)
 {
 	xpad_app_init (argc, argv);
-	
+
 	gtk_main ();
 	
 	return 0;
 }
 
-
-
-
 /* parent and secondary may be NULL.
  * Returns when user dismisses error.
  */
@@ -228,15 +217,12 @@
 	xpad_session_manager_stop_interact (FALSE);
 }
 
-
-
 G_CONST_RETURN gchar *
 xpad_app_get_config_dir (void)
 {
 	return config_dir;
 }
 
-
 /* Returns absolute path to our own executable. May be NULL. */
 G_CONST_RETURN gchar *
 xpad_app_get_program_path (void)
@@ -244,7 +230,6 @@
 	return program_path;
 }
 
-
 XpadPadGroup *
 xpad_app_get_pad_group (void)
 {
@@ -255,25 +240,23 @@
 xpad_app_quit (void)
 {
 	// Free the memory used by the pads belonging to this group
-	xpad_pad_group_destroy_pads(xpad_app_get_pad_group());
+	xpad_pad_group_destroy_pads (xpad_app_get_pad_group());
 
 	// Free the memory used by group.
-	g_object_unref(xpad_app_get_pad_group());
+	g_object_unref (xpad_app_get_pad_group());
 
 	// Free the memory used by the settings menu.
-	g_object_unref(XPAD_SETTINGS(xpad_settings()));
+	g_object_unref (xpad_global_settings);
+	xpad_global_settings = NULL; // This is needed due to the asynchronous finalizing process.
 
 	// Free the memory used by the tray icon and its menu.
-	xpad_tray_close();
+	xpad_tray_close ();
+
+	// Free the theme reference. Unfortunately GTK3 leaves about 1000 objects behind.
+	g_object_unref (gtk_icon_theme_get_default ());
 
 	// Give GTK the signal to clean the rest and quit the application.
-	gtk_main_quit();
-}
-
-gboolean
-xpad_app_get_translucent (void)
-{
-	return xpad_translucent;
+	gtk_main_quit ();
 }
 
 static gboolean
@@ -361,19 +344,17 @@
  * secondary text of 'secondary'.  No buttons are added.
  */
 GtkWidget *
-xpad_app_alert_new (GtkWindow *parent, const gchar *stock,
-                    const gchar *primary, const gchar *secondary)
+xpad_app_alert_new (GtkWindow *parent, const gchar *stock, const gchar *primary, const gchar *secondary)
 {
 	GtkWidget *dialog, *hbox, *image, *label;
 	gchar *buf;
 	
-	dialog = gtk_dialog_new_with_buttons (
-		"",
-		parent,
-		GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
-		NULL);
-	
-	hbox = gtk_hbox_new (FALSE, 12);
+	dialog = gtk_dialog_new();
+	gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);
+	gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
+	gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
 	image = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_DIALOG);
 	label = gtk_label_new (NULL);
 	
@@ -385,14 +366,14 @@
 	gtk_label_set_markup (GTK_LABEL (label), buf);
 	g_free (buf);
 	
-	gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox);
+	gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 12);
+	gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox);
 	gtk_container_add (GTK_CONTAINER (hbox), image);
 	gtk_container_add (GTK_CONTAINER (hbox), label);
 	
 	gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0);
 	gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0);
 	gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
-	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 12);
 	gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
 	gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
 	gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
@@ -529,16 +510,27 @@
 converts main program arguments into one long string.
 puts allocated string in dest, and returns size
 */
-static gint
+static guint
 args_to_string (int argc, char **argv, char **dest)
 {
-	gint i;
-	gint size = 0;
-	gchar *p;
-	
-	for (i = 0; i < argc; i++)
-		size += strlen (argv[i]) + 1;
-	
+	gint i = 0;
+	guint size = 0;
+	gchar *p = NULL;
+	size_t string_length = 0;
+	
+	
+	for (i = 0; i < argc; i++) {
+		string_length = strlen (argv[i]) + 1;
+
+		// safe cast
+		if( string_length <= UINT_MAX ) {
+		       size += (guint) string_length;
+		}
+		else {
+			g_warning("casting the size of the arguments failed");
+		}
+	}
+
 	*dest = g_malloc (size);
 	
 	p = *dest;
@@ -561,10 +553,10 @@
 /*
 returns number of strings in newly allocated argv
 */
-static gint
+static guint
 string_to_args (const char *string, char ***argv)
 {
-	gint num, i;
+	guint num, i;
 	const gchar *tmp;
 	char **list;
 	
@@ -582,8 +574,18 @@
 		/* string points to beginning of current arg */
 		tmp = strchr (string, ' '); /* NULL or end of this arg */
 		
-		if (tmp) len = tmp - string;
-		else   len = strlen (string);
+		if (tmp) {
+			long int difference = tmp - string;
+			// safe cast from long int to size_t
+			if (difference >= 0)
+				len = (size_t) difference;
+			else {
+				g_warning("Error casting argument length. Arguments might not be processed correctly.");
+				len = 0;
+			}
+		}
+		else
+			len = strlen (string);
 		
 		list[i] = g_malloc (len + 1);
 		strncpy (list[i], string, len);
@@ -600,18 +602,18 @@
 	return num;
 }
 
-#include <errno.h>
 /* This reads a line from the proc file.  This line will contain arguments to process. */
 static void
 xpad_app_read_from_proc_file (void)
 {
-	gint client_fd, size;
+	gint client_fd;
+	guint size = 0;
 	gint argc;
 	gchar **argv;
 	gchar *args;
 	struct sockaddr_un client;
 	socklen_t client_len;
-	size_t bytes;
+	ssize_t bytes = -1;
 	
 	/* accept waiting connection */
 	client_len = sizeof (client);
@@ -619,10 +621,12 @@
 	if (client_fd == -1)
 		return;
 	
-	/* get size of args */
+	/* get size of args and verify for errors */
 	bytes = read (client_fd, &size, sizeof (size));
-	if (bytes != sizeof(size))
+	if (bytes == -1 || bytes != sizeof(size)) {
+		g_warning("Cannot read proc file correctly");
 		goto close_client_fd;
+	}
 	
 	/* alloc memory */
 	args = (gchar *) g_malloc (size);
@@ -634,7 +638,7 @@
 	if (bytes < size)
 		goto close_client_fd;
 	
-	argc = string_to_args (args, &argv);
+	argc = (gint) string_to_args (args, &argv);
 	
 	g_free (args);
 	
@@ -645,7 +649,11 @@
 	{
 		/* if there were no non-local arguments, insert --new as argument */
 		gint c = 2;
-		gchar **v = g_malloc (sizeof (gchar *) * c);
+		gchar **v = NULL;
+		unsigned long int my_size = 0;
+		// safe cast
+		my_size = sizeof (gchar *) * (long unsigned) c;
+		v = g_malloc (my_size);
 		v[0] = PACKAGE;
 		v[1] = "--new";
 		
@@ -665,10 +673,15 @@
 	close (client_fd);
 }
 
-
 static gboolean
 can_read_from_server_fd (GIOChannel *source, GIOCondition condition, gpointer data)
 {
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) source;
+	(void) condition;
+	(void) data;
+
 	xpad_app_read_from_proc_file ();
 	
 	return TRUE;
@@ -712,8 +725,8 @@
 	fd_set fdset;
 	gchar buf [129];
 	gchar *args = NULL;
-	gint size;
-	gint bytesRead;
+	guint size;
+	ssize_t bytesRead;
 	gboolean connected = FALSE;
 	ssize_t error = NULL;
 	
 
=== modified file 'src/xpad-app.h'
--- src/xpad-app.h	2013-10-09 14:46:10 +0000
+++ src/xpad-app.h	2013-11-01 20:03:38 +0000
@@ -21,6 +21,7 @@
 
 #include <gtk/gtk.h>
 #include "xpad-pad-group.h"
+#include "xpad-settings.h"
 
 G_BEGIN_DECLS
 
@@ -30,6 +31,7 @@
 G_CONST_RETURN gchar *xpad_app_get_config_dir (void);
 G_CONST_RETURN gchar *xpad_app_get_program_path (void);
 XpadPadGroup         *xpad_app_get_pad_group (void);
+XpadSettings		 *xpad_global_settings;
 gboolean              xpad_app_get_translucent (void);
 void                  xpad_app_quit (void);
 
 
=== modified file 'src/xpad-grip-tool-item.c'
--- src/xpad-grip-tool-item.c	2013-10-18 18:31:20 +0000
+++ src/xpad-grip-tool-item.c	2013-11-01 20:03:38 +0000
@@ -16,6 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "../config.h"
 #include "xpad-grip-tool-item.h"
 
 struct XpadGripToolItemPrivate
@@ -28,7 +29,7 @@
 static void xpad_grip_tool_item_dispose (GObject *object);
 static void xpad_grip_tool_item_finalize (GObject *object);
 
-static gboolean xpad_grip_tool_item_event_box_expose (GtkWidget *widget, GdkEventExpose *event);
+static gboolean xpad_grip_tool_item_event_box_draw (GtkWidget *widget, cairo_t *cr);
 static void xpad_grip_tool_item_event_box_realize (GtkWidget *widget);
 static gboolean xpad_grip_tool_item_button_pressed_event (GtkWidget *widget, GdkEventButton *event);
 
@@ -59,7 +60,7 @@
 	gtk_widget_add_events (grip->priv->drawbox, GDK_BUTTON_PRESS_MASK | GDK_EXPOSURE_MASK);
 	g_signal_connect (grip->priv->drawbox, "button-press-event", G_CALLBACK (xpad_grip_tool_item_button_pressed_event), NULL);
 	g_signal_connect (grip->priv->drawbox, "realize", G_CALLBACK (xpad_grip_tool_item_event_box_realize), NULL);
-	g_signal_connect (grip->priv->drawbox, "expose-event", G_CALLBACK (xpad_grip_tool_item_event_box_expose), NULL);
+	g_signal_connect (grip->priv->drawbox, "draw", G_CALLBACK (xpad_grip_tool_item_event_box_draw), NULL);
 	gtk_widget_set_size_request (grip->priv->drawbox, 18, 18);
 	
 	right =	gtk_widget_get_direction (grip->priv->drawbox) == GTK_TEXT_DIR_LTR;
@@ -95,7 +96,7 @@
 			edge = GDK_WINDOW_EDGE_SOUTH_WEST;
 	
 		gtk_window_begin_resize_drag (GTK_WINDOW (gtk_widget_get_toplevel (widget)),
-			edge, event->button, event->x_root, event->y_root, event->time);
+			edge, (gint) event->button, (gint) event->x_root, (gint) event->y_root, event->time);
 		
 		return TRUE;
 	}
@@ -116,30 +117,18 @@
 		cursor_type = GDK_BOTTOM_LEFT_CORNER;
 	
 	cursor = gdk_cursor_new_for_display (display, cursor_type);
-	gdk_window_set_cursor (widget->window, cursor);
-	gdk_cursor_unref (cursor);
+	gdk_window_set_cursor (gtk_widget_get_window(widget), cursor);
+	g_object_unref (cursor);
 }
 
 static gboolean
-xpad_grip_tool_item_event_box_expose (GtkWidget *widget, GdkEventExpose *event)
+xpad_grip_tool_item_event_box_draw (GtkWidget *widget, cairo_t *cr)
 {
-	GdkWindowEdge edge;
-	
-	if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
-		edge = GDK_WINDOW_EDGE_SOUTH_EAST;
-	else
-		edge = GDK_WINDOW_EDGE_SOUTH_WEST;
-	
-	gtk_paint_resize_grip (
-		widget->style,
-		widget->window,
-		GTK_WIDGET_STATE (widget),
-		NULL,
-		widget,
-		"xpad-grip-tool-item",
-		edge,
-		0, 0,
-		widget->allocation.width, widget->allocation.height);
+	gtk_render_handle(gtk_widget_get_style_context(widget),
+			cr,
+			0, 0,
+			gtk_widget_get_allocated_width(widget),
+			gtk_widget_get_allocated_width(widget));
 	
 	return FALSE;
 }
 
=== modified file 'src/xpad-pad-group.c'
--- src/xpad-pad-group.c	2013-10-18 18:31:20 +0000
+++ src/xpad-pad-group.c	2013-11-01 20:03:38 +0000
@@ -17,6 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "../config.h"
 #include "xpad-pad-group.h"
 #include "xpad-settings.h"
 #include "xpad-pad.h"
@@ -165,7 +166,7 @@
 		GSList *i;
 		for (i = group->priv->pads; i; i = i->next)
 		{
-			if (GTK_WIDGET_VISIBLE(GTK_WIDGET(i->data)))
+			if (gtk_widget_get_visible(GTK_WIDGET(i->data)))
 				num ++;
 		}
 		g_slist_free(i);
 
=== modified file 'src/xpad-pad-properties.c'
--- src/xpad-pad-properties.c	2013-10-21 02:51:19 +0000
+++ src/xpad-pad-properties.c	2013-11-01 20:03:38 +0000
@@ -29,10 +29,10 @@
 	GtkWidget *colorbox;
 	
 	GtkWidget *textbutton;
-	GdkColor texttmp;
+	GdkRGBA texttmp;
 	
 	GtkWidget *backbutton;
-	GdkColor backtmp;
+	GdkRGBA backtmp;
 	
 	GtkWidget *fontbutton;
 };
@@ -100,7 +100,7 @@
 	                                 g_param_spec_boxed ("text-color",
 	                                                     "Text Color",
 	                                                     "The color of text in the pad",
-	                                                     GDK_TYPE_COLOR,
+	                                                     GDK_TYPE_RGBA,
 	                                                     G_PARAM_READWRITE));
 	
 	g_object_class_install_property (gobject_class,
@@ -108,7 +108,7 @@
 	                                 g_param_spec_boxed ("back-color",
 	                                                     "Back Color",
 	                                                     "The color of the background in the pad",
-	                                                     GDK_TYPE_COLOR,
+	                                                     GDK_TYPE_RGBA,
 	                                                     G_PARAM_READWRITE));
 	
 	g_object_class_install_property (gobject_class,
@@ -123,7 +123,7 @@
 static void
 xpad_pad_properties_init (XpadPadProperties *prop)
 {
-	GtkWidget *font_radio, *color_radio, *hbox, *font_hbox, *vbox;
+	GtkWidget *font_radio, *color_radio, *hbox, *font_hbox, *vbox = NULL;
 	GtkWidget *label, *appearance_frame, *alignment, *appearance_vbox;
 	gchar *text;
 	GtkSizeGroup *size_group_labels = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
@@ -137,10 +137,10 @@
 		"xalign", 0.0,
 		NULL));
 	g_free (text);
-	appearance_vbox = GTK_WIDGET (g_object_new (GTK_TYPE_VBOX,
-		"homogeneous", FALSE,
-		"spacing", 18,
-		NULL));
+
+	appearance_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 18);
+	gtk_box_set_homogeneous (GTK_BOX (appearance_vbox), FALSE);
+
 	alignment = gtk_alignment_new (1, 1, 1, 1);
 	g_object_set (G_OBJECT (alignment),
 		"left-padding", 12,
@@ -163,12 +163,14 @@
 	color_radio = gtk_radio_button_new_with_mnemonic (NULL, _("Use colors from xpad preferences"));
 	prop->priv->colorcheck = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (color_radio), _("Use these colors:"));
 	
-	font_hbox = gtk_hbox_new (FALSE, 6);
+	font_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+
 	gtk_box_pack_start (GTK_BOX (font_hbox), prop->priv->fontcheck, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (font_hbox), prop->priv->fontbutton, TRUE, TRUE, 0);
 	
-	prop->priv->colorbox = gtk_vbox_new (FALSE, 6);
-	hbox = gtk_hbox_new (FALSE, 12);
+	prop->priv->colorbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+
 	label = gtk_label_new_with_mnemonic (_("Background:"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
 	gtk_size_group_add_widget (size_group_labels, label);
@@ -176,7 +178,7 @@
 	gtk_box_pack_start (GTK_BOX (hbox), prop->priv->backbutton, TRUE, TRUE, 0);
 	g_object_set (G_OBJECT (prop->priv->colorbox), "child", hbox, NULL);
 	
-	hbox = gtk_hbox_new (FALSE, 12);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 	label = gtk_label_new_with_mnemonic (_("Foreground:"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
 	gtk_size_group_add_widget (size_group_labels, label);
@@ -188,25 +190,26 @@
 	gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 12, 0);
 	gtk_container_add (GTK_CONTAINER (alignment), prop->priv->colorbox);
 	
-	
 	gtk_dialog_add_button (GTK_DIALOG (prop), "gtk-close", GTK_RESPONSE_CLOSE);
 	gtk_dialog_set_default_response (GTK_DIALOG (prop), GTK_RESPONSE_CLOSE);
-	gtk_dialog_set_has_separator (GTK_DIALOG (prop), FALSE);
 	g_signal_connect (prop, "response", G_CALLBACK (xpad_pad_properties_response), NULL);
 	
-	gtk_color_button_set_use_alpha (GTK_COLOR_BUTTON (prop->priv->textbutton), FALSE);
-	gtk_color_button_set_use_alpha (GTK_COLOR_BUTTON (prop->priv->backbutton), FALSE);
+	gtk_color_chooser_set_use_alpha (GTK_COLOR_CHOOSER (prop->priv->textbutton), FALSE);
+	gtk_color_chooser_set_use_alpha (GTK_COLOR_CHOOSER (prop->priv->backbutton), TRUE);
 	
 	gtk_color_button_set_title (GTK_COLOR_BUTTON (prop->priv->textbutton), _("Set Foreground Color"));
 	gtk_color_button_set_title (GTK_COLOR_BUTTON (prop->priv->backbutton), _("Set Background Color"));
 	gtk_font_button_set_title (GTK_FONT_BUTTON (prop->priv->fontbutton), _("Set Font"));
 	
-	vbox = gtk_vbox_new (FALSE, 6);
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+
 	gtk_box_pack_start (GTK_BOX (vbox), font_radio, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (vbox), font_hbox, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (appearance_vbox), vbox, FALSE, FALSE, 0);
-	
-	vbox = gtk_vbox_new (FALSE, 6);
+
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+
 	gtk_box_pack_start (GTK_BOX (vbox), color_radio, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (vbox), prop->priv->colorcheck, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0);
@@ -227,10 +230,9 @@
 	
 	g_object_unref (size_group_labels);
 	
-	g_object_set (G_OBJECT (GTK_DIALOG (prop)->vbox),
-		"child", appearance_frame,
-		NULL);
-	gtk_widget_show_all (GTK_DIALOG (prop)->vbox);
+	gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (prop))), appearance_frame);
+
+	gtk_widget_show_all (gtk_dialog_get_content_area (GTK_DIALOG (prop)));
 }
 
 static void
@@ -271,18 +273,30 @@
 static void
 change_text_color (GtkColorButton *button, XpadPadProperties *prop)
 {
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) button;
+
 	g_object_notify (G_OBJECT (prop), "text-color");
 }
 
 static void
 change_back_color (GtkColorButton *button, XpadPadProperties *prop)
 {
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) button;
+
 	g_object_notify (G_OBJECT (prop), "back-color");
 }
 
 static void
 change_font_face (GtkFontButton *button, XpadPadProperties *prop)
 {
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) button;
+
 	g_object_notify (G_OBJECT (prop), "fontname");
 }
 
@@ -290,7 +304,6 @@
 xpad_pad_properties_set_follow_font_style (XpadPadProperties *prop, gboolean follow)
 {
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prop->priv->fontcheck), !follow);
-	
 	g_object_notify (G_OBJECT (prop), "follow_font_style");
 }
 
@@ -304,7 +317,6 @@
 xpad_pad_properties_set_follow_color_style (XpadPadProperties *prop, gboolean follow)
 {
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prop->priv->colorcheck), !follow);
-	
 	g_object_notify (G_OBJECT (prop), "follow_color_style");
 }
 
@@ -315,32 +327,30 @@
 }
 
 void
-xpad_pad_properties_set_back_color (XpadPadProperties *prop, const GdkColor *back)
+xpad_pad_properties_set_back_color (XpadPadProperties *prop, const GdkRGBA *back)
 {
-	gtk_color_button_set_color (GTK_COLOR_BUTTON (prop->priv->backbutton), back);
-	
+	gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (prop->priv->backbutton), back);
 	g_object_notify (G_OBJECT (prop), "back_color");
 }
 
-G_CONST_RETURN GdkColor *
+G_CONST_RETURN GdkRGBA *
 xpad_pad_properties_get_back_color (XpadPadProperties *prop)
 {
-	gtk_color_button_get_color (GTK_COLOR_BUTTON (prop->priv->backbutton), &prop->priv->backtmp);
+	gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (prop->priv->backbutton), &prop->priv->backtmp);
 	return &prop->priv->backtmp;
 }
 
 void
-xpad_pad_properties_set_text_color (XpadPadProperties *prop, const GdkColor *text)
+xpad_pad_properties_set_text_color (XpadPadProperties *prop, const GdkRGBA *text)
 {
-	gtk_color_button_set_color (GTK_COLOR_BUTTON (prop->priv->textbutton), text);
-	
+	gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (prop->priv->textbutton), text);
 	g_object_notify (G_OBJECT (prop), "text_color");
 }
 
-G_CONST_RETURN GdkColor *
+G_CONST_RETURN GdkRGBA *
 xpad_pad_properties_get_text_color (XpadPadProperties *prop)
 {
-	gtk_color_button_get_color (GTK_COLOR_BUTTON (prop->priv->textbutton), &prop->priv->texttmp);
+	gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (prop->priv->textbutton), &prop->priv->texttmp);
 	return &prop->priv->texttmp;
 }
 
@@ -348,7 +358,6 @@
 xpad_pad_properties_set_fontname (XpadPadProperties *prop, const gchar *fontname)
 {
 	gtk_font_button_set_font_name (GTK_FONT_BUTTON (prop->priv->fontbutton), fontname);
-	
 	g_object_notify (G_OBJECT (prop), "fontname");
 }
 
 
=== modified file 'src/xpad-pad-properties.h'
--- src/xpad-pad-properties.h	2008-09-21 00:03:40 +0000
+++ src/xpad-pad-properties.h	2013-11-01 20:03:38 +0000
@@ -58,11 +58,11 @@
 void xpad_pad_properties_set_follow_color_style (XpadPadProperties *pad_properties, gboolean follow);
 gboolean xpad_pad_properties_get_follow_color_style (XpadPadProperties *pad_properties);
 
-void xpad_pad_properties_set_back_color (XpadPadProperties *pad_properties, const GdkColor *back);
-G_CONST_RETURN GdkColor *xpad_pad_properties_get_back_color (XpadPadProperties *pad_properties);
+void xpad_pad_properties_set_back_color (XpadPadProperties *pad_properties, const GdkRGBA *back);
+G_CONST_RETURN GdkRGBA *xpad_pad_properties_get_back_color (XpadPadProperties *pad_properties);
 
-void xpad_pad_properties_set_text_color (XpadPadProperties *pad_properties, const GdkColor *text);
-G_CONST_RETURN GdkColor *xpad_pad_properties_get_text_color (XpadPadProperties *pad_properties);
+void xpad_pad_properties_set_text_color (XpadPadProperties *pad_properties, const GdkRGBA *text);
+G_CONST_RETURN GdkRGBA *xpad_pad_properties_get_text_color (XpadPadProperties *pad_properties);
 
 void xpad_pad_properties_set_fontname (XpadPadProperties *pad_properties, const gchar *fontname);
 G_CONST_RETURN gchar *xpad_pad_properties_get_fontname (XpadPadProperties *pad_properties);
 
=== modified file 'src/xpad-pad.c'
--- src/xpad-pad.c	2013-10-23 18:30:54 +0000
+++ src/xpad-pad.c	2013-11-01 20:03:38 +0000
@@ -123,8 +123,8 @@
 static void xpad_pad_paste (XpadPad *pad);
 static void xpad_pad_delete (XpadPad *pad);
 static void xpad_pad_open_properties (XpadPad *pad);
-static void xpad_pad_open_preferences (XpadPad *pad);
-static void xpad_pad_quit (XpadPad *pad);
+static void xpad_pad_open_preferences ();
+static void xpad_pad_quit ();
 static void xpad_pad_close_all (XpadPad *pad);
 static void xpad_pad_sync_title (XpadPad *pad);
 static void xpad_pad_set_group (XpadPad *pad, XpadPadGroup *group);
@@ -237,11 +237,11 @@
 	pad->priv->x = 0;
 	pad->priv->y = 0;
 	pad->priv->location_valid = FALSE;
-	pad->priv->width = xpad_settings_get_width (xpad_settings ());
-	pad->priv->height = xpad_settings_get_height (xpad_settings ());
+	pad->priv->width = xpad_settings_get_width (xpad_global_settings);
+	pad->priv->height = xpad_settings_get_height (xpad_global_settings);
 	pad->priv->infoname = NULL;
 	pad->priv->contentname = NULL;
-	pad->priv->sticky = xpad_settings_get_sticky (xpad_settings ());
+	pad->priv->sticky = xpad_settings_get_sticky (xpad_global_settings);
 	pad->priv->textview = NULL;
 	pad->priv->scrollbar = NULL;
 	pad->priv->toolbar = NULL;
@@ -254,11 +254,7 @@
 	pad->priv->unsaved_info = FALSE;
 	pad->priv->group = NULL;
 
-	XpadTextView *text_view = g_object_new (XPAD_TYPE_TEXT_VIEW,
-		"follow-font-style", TRUE,
-		"follow-color-style", TRUE,
-		NULL);
-
+	XpadTextView *text_view = XPAD_TEXT_VIEW (xpad_text_view_new ());
 	xpad_text_view_set_pad (text_view, pad);
 
 	pad->priv->textview = GTK_WIDGET (text_view);
@@ -276,25 +272,26 @@
 
 	accel_group = gtk_accel_group_new ();
 	gtk_window_add_accel_group (GTK_WINDOW (pad), accel_group);
+
 	pad->priv->menu = menu_get_popup_no_highlight (pad, accel_group);
 	pad->priv->highlight_menu = menu_get_popup_highlight (pad, accel_group);
-	gtk_accel_group_connect (accel_group, GDK_Q, GDK_CONTROL_MASK, 0,
-									 g_cclosure_new_swap (G_CALLBACK (xpad_pad_quit), pad, NULL));
+
+	gtk_accel_group_connect (accel_group, GDK_KEY_Q, GDK_CONTROL_MASK, 0,
+									 g_cclosure_new_swap (G_CALLBACK (xpad_app_quit), pad, NULL));
 	g_object_unref (G_OBJECT (accel_group));
 
-	vbox = GTK_WIDGET (g_object_new (GTK_TYPE_VBOX,
-		"homogeneous", FALSE,
-		"spacing", 0,
-		"child", pad->priv->scrollbar,
-		"child", pad->priv->toolbar,
-		NULL));
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	gtk_box_set_homogeneous (GTK_BOX(vbox), FALSE);
+	gtk_box_pack_start (GTK_BOX(vbox), pad->priv->scrollbar, TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX(vbox), pad->priv->toolbar, FALSE, FALSE, 0);
+
 	gtk_container_child_set (GTK_CONTAINER (vbox), pad->priv->toolbar, "expand", FALSE, NULL);
 
-	gtk_window_set_decorated (GTK_WINDOW(pad), xpad_settings_get_has_decorations (xpad_settings ()));
-	gtk_window_set_default_size (GTK_WINDOW(pad), (gint) xpad_settings_get_width (xpad_settings ()), (gint) xpad_settings_get_height (xpad_settings ()));
-	gtk_window_set_gravity (GTK_WINDOW(pad),  GDK_GRAVITY_STATIC); /* static gravity makes saving pad x,y work */
-	gtk_window_set_skip_pager_hint (GTK_WINDOW(pad),xpad_settings_get_has_decorations (xpad_settings ()));
-	gtk_window_set_skip_taskbar_hint (GTK_WINDOW(pad), !xpad_settings_get_has_decorations (xpad_settings ()));
+	gtk_window_set_decorated (GTK_WINDOW(pad), xpad_settings_get_has_decorations (xpad_global_settings));
+	gtk_window_set_default_size (GTK_WINDOW(pad), (gint) xpad_settings_get_width (xpad_global_settings), (gint) xpad_settings_get_height (xpad_global_settings));
+	gtk_window_set_gravity (GTK_WINDOW(pad),  GDK_GRAVITY_STATIC); // static gravity makes saving pad x,y work
+	gtk_window_set_skip_pager_hint (GTK_WINDOW(pad),xpad_settings_get_has_decorations (xpad_global_settings));
+	gtk_window_set_skip_taskbar_hint (GTK_WINDOW(pad), !xpad_settings_get_has_decorations (xpad_global_settings));
 	gtk_window_set_type_hint (GTK_WINDOW(pad), GDK_WINDOW_TYPE_HINT_NORMAL);
 	gtk_window_set_position (GTK_WINDOW(pad), GTK_WIN_POS_MOUSE);
 
@@ -321,7 +318,7 @@
 	gtk_widget_hide (pad->priv->toolbar);
 	xpad_pad_notify_has_toolbar (pad);
 
-	/* Set up signals */
+	// Set up signals
 	gtk_widget_add_events (GTK_WIDGET (pad), GDK_BUTTON_PRESS_MASK | GDK_PROPERTY_CHANGE_MASK);
 	gtk_widget_add_events (pad->priv->toolbar, GDK_ALL_EVENTS_MASK);
 	g_signal_connect (pad->priv->textview, "button-press-event", G_CALLBACK (xpad_pad_text_view_button_press_event), pad);
@@ -337,10 +334,10 @@
 	g_signal_connect (pad, "enter-notify-event", G_CALLBACK (xpad_pad_enter_notify_event), NULL);
 	g_signal_connect (pad, "leave-notify-event", G_CALLBACK (xpad_pad_leave_notify_event), NULL);
 
-	g_signal_connect_swapped (xpad_settings (), "notify::has-decorations", G_CALLBACK (xpad_pad_notify_has_decorations), pad);
-	g_signal_connect_swapped (xpad_settings (), "notify::has-toolbar", G_CALLBACK (xpad_pad_notify_has_toolbar), pad);
-	g_signal_connect_swapped (xpad_settings (), "notify::autohide-toolbar", G_CALLBACK (xpad_pad_notify_autohide_toolbar), pad);
-	g_signal_connect_swapped (xpad_settings (), "notify::has-scrollbar", G_CALLBACK (xpad_pad_notify_has_scrollbar), pad);
+	g_signal_connect_swapped (xpad_global_settings, "notify::has-decorations", G_CALLBACK (xpad_pad_notify_has_decorations), pad);
+	g_signal_connect_swapped (xpad_global_settings, "notify::has-toolbar", G_CALLBACK (xpad_pad_notify_has_toolbar), pad);
+	g_signal_connect_swapped (xpad_global_settings, "notify::autohide-toolbar", G_CALLBACK (xpad_pad_notify_autohide_toolbar), pad);
+	g_signal_connect_swapped (xpad_global_settings, "notify::has-scrollbar", G_CALLBACK (xpad_pad_notify_has_scrollbar), pad);
 	g_signal_connect_swapped (gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)), "notify::has-selection", G_CALLBACK (xpad_pad_notify_has_selection), pad);
 	g_signal_connect_swapped (pad->priv->clipboard, "owner-change", G_CALLBACK (xpad_pad_notify_clipboard_owner_changed), pad);
 
@@ -365,25 +362,6 @@
 }
 
 static void
-xpad_pad_show (XpadPad *pad)
-{
-	/* Some wm's might not acknowledge our request for a specific
-		location before we are shown.  What we do here is a little gimpy
-		and not very respectful of wms' sovereignty, but it has the effect
-		of making pads' locations very dependable.  We just move the pad
-		again here after being shown.  This may create a visual effect if 
-		the wm did ignore us, but is better than being in the wrong
-		place, I guess. */
-	if (pad->priv->location_valid)
-		gtk_window_move (GTK_WINDOW (pad), pad->priv->x, pad->priv->y);
-		
-	if (pad->priv->sticky)
-		gtk_window_stick (GTK_WINDOW (pad));
-	else
-		gtk_window_unstick (GTK_WINDOW (pad));
-}
-
-static void
 xpad_pad_dispose (GObject *object)
 {
 	XpadPad *pad = XPAD_PAD (object);
@@ -403,13 +381,18 @@
 		pad->priv->highlight_menu = NULL;
 	}
 
+	// For some reason the clipboard handler does not get automatically disconnected (or not at the right moment), leading to errors after deleting a pad. This manual disconnect prevents this error.
 	if (GTK_IS_CLIPBOARD(pad->priv->clipboard)) {
-		// For some reason the clipboard handler does not get automatically disconnected (or not at the right moment), leading to errors after deleting a pad. This manual disconnect prevents this error.
 		g_signal_handlers_disconnect_matched (pad->priv->clipboard, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, pad);
 	}
 
+<<<<<<< TREE
 	if (XPAD_IS_TOOLBAR(pad->priv->toolbar)) {
 		// For some reason the toolbar handler does not get automatically disconnected (or not at the right moment), leading to errors after deleting a pad. This manual disconnect prevents this error.
+=======
+	// For some reason the toolbar handler does not get automatically disconnected (or not at the right moment), leading to errors after deleting a pad. This manual disconnect prevents this error.
+	if (XPAD_IS_TOOLBAR(pad->priv->toolbar)) {
+>>>>>>> MERGE-SOURCE
 		g_signal_handlers_disconnect_matched (pad->priv->toolbar, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, pad);
 		gtk_widget_destroy(pad->priv->toolbar);
 		pad->priv->toolbar = NULL;
@@ -423,7 +406,8 @@
 {
 	XpadPad *pad = XPAD_PAD (object);
 
-	g_signal_handlers_disconnect_matched (xpad_settings (), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, pad);
+	if (xpad_global_settings != NULL)
+		g_signal_handlers_disconnect_matched (xpad_global_settings, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, pad);
 
 	g_free (pad->priv->infoname);
 	g_free (pad->priv->contentname);
@@ -432,9 +416,28 @@
 }
 
 static void
+xpad_pad_show (XpadPad *pad)
+{
+	/* Some wm's might not acknowledge our request for a specific
+		location before we are shown.  What we do here is a little gimpy
+		and not very respectful of wms' sovereignty, but it has the effect
+		of making pads' locations very dependable.  We just move the pad
+		again here after being shown.  This may create a visual effect if
+		the wm did ignore us, but is better than being in the wrong
+		place, I guess. */
+	if (pad->priv->location_valid)
+		gtk_window_move (GTK_WINDOW (pad), pad->priv->x, pad->priv->y);
+
+	if (pad->priv->sticky)
+		gtk_window_stick (GTK_WINDOW (pad));
+	else
+		gtk_window_unstick (GTK_WINDOW (pad));
+}
+
+static void
 xpad_pad_notify_has_scrollbar (XpadPad *pad)
 {
-	if (xpad_settings_get_has_scrollbar (xpad_settings ()))
+	if (xpad_settings_get_has_scrollbar (xpad_global_settings))
 	{
 		gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (pad->priv->scrollbar), 
 			GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
@@ -458,7 +461,7 @@
 static void
 xpad_pad_notify_has_decorations (XpadPad *pad)
 {
-	gboolean decorations = xpad_settings_get_has_decorations (xpad_settings ());
+	gboolean decorations = xpad_settings_get_has_decorations (xpad_global_settings);
 	
 	/**
 	 *  There are two modes of operation:  a normal mode and a 'stealth' mode.
@@ -478,7 +481,7 @@
 static guint
 xpad_pad_text_and_toolbar_height (XpadPad *pad)
 {
-	GdkRectangle rec;
+	cairo_rectangle_int_t rec;
 	gint textx, texty, x, y;
 	GtkTextIter iter;
 	
@@ -503,22 +506,22 @@
 static void
 xpad_pad_show_toolbar (XpadPad *pad)
 {
-	if (!GTK_WIDGET_VISIBLE (pad->priv->toolbar))
+	if (!gtk_widget_get_visible (pad->priv->toolbar))
 	{
 		GtkRequisition req;
 		
-		if (GTK_WIDGET (pad)->window)
-			gdk_window_freeze_updates (GTK_WIDGET (pad)->window);
+		if (gtk_widget_get_window(GTK_WIDGET(pad)))
+			gdk_window_freeze_updates (gtk_widget_get_window(GTK_WIDGET(pad)));
 		gtk_widget_show (pad->priv->toolbar);
 		if (!pad->priv->toolbar_height)
 		{
-			gtk_widget_size_request (pad->priv->toolbar, &req);
+			gtk_widget_get_preferred_size (pad->priv->toolbar, &req, NULL);
 			// safe cast from gint to guint
 			if (req.height >= 0) {
 				pad->priv->toolbar_height = (guint) req.height;
 			}
 			else {
-				g_warning("There is a problem in the program Xpad. In function 'xpad_pad_show_toolbar' the variable 'req.height' is not a postive number. Please send a bugreport to https://bugs.launchpad.net/xpad/+filebug to help improve Xpad.");
+				g_warning ("There is a problem in the program Xpad. In function 'xpad_pad_show_toolbar' the variable 'req.height' is not a postive number. Please send a bugreport to https://bugs.launchpad.net/xpad/+filebug to help improve Xpad.");
 				pad->priv->toolbar_height = 0;
 			}
 		}
@@ -535,18 +538,18 @@
 		
 		pad->priv->toolbar_pad_resized = FALSE;
 		
-		if (GTK_WIDGET (pad)->window)
-			gdk_window_thaw_updates (GTK_WIDGET (pad)->window);
+		if (gtk_widget_get_window(GTK_WIDGET(pad)))
+			gdk_window_thaw_updates (gtk_widget_get_window(GTK_WIDGET(pad)));
 	}
 }
 
 static void
 xpad_pad_hide_toolbar (XpadPad *pad)
 {
-	if (GTK_WIDGET_VISIBLE (pad->priv->toolbar))
+	if (gtk_widget_get_visible (pad->priv->toolbar))
 	{
-		if (GTK_WIDGET (pad)->window)
-			gdk_window_freeze_updates (GTK_WIDGET (pad)->window);
+		if (gtk_widget_get_window(GTK_WIDGET(pad)))
+			gdk_window_freeze_updates (gtk_widget_get_window(GTK_WIDGET(pad)));
 		gtk_widget_hide (pad->priv->toolbar);
 		
 		if (pad->priv->toolbar_expanded ||
@@ -556,17 +559,17 @@
 				gtk_window_resize (GTK_WINDOW (pad), (gint) pad->priv->width, (gint) pad->priv->height);
 				pad->priv->toolbar_expanded = FALSE;
 		}
-		if (GTK_WIDGET (pad)->window)
-			gdk_window_thaw_updates (GTK_WIDGET (pad)->window);
+		if (gtk_widget_get_window(GTK_WIDGET(pad)))
+			gdk_window_thaw_updates (gtk_widget_get_window(GTK_WIDGET(pad)));
 	}
 }
 
 static void
 xpad_pad_notify_has_toolbar (XpadPad *pad)
 {
-	if (xpad_settings_get_has_toolbar (xpad_settings ()))
+	if (xpad_settings_get_has_toolbar (xpad_global_settings))
 	{
-		if (!xpad_settings_get_autohide_toolbar (xpad_settings ()))
+		if (!xpad_settings_get_autohide_toolbar (xpad_global_settings))
 			xpad_pad_show_toolbar (pad);
 	}
 	else
@@ -580,8 +583,8 @@
 		return FALSE;
 
 	if (pad->priv->toolbar_timeout &&
-		 xpad_settings_get_autohide_toolbar (xpad_settings ()) &&
-		 xpad_settings_get_has_toolbar (xpad_settings ()))
+		 xpad_settings_get_autohide_toolbar (xpad_global_settings) &&
+		 xpad_settings_get_has_toolbar (xpad_global_settings))
 		xpad_pad_hide_toolbar (pad);
 	
 	pad->priv->toolbar_timeout = 0;
@@ -592,7 +595,7 @@
 static void
 xpad_pad_notify_autohide_toolbar (XpadPad *pad)
 {
-	if (xpad_settings_get_autohide_toolbar (xpad_settings ()))
+	if (xpad_settings_get_autohide_toolbar (xpad_global_settings))
 	{
 		/* Likely not to be in pad when turning setting on */
 		if (!pad->priv->toolbar_timeout)
@@ -600,7 +603,7 @@
 	}
 	else
 	{
-		if (xpad_settings_get_has_toolbar (xpad_settings ()))
+		if (xpad_settings_get_has_toolbar (xpad_global_settings))
 			xpad_pad_show_toolbar(pad);
 	}
 }
@@ -613,9 +616,9 @@
 	GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview));
 	gboolean has_selection = gtk_text_buffer_get_has_selection (buffer);
 
-	XpadToolbar *toolbar = NULL;
-	toolbar = XPAD_TOOLBAR (pad->priv->toolbar);
-	g_return_if_fail (toolbar);
+	XpadToolbar *toolbar = XPAD_TOOLBAR (pad->priv->toolbar);
+	if (toolbar == NULL)
+		return;
 
 	xpad_toolbar_enable_cut_button (toolbar, has_selection);
 	xpad_toolbar_enable_copy_button (toolbar, has_selection);
@@ -628,7 +631,7 @@
 
 	XpadToolbar *toolbar = NULL;
 	// safe cast to toolbar
-	if (XPAD_IS_TOOLBAR(pad->priv->toolbar)) {
+	if (XPAD_IS_TOOLBAR (pad->priv->toolbar)) {
 		toolbar = XPAD_TOOLBAR (pad->priv->toolbar);
 		g_return_if_fail (toolbar);
 
@@ -660,8 +663,8 @@
 static gboolean
 xpad_pad_enter_notify_event (GtkWidget *pad, GdkEventCrossing *event)
 {
-	if (xpad_settings_get_has_toolbar (xpad_settings ()) &&
-		 xpad_settings_get_autohide_toolbar (xpad_settings ()) &&
+	if (xpad_settings_get_has_toolbar (xpad_global_settings) &&
+		 xpad_settings_get_autohide_toolbar (xpad_global_settings) &&
 		 event->detail != GDK_NOTIFY_INFERIOR &&
 		 event->mode == GDK_CROSSING_NORMAL)
 	{
@@ -675,8 +678,8 @@
 static gboolean
 xpad_pad_leave_notify_event (GtkWidget *pad, GdkEventCrossing *event)
 {
-	if (xpad_settings_get_has_toolbar (xpad_settings ()) &&
-		 xpad_settings_get_autohide_toolbar (xpad_settings ()) &&
+	if (xpad_settings_get_has_toolbar (xpad_global_settings) &&
+		 xpad_settings_get_autohide_toolbar (xpad_global_settings) &&
 		 event->detail != GDK_NOTIFY_INFERIOR &&
 		 event->mode == GDK_CROSSING_NORMAL)
 	{
@@ -727,7 +730,7 @@
 void
 xpad_pad_toggle(XpadPad *pad)
 {
-	 if (GTK_WIDGET_VISIBLE (pad)) 
+	 if (gtk_widget_get_visible (GTK_WIDGET(pad)))
 		  xpad_pad_close (pad);
 	 else
 		  gtk_widget_show (GTK_WIDGET (pad));
@@ -741,7 +744,7 @@
 	gchar *content;
 	gboolean confirm;
 	
-	if (!xpad_settings_get_confirm_destroy (xpad_settings ()))
+	if (!xpad_settings_get_confirm_destroy (xpad_global_settings))
 		return FALSE;
 	
 	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview));
@@ -832,7 +835,7 @@
 		PangoFontDescription *fontdesc;
 		
 		fontdesc = font ? pango_font_description_from_string (font) : NULL;
-		gtk_widget_modify_font (pad->priv->textview, fontdesc);
+		gtk_widget_override_font (pad->priv->textview, fontdesc);
 		if (fontdesc)
 			pango_font_description_free (fontdesc);
 	}
@@ -841,38 +844,41 @@
 }
 
 static void
-prop_notify_follow_color (XpadPad *pad)
+prop_notify_colors (XpadPad *pad)
 {
 	XpadPadProperties *prop = XPAD_PAD_PROPERTIES (pad->priv->properties);
 	
 	xpad_text_view_set_follow_color_style (XPAD_TEXT_VIEW (pad->priv->textview), xpad_pad_properties_get_follow_color_style (prop));
-	
-	if (!xpad_pad_properties_get_follow_color_style (prop))
-	{
-		gtk_widget_modify_base (pad->priv->textview, GTK_STATE_NORMAL, xpad_pad_properties_get_back_color (prop));
-		gtk_widget_modify_text (pad->priv->textview, GTK_STATE_NORMAL, xpad_pad_properties_get_text_color (prop));
-	}
-	
-	xpad_pad_save_info_delayed (pad);
-}
-
-static void
-prop_notify_text (XpadPad *pad)
-{
-	XpadPadProperties *prop = XPAD_PAD_PROPERTIES (pad->priv->properties);
-	
-	gtk_widget_modify_text (pad->priv->textview, GTK_STATE_NORMAL, xpad_pad_properties_get_text_color (prop));
-	
-	xpad_pad_save_info_delayed (pad);
-}
-
-static void
-prop_notify_back (XpadPad *pad)
-{
-	XpadPadProperties *prop = XPAD_PAD_PROPERTIES (pad->priv->properties);
-	
-	gtk_widget_modify_base (pad->priv->textview, GTK_STATE_NORMAL, xpad_pad_properties_get_back_color (prop));
-	
+
+	if (xpad_pad_properties_get_follow_color_style (prop))
+	{
+		// Set the colors to the global preferences colors
+		const GdkRGBA *text_color = xpad_settings_get_text_color (xpad_global_settings);
+		const GdkRGBA *back_color = xpad_settings_get_back_color (xpad_global_settings);
+
+		gtk_widget_override_cursor (pad->priv->textview, text_color, text_color);
+		gtk_widget_override_color (pad->priv->textview, GTK_STATE_FLAG_NORMAL, text_color);
+		gtk_widget_override_background_color (pad->priv->textview, GTK_STATE_FLAG_NORMAL, back_color);
+
+		// Inverse the text and background colors for selected text, so it is likely to be visible by any choice of the colors.
+		gtk_widget_override_color (pad->priv->textview, GTK_STATE_FLAG_SELECTED, back_color);
+		gtk_widget_override_background_color (pad->priv->textview, GTK_STATE_FLAG_SELECTED, text_color);
+	}
+	else
+	{
+		// Set the color to the individual pad properties colors
+		const GdkRGBA *text_color = xpad_pad_properties_get_text_color (prop);
+		const GdkRGBA *back_color = xpad_pad_properties_get_back_color (prop);
+
+		gtk_widget_override_cursor (pad->priv->textview, text_color, text_color);
+		gtk_widget_override_color (pad->priv->textview, GTK_STATE_FLAG_NORMAL, text_color);
+		gtk_widget_override_background_color (pad->priv->textview, GTK_STATE_FLAG_NORMAL, back_color);
+
+		// Inverse the text and background colors for selected text, so it is likely to be visible by any choice of the colors.
+		gtk_widget_override_color (pad->priv->textview, GTK_STATE_FLAG_SELECTED, back_color);
+		gtk_widget_override_background_color (pad->priv->textview, GTK_STATE_FLAG_SELECTED, text_color);
+	}
+
 	xpad_pad_save_info_delayed (pad);
 }
 
@@ -885,7 +891,7 @@
 	PangoFontDescription *fontdesc;
 	
 	fontdesc = font ? pango_font_description_from_string (font) : NULL;
-	gtk_widget_modify_font (pad->priv->textview, fontdesc);
+	gtk_widget_override_font (pad->priv->textview, fontdesc);
 	if (fontdesc)
 		pango_font_description_free (fontdesc);
 	
@@ -895,8 +901,10 @@
 static void
 xpad_pad_open_properties (XpadPad *pad)
 {
-	GtkStyle *style;
-	gchar *fontname;
+	GtkStyleContext *style = NULL;
+	PangoFontDescription *font;
+	GdkRGBA widget_text_color = {0, 0, 0, 0};
+	GdkRGBA widget_background_color = {0, 0, 0, 0};
 	
 	if (pad->priv->properties)
 	{
@@ -911,22 +919,25 @@
 	
 	g_signal_connect_swapped (pad->priv->properties, "destroy", G_CALLBACK (pad_properties_destroyed), pad);
 	g_signal_connect (pad, "notify::title", G_CALLBACK (pad_properties_sync_title), NULL);
-	
-	style = gtk_widget_get_style (pad->priv->textview);
-	fontname = style->font_desc ? pango_font_description_to_string (style->font_desc) : NULL;
+
+	style = gtk_widget_get_style_context (pad->priv->textview);
+	gtk_style_context_get(style, GTK_STATE_FLAG_NORMAL, GTK_STYLE_PROPERTY_FONT, &font, NULL);
+	gtk_style_context_get_color (style, GTK_STATE_FLAG_NORMAL, &widget_text_color);
+	gtk_style_context_get_background_color (style, GTK_STATE_FLAG_NORMAL, &widget_background_color);
+
 	g_object_set (G_OBJECT (pad->priv->properties),
 		"follow-font-style", xpad_text_view_get_follow_font_style (XPAD_TEXT_VIEW (pad->priv->textview)),
 		"follow-color-style", xpad_text_view_get_follow_color_style (XPAD_TEXT_VIEW (pad->priv->textview)),
-		"back-color", &style->base[GTK_STATE_NORMAL],
-		"text-color", &style->text[GTK_STATE_NORMAL],
-		"fontname", fontname,
+		"back-color", &widget_background_color,
+		"text-color", &widget_text_color,
+		"fontname", pango_font_description_to_string(font),
 		NULL);
-	g_free (fontname);
+	pango_font_description_free (font);
 	
 	g_signal_connect_swapped (pad->priv->properties, "notify::follow-font-style", G_CALLBACK (prop_notify_follow_font), pad);
-	g_signal_connect_swapped (pad->priv->properties, "notify::follow-color-style", G_CALLBACK (prop_notify_follow_color), pad);
-	g_signal_connect_swapped (pad->priv->properties, "notify::text-color", G_CALLBACK (prop_notify_text), pad);
-	g_signal_connect_swapped (pad->priv->properties, "notify::back-color", G_CALLBACK (prop_notify_back), pad);
+	g_signal_connect_swapped (pad->priv->properties, "notify::follow-color-style", G_CALLBACK (prop_notify_colors), pad);
+	g_signal_connect_swapped (pad->priv->properties, "notify::text-color", G_CALLBACK (prop_notify_colors), pad);
+	g_signal_connect_swapped (pad->priv->properties, "notify::back-color", G_CALLBACK (prop_notify_colors), pad);
 	g_signal_connect_swapped (pad->priv->properties, "notify::fontname", G_CALLBACK (prop_notify_font), pad);
 	
 	pad_properties_sync_title (pad);
@@ -935,13 +946,13 @@
 }
 
 static void
-xpad_pad_open_preferences (XpadPad *pad)
+xpad_pad_open_preferences ()
 {
 	xpad_preferences_open ();
 }
 
 static void
-xpad_pad_quit (XpadPad *pad)
+xpad_pad_quit ()
 {
 	xpad_app_quit ();
 }
@@ -949,6 +960,10 @@
 static void
 xpad_pad_text_changed (XpadPad *pad, GtkTextBuffer *buffer)
 {
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) buffer;
+
 	/* set title */
 	xpad_pad_sync_title (pad);
 	
@@ -973,7 +988,7 @@
 static gboolean
 xpad_pad_configure_event (XpadPad *pad, GdkEventConfigure *event)
 {
-	if (!GTK_WIDGET_VISIBLE (pad))
+	if (!gtk_widget_get_visible (GTK_WIDGET(pad)))
 		return FALSE;
 
 	int eWidth = event->width;
@@ -1012,6 +1027,10 @@
 static gboolean
 xpad_pad_delete_event (XpadPad *pad, GdkEvent *event)
 {
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) event;
+
 	xpad_pad_close (pad);
 	
 	return TRUE;
@@ -1028,6 +1047,10 @@
 static gboolean
 xpad_pad_text_view_button_press_event (GtkWidget *text_view, GdkEventButton *event, XpadPad *pad)
 {
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) text_view;
+
 	if (event->type == GDK_BUTTON_PRESS)
 	{
 		switch (event->button)
@@ -1236,7 +1259,10 @@
 {
 	gboolean locked = FALSE, follow_font = TRUE, follow_color = TRUE;
 	gboolean hidden = FALSE;
-	GdkColor text = {0}, back = {0};
+	gchar *text_color_string = NULL;
+	gchar *background_color_string = NULL;
+	GdkRGBA text = {0, 0, 0, 0};
+	GdkRGBA back = {0, 0, 0, 0};
 	gchar *fontname = NULL;
 
 	if (!pad->priv->infoname)
@@ -1252,12 +1278,8 @@
 		"b|follow_color", &follow_color,
 		"b|sticky", &pad->priv->sticky,
 		"b|hidden", &hidden,
-		"h|back_red", &back.red,
-		"h|back_green", &back.green,
-		"h|back_blue", &back.blue,
-		"h|text_red", &text.red,
-		"h|text_green", &text.green,
-		"h|text_blue", &text.blue,
+		"s|back", &background_color_string,
+		"s|text", &text_color_string,
 		"s|fontname", &fontname,
 		"s|content", &pad->priv->contentname,
 		NULL))
@@ -1266,8 +1288,8 @@
 	pad->priv->unsaved_info = FALSE;
 	
 	pad->priv->location_valid = TRUE;
-	if (xpad_settings_get_has_toolbar (xpad_settings ()) &&
-		 !xpad_settings_get_autohide_toolbar (xpad_settings ()))
+	if (xpad_settings_get_has_toolbar (xpad_global_settings) &&
+		 !xpad_settings_get_autohide_toolbar (xpad_global_settings))
 	{
 		pad->priv->toolbar_height = 0;
 		xpad_pad_hide_toolbar (pad);
@@ -1280,26 +1302,45 @@
 	xpad_text_view_set_follow_font_style (XPAD_TEXT_VIEW (pad->priv->textview), follow_font);
 	xpad_text_view_set_follow_color_style (XPAD_TEXT_VIEW (pad->priv->textview), follow_color);
 	
-	/* obsolete setting, no longer written as of xpad-2.0-b2 */
 	if (locked)
 	{
 		xpad_text_view_set_follow_font_style (XPAD_TEXT_VIEW (pad->priv->textview), FALSE);
 		xpad_text_view_set_follow_color_style (XPAD_TEXT_VIEW (pad->priv->textview), FALSE);
 	}
 	
-	if (!xpad_text_view_get_follow_color_style (XPAD_TEXT_VIEW (pad->priv->textview)))
-	{
-		gtk_widget_modify_text (pad->priv->textview, GTK_STATE_NORMAL, &text);
-		gtk_widget_modify_base (pad->priv->textview, GTK_STATE_NORMAL, &back);
-	}
-	
-	if (!xpad_text_view_get_follow_font_style (XPAD_TEXT_VIEW (pad->priv->textview)))
+	if (!follow_font)
 	{
 		PangoFontDescription *font_desc = pango_font_description_from_string (fontname);
-		gtk_widget_modify_font (pad->priv->textview, font_desc);
+		gtk_widget_override_font (pad->priv->textview, font_desc);
 		pango_font_description_free (font_desc);
 	}
 
+	if (!follow_color)
+	{
+		// If, for some reason, one of the colors could not be retrieved
+		// (for example due to the migration to the new GdkRGBA colors), set the color to the default.
+		if (text_color_string == NULL || background_color_string == NULL) {
+			text = (GdkRGBA) {0, 0, 0, 1};
+			back = (GdkRGBA) {1, 0.933334350586, 0.6, 1};
+		}
+		else {
+			// If, for some reason, the parsing of the colors fail, set the color to the default.
+			if (!gdk_rgba_parse (&text, text_color_string) || !gdk_rgba_parse (&back, background_color_string)) {
+				text = (GdkRGBA) {0, 0, 0, 1};
+				back = (GdkRGBA) {1, 0.933334350586, 0.6, 1};
+			}
+		}
+
+		// Set the text and background color for this pad, as stated in its properties file.
+		gtk_widget_override_cursor (pad->priv->textview, &text, &text);
+		gtk_widget_override_color (pad->priv->textview, GTK_STATE_FLAG_NORMAL, &text);
+		gtk_widget_override_background_color (pad->priv->textview, GTK_STATE_FLAG_NORMAL, &back);
+
+		// Inverse the text and background colors for selected text, so it is likely to be visible by any choice of the colors.
+		gtk_widget_override_color (pad->priv->textview, GTK_STATE_FLAG_SELECTED, &back);
+		gtk_widget_override_background_color (pad->priv->textview, GTK_STATE_FLAG_SELECTED, &text);
+	}
+	
 	/* Find the sticky notes menu setting for this pad (which is on the global default),
 	 * and change its setting to the setting from the info file (pad specific default).
 	 */
@@ -1346,8 +1387,10 @@
 xpad_pad_save_info (XpadPad *pad)
 {
 	guint height = NULL;
-	GtkStyle *style = NULL;
-	gchar *fontname = NULL;
+	GtkStyleContext *style = NULL;
+	PangoFontDescription *font = NULL;
+	GdkRGBA widget_text_color = {0, 0, 0, 0};
+	GdkRGBA widget_background_color = {0, 0, 0, 0};
 
 	g_return_if_fail (pad);
 
@@ -1371,12 +1414,14 @@
 	}
 	
 	height = pad->priv->height;
-	if (GTK_WIDGET_VISIBLE (pad->priv->toolbar) && pad->priv->toolbar_expanded)
+	if (gtk_widget_get_visible (pad->priv->toolbar) && pad->priv->toolbar_expanded)
 		height -= pad->priv->toolbar_height;
 	
-	style = gtk_widget_get_style (pad->priv->textview);
-	fontname = pango_font_description_to_string (style->font_desc);
-	
+	style = gtk_widget_get_style_context (pad->priv->textview);
+	gtk_style_context_get (style, GTK_STATE_FLAG_NORMAL, GTK_STYLE_PROPERTY_FONT, &font, NULL);
+	gtk_style_context_get_color (style, GTK_STATE_FLAG_NORMAL, &widget_text_color);
+	gtk_style_context_get_background_color (style, GTK_STATE_FLAG_NORMAL, &widget_background_color);
+
 	fio_set_values_to_file (pad->priv->infoname,
 		"i|width", pad->priv->width,
 		"i|height", height,
@@ -1385,19 +1430,15 @@
 		"b|follow_font", xpad_text_view_get_follow_font_style (XPAD_TEXT_VIEW (pad->priv->textview)),
 		"b|follow_color", xpad_text_view_get_follow_color_style (XPAD_TEXT_VIEW (pad->priv->textview)),
 		"b|sticky", pad->priv->sticky,
-		"b|hidden", !GTK_WIDGET_VISIBLE (pad),
-		"h|back_red", style->base[GTK_STATE_NORMAL].red,
-		"h|back_green", style->base[GTK_STATE_NORMAL].green,
-		"h|back_blue", style->base[GTK_STATE_NORMAL].blue,
-		"h|text_red", style->text[GTK_STATE_NORMAL].red,
-		"h|text_green", style->text[GTK_STATE_NORMAL].green,
-		"h|text_blue", style->text[GTK_STATE_NORMAL].blue,
-		"s|fontname", fontname,
+		"b|hidden", !gtk_widget_get_visible (GTK_WIDGET(pad)),
+		"s|back", gdk_rgba_to_string (&widget_background_color),
+		"s|text", gdk_rgba_to_string (&widget_text_color),
+		"s|fontname", pango_font_description_to_string (font),
 		"s|content", pad->priv->contentname,
 		NULL);
 
+	pango_font_description_free (font);
 	pad->priv->unsaved_info = FALSE;
-	g_free (fontname);
 }
 
 static void
@@ -1407,21 +1448,6 @@
 	const gchar *authors[] = {"Arthur Borsboom <[e-mail]>", "Jeroen Vermeulen <[e-mail]>", "Michael Terry <[e-mail]>", "Paul Ivanov <[e-mail]>", "Sachin Raut <[e-mail]>", NULL};
 	const gchar *comments = _("Sticky notes");
 	const gchar *copyright = "© 2001-2013 Michael Terry";
-	/* we use g_strdup_printf because C89 has size limits on static strings */
-	gchar *license = g_strdup_printf ("%s\n%s\n%s",
-"This program is free software; you can redistribute it and/or\n"
-"modify it under the terms of the GNU General Public License\n"
-"as published by the Free Software Foundation; either version 3\n"
-"of the License, or (at your option) any later version.\n"
-,
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-,
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.");
 	/* Translators: please translate this as your own name and optionally email
 		like so: "Your Name <[e-mail]>" */
 	const gchar *translator_credits = _("translator-credits");
@@ -1432,14 +1458,12 @@
 		"authors", authors,
 		"comments", comments,
 		"copyright", copyright,
-		"license", license,
+		"license-type", GTK_LICENSE_GPL_3_0,
 		"logo-icon-name", PACKAGE,
 		"translator-credits", translator_credits,
 		"version", VERSION,
 		"website", website,
 		NULL);
-	
-	g_free (license);
 }
 
 void
@@ -1616,25 +1640,41 @@
 static void
 menu_toolbar (XpadPad *pad, GtkCheckMenuItem *check)
 {
-	xpad_settings_set_has_toolbar (xpad_settings (), gtk_check_menu_item_get_active (check));
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) pad;
+
+	xpad_settings_set_has_toolbar (xpad_global_settings, gtk_check_menu_item_get_active (check));
 }
 
 static void
 menu_scrollbar (XpadPad *pad, GtkCheckMenuItem *check)
 {
-	xpad_settings_set_has_scrollbar (xpad_settings (), gtk_check_menu_item_get_active (check));
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) pad;
+
+	xpad_settings_set_has_scrollbar (xpad_global_settings, gtk_check_menu_item_get_active (check));
 }
 
 static void
 menu_autohide (XpadPad *pad, GtkCheckMenuItem *check)
 {
-	xpad_settings_set_autohide_toolbar (xpad_settings (), gtk_check_menu_item_get_active (check));
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) pad;
+
+	xpad_settings_set_autohide_toolbar (xpad_global_settings, gtk_check_menu_item_get_active (check));
 }
 
 static void
 menu_decorated (XpadPad *pad, GtkCheckMenuItem *check)
 {
-	xpad_settings_set_has_decorations (xpad_settings (), gtk_check_menu_item_get_active (check));
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) pad;
+
+	xpad_settings_set_has_decorations (xpad_global_settings, gtk_check_menu_item_get_active (check));
 }
 
 static gint
@@ -1718,7 +1758,6 @@
 	MENU_ADD_STOCK (GTK_STOCK_CLOSE, xpad_pad_close);
 	MENU_ADD_STOCK (GTK_STOCK_DELETE, xpad_pad_delete);
 	
-	
 	item = gtk_menu_item_new_with_mnemonic (_("_Edit"));
 	gtk_container_add (GTK_CONTAINER (uppermenu), item);
 	gtk_widget_show (item);
@@ -1726,10 +1765,10 @@
 	menu = gtk_menu_new ();
 	gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu);
 	 
-	MENU_ADD_STOCK_WITH_ACCEL (GTK_STOCK_UNDO, menu_undo, GDK_Z, GDK_CONTROL_MASK);
+	MENU_ADD_STOCK_WITH_ACCEL (GTK_STOCK_UNDO, menu_undo, GDK_KEY_Z, GDK_CONTROL_MASK);
 	g_object_set_data (G_OBJECT (uppermenu), "undo", item);
 	 
-	MENU_ADD_STOCK_WITH_ACCEL (GTK_STOCK_REDO, menu_redo, GDK_R, GDK_CONTROL_MASK);
+	MENU_ADD_STOCK_WITH_ACCEL (GTK_STOCK_REDO, menu_redo, GDK_KEY_R, GDK_CONTROL_MASK);
 	g_object_set_data (G_OBJECT (uppermenu), "redo", item);
 
 	MENU_ADD_SEP();
@@ -1749,11 +1788,11 @@
 	menu = gtk_menu_new ();
 	gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu);
 	
-	MENU_ADD_CHECK (_("_Toolbar"), xpad_settings_get_has_toolbar (xpad_settings ()), menu_toolbar);
-	MENU_ADD_CHECK (_("_Autohide Toolbar"), xpad_settings_get_autohide_toolbar (xpad_settings ()), menu_autohide);
-	gtk_widget_set_sensitive (item, xpad_settings_get_has_toolbar (xpad_settings ()));
-	MENU_ADD_CHECK (_("_Scrollbar"), xpad_settings_get_has_scrollbar (xpad_settings ()), menu_scrollbar);
-	MENU_ADD_CHECK (_("_Window Decorations"), xpad_settings_get_has_decorations (xpad_settings ()), menu_decorated);
+	MENU_ADD_CHECK (_("_Toolbar"), xpad_settings_get_has_toolbar (xpad_global_settings), menu_toolbar);
+	MENU_ADD_CHECK (_("_Autohide Toolbar"), xpad_settings_get_autohide_toolbar (xpad_global_settings), menu_autohide);
+	gtk_widget_set_sensitive (item, xpad_settings_get_has_toolbar (xpad_global_settings));
+	MENU_ADD_CHECK (_("_Scrollbar"), xpad_settings_get_has_scrollbar (xpad_global_settings), menu_scrollbar);
+	MENU_ADD_CHECK (_("_Window Decorations"), xpad_settings_get_has_decorations (xpad_global_settings), menu_decorated);
 	
 	
 	item = gtk_menu_item_new_with_mnemonic (_("_Notes"));
@@ -1776,7 +1815,7 @@
 	menu = gtk_menu_new ();
 	gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu);
 	
-	MENU_ADD (_("_Contents"), GTK_STOCK_HELP, GDK_F1, 0, show_help);
+	MENU_ADD (_("_Contents"), GTK_STOCK_HELP, GDK_KEY_F1, 0, show_help);
 	MENU_ADD (_("_About"), GTK_STOCK_ABOUT, 0, 0, menu_about);
 	
 	return uppermenu;
@@ -1880,9 +1919,9 @@
 	MENU_ADD_STOCK (GTK_STOCK_PASTE, menu_paste);
 	g_object_set_data (G_OBJECT (menu), "paste", item);
 	MENU_ADD_SEP ();
-	MENU_ADD_STOCK_WITH_ACCEL (GTK_STOCK_BOLD, menu_bold, GDK_b, GDK_CONTROL_MASK);
-	MENU_ADD_STOCK_WITH_ACCEL (GTK_STOCK_ITALIC, menu_italic, GDK_i, GDK_CONTROL_MASK);
-	MENU_ADD_STOCK_WITH_ACCEL (GTK_STOCK_UNDERLINE, menu_underline, GDK_u, GDK_CONTROL_MASK);
+	MENU_ADD_STOCK_WITH_ACCEL (GTK_STOCK_BOLD, menu_bold, GDK_KEY_b, GDK_CONTROL_MASK);
+	MENU_ADD_STOCK_WITH_ACCEL (GTK_STOCK_ITALIC, menu_italic, GDK_KEY_i, GDK_CONTROL_MASK);
+	MENU_ADD_STOCK_WITH_ACCEL (GTK_STOCK_UNDERLINE, menu_underline, GDK_KEY_u, GDK_CONTROL_MASK);
 	MENU_ADD_STOCK (GTK_STOCK_STRIKETHROUGH, menu_strikethrough);
 	
 	return menu;
@@ -1891,6 +1930,10 @@
 static void
 menu_prep_popup_highlight (XpadPad *pad, GtkWidget *menu)
 {
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) pad;
+
 	GtkWidget *item;
 	GtkClipboard *clipboard;
 	
@@ -1904,6 +1947,10 @@
 static void
 menu_popup (GtkWidget *menu, XpadPad *pad)
 {
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) menu;
+
 	g_signal_handlers_block_matched (pad, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, (gpointer) xpad_pad_leave_notify_event, NULL);
 	pad->priv->toolbar_timeout = 0;
 }
@@ -1911,20 +1958,33 @@
 static void
 menu_popdown (GtkWidget *menu, XpadPad *pad)
 {
-	GdkRectangle rect;
-	
-	g_signal_handlers_unblock_matched (pad, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, (gpointer) xpad_pad_leave_notify_event, NULL);
-	
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) menu;
+
+	cairo_rectangle_int_t rect;
+
 	/**
 	 * We must check if we disabled off of pad and start the timeout if so.
 	 */
-	gdk_window_get_pointer (GTK_WIDGET (pad)->window, &rect.x, &rect.y, NULL);
+
+	// TODO: The replacement GTK3 function below gives a Gdk-critical error.
+	//       However when setting the rectangular to a fixed x and y position, I don't see any negative effects.
+	//       What is the reason of getting the device position for making the menu dissapear?
+
+	// GTK2: gdk_window_get_pointer (gtk_widget_get_window(GTK_WIDGET(pad)), &rect.x, &rect.y, NULL);
+	// GTK3: gdk_window_get_device_position (gtk_widget_get_window (GTK_WIDGET (pad)), GDK_SOURCE_MOUSE, &rect.x, &rect.y, NULL);
+	// Gdk-CRITICAL **: gdk_window_get_device_position: assertion 'GDK_IS_DEVICE (device)' failed
+
+	rect.x = 10;
+	rect.y = 10;
 	rect.width = 1;
 	rect.height = 1;
 	
-	if (!pad->priv->toolbar_timeout &&
-		 !gtk_widget_intersect (GTK_WIDGET (pad), &rect, NULL))
+	if (!pad->priv->toolbar_timeout && !gtk_widget_intersect (GTK_WIDGET (pad), &rect, NULL))
 		pad->priv->toolbar_timeout = g_timeout_add (1000, (GSourceFunc) toolbar_timeout, pad);
+
+	g_signal_handlers_unblock_matched (pad, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, (gpointer) xpad_pad_leave_notify_event, NULL);
 }
 
 static void
@@ -1936,12 +1996,20 @@
 static void
 xpad_pad_toolbar_popup (GtkWidget *toolbar, GtkMenu *menu, XpadPad *pad)
 {
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) toolbar;
+
 	menu_popup (GTK_WIDGET (menu), pad);
 }
 
 static void
 xpad_pad_toolbar_popdown (GtkWidget *toolbar, GtkMenu *menu, XpadPad *pad)
 {
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) toolbar;
+
 	menu_popdown (GTK_WIDGET (menu), pad);
 }
 
 
=== modified file 'src/xpad-periodic.c'
--- src/xpad-periodic.c	2013-10-09 14:46:10 +0000
+++ src/xpad-periodic.c	2013-11-01 20:03:38 +0000
@@ -1,4 +1,4 @@
-
+#include "../config.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -57,21 +57,20 @@
 gboolean Xpad_periodic_init (void)
 {
     memset(xpptr, 0, sizeof(*xpptr));
-    xpptr->after_id =
-    g_timeout_add_seconds(TIMEOUT_SECONDS, xppd_intercept, xpptr);
+    xpptr->after_id = (gint) g_timeout_add_seconds(TIMEOUT_SECONDS, xppd_intercept, xpptr);
 
     /* Allocate space for the signal references. */
     int tlen = xpptr->template_len = 5;
     int slen = xpptr->sigs_len = 20;
-    xpptr->template = g_malloc0(tlen * sizeof(Xpadsigref));
-    xpptr->sigs = g_malloc0(slen * sizeof(Xpadsigref));
+    xpptr->template = g_malloc0((gsize) tlen * sizeof(Xpadsigref));
+    xpptr->sigs = g_malloc0((gsize) slen * sizeof(Xpadsigref));
 
     return TRUE;
 }
 
 void    Xpad_periodic_close (void)
 {
-    if (xpptr->after_id) { g_source_remove(xpptr->after_id); }
+    if (xpptr->after_id) { g_source_remove((guint) xpptr->after_id); }
     /* Free the signal references memory. */
     g_free(xpptr->template);
     g_free(xpptr->sigs);
@@ -92,6 +91,10 @@
 ************************/
 gint xppd_intercept (gpointer cdata)
 {
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) cdata;
+
     int cnt=0;
     XpadPeriodicFunc fnptr=0;
     xpptr->count++; /* increment tick count */
@@ -228,6 +231,10 @@
 
 gint gprint_ignore (const char * fmt, ...)
 {
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) fmt;
+
     return 0;
 }
 
 
=== modified file 'src/xpad-preferences.c'
--- src/xpad-preferences.c	2013-10-21 02:51:19 +0000
+++ src/xpad-preferences.c	2013-11-01 20:03:38 +0000
@@ -42,22 +42,22 @@
 	GtkWidget *backbutton;
 	GtkWidget *fontbutton;
 	
-	guint notify_edit_handler;
-	guint notify_sticky_handler;
-	guint notify_confirm_handler;
-	guint notify_font_handler;
-	guint notify_back_handler;
-	guint notify_text_handler;
-	guint notify_tray_handler;
-	guint font_handler;
-	guint back_handler;
-	guint text_handler;
-	guint colorcheck_handler;
-	guint fontcheck_handler;
-	guint editcheck_handler;
-	guint stickycheck_handler;
-	guint confirmcheck_handler;
-	guint trayclick_handler;
+	gulong notify_edit_handler;
+	gulong notify_sticky_handler;
+	gulong notify_confirm_handler;
+	gulong notify_font_handler;
+	gulong notify_back_handler;
+	gulong notify_text_handler;
+	gulong notify_tray_handler;
+	gulong font_handler;
+	gulong back_handler;
+	gulong text_handler;
+	gulong colorcheck_handler;
+	gulong fontcheck_handler;
+	gulong editcheck_handler;
+	gulong stickycheck_handler;
+	gulong confirmcheck_handler;
+	gulong trayclick_handler;
 };
 
 G_DEFINE_TYPE_WITH_PRIVATE(XpadPreferences, xpad_preferences, GTK_TYPE_DIALOG)
@@ -67,8 +67,8 @@
 static void change_confirm_check (GtkToggleButton *button, XpadPreferences *pref);
 static void change_color_check (GtkToggleButton *button, XpadPreferences *pref);
 static void change_font_check (GtkToggleButton *button, XpadPreferences *pref);
-static void change_text_color (GtkColorButton *button, XpadPreferences *pref);
-static void change_back_color (GtkColorButton *button, XpadPreferences *pref);
+static void change_text_color (GtkColorChooser *chooser, XpadPreferences *pref);
+static void change_back_color (GtkColorChooser *chooser, XpadPreferences *pref);
 static void change_font_face (GtkFontButton *button, XpadPreferences *pref);
 static void change_tray_click_configuration(GtkComboBox *box, XpadPreferences *pref);
 static void notify_edit (XpadPreferences *pref);
@@ -112,14 +112,16 @@
 xpad_preferences_init (XpadPreferences *pref)
 {
 	GtkWidget *hbox, *font_hbox, *vbox;
-	const GdkColor *color;
+	const GdkRGBA *color;
 	const gchar *fontname;
-	GtkStyle *style;
+	GtkStyleContext *style;
 	GtkWidget *label, *appearance_frame, *alignment, *appearance_vbox;
 	GtkWidget *options_frame, *options_vbox, *global_vbox, *tray_config_vbox;
 	gchar *text;
 	GtkSizeGroup *size_group_labels = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 	GtkRequisition req;
+	GdkRGBA theme_text_color = {0, 0, 0, 0};
+	GdkRGBA theme_background_color = {0, 0, 0, 0};
 	
 	pref->priv = xpad_preferences_get_instance_private(pref);
 	
@@ -130,10 +132,9 @@
 		"xalign", 0.0,
 		NULL));
 	g_free (text);
-	appearance_vbox = GTK_WIDGET (g_object_new (GTK_TYPE_VBOX,
-		"homogeneous", FALSE,
-		"spacing", 18,
-		NULL));
+	appearance_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 18);
+	gtk_box_set_homogeneous (GTK_BOX (appearance_vbox), FALSE);
+
 	alignment = gtk_alignment_new (1, 1, 1, 1);
 	g_object_set (G_OBJECT (alignment),
 		"left-padding", 12,
@@ -155,12 +156,14 @@
 	pref->priv->anticolorcheck = gtk_radio_button_new_with_mnemonic (NULL, _("Use colors from theme"));
 	pref->priv->colorcheck = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (pref->priv->anticolorcheck), _("Use these colors:"));
 	
-	font_hbox = gtk_hbox_new (FALSE, 6);
+	font_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+
 	gtk_box_pack_start (GTK_BOX (font_hbox), pref->priv->fontcheck, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (font_hbox), pref->priv->fontbutton, TRUE, TRUE, 0);
 	
-	pref->priv->colorbox = gtk_vbox_new (FALSE, 6);
-	hbox = gtk_hbox_new (FALSE, 12);
+	pref->priv->colorbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+
 	label = gtk_label_new_with_mnemonic (_("Background:"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
 	gtk_size_group_add_widget (size_group_labels, label);
@@ -168,7 +171,8 @@
 	gtk_box_pack_start (GTK_BOX (hbox), pref->priv->backbutton, TRUE, TRUE, 0);
 	g_object_set (G_OBJECT (pref->priv->colorbox), "child", hbox, NULL);
 	
-	hbox = gtk_hbox_new (FALSE, 12);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+
 	label = gtk_label_new_with_mnemonic (_("Foreground:"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
 	gtk_size_group_add_widget (size_group_labels, label);
@@ -186,40 +190,41 @@
 	
 	gtk_dialog_add_button (GTK_DIALOG (pref), "gtk-close", GTK_RESPONSE_CLOSE);
 	gtk_dialog_set_default_response (GTK_DIALOG (pref), GTK_RESPONSE_CLOSE);
-	gtk_dialog_set_has_separator (GTK_DIALOG (pref), FALSE);
 	g_signal_connect (pref, "response", G_CALLBACK (xpad_preferences_response), NULL);
 	gtk_window_set_title (GTK_WINDOW (pref), _("Xpad Preferences"));
 	
-	gtk_color_button_set_use_alpha (GTK_COLOR_BUTTON (pref->priv->textbutton), FALSE);
-	gtk_color_button_set_use_alpha (GTK_COLOR_BUTTON (pref->priv->backbutton), xpad_app_get_translucent ());
+	gtk_color_chooser_set_use_alpha (GTK_COLOR_CHOOSER (pref->priv->textbutton), FALSE);
+	gtk_color_chooser_set_use_alpha (GTK_COLOR_CHOOSER (pref->priv->backbutton), TRUE);
 	
 	gtk_color_button_set_title (GTK_COLOR_BUTTON (pref->priv->textbutton), _("Set Foreground Color"));
 	gtk_color_button_set_title (GTK_COLOR_BUTTON (pref->priv->backbutton), _("Set Background Color"));
 	gtk_font_button_set_title (GTK_FONT_BUTTON (pref->priv->fontbutton), _("Set Font"));
 	
 	/* Set current state */
-	style = gtk_widget_get_default_style ();
+	style = gtk_widget_get_style_context (GTK_WIDGET(pref));
+	gtk_style_context_get_color (style, GTK_STATE_FLAG_NORMAL, &theme_text_color);
+	gtk_style_context_get_background_color (style, GTK_STATE_FLAG_NORMAL, &theme_background_color);
 	
-	color = xpad_settings_get_back_color (xpad_settings ());
+	color = xpad_settings_get_back_color (xpad_global_settings);
 	if (color)
 	{
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->colorcheck), TRUE);
-		gtk_color_button_set_color (GTK_COLOR_BUTTON (pref->priv->backbutton), color);
+		gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (pref->priv->backbutton), color);
 	}
 	else
 	{
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->anticolorcheck), TRUE);
 		gtk_widget_set_sensitive (pref->priv->colorbox, FALSE);
-		gtk_color_button_set_color (GTK_COLOR_BUTTON (pref->priv->backbutton), &style->base[GTK_STATE_NORMAL]);
+		gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (pref->priv->backbutton), &theme_background_color);
 	}
 	
-	color = xpad_settings_get_text_color (xpad_settings ());
+	color = xpad_settings_get_text_color (xpad_global_settings);
 	if (color)
-		gtk_color_button_set_color (GTK_COLOR_BUTTON (pref->priv->textbutton), color);
+		gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (pref->priv->textbutton), color);
 	else
-		gtk_color_button_set_color (GTK_COLOR_BUTTON (pref->priv->textbutton), &style->text[GTK_STATE_NORMAL]);
+		gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (pref->priv->textbutton), &theme_text_color);
 	
-	fontname = xpad_settings_get_fontname (xpad_settings ());
+	fontname = xpad_settings_get_fontname (xpad_global_settings);
 	if (fontname)
 	{
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->fontcheck), TRUE);
@@ -227,32 +232,33 @@
 	}
 	else
 	{
-		gchar *str;
+		PangoFontDescription *font;
 		
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->antifontcheck), TRUE);
 		gtk_widget_set_sensitive (pref->priv->fontbutton, FALSE);
 		
-		str = pango_font_description_to_string (style->font_desc);
-		gtk_font_button_set_font_name (GTK_FONT_BUTTON (pref->priv->fontbutton), str);
-		g_free (str);
+		gtk_style_context_get (style, GTK_STATE_FLAG_NORMAL, GTK_STYLE_PROPERTY_FONT, &font, NULL);
+		gtk_font_button_set_font_name (GTK_FONT_BUTTON (pref->priv->fontbutton), pango_font_description_to_string(font));
+		pango_font_description_free (font);
 	}
 	
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->editcheck), xpad_settings_get_edit_lock (xpad_settings ()));
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->stickycheck), xpad_settings_get_sticky (xpad_settings ()));
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->confirmcheck), xpad_settings_get_confirm_destroy (xpad_settings ()));
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->editcheck), xpad_settings_get_edit_lock (xpad_global_settings));
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->stickycheck), xpad_settings_get_sticky (xpad_global_settings));
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->confirmcheck), xpad_settings_get_confirm_destroy (xpad_global_settings));
 	
-	vbox = gtk_vbox_new (FALSE, 6);
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+
 	gtk_box_pack_start (GTK_BOX (vbox), pref->priv->antifontcheck, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (vbox), font_hbox, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (appearance_vbox), vbox, FALSE, FALSE, 0);
 	
-	vbox = gtk_vbox_new (FALSE, 6);
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+
 	gtk_box_pack_start (GTK_BOX (vbox), pref->priv->anticolorcheck, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (vbox), pref->priv->colorcheck, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (appearance_vbox), vbox, FALSE, FALSE, 0);
 	
-	
 	text = g_strconcat ("<b>", _("Options"), "</b>", NULL);
 	label = GTK_WIDGET (g_object_new (GTK_TYPE_LABEL,
 		"label", text,
@@ -260,10 +266,10 @@
 		"xalign", 0.0,
 		NULL));
 	g_free (text);
-	options_vbox = GTK_WIDGET (g_object_new (GTK_TYPE_VBOX,
-		"homogeneous", FALSE,
-		"spacing", 6,
-		NULL));
+
+	options_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+	gtk_box_set_homogeneous (GTK_BOX (options_vbox), FALSE);
+
 	alignment = gtk_alignment_new (1, 1, 1, 1);
 	g_object_set (G_OBJECT (alignment),
 		"left-padding", 12,
@@ -275,39 +281,35 @@
 		"shadow-type", GTK_SHADOW_NONE,
 		"child", alignment,
 		NULL));
-	
-	tray_config_vbox = GTK_WIDGET (g_object_new (GTK_TYPE_VBOX,
-		"homogeneous", FALSE,
-		"spacing", 6,
-		NULL));
-
-	pref->priv->trayconfigbox = gtk_combo_box_new_text();
-	gtk_combo_box_append_text( GTK_COMBO_BOX( pref->priv->trayconfigbox ), "Do Nothing" );
-	gtk_combo_box_append_text( GTK_COMBO_BOX( pref->priv->trayconfigbox ), "Toggle Show All" );
-	gtk_combo_box_append_text( GTK_COMBO_BOX( pref->priv->trayconfigbox ), "List of Pads" );
-	gtk_combo_box_append_text( GTK_COMBO_BOX( pref->priv->trayconfigbox ), "New Pad" );
-	gtk_combo_box_set_active( GTK_COMBO_BOX( pref->priv->trayconfigbox ), xpad_settings_get_tray_click_handler(xpad_settings()));
-
-	hbox = gtk_hbox_new(FALSE, 12);
+
+	// System tray configuration left-click behaviour
+	tray_config_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+	gtk_box_set_homogeneous (GTK_BOX (tray_config_vbox), FALSE);
+	pref->priv->trayconfigbox = gtk_combo_box_text_new();
+	gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT( pref->priv->trayconfigbox ), _("Do Nothing") );
+	gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT( pref->priv->trayconfigbox ), _("Toggle Show All") );
+	gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT( pref->priv->trayconfigbox ), _("List of Pads") );
+	gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT( pref->priv->trayconfigbox ), _("New Pad") );
+	gtk_combo_box_set_active( GTK_COMBO_BOX( pref->priv->trayconfigbox ), (gint) xpad_settings_get_tray_click_handler(xpad_global_settings));
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 	label = gtk_label_new_with_mnemonic(_("Tray click behaviour"));
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(hbox), pref->priv->trayconfigbox, TRUE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(tray_config_vbox), hbox, TRUE, TRUE, 0);
 
+	// Edit, sticky and confirmation checkboxes
 	gtk_box_pack_start (GTK_BOX (options_vbox), pref->priv->editcheck, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (options_vbox), pref->priv->stickycheck, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (options_vbox), pref->priv->confirmcheck, FALSE, FALSE, 0);	
 	g_object_set (GTK_WIDGET(options_vbox), "child", tray_config_vbox, NULL);
 	
-	global_vbox = g_object_new (GTK_TYPE_VBOX,
-		"border-width", 6,
-		"homogeneous", FALSE,
-		"spacing", 18,
-		"child", appearance_frame,
-		"child", options_frame,
-		NULL);
-	
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (pref)->vbox), global_vbox, FALSE, FALSE, 0);
+	global_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+	gtk_box_set_homogeneous (GTK_BOX (global_vbox), FALSE);
+	gtk_box_pack_start (GTK_BOX (global_vbox), appearance_frame, FALSE, FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (global_vbox), options_frame, FALSE, FALSE, 0);
+	gtk_container_set_border_width (GTK_CONTAINER (global_vbox), 6);
+
+	gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (pref))), global_vbox, FALSE, FALSE, 0);
 	
 	pref->priv->editcheck_handler = g_signal_connect (pref->priv->editcheck, "toggled", G_CALLBACK (change_edit_check), pref);
 	pref->priv->stickycheck_handler = g_signal_connect (pref->priv->stickycheck, "toggled", G_CALLBACK (change_sticky_check), pref);
@@ -318,20 +320,20 @@
 	pref->priv->back_handler = g_signal_connect (pref->priv->backbutton, "color-set", G_CALLBACK (change_back_color), pref);
 	pref->priv->font_handler = g_signal_connect (pref->priv->fontbutton, "font-set", G_CALLBACK (change_font_face), pref);
 	pref->priv->trayclick_handler = g_signal_connect(pref->priv->trayconfigbox, "changed", G_CALLBACK(change_tray_click_configuration), pref);
-	pref->priv->notify_font_handler = g_signal_connect_swapped (xpad_settings (), "notify::fontname", G_CALLBACK (notify_fontname), pref);
-	pref->priv->notify_text_handler = g_signal_connect_swapped (xpad_settings (), "notify::text-color", G_CALLBACK (notify_text_color), pref);
-	pref->priv->notify_back_handler = g_signal_connect_swapped (xpad_settings (), "notify::back-color", G_CALLBACK (notify_back_color), pref);
-	pref->priv->notify_sticky_handler = g_signal_connect_swapped (xpad_settings (), "notify::sticky", G_CALLBACK (notify_sticky), pref);
-	pref->priv->notify_edit_handler = g_signal_connect_swapped (xpad_settings (), "notify::edit-lock", G_CALLBACK (notify_edit), pref);
-	pref->priv->notify_confirm_handler = g_signal_connect_swapped (xpad_settings (), "notify::confirm-destroy", G_CALLBACK (notify_confirm), pref);
-	pref->priv->notify_tray_handler = g_signal_connect_swapped (xpad_settings (), "notify::tray_click_configuration", G_CALLBACK(notify_tray_click), pref);
+	pref->priv->notify_font_handler = g_signal_connect_swapped (xpad_global_settings, "notify::fontname", G_CALLBACK (notify_fontname), pref);
+	pref->priv->notify_text_handler = g_signal_connect_swapped (xpad_global_settings, "notify::text-color", G_CALLBACK (notify_text_color), pref);
+	pref->priv->notify_back_handler = g_signal_connect_swapped (xpad_global_settings, "notify::back-color", G_CALLBACK (notify_back_color), pref);
+	pref->priv->notify_sticky_handler = g_signal_connect_swapped (xpad_global_settings, "notify::sticky", G_CALLBACK (notify_sticky), pref);
+	pref->priv->notify_edit_handler = g_signal_connect_swapped (xpad_global_settings, "notify::edit-lock", G_CALLBACK (notify_edit), pref);
+	pref->priv->notify_confirm_handler = g_signal_connect_swapped (xpad_global_settings, "notify::confirm-destroy", G_CALLBACK (notify_confirm), pref);
+	pref->priv->notify_tray_handler = g_signal_connect_swapped (xpad_global_settings, "notify::tray_click_configuration", G_CALLBACK(notify_tray_click), pref);
 	
 	g_object_unref (size_group_labels);
 	
-	gtk_widget_show_all (GTK_DIALOG (pref)->vbox);
+	gtk_widget_show_all (gtk_dialog_get_content_area (GTK_DIALOG (pref)));
 	
 	/* Make window not so squished */
-	gtk_widget_size_request (GTK_WIDGET (pref), &req);
+	gtk_widget_get_preferred_size (GTK_WIDGET (pref), &req, NULL);
 	g_object_set (G_OBJECT (pref), "default-width", (gint) (req.height * 0.8), NULL);
 }
 
@@ -346,7 +348,7 @@
 {
 	XpadPreferences *pref = XPAD_PREFERENCES (object);
 
-	g_signal_handlers_disconnect_matched (xpad_settings (), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, pref);
+	g_signal_handlers_disconnect_matched (xpad_global_settings, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, pref);
 	
 	G_OBJECT_CLASS (xpad_preferences_parent_class)->finalize (object);
 }
@@ -361,108 +363,110 @@
 static void
 change_color_check (GtkToggleButton *button, XpadPreferences *pref)
 {
-	g_signal_handler_block (xpad_settings (), pref->priv->notify_back_handler);
-	g_signal_handler_block (xpad_settings (), pref->priv->notify_text_handler);
+	g_signal_handler_block (xpad_global_settings, pref->priv->notify_back_handler);
+	g_signal_handler_block (xpad_global_settings, pref->priv->notify_text_handler);
 	
 	if (!gtk_toggle_button_get_active (button))
 	{
-		xpad_settings_set_text_color (xpad_settings (), NULL);
-		xpad_settings_set_back_color (xpad_settings (), NULL);
+		xpad_settings_set_text_color (xpad_global_settings, NULL);
+		xpad_settings_set_back_color (xpad_global_settings, NULL);
 	}
 	else
 	{
-		GdkColor color;
-		gtk_color_button_get_color (GTK_COLOR_BUTTON (pref->priv->textbutton), &color);
-		xpad_settings_set_text_color (xpad_settings (), &color);
-		gtk_color_button_get_color (GTK_COLOR_BUTTON (pref->priv->backbutton), &color);
-		xpad_settings_set_back_color (xpad_settings (), &color);
+		GdkRGBA color;
+		gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (pref->priv->textbutton), &color);
+		xpad_settings_set_text_color (xpad_global_settings, &color);
+		gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (pref->priv->backbutton), &color);
+		xpad_settings_set_back_color (xpad_global_settings, &color);
 	}
 	
 	gtk_widget_set_sensitive (pref->priv->colorbox, gtk_toggle_button_get_active (button));
 	
-	g_signal_handler_unblock (xpad_settings (), pref->priv->notify_back_handler);
-	g_signal_handler_unblock (xpad_settings (), pref->priv->notify_text_handler);
+	g_signal_handler_unblock (xpad_global_settings, pref->priv->notify_back_handler);
+	g_signal_handler_unblock (xpad_global_settings, pref->priv->notify_text_handler);
 }
 
 static void
 change_font_check (GtkToggleButton *button, XpadPreferences *pref)
 {
-	g_signal_handler_block (xpad_settings (), pref->priv->notify_font_handler);
+	g_signal_handler_block (xpad_global_settings, pref->priv->notify_font_handler);
 	
 	if (!gtk_toggle_button_get_active (button))
-		xpad_settings_set_fontname (xpad_settings (), NULL);
+		xpad_settings_set_fontname (xpad_global_settings, NULL);
 	else
-		xpad_settings_set_fontname (xpad_settings (), gtk_font_button_get_font_name (GTK_FONT_BUTTON (pref->priv->fontbutton)));
+		xpad_settings_set_fontname (xpad_global_settings, gtk_font_button_get_font_name (GTK_FONT_BUTTON (pref->priv->fontbutton)));
 	
 	gtk_widget_set_sensitive (pref->priv->fontbutton, gtk_toggle_button_get_active (button));
 	
-	g_signal_handler_unblock (xpad_settings (), pref->priv->notify_font_handler);
+	g_signal_handler_unblock (xpad_global_settings, pref->priv->notify_font_handler);
 }
 
 static void
 change_edit_check (GtkToggleButton *button, XpadPreferences *pref)
 {
-	g_signal_handler_block (xpad_settings (), pref->priv->notify_edit_handler);
-	xpad_settings_set_edit_lock (xpad_settings (), gtk_toggle_button_get_active (button));
-	g_signal_handler_unblock (xpad_settings (), pref->priv->notify_edit_handler);
+	g_signal_handler_block (xpad_global_settings, pref->priv->notify_edit_handler);
+	xpad_settings_set_edit_lock (xpad_global_settings, gtk_toggle_button_get_active (button));
+	g_signal_handler_unblock (xpad_global_settings, pref->priv->notify_edit_handler);
 }
 
 static void
 change_sticky_check (GtkToggleButton *button, XpadPreferences *pref)
 {
-	g_signal_handler_block (xpad_settings (), pref->priv->notify_sticky_handler);
-	xpad_settings_set_sticky (xpad_settings (), gtk_toggle_button_get_active (button));
-	g_signal_handler_unblock (xpad_settings (), pref->priv->notify_sticky_handler);
+	g_signal_handler_block (xpad_global_settings, pref->priv->notify_sticky_handler);
+	xpad_settings_set_sticky (xpad_global_settings, gtk_toggle_button_get_active (button));
+	g_signal_handler_unblock (xpad_global_settings, pref->priv->notify_sticky_handler);
 }
 
 static void
 change_confirm_check (GtkToggleButton *button, XpadPreferences *pref)
 {
-	g_signal_handler_block (xpad_settings (), pref->priv->notify_confirm_handler);
-	xpad_settings_set_confirm_destroy (xpad_settings (), gtk_toggle_button_get_active (button));
-	g_signal_handler_unblock (xpad_settings (), pref->priv->notify_confirm_handler);
+	g_signal_handler_block (xpad_global_settings, pref->priv->notify_confirm_handler);
+	xpad_settings_set_confirm_destroy (xpad_global_settings, gtk_toggle_button_get_active (button));
+	g_signal_handler_unblock (xpad_global_settings, pref->priv->notify_confirm_handler);
 }
 
 static void
 change_tray_click_configuration(GtkComboBox *box, XpadPreferences *pref)
 {
-	g_signal_handler_block(xpad_settings(), pref->priv->notify_tray_handler);
-	xpad_settings_set_tray_click_handler(xpad_settings(), gtk_combo_box_get_active(box));
-	g_signal_handler_unblock(xpad_settings(), pref->priv->notify_tray_handler);
-}
-
-static void
-change_text_color (GtkColorButton *button, XpadPreferences *pref)
-{
-	GdkColor color;
-	gtk_color_button_get_color (button, &color);
-	g_signal_handler_block (xpad_settings (), pref->priv->notify_text_handler);
-	xpad_settings_set_text_color (xpad_settings (), &color);
-	g_signal_handler_unblock (xpad_settings (), pref->priv->notify_text_handler);
-}
-
-static void
-change_back_color (GtkColorButton *button, XpadPreferences *pref)
-{
-	GdkColor color;
-	gtk_color_button_get_color (button, &color);
-	g_signal_handler_block (xpad_settings (), pref->priv->notify_back_handler);
-	xpad_settings_set_back_color (xpad_settings (), &color);
-	g_signal_handler_unblock (xpad_settings (), pref->priv->notify_back_handler);
+	g_signal_handler_block(xpad_global_settings, pref->priv->notify_tray_handler);
+	xpad_settings_set_tray_click_handler(xpad_global_settings, (guint) gtk_combo_box_get_active(box));
+	g_signal_handler_unblock(xpad_global_settings, pref->priv->notify_tray_handler);
+}
+
+static void
+change_text_color (GtkColorChooser *chooser, XpadPreferences *pref)
+{
+	GdkRGBA color = {0, 0, 0, 0};
+	gtk_color_chooser_get_rgba (chooser, &color);
+
+	g_signal_handler_block (xpad_global_settings, pref->priv->notify_text_handler);
+	xpad_settings_set_text_color (xpad_global_settings, &color);
+	g_signal_handler_unblock (xpad_global_settings, pref->priv->notify_text_handler);
+}
+
+static void
+change_back_color (GtkColorChooser *chooser, XpadPreferences *pref)
+{
+	GdkRGBA color = {0, 0, 0, 0};
+	gtk_color_chooser_get_rgba (chooser, &color);
+
+	g_signal_handler_block (xpad_global_settings, pref->priv->notify_back_handler);
+	xpad_settings_set_back_color (xpad_global_settings, &color);
+	g_signal_handler_unblock (xpad_global_settings, pref->priv->notify_back_handler);
 }
 
 static void
 change_font_face (GtkFontButton *button, XpadPreferences *pref)
 {
-	g_signal_handler_block (xpad_settings (), pref->priv->notify_font_handler);
-	xpad_settings_set_fontname (xpad_settings (), gtk_font_button_get_font_name (button));
-	g_signal_handler_unblock (xpad_settings (), pref->priv->notify_font_handler);
+	g_signal_handler_block (xpad_global_settings, pref->priv->notify_font_handler);
+	xpad_settings_set_fontname (xpad_global_settings, gtk_font_button_get_font_name (button));
+	g_signal_handler_unblock (xpad_global_settings, pref->priv->notify_font_handler);
 }
 
 static void
 notify_back_color (XpadPreferences *pref)
 {
-	const GdkColor *color = xpad_settings_get_back_color (xpad_settings ());
+	const GdkRGBA *color = xpad_settings_get_back_color (xpad_global_settings);
 	
 	g_signal_handler_block (pref->priv->backbutton, pref->priv->back_handler);
 	g_signal_handler_block (pref->priv->colorcheck, pref->priv->colorcheck_handler);
@@ -471,7 +475,7 @@
 	{
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->colorcheck), TRUE);
 		gtk_widget_set_sensitive (pref->priv->colorbox, TRUE);
-		gtk_color_button_set_color (GTK_COLOR_BUTTON (pref->priv->backbutton), color);
+		gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (pref->priv->backbutton), color);
 	}
 	else
 	{
@@ -486,7 +490,7 @@
 static void
 notify_text_color (XpadPreferences *pref)
 {
-	const GdkColor *color = xpad_settings_get_text_color (xpad_settings ());
+	const GdkRGBA *color = xpad_settings_get_text_color (xpad_global_settings);
 	
 	g_signal_handler_block (pref->priv->textbutton, pref->priv->text_handler);
 	g_signal_handler_block (pref->priv->colorcheck, pref->priv->colorcheck_handler);
@@ -495,7 +499,8 @@
 	{
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->colorcheck), TRUE);
 		gtk_widget_set_sensitive (pref->priv->colorbox, TRUE);
-		gtk_color_button_set_color (GTK_COLOR_BUTTON (pref->priv->textbutton), color);
+		gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (pref->priv->textbutton), color);
+
 	}
 	else
 	{
@@ -510,7 +515,7 @@
 static void
 notify_fontname (XpadPreferences *pref)
 {
-	const gchar *fontname = xpad_settings_get_fontname (xpad_settings ());
+	const gchar *fontname = xpad_settings_get_fontname (xpad_global_settings);
 	
 	g_signal_handler_block (pref->priv->fontbutton, pref->priv->font_handler);
 	g_signal_handler_block (pref->priv->fontcheck, pref->priv->fontcheck_handler);
@@ -535,7 +540,7 @@
 notify_edit (XpadPreferences *pref)
 {
 	g_signal_handler_block (pref->priv->editcheck, pref->priv->editcheck_handler);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->editcheck), xpad_settings_get_edit_lock (xpad_settings ()));
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->editcheck), xpad_settings_get_edit_lock (xpad_global_settings));
 	g_signal_handler_unblock (pref->priv->editcheck, pref->priv->editcheck_handler);
 }
 
@@ -543,7 +548,7 @@
 notify_sticky (XpadPreferences *pref)
 {
 	g_signal_handler_block (pref->priv->stickycheck, pref->priv->stickycheck_handler);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->stickycheck), xpad_settings_get_sticky (xpad_settings ()));
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->stickycheck), xpad_settings_get_sticky (xpad_global_settings));
 	g_signal_handler_unblock (pref->priv->stickycheck, pref->priv->stickycheck_handler);
 }
 
@@ -551,7 +556,7 @@
 notify_confirm (XpadPreferences *pref)
 {
 	g_signal_handler_block (pref->priv->confirmcheck, pref->priv->confirmcheck_handler);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->confirmcheck), xpad_settings_get_confirm_destroy (xpad_settings ()));
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->confirmcheck), xpad_settings_get_confirm_destroy (xpad_global_settings));
 	g_signal_handler_unblock (pref->priv->confirmcheck, pref->priv->confirmcheck_handler);
 }
 
@@ -559,7 +564,7 @@
 notify_tray_click(XpadPreferences *pref)
 {
 	g_signal_handler_block(pref->priv->trayconfigbox, pref->priv->trayclick_handler);
-	gtk_combo_box_set_active(GTK_COMBO_BOX(pref->priv->trayconfigbox), xpad_settings_get_tray_click_handler(xpad_settings()));
+	gtk_combo_box_set_active(GTK_COMBO_BOX(pref->priv->trayconfigbox), (gint) xpad_settings_get_tray_click_handler(xpad_global_settings));
 	g_signal_handler_unblock(pref->priv->trayconfigbox, pref->priv->trayclick_handler);
 }
 
 
=== modified file 'src/xpad-session-manager.c'
--- src/xpad-session-manager.c	2008-09-21 00:03:40 +0000
+++ src/xpad-session-manager.c	2013-11-01 20:03:38 +0000
@@ -18,10 +18,12 @@
 
 */
 
+#include "../config.h"
 #include "xpad-session-manager.h"
 
 #ifndef X_DISPLAY_MISSING
 
+#include <gdk/gdkx.h>
 #include <X11/SM/SMlib.h>
 #include <stdio.h>	/* only for printf */
 #include <sys/types.h> /* for getuid and getpwuid */
@@ -56,8 +58,14 @@
 static gboolean
 xpad_session_manager_cycle (GIOChannel *source, GIOCondition condition,
                             gpointer data)
-{	
-  gboolean rv = TRUE;
+{
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) source;
+	(void) condition;
+	(void) data;
+
+	gboolean rv = TRUE;
 	IceConn ice_conn;
 	
 	ice_conn = SmcGetIceConnection (xpad_session_manager_conn);
@@ -102,8 +110,13 @@
 static void
 xpad_session_manager_start_interact_callback (SmcConn smc_conn, SmPointer client_data)
 {
-  if (blocking)
-    gtk_main_quit ();
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) client_data;
+	(void) smc_conn;
+
+	if (blocking)
+		gtk_main_quit ();
 	blocking = FALSE;
 }
 
@@ -163,6 +176,11 @@
 xpad_session_manager_ice_connection_watch (IceConn ice_conn,
 	IcePointer client_data, Bool opening, IcePointer *watch_data)
 {
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) client_data;
+	(void) watch_data;
+
 	int fd = IceConnectionNumber (ice_conn);
 	
 	if (opening)
@@ -192,9 +210,10 @@
 	};
 	SmProp *props[G_N_ELEMENTS (prop)];
 	struct passwd *pw;
-	int i;
+	uint i;
 	gchar *pid_str;
 	gchar *command = g_strdup (xpad_app_get_program_path ());
+	size_t string_length = 0;
 	
 	prop[0].vals = vals.clone;
 	prop[1].vals = vals.program;
@@ -207,28 +226,57 @@
 	}
 	
 	pw = getpwuid (getuid ());
-	
+
+	// While setting all the properties, safe casts are being used.
 	vals.user->value = pw ? pw->pw_name : "";
-	vals.user->length = strlen (vals.user->value);
+	string_length = strlen (vals.user->value);
+	if (string_length <= INT_MAX)
+		vals.user->length = (int) string_length;
+	else
+		g_warning("While setting the session manager properties a casting problem has occured. Xpad might not function as expected. Please send a bugreport.");
 	
 	vals.program->value = command;
-	vals.program->length = strlen (vals.program->value);
+	string_length = strlen (vals.program->value);
+	if (string_length <= INT_MAX)
+		vals.program->length = (int) string_length;
+	else
+		g_warning("While setting the session manager properties a casting problem has occured. Xpad might not function as expected. Please send a bugreport.");
 	
 	vals.clone->value = command;
-	vals.clone->length = strlen (vals.clone->value);
+	string_length = strlen (vals.clone->value);
+	if (string_length <= INT_MAX)
+		vals.clone->length = (int) string_length;
+	else
+		g_warning("While setting the session manager properties a casting problem has occured. Xpad might not function as expected. Please send a bugreport.");
 	
 	vals.restart[0].value = command;
-	vals.restart[0].length = strlen (vals.restart[0].value);
-	
+	string_length = strlen (vals.restart[0].value);
+	if (string_length <= INT_MAX)
+		vals.restart[0].length = (int) string_length;
+	else
+		g_warning("While setting the session manager properties a casting problem has occured. Xpad might not function as expected. Please send a bugreport.");
+
 	vals.restart[1].value = "--sm-client-id";
-	vals.restart[1].length = strlen (vals.restart[1].value);
-	
+	string_length = strlen (vals.restart[1].value);
+	if (string_length <= INT_MAX)
+		vals.restart[1].length = (int) string_length;
+	else
+		g_warning("While setting the session manager properties a casting problem has occured. Xpad might not function as expected. Please send a bugreport.");
+
 	vals.restart[2].value = client_id;
-	vals.restart[2].length = strlen (vals.restart[2].value);
+	string_length = strlen (vals.restart[2].value);
+	if (string_length <= INT_MAX)
+		vals.restart[2].length = (int) string_length;
+	else
+		g_warning("While setting the session manager properties a casting problem has occured. Xpad might not function as expected. Please send a bugreport.");
 	
 	pid_str = g_strdup_printf ("%i", getpid ());
 	vals.process->value = pid_str;
-	vals.process->length = strlen (vals.process->value);
+	string_length = strlen (vals.process->value);
+	if (string_length <= INT_MAX)
+		vals.process->length = (int) string_length;
+	else
+		g_warning("While setting the session manager properties a casting problem has occured. Xpad might not function as expected. Please send a bugreport.");
 	
 	SmcSetProperties (xpad_session_manager_conn, 4, (SmProp **) &props);
 	
@@ -270,7 +318,7 @@
 	xpad_ice_fd = -1;
 	IceAddConnectionWatch (xpad_session_manager_ice_connection_watch, NULL);
 	
-	gdk_set_sm_client_id (client_id);
+	gdk_x11_set_sm_client_id (client_id);
 }
 
 void
@@ -306,6 +354,10 @@
 static void
 xpad_session_manager_save_global (Bool fast)
 {
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) fast;
+
 	/* No need to do anything.  Currently, all xpad pads are always current with
 	hard drive. */
 }
@@ -313,6 +365,10 @@
 static void
 xpad_session_manager_save_local (Bool fast)
 {
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) fast;
+
 	/* should also save cursor positions and open accessory windows */
 	
 	if (set_props)
@@ -327,6 +383,10 @@
                                     int save_type, Bool shutdown, int interact_style,
                                     Bool fast)
 {
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) client_data;
+
 	RETURN_IF_BAD_CONN (smc_conn);
 	
 	xpad_interact_style = interact_style;
@@ -357,6 +417,10 @@
 static void
 xpad_session_manager_die (SmcConn smc_conn, SmPointer client_data)
 {
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) client_data;
+
 	RETURN_IF_BAD_CONN (smc_conn);
 	xpad_shutdown = True;
 	
@@ -372,6 +436,10 @@
 static void
 xpad_session_manager_shutdown_cancelled (SmcConn smc_conn, SmPointer client_data)
 {
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) client_data;
+
 	RETURN_IF_BAD_CONN (smc_conn);
 	RETURN_IF_NOT_SAVING ();
 	xpad_shutdown = False;
@@ -386,6 +454,10 @@
 static void
 xpad_session_manager_save_complete (SmcConn smc_conn, SmPointer client_data)
 {
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) client_data;
+
 	RETURN_IF_BAD_CONN (smc_conn);
 	RETURN_IF_NOT_SAVING ();
 	
 
=== modified file 'src/xpad-settings.c'
--- src/xpad-settings.c	2013-10-18 20:23:43 +0000
+++ src/xpad-settings.c	2013-11-01 20:03:38 +0000
@@ -18,11 +18,12 @@
 
 */
 
+#include "../config.h"
 #include <string.h>
 #include "xpad-settings.h"
 #include "fio.h"
 
-struct XpadSettingsPrivate 
+struct XpadSettingsPrivate
 {
 	guint width;
 	guint height;
@@ -34,8 +35,8 @@
 	gboolean has_toolbar;
 	gboolean autohide_toolbar;
 	gboolean has_scrollbar;
-	GdkColor *back;
-	GdkColor *text;
+	GdkRGBA *back;
+	GdkRGBA *text;
 	gchar *fontname;
 	GSList *toolbar_buttons;
 };
@@ -76,17 +77,12 @@
 static void xpad_settings_dispose (GObject *object);
 static void xpad_settings_finalize (GObject *object);
 
-static XpadSettings *_xpad_settings = NULL;
 static guint signals[LAST_SIGNAL] = { 0 };
 
 XpadSettings *
-xpad_settings (void)
+xpad_settings_new (void)
 {
-	/* Singleton class */
-	if (!_xpad_settings)
-		_xpad_settings = XPAD_SETTINGS (g_object_new (XPAD_TYPE_SETTINGS, NULL));
-	
-	return _xpad_settings;
+	return g_object_new (XPAD_TYPE_SETTINGS, NULL);
 }
 
 static void
@@ -198,7 +194,7 @@
 	                                 g_param_spec_boxed ("text_color",
 	                                                     "Text Color",
 	                                                     "Default color of pad text",
-	                                                     GDK_TYPE_COLOR,
+	                                                     GDK_TYPE_RGBA,
 	                                                     G_PARAM_READWRITE));
 	
 	g_object_class_install_property (gobject_class,
@@ -206,7 +202,7 @@
 	                                 g_param_spec_boxed ("back_color",
 	                                                     "Back Color",
 	                                                     "Default color of pad background",
-	                                                     GDK_TYPE_COLOR,
+	                                                     GDK_TYPE_RGBA,
 	                                                     G_PARAM_READWRITE));
 	
 	/* Signals */
@@ -223,25 +219,12 @@
 static void
 xpad_settings_init (XpadSettings *settings)
 {
-	GdkColor back, text;
-	
 	settings->priv = xpad_settings_get_instance_private(settings);
-	
-	/* A pleasant light yellow color, similar to 
-	   commercial sticky notes. */
-	back.pixel = 0;
-	back.red = 65535;
-	back.green = 61166;
-	back.blue = 39321;
-	settings->priv->back = gdk_color_copy (&back);
-	
-	/* Black */
-	text.pixel = 0;
-	text.red = 0;
-	text.green = 0;
-	text.blue = 0;
-	settings->priv->text = gdk_color_copy (&text);
-	
+
+	/* A pleasant light yellow background color, similar to commercial sticky notes, with black text. */
+	settings->priv->text = gdk_rgba_copy(&(GdkRGBA) {0, 0, 0, 1});
+	settings->priv->back = gdk_rgba_copy(&(GdkRGBA) {1, 0.933334350586, 0.6, 1});
+
 	settings->priv->width = 200;
 	settings->priv->height = 200;
 	settings->priv->has_decorations = TRUE;
@@ -276,9 +259,9 @@
 	g_slist_free (settings->priv->toolbar_buttons);
 
 	if (settings->priv->text)
-		gdk_color_free (settings->priv->text);
+		gdk_rgba_free (settings->priv->text);
 	if (settings->priv->back)
-		gdk_color_free (settings->priv->back);
+		gdk_rgba_free (settings->priv->back);
 
 	g_free (settings->priv->fontname);
 	
@@ -575,13 +558,13 @@
 	return settings->priv->toolbar_buttons;
 }
 
-void xpad_settings_set_back_color (XpadSettings *settings, const GdkColor *back)
+void xpad_settings_set_back_color (XpadSettings *settings, const GdkRGBA *back)
 {
 	if (settings->priv->back)
-		gdk_color_free (settings->priv->back);
+		gdk_rgba_free (settings->priv->back);
 	
 	if (back)
-		settings->priv->back = gdk_color_copy (back);
+		settings->priv->back = gdk_rgba_copy (back);
 	else
 		settings->priv->back = NULL;
 	
@@ -590,18 +573,18 @@
 	g_object_notify (G_OBJECT (settings), "back_color");
 }
 
-G_CONST_RETURN GdkColor *xpad_settings_get_back_color (XpadSettings *settings)
+G_CONST_RETURN GdkRGBA *xpad_settings_get_back_color (XpadSettings *settings)
 {
 	return settings->priv->back;
 }
 
-void xpad_settings_set_text_color (XpadSettings *settings, const GdkColor *text)
+void xpad_settings_set_text_color (XpadSettings *settings, const GdkRGBA *text)
 {
 	if (settings->priv->text)
-		gdk_color_free (settings->priv->text);
+		gdk_rgba_free (settings->priv->text);
 	
 	if (text)
-		settings->priv->text = gdk_color_copy (text);
+		settings->priv->text = gdk_rgba_copy (text);
 	else
 		settings->priv->text = NULL;
 	
@@ -610,7 +593,7 @@
 	g_object_notify (G_OBJECT (settings), "text_color");
 }
 
-G_CONST_RETURN GdkColor *xpad_settings_get_text_color (XpadSettings *settings)
+G_CONST_RETURN GdkRGBA *xpad_settings_get_text_color (XpadSettings *settings)
 {
 	return settings->priv->text;
 }
@@ -767,18 +750,23 @@
 	 * We need to set up int values for all these to take the value from the file.
 	 * These will be assigned back to the appropriate values after load.
 	 */
+
 	gchar *buttons = NULL;
-	GdkColor text = {0}, back = {0};
+	gchar *text_color_string = NULL;
+	gchar *background_color_string = NULL;
+	GdkRGBA text = {0, 0, 0, 0};
+	GdkRGBA back = {0, 0, 0, 0};
 	gboolean use_text, use_back;
 	
 	use_text = settings->priv->text ? TRUE : FALSE;
 	if (settings->priv->text)
 		text = *settings->priv->text;
-	
+
 	use_back = settings->priv->back ? TRUE : FALSE;
 	if (settings->priv->back)
 		back = *settings->priv->back;
-	
+
+	// get all the values from the default-style text file in the forms of booleans, ints or strings.
 	if (fio_get_values_from_file (filename, 
 		"b|decorations", &settings->priv->has_decorations,
 		"u|height", &settings->priv->height,
@@ -787,13 +775,9 @@
 		"b|edit_lock", &settings->priv->edit_lock,
 		"b|sticky_on_start", &settings->priv->sticky,
 		"u|tray_click_configuration", &settings->priv->tray_click_configuration,
-		"h|back_red", &back.red,
-		"h|back_green", &back.green,
-		"h|back_blue", &back.blue,
+		"s|back", &background_color_string,
 		"b|use_back", &use_back,
-		"h|text_red", &text.red,
-		"h|text_green", &text.green,
-		"h|text_blue", &text.blue,
+		"s|text", &text_color_string,
 		"b|use_text", &use_text,
 		"s|fontname", &settings->priv->fontname,
 		"b|toolbar", &settings->priv->has_toolbar,
@@ -802,21 +786,46 @@
 		"s|buttons", &buttons,
 		NULL))
 		return;
-	
+
 	if (use_text)
 	{
-		gdk_color_free (settings->priv->text);
-		settings->priv->text = gdk_color_copy (&text);
-	}
-
-	gdk_color_free (settings->priv->back);
-	if (use_back)
-		settings->priv->back = gdk_color_copy (&back);
+		gdk_rgba_free (settings->priv->text);
+
+		// If, for some reason, one of the colors could not be retrieved
+		// (for example due to the migration to the new GdkRGBA colors), set the color to the default.
+		if (text_color_string == NULL) {
+			text = (GdkRGBA) {0, 0, 0, 1};
+		}
+		else {
+			// If, for some reason, the parsing of the colors fail, set the color to the default.
+			if (!gdk_rgba_parse (&text, text_color_string)) {
+				text = (GdkRGBA) {0, 0, 0, 1};
+			}
+		}
+
+		settings->priv->text = gdk_rgba_copy (&text);
+	}
+
+	gdk_rgba_free (settings->priv->back);
+	if (use_back) {
+		// If, for some reason, one of the colors could not be retrieved
+		// (for example due to the migration to the new GdkRGBA colors), set the color to the default.
+		if (background_color_string == NULL) {
+			back = (GdkRGBA) {1, 0.933334350586, 0.6, 1};
+		}
+		else {
+			// If, for some reason, the parsing of the colors fail, set the color to the default.
+			if (!gdk_rgba_parse (&back, background_color_string)) {
+				back = (GdkRGBA) {1, 0.933334350586, 0.6, 1};
+			}
+		}
+
+		settings->priv->back = gdk_rgba_copy (&back);
+	}
 	else
 		settings->priv->back = NULL;
 
-	if (settings->priv->fontname &&
-	    strcmp (settings->priv->fontname, "NULL") == 0)
+	if (settings->priv->fontname && strcmp (settings->priv->fontname, "NULL") == 0)
 	{
 		g_free (settings->priv->fontname);
 		settings->priv->fontname = NULL;
@@ -841,7 +850,7 @@
 		{
 			settings->priv->toolbar_buttons = 
 				g_slist_append (settings->priv->toolbar_buttons,
-				g_strstrip (button_names[i])); /* takes ownership of string */
+				g_strstrip (button_names[i])); // takes ownership of string
 		}
 		
 		g_free (button_names);
@@ -879,13 +888,9 @@
 		"b|edit_lock", settings->priv->edit_lock,
 		"b|sticky_on_start", settings->priv->sticky,
 		"u|tray_click_configuration", settings->priv->tray_click_configuration,
-		"h|back_red", settings->priv->back ? settings->priv->back->red : 0,
-		"h|back_green", settings->priv->back ? settings->priv->back->green : 0,
-		"h|back_blue", settings->priv->back ? settings->priv->back->blue : 0,
+		"s|back", settings->priv->back ? gdk_rgba_to_string (settings->priv->back) : "NULL",
 		"b|use_back", settings->priv->back ? TRUE : FALSE,
-		"h|text_red", settings->priv->text ? settings->priv->text->red : 0,
-		"h|text_green", settings->priv->text ? settings->priv->text->green : 0,
-		"h|text_blue", settings->priv->text ? settings->priv->text->blue : 0,
+		"s|text", settings->priv->text ? gdk_rgba_to_string (settings->priv->text) : "NULL",
 		"b|use_text", settings->priv->text ? TRUE : FALSE,
 		"s|fontname", settings->priv->fontname ? settings->priv->fontname : "NULL",
 		"b|toolbar", settings->priv->has_toolbar,
 
=== modified file 'src/xpad-settings.h'
--- src/xpad-settings.h	2013-10-18 20:23:43 +0000
+++ src/xpad-settings.h	2013-11-01 20:03:38 +0000
@@ -52,7 +52,7 @@
 
 GType xpad_settings_get_type (void);
 
-XpadSettings *xpad_settings (void);
+XpadSettings *xpad_settings_new (void);
 
 void xpad_settings_set_width (XpadSettings *settings, guint width);
 guint xpad_settings_get_width (XpadSettings *settings);
@@ -88,15 +88,16 @@
 gboolean xpad_settings_remove_last_toolbar_button (XpadSettings *settings);
 G_CONST_RETURN GSList *xpad_settings_get_toolbar_buttons (XpadSettings *settings);
 
-void xpad_settings_set_back_color (XpadSettings *settings, const GdkColor *back);
-G_CONST_RETURN GdkColor *xpad_settings_get_back_color (XpadSettings *settings);
+void xpad_settings_set_back_color (XpadSettings *settings, const GdkRGBA *back);
+G_CONST_RETURN GdkRGBA *xpad_settings_get_back_color (XpadSettings *settings);
 
-void xpad_settings_set_text_color (XpadSettings *settings, const GdkColor *text);
-G_CONST_RETURN GdkColor *xpad_settings_get_text_color (XpadSettings *settings);
+void xpad_settings_set_text_color (XpadSettings *settings, const GdkRGBA *text);
+G_CONST_RETURN GdkRGBA *xpad_settings_get_text_color (XpadSettings *settings);
 
 void xpad_settings_set_fontname (XpadSettings *settings, const gchar *fontname);
 G_CONST_RETURN gchar *xpad_settings_get_fontname (XpadSettings *settings);
 
+void xpad_settings_set_tray_click_handler (XpadSettings *settings, guint conf);
 guint xpad_settings_get_tray_click_handler(XpadSettings *settings);
 
 G_END_DECLS
 
=== modified file 'src/xpad-text-buffer.c'
--- src/xpad-text-buffer.c	2013-10-23 18:30:54 +0000
+++ src/xpad-text-buffer.c	2013-11-01 20:03:38 +0000
@@ -17,6 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "../config.h"
 #include "xpad-text-buffer.h"
 #include "xpad-undo.h"
 #include "xpad-pad.h"
 
=== modified file 'src/xpad-text-view.c'
--- src/xpad-text-view.c	2013-10-18 18:31:20 +0000
+++ src/xpad-text-view.c	2013-11-01 20:03:38 +0000
@@ -16,9 +16,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "../config.h"
 #include "xpad-text-view.h"
 #include "xpad-text-buffer.h"
 #include "xpad-settings.h"
+#include "xpad-app.h"
 
 struct XpadTextViewPrivate 
 {
@@ -42,9 +44,7 @@
 static void xpad_text_view_notify_edit_lock (XpadTextView *view);
 static void xpad_text_view_notify_editable (XpadTextView *view);
 static void xpad_text_view_notify_fontname (XpadTextView *view);
-static void xpad_text_view_notify_text_color (XpadTextView *view);
-static void xpad_text_view_notify_back_color (XpadTextView *view);
-static void xpad_text_view_style_set (GtkWidget *widget, GtkStyle *previous_style);
+static void xpad_text_view_notify_colors (XpadTextView *view);
 
 enum
 {
@@ -57,7 +57,7 @@
 GtkWidget *
 xpad_text_view_new (void)
 {
-	return GTK_WIDGET (g_object_new (XPAD_TYPE_TEXT_VIEW, NULL));
+	return GTK_WIDGET (g_object_new (XPAD_TYPE_TEXT_VIEW, "follow-font-style", TRUE, "follow-color-style", TRUE, NULL));
 }
 
 static void
@@ -113,14 +113,12 @@
 	g_signal_connect_after (view, "focus-out-event", G_CALLBACK (xpad_text_view_focus_out_event), NULL);
 	g_signal_connect (view, "realize", G_CALLBACK (xpad_text_view_realize), NULL);
 	g_signal_connect (view, "notify::editable", G_CALLBACK (xpad_text_view_notify_editable), NULL);
-	g_signal_connect (view, "style-set", G_CALLBACK (xpad_text_view_style_set), NULL);
-	g_signal_connect_swapped (xpad_settings (), "notify::edit-lock", G_CALLBACK (xpad_text_view_notify_edit_lock), view);
-	view->priv->notify_font_handler = g_signal_connect_swapped (xpad_settings (), "notify::fontname", G_CALLBACK (xpad_text_view_notify_fontname), view);
-	view->priv->notify_text_handler = g_signal_connect_swapped (xpad_settings (), "notify::text-color", G_CALLBACK (xpad_text_view_notify_text_color), view);
-	view->priv->notify_back_handler = g_signal_connect_swapped (xpad_settings (), "notify::back-color", G_CALLBACK (xpad_text_view_notify_back_color), view);
+	g_signal_connect_swapped (xpad_global_settings, "notify::edit-lock", G_CALLBACK (xpad_text_view_notify_edit_lock), view);
+	view->priv->notify_font_handler = g_signal_connect_swapped (xpad_global_settings, "notify::fontname", G_CALLBACK (xpad_text_view_notify_fontname), view);
+	view->priv->notify_text_handler = g_signal_connect_swapped (xpad_global_settings, "notify::text-color", G_CALLBACK (xpad_text_view_notify_colors), view);
+	view->priv->notify_back_handler = g_signal_connect_swapped (xpad_global_settings, "notify::back-color", G_CALLBACK (xpad_text_view_notify_colors), view);
 	
-	xpad_text_view_notify_text_color (view);
-	xpad_text_view_notify_back_color (view);
+	xpad_text_view_notify_colors (view);
 	xpad_text_view_notify_fontname (view);
 }
 
@@ -139,19 +137,27 @@
 static void
 xpad_text_view_finalize (GObject *object)
 {
+	XpadTextView *view = XPAD_TEXT_VIEW (object);
+
+	g_signal_handlers_disconnect_matched (xpad_global_settings, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, view);
+
 	G_OBJECT_CLASS (xpad_text_view_parent_class)->finalize (object);
 }
 
 static void
 xpad_text_view_realize (XpadTextView *view)
 {
-	gtk_text_view_set_editable (GTK_TEXT_VIEW (view), !xpad_settings_get_edit_lock (xpad_settings ()));
+	gtk_text_view_set_editable (GTK_TEXT_VIEW (view), !xpad_settings_get_edit_lock (xpad_global_settings));
 }
 
 static gboolean
 xpad_text_view_focus_out_event (GtkWidget *widget, GdkEventFocus *event)
 {
-	if (xpad_settings_get_edit_lock (xpad_settings ()))
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) event;
+
+	if (xpad_settings_get_edit_lock (xpad_global_settings))
 	{
 		gtk_text_view_set_editable (GTK_TEXT_VIEW (widget), FALSE);
 		return TRUE;
@@ -164,7 +170,7 @@
 xpad_text_view_button_press_event (GtkWidget *widget, GdkEventButton *event)
 {
 	if (event->button == 1 &&
-	    xpad_settings_get_edit_lock (xpad_settings ()) &&
+	    xpad_settings_get_edit_lock (xpad_global_settings) &&
 	    !gtk_text_view_get_editable (GTK_TEXT_VIEW (widget)))
 	{
 		if (event->type == GDK_2BUTTON_PRESS)
@@ -174,7 +180,7 @@
 		}
 		else if (event->type == GDK_BUTTON_PRESS)
 		{
-			gtk_window_begin_move_drag (GTK_WINDOW (gtk_widget_get_toplevel (widget)), event->button, event->x_root, event->y_root, event->time);
+			gtk_window_begin_move_drag (GTK_WINDOW (gtk_widget_get_toplevel (widget)), (gint) event->button, (gint) event->x_root, (gint) event->y_root, event->time);
 			return TRUE;
 		}
 	}
@@ -186,7 +192,7 @@
 xpad_text_view_notify_edit_lock (XpadTextView *view)
 {
 	/* chances are good that they don't have the text view focused while it changed, so make non-editable if edit lock turned on */
-	gtk_text_view_set_editable (GTK_TEXT_VIEW (view), !xpad_settings_get_edit_lock (xpad_settings ()));
+	gtk_text_view_set_editable (GTK_TEXT_VIEW (view), !xpad_settings_get_edit_lock (xpad_global_settings));
 }
 
 static void
@@ -203,71 +209,53 @@
 	gdk_window_set_cursor (gtk_text_view_get_window (GTK_TEXT_VIEW (view), GTK_TEXT_WINDOW_TEXT), cursor);
 	
 	if (cursor)
-		gdk_cursor_unref (cursor);
-}
-
-/* Adjust the cursor to match the text color */
-static void
-xpad_text_view_style_set (GtkWidget *widget, GtkStyle *previous_style)
-{
-	GdkColor c;
-	
-	/* text color changes */
-	c = gtk_widget_get_style (widget)->text[GTK_STATE_NORMAL];
-	if (!previous_style || !gdk_color_equal (&c, &previous_style->text[GTK_STATE_NORMAL]))
-	{
-		const gchar *name = gtk_widget_get_name (widget);
-		gchar *style_string = g_strdup_printf ("style '%s' {GtkWidget::cursor_color = {%" G_GUINT16_FORMAT ", %" G_GUINT16_FORMAT ", %" G_GUINT16_FORMAT "}} widget '*%s' style '%s'", name, c.red, c.green, c.blue, name, name);
-		gtk_rc_parse_string (style_string);
-		g_free (style_string);
-		gtk_widget_reset_rc_styles (widget);
-	}
-	
-	/* base color changes */
-	c = gtk_widget_get_style (widget)->base[GTK_STATE_NORMAL];
-	if (!previous_style || !gdk_color_equal (&c, &previous_style->base[GTK_STATE_NORMAL]))
-	{
-		gtk_widget_modify_bg (widget, GTK_STATE_NORMAL, &c);
-	}
+		g_object_unref (cursor);
 }
 
 static void
 xpad_text_view_notify_fontname (XpadTextView *view)
 {
-	const gchar *font = xpad_settings_get_fontname (xpad_settings ());
+	const gchar *font = xpad_settings_get_fontname (xpad_global_settings);
 	PangoFontDescription *fontdesc;
 	
 	fontdesc = font ? pango_font_description_from_string (font) : NULL;
-	gtk_widget_modify_font (GTK_WIDGET (view), fontdesc);
+	gtk_widget_override_font (GTK_WIDGET (view), fontdesc);
 	if (fontdesc)
 		pango_font_description_free (fontdesc);
 }
 
-static void
-xpad_text_view_notify_text_color (XpadTextView *view)
-{
-	gtk_widget_modify_text (GTK_WIDGET (view), GTK_STATE_NORMAL, xpad_settings_get_text_color (xpad_settings ()));
-}
-
-static void
-xpad_text_view_notify_back_color (XpadTextView *view)
-{
-	gtk_widget_modify_base (GTK_WIDGET (view), GTK_STATE_NORMAL, xpad_settings_get_back_color (xpad_settings ()));
+// Update the colors of the textview
+static void
+xpad_text_view_notify_colors (XpadTextView *view)
+{
+	// Set the colors of this individual pad to the global setting preference.
+	const GdkRGBA *text_color = xpad_settings_get_text_color (xpad_global_settings);
+	const GdkRGBA *back_color = xpad_settings_get_back_color (xpad_global_settings);
+
+	gtk_widget_override_cursor (GTK_WIDGET (view), text_color, text_color);
+	gtk_widget_override_color (GTK_WIDGET (view), GTK_STATE_FLAG_NORMAL, text_color);
+	gtk_widget_override_background_color (GTK_WIDGET (view), GTK_STATE_FLAG_NORMAL, back_color);
+
+	// Inverse the text and background colors for selected text, so it is likely to be visible by any choice of the colors.
+	gtk_widget_override_color (GTK_WIDGET (view), GTK_STATE_FLAG_SELECTED, back_color);
+	gtk_widget_override_background_color (GTK_WIDGET (view), GTK_STATE_FLAG_SELECTED, text_color);
 }
 
 void
 xpad_text_view_set_follow_font_style (XpadTextView *view, gboolean follow)
 {
+	g_return_if_fail (view);
+
 	if (follow != view->priv->follow_font_style)
 	{
 		if (follow)
 		{
-			g_signal_handler_unblock (xpad_settings (), view->priv->notify_font_handler);
+			g_signal_handler_unblock (xpad_global_settings, view->priv->notify_font_handler);
 			xpad_text_view_notify_fontname (view);
 		}
 		else
 		{
-			g_signal_handler_block (xpad_settings (), view->priv->notify_font_handler);
+			g_signal_handler_block (xpad_global_settings, view->priv->notify_font_handler);
 		}
 	}
 	
@@ -279,37 +267,44 @@
 gboolean
 xpad_text_view_get_follow_font_style (XpadTextView *view)
 {
-	return view->priv->follow_font_style;
+	if (view == NULL)
+		return TRUE;
+	else
+		return view->priv->follow_font_style;
 }
 
 void
 xpad_text_view_set_follow_color_style (XpadTextView *view, gboolean follow)
 {
+	g_return_if_fail (view);
+
 	if (follow != view->priv->follow_color_style)
 	{
 		if (follow)
 		{
-			g_signal_handler_unblock (xpad_settings (), view->priv->notify_text_handler);
-			g_signal_handler_unblock (xpad_settings (), view->priv->notify_back_handler);
-			xpad_text_view_notify_text_color (view);
-			xpad_text_view_notify_back_color (view);
+			xpad_text_view_notify_colors (view);
+			g_signal_handler_unblock (xpad_global_settings, view->priv->notify_text_handler);
+			g_signal_handler_unblock (xpad_global_settings, view->priv->notify_back_handler);
 		}
 		else
 		{
-			g_signal_handler_block (xpad_settings (), view->priv->notify_text_handler);
-			g_signal_handler_block (xpad_settings (), view->priv->notify_back_handler);
+			g_signal_handler_block (xpad_global_settings, view->priv->notify_text_handler);
+			g_signal_handler_block (xpad_global_settings, view->priv->notify_back_handler);
 		}
+
+		view->priv->follow_color_style = follow;
 	}
-	
-	view->priv->follow_color_style = follow;
-	
+
 	g_object_notify (G_OBJECT (view), "follow_color_style");
 }
 
 gboolean
 xpad_text_view_get_follow_color_style (XpadTextView *view)
 {
-	return view->priv->follow_color_style;
+	if (view == NULL)
+		return TRUE;
+	else
+		return view->priv->follow_color_style;
 }
 
 static void
 
=== modified file 'src/xpad-toolbar.c'
--- src/xpad-toolbar.c	2013-10-18 18:31:20 +0000
+++ src/xpad-toolbar.c	2013-11-01 20:03:38 +0000
@@ -25,6 +25,7 @@
 #include "xpad-toolbar.h"
 #include "xpad-settings.h"
 #include "xpad-grip-tool-item.h"
+#include "xpad-app.h"
 
 struct XpadToolbarPrivate
 {
@@ -279,7 +280,7 @@
 	              "toolbar-style", GTK_TOOLBAR_ICONS,
 	              NULL);
 	
-	g_signal_connect_swapped (xpad_settings (), "change-buttons", G_CALLBACK (xpad_toolbar_change_buttons), toolbar);
+	g_signal_connect_swapped (xpad_global_settings, "change-buttons", G_CALLBACK (xpad_toolbar_change_buttons), toolbar);
 	
 	xpad_toolbar_change_buttons (toolbar);
 }
@@ -288,7 +289,7 @@
 xpad_toolbar_dispose (GObject *object)
 {
 	XpadToolbar *toolbar = XPAD_TOOLBAR (object);
-	
+
 	if (toolbar->priv->pad) {
 		g_object_unref (toolbar->priv->pad);
 		toolbar->priv->pad = NULL;
@@ -346,6 +347,10 @@
 static G_CONST_RETURN XpadToolbarButton *
 xpad_toolbar_button_lookup (XpadToolbar *toolbar, const gchar *name)
 {
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) toolbar;
+
 	guint i;
 	for (i = 0; i < G_N_ELEMENTS (buttons); i++)
 		if (!g_ascii_strcasecmp (name, buttons[i].name))
@@ -424,7 +429,7 @@
 	for (j = 0; j < G_N_ELEMENTS (buttons); j++)
 		g_object_set_data (G_OBJECT (toolbar), buttons[j].name, NULL);
 	
-	slist = xpad_settings_get_toolbar_buttons (xpad_settings ());
+	slist = xpad_settings_get_toolbar_buttons (xpad_global_settings);
 	for (stemp = slist; stemp; stemp = stemp->next)
 	{
 		const XpadToolbarButton *button;
@@ -468,19 +473,19 @@
 static void
 xpad_toolbar_remove_all_buttons ()
 {
-	xpad_settings_remove_all_toolbar_buttons (xpad_settings ());
+	xpad_settings_remove_all_toolbar_buttons (xpad_global_settings);
 }
 
 static void
 xpad_toolbar_remove_last_button ()
 {
-	xpad_settings_remove_last_toolbar_button (xpad_settings ());
+	xpad_settings_remove_last_toolbar_button (xpad_global_settings);
 }
 
 static void
 xpad_toolbar_add_button (const gchar *name)
 {
-	xpad_settings_add_toolbar_button (xpad_settings (), name);
+	xpad_settings_add_toolbar_button (xpad_global_settings, name);
 }
 
 static void
@@ -492,13 +497,18 @@
 static gboolean
 xpad_toolbar_popup_context_menu (GtkToolbar *toolbar, gint x, gint y, gint button)
 {
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) x;
+	(void) y;
+
 	GtkWidget *menu;
 	const GSList *current_buttons;
 	guint i;
 	
 	menu = gtk_menu_new ();
 	
-	current_buttons = xpad_settings_get_toolbar_buttons (xpad_settings ());
+	current_buttons = xpad_settings_get_toolbar_buttons (xpad_global_settings);
 
 	gboolean is_button = FALSE;
 	
@@ -679,7 +689,7 @@
 
 	button_num = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button), "xpad-button-num"));
 
-	xpad_settings_remove_toolbar_button (xpad_settings (), button_num);
+	xpad_settings_remove_toolbar_button (xpad_global_settings, button_num);
 }
 
 static void
@@ -731,7 +741,7 @@
 static gboolean
 xpad_toolbar_move_button_move_keyboard (XpadToolbar *toolbar, GdkEventKey *event)
 {
-	if (event->keyval == GDK_Left || event->keyval == GDK_KP_Left)
+	if (event->keyval == GDK_KEY_Left || event->keyval == GDK_KEY_KP_Left)
 	{
 		if (!toolbar->priv->move_removed)
 		{
@@ -744,7 +754,7 @@
 
 		gtk_toolbar_set_drop_highlight_item (GTK_TOOLBAR (toolbar), toolbar->priv->move_button, toolbar->priv->move_index);
 	}
-	else if (event->keyval == GDK_Right || event->keyval == GDK_KP_Right)
+	else if (event->keyval == GDK_KEY_Right || event->keyval == GDK_KEY_KP_Right)
 	{
 		gint max;
 
@@ -761,7 +771,7 @@
 
 		gtk_toolbar_set_drop_highlight_item (GTK_TOOLBAR (toolbar), toolbar->priv->move_button, toolbar->priv->move_index);
 	}
-	else if (event->keyval == GDK_space || event->keyval == GDK_KP_Space || event->keyval == GDK_Return || event->keyval == GDK_KP_Enter)
+	else if (event->keyval == GDK_KEY_space || event->keyval == GDK_KEY_KP_Space || event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_KP_Enter)
 	{
 		xpad_toolbar_move_button_end (toolbar);
 		return TRUE;
@@ -813,7 +823,7 @@
 	max = gtk_toolbar_get_n_items (GTK_TOOLBAR (toolbar)) - 2;
 	toolbar->priv->move_index = MIN (toolbar->priv->move_index, max);
 
-	if (!xpad_settings_move_toolbar_button (xpad_settings (), old_spot,	toolbar->priv->move_index) &&
+	if (!xpad_settings_move_toolbar_button (xpad_global_settings, old_spot,	toolbar->priv->move_index) &&
 	    toolbar->priv->move_removed)
 	{
 		gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolbar->priv->move_button, toolbar->priv->move_index);
 
=== modified file 'src/xpad-tray.c'
--- src/xpad-tray.c	2013-10-21 02:51:19 +0000
+++ src/xpad-tray.c	2013-11-01 20:03:38 +0000
@@ -2,6 +2,7 @@
 
 Copyright (c) 2002 Jamis Buck
 Copyright (c) 2003-2007 Michael Terry
+Copyright (c) 2013 Arthur Borsboom
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -52,26 +53,25 @@
 static GtkWidget *menu = NULL;
 
 void
-xpad_tray_open (void)
+xpad_tray_open ()
 {
 	GtkIconTheme *theme;
 
-	// xpad_tray_close ();
-	
 	theme = gtk_icon_theme_get_default ();
+
 	if (!gtk_icon_theme_has_icon (theme, PACKAGE)) {
 		return;
 	}
-	
+
 	if (gtk_icon_theme_has_icon (theme, "xpad-panel"))
-    {
-	    docklet = gtk_status_icon_new_from_icon_name ("xpad-panel");
-    }
-    else
-    {
+	{
+		docklet = gtk_status_icon_new_from_icon_name ("xpad-panel");
+	}
+	else
+	{
 	    docklet = gtk_status_icon_new_from_icon_name (PACKAGE);
-    }
-	
+	}
+
 	if (docklet)
 	{
 		g_signal_connect (docklet, "activate", G_CALLBACK (xpad_tray_activate_cb), NULL);
@@ -117,7 +117,7 @@
 static void
 menu_show_all (XpadPadGroup *group)
 {
-	GSList *pads = xpad_pad_group_get_pads (xpad_app_get_pad_group ());
+	GSList *pads = xpad_pad_group_get_pads (group);
 	g_slist_foreach (pads, (GFunc) gtk_window_present, NULL);
 	g_slist_free (pads);
 }
@@ -153,7 +153,6 @@
 {
 	GtkWidget *item;
 	GSList *pads;
-	gint n;
 	gboolean no_any_pad = FALSE;
 	
 	menu = gtk_menu_new ();
@@ -208,7 +207,7 @@
 static void
 xpad_tray_activate_cb (GtkStatusIcon *icon)
 {
-	switch (xpad_settings_get_tray_click_handler(xpad_settings()))
+	switch (xpad_settings_get_tray_click_handler(xpad_global_settings))
 	{
 		case TOGGLE_SHOW_ALL:
 			xpad_tray_show_hide_all();
 
=== modified file 'src/xpad-undo.c'
--- src/xpad-undo.c	2013-10-18 18:31:20 +0000
+++ src/xpad-undo.c	2013-11-01 20:03:38 +0000
@@ -223,12 +223,20 @@
 static void
 xpad_undo_begin_user_action (GtkTextBuffer *buffer, XpadUndo *undo)
 {
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) buffer;
+
 	undo->priv->user_action++;
 }
 
 static void
 xpad_undo_end_user_action (GtkTextBuffer *buffer, XpadUndo *undo)
 {
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) buffer;
+
 	if (undo->priv->user_action > 0)
 		undo->priv->user_action--;
 }
@@ -275,15 +283,28 @@
 static void
 xpad_undo_insert_text (GtkTextBuffer *buffer, GtkTextIter *location, gchar *text, gint len, XpadUndo *undo)
 {
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) buffer;
+
 	if (undo->priv->frozen)
 		return;
 
 	if (undo->priv->user_action)
 	{
+		gint n_utf8_chars = 0;
+		glong string_length = 0;
+
 		xpad_undo_clear_redo_history (undo);
 
 		gint pos = gtk_text_iter_get_offset (location);
-		gint n_utf8_chars = g_utf8_strlen (text, len);
+
+		// safe cast
+		string_length = g_utf8_strlen (text, len);
+		if (string_length <= UINT_MAX)
+			n_utf8_chars = (gint) string_length;
+		else
+			g_warning("Casting problem in undo insert text function. Please send a bugreport.");
 
 		/* Merge similar actions. This is how Undo works in most editors, if there is a series of
 			1-letter insertions - they are merge for Undo */
@@ -299,8 +320,8 @@
 					&& (prev_action->n_utf8_chars == 1 || prev_action->merged)) // with which we should merge
 				{
 					/* if there was a space stop merging unless that was a series of spaces */
-					if ((!g_unichar_isspace (prev_action->text[0]) && !g_ascii_isspace (text[0])) ||
-						(g_unichar_isspace (prev_action->text[0]) && g_unichar_isspace (text[0])))
+					if ((!g_unichar_isspace ((gunichar) prev_action->text[0]) && !g_ascii_isspace ((gunichar) text[0])) ||
+						(g_unichar_isspace ((gunichar) prev_action->text[0]) && g_unichar_isspace ((gunichar) text[0])))
 					{
 						gchar *joined_str = g_strjoin (NULL, prev_action->text, text, NULL);
 						g_free (prev_action->text);
@@ -328,7 +349,11 @@
 			is nothing after history_curr at this point so we
 			insert right after it. history_start won't change
 			since it is a left guard - not NULL */
-		GList *dummy_start = g_list_append (undo->priv->history_curr, action); // supress warning, we have left guard for start
+		GList *dummy_start = g_list_append (undo->priv->history_curr, action);
+		// A dirty way to silence the compiler for these unused variables.
+		// Feel free to implement these variables in the way they are ment to be used.
+		(void) dummy_start;
+
 		undo->priv->history_curr = g_list_next (undo->priv->history_curr);
 
 		xpad_pad_notify_undo_redo_changed (xpad_text_buffer_get_pad (undo->priv->buffer));
@@ -338,18 +363,31 @@
 static void
 xpad_undo_delete_range (GtkTextBuffer *buffer, GtkTextIter *start, GtkTextIter *end, XpadUndo *undo)
 {
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) buffer;
+
 	if (undo->priv->frozen)
 		return;
 
 	if (undo->priv->user_action)
 	{
+		gint n_utf8_chars = 0;
+		glong string_length = 0;
+
 		xpad_undo_clear_redo_history (undo);
 
 		gchar *text = gtk_text_iter_get_text (start, end);
 		gint start_offset = gtk_text_iter_get_offset (start);
 		gint end_offset = gtk_text_iter_get_offset (end);
 		gint len = abs (end_offset - start_offset);
-		gint n_utf8_chars = g_utf8_strlen (text, len);
+
+		// safe cast
+		string_length = g_utf8_strlen (text, len);
+		if (string_length <= UINT_MAX)
+			n_utf8_chars = (gint) string_length;
+		else
+			g_warning("Casting problem in undo delete range function. Please send a bugreport.");
 
 		UserAction *action = g_new (UserAction, 1);
 		action->action_type = USER_ACTION_DELETE_RANGE;
@@ -360,7 +398,11 @@
 		action->n_utf8_chars = n_utf8_chars;
 		action->merged = FALSE;
 
-		GList *dummy_start = g_list_append (undo->priv->history_curr, action); // supress warning, we have left guard for start
+		GList *dummy_start = g_list_append (undo->priv->history_curr, action);
+		// A dirty way to silence the compiler for these unused variables.
+		// Feel free to implement these variables in the way they are ment to be used.
+		(void) dummy_start;
+
 		undo->priv->history_curr = g_list_next (undo->priv->history_curr);
 
 		xpad_pad_notify_undo_redo_changed (xpad_text_buffer_get_pad (undo->priv->buffer));
@@ -385,7 +427,11 @@
 	action->end = end_offset;	
 	action->merged = FALSE;
 
-	GList *dummy_start = g_list_append (undo->priv->history_curr, action); // supress warning, we have left guard for start
+	GList *dummy_start = g_list_append (undo->priv->history_curr, action);
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) dummy_start;
+
 	undo->priv->history_curr = g_list_next (undo->priv->history_curr);
 
 	xpad_pad_notify_undo_redo_changed (xpad_text_buffer_get_pad (undo->priv->buffer));
@@ -409,7 +455,11 @@
 	action->end = end_offset;
 	action->merged = FALSE;
 
-	GList *dummy_start = g_list_append (undo->priv->history_curr, action); // supress warning, we have left guard for start
+	GList *dummy_start = g_list_append (undo->priv->history_curr, action);
+	// A dirty way to silence the compiler for these unused variables.
+	// Feel free to implement these variables in the way they are ment to be used.
+	(void) dummy_start;
+
 	undo->priv->history_curr = g_list_next (undo->priv->history_curr);
 
 	xpad_pad_notify_undo_redo_changed (xpad_text_buffer_get_pad (undo->priv->buffer));