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

[Arthur Borsboom]

* New: Toolbar - ability to add multiple separators (#351775)
* New: Toolbar - ability to add paste button on toolbar (#351775)
* New: Preferences - Ability to set the automatic start of Xpad in the Preferences menu (#405314)
* New: Preferences - Ability to set the wait for systray option in the Preferences menu (#405314)
* New: Preferences - Ability to delay the start of Xpad in the Preferences menu (#405314)
* New: Preferences - Ability to set the automatic creation of a new pad at the start of Xpad in the Preferences menu
* New: Preferences - Ability to set the automatic open/hide/restore of all pads at the start of Xpad in the Preferences menu (#405314)
* Fix: Toolbar - improved default toolbar items to the commonly used items
* Fix: Toolbar - improved item names
* Fix: Toolbar - prevented a crash when erasing toolbar items
* Fix: Preferences - Changed description of Edit Lock into Make pads read-only
* Fix: Preferences - Make sure that the preference window is always presented up front to the user, when requested.

And many technical fixes (see change log)

[Arthur Borsboom (arthurborsboom)]

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2013-10-24 17:01:13 +0000
+++ ChangeLog	2014-06-07 00:27:40 +0000
@@ -1,5 +1,34 @@
+<<<<<<< TREE
 Version 4.2
 * New: Undo/redo functionality such as CTRL-Z (#1121740)
+=======
+Version 4.3
+* New: Toolbar - ability to add multiple separators (#351775)
+* New: Toolbar - ability to add paste button on toolbar (#351775)
+* New: Preferences - Ability to set the automatic start of Xpad in the Preferences menu (#405314)
+* New: Preferences - Ability to set the wait for systray option in the Preferences menu (#405314)
+* New: Preferences - Ability to delay the start of Xpad in the Preferences menu (#405314)
+* New: Preferences - Ability to set the automatic creation of a new pad at the start of Xpad in the Preferences menu
+* New: Preferences - Ability to set the automatic open/hide/restore of all pads at the start of Xpad in the Preferences menu (#405314)
+* Fix: Toolbar - improved default toolbar items to the commonly used items
+* Fix: Toolbar - improved item names
+* Fix: Toolbar - prevented a crash when erasing toolbar items
+* Fix: Preferences - Changed description of Edit Lock into Make pads read-only
+* Fix: Preferences - Make sure that the preference window is always presented up front to the user, when requested.
+* Fix: Technical - Migrated Xpad from GTK2 to GTK3 (#1242424)
+* Fix: Technical - Replaced deprecated Glib and GTK statements
+* Fix: Technical - Improved configure.ac for better debugging and code quality
+* Fix: Technical - Corrected commenting style to C89 standard
+* Fix: Technical - Reorganized code of preferences dialog in preparation of another change
+* Fix: Technical - Prevented an error while changing the Edit lock preference
+* Fix: Technical - Prevented a crash when using command line option -n (= new pad)
+* Fix: Technical - Improve the hiding of pads at Xpad launch (#405314)
+* Fix: Technical - Added thread safe handling of new preferences
+* Fix: Technical - Ensured the use of GNU C libraries, so the readlink function is available
+
+Version 4.2
+* New: Undo functionality such as CTRL-Z (#1121740)
+>>>>>>> MERGE-SOURCE
 * New: Tray click behaviour can now be configured (#345278, #304331, #890335)
 * New: Theme builders can now use seperate tray icon by adding xpad-panel.xvg (#907705)
 * Fix: Theme color stays after application restart (#307669)
 
=== modified file 'INSTALL'
--- INSTALL	2009-05-02 17:21:29 +0000
+++ INSTALL	2014-06-07 00:27:40 +0000
@@ -1,19 +1,25 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+Inc.
 
-   This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 Basic Installation
 ==================
 
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
+   Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -42,7 +48,7 @@
 you want to change it or regenerate `configure' using a newer version
 of `autoconf'.
 
-The simplest way to compile this package is:
+   The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
      `./configure' to configure the package for your system.
@@ -53,12 +59,22 @@
   2. Type `make' to compile the package.
 
   3. Optionally, type `make check' to run any self-tests that come with
-     the package.
+     the package, generally using the just-built uninstalled binaries.
 
   4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
      source code directory by typing `make clean'.  To also remove the
      files that `configure' created (so you can compile the package for
      a different kind of computer), type `make distclean'.  There is
@@ -67,8 +83,15 @@
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
-  6. Often, you can also type `make uninstall' to remove the installed
-     files again.
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
 
 Compilers and Options
 =====================
@@ -93,7 +116,8 @@
 own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
 
    With a non-GNU `make', it is safer to compile the package for one
 architecture at a time in the source code directory.  After you have
@@ -120,7 +144,8 @@
    By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
@@ -131,15 +156,46 @@
    In addition, if you use an unusual directory layout you can give
 options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
 
    If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 
-Optional Features
-=================
-
    Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
@@ -152,6 +208,13 @@
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
 Particular systems
 ==================
 
@@ -159,10 +222,15 @@
 CC is not installed, it is recommended to use the following options in
 order to use an ANSI C compiler:
 
-     ./configure CC="cc -Ae"
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
@@ -174,6 +242,16 @@
 
      ./configure CC="cc -nodtk"
 
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
 Specifying the System Type
 ==========================
 
@@ -189,7 +267,8 @@
 
 where SYSTEM can have one of these forms:
 
-     OS KERNEL-OS
+     OS
+     KERNEL-OS
 
    See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
@@ -230,9 +309,10 @@
 overridden in the site shell script).
 
 Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
+an Autoconf limitation.  Until the limitation is lifted, you can use
+this workaround:
 
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
@@ -277,7 +357,7 @@
      `configure' can determine that directory automatically.
 
 `--prefix=DIR'
-     Use DIR as the installation prefix.  *Note Installation Names::
+     Use DIR as the installation prefix.  *note Installation Names::
      for more details, including other options available for fine-tuning
      the installation locations.
 
@@ -288,4 +368,3 @@
 
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
-
 
=== modified file 'configure.ac'
--- configure.ac	2013-10-31 21:17:36 +0000
+++ configure.ac	2014-06-07 00:27:40 +0000
@@ -20,19 +20,12 @@
 # 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_LIBS)
 AC_SUBST(GTK_CFLAGS)
-AC_SUBST(GTK_LIBS)
 
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.38)
+AC_SUBST(GLIB_LIBS)
 AC_SUBST(GLIB_CFLAGS)
-AC_SUBST(GLIB_LIBS)
 
 PKG_CHECK_MODULES(PANGO, pango >= 1.32)
 AC_SUBST(PANGO_LIBS)
@@ -46,6 +39,9 @@
 AC_SUBST(ATK_LIBS)
 AC_SUBST(ATK_CFLAGS)
 
+# Force the use of GNU libraries, for the special case of the function readlink
+AC_GNU_SOURCE
+
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_SIZE_T
@@ -71,7 +67,7 @@
   enable_debug="$enableval",
   enable_debug=no)
 if test "$enable_debug" = "yes"; then
-  DEBUG_CFLAGS="-ansi -Wall -Werror -g -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGTK_MULTIHEAD_SAFE"
+  DEBUG_CFLAGS="-ansi -Wall -Werror -g -O0 -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGTK_MULTIHEAD_SAFE -DGTK_DISABLE_SINGLE_INCLUDES -DGSEAL_ENABLE"
 else
   DEBUG_CFLAGS=""
 fi
@@ -80,4 +76,3 @@
 # Sets up output files.
 AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile images/Makefile po/Makefile.in autopackage/Makefile autopackage/default.apspec])
 AC_OUTPUT
-
 
=== modified file 'src/fio.c'
--- src/fio.c	2013-10-31 21:17:36 +0000
+++ src/fio.c	2014-06-07 00:27:40 +0000
@@ -67,7 +67,7 @@
 		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);
+		memmove (p + rsize, p + osize, strlen (p + osize) + 1);
 		
 		memcpy (p, replacement, rsize);
 		
@@ -173,12 +173,14 @@
 	if (!buf)
 		return 1;
 	
-	/* because of the way we look for a matching variable name, which is
-		to look for an endline, the variable name, and a space, we insert a
-		newline at the beginning, so that the first variable name is caught. */
+	/*
+	 * because of the way we look for a matching variable name, which is
+	 * to look for an endline, the variable name, and a space, we insert a
+	 * newline at the beginning, so that the first variable name is caught.
+	 */
 	len = strlen (buf);
 	buf = g_realloc (buf, len + 2);
-	g_memmove (buf + 1, buf, len + 1);
+	memmove (buf + 1, buf, len + 1);
 	buf[0] = '\n';
 	
 	va_start (ap, filename);
 
=== modified file 'src/prefix.c'
--- src/prefix.c	2013-10-23 02:51:47 +0000
+++ src/prefix.c	2014-06-07 00:27:40 +0000
@@ -45,7 +45,6 @@
 	#define BR_PTHREADS 0
 #endif /* BR_PTHREADS */
 
-#define _GNU_SOURCE
 #include <stdlib.h>
 #include <stdio.h>
 #include <limits.h>
 
=== modified file 'src/xpad-app.c'
--- src/xpad-app.c	2013-10-31 21:17:36 +0000
+++ src/xpad-app.c	2014-06-07 00:27:40 +0000
@@ -62,7 +62,6 @@
 #define SUN_LEN(sunp) ((size_t)((struct sockaddr_un *)0)->sun_path + strlen((sunp)->sun_path))
 #endif
 
-
 static gint xpad_argc;
 static gchar **xpad_argv;
 static gboolean option_nonew;
@@ -84,18 +83,17 @@
 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		process_remote_args         (gint *argc, gchar **argv[], gboolean have_gtk, XpadSettings *xpad_settings);
 
 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 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
 xpad_app_init (int argc, char **argv)
 {
@@ -109,7 +107,7 @@
 	textdomain (GETTEXT_PACKAGE);
 #endif
 
-	have_gtk = gtk_init_check (&argc, &argv); // Leaves 135 referenced objects behind. No idea how to unref. Total up to here 135.
+	have_gtk = gtk_init_check (&argc, &argv);
 	xpad_argc = argc;
 	xpad_argv = argv;
 	output = stdout;
@@ -129,7 +127,7 @@
 		process_local_args (&xpad_argc, &xpad_argv);
 		if (!xpad_app_pass_args ())
 		{
-			process_remote_args (&xpad_argc, &xpad_argv, FALSE);
+			process_remote_args (&xpad_argc, &xpad_argv, FALSE, xpad_global_settings);
 			fprintf (output, "%s\n", _("Xpad is a graphical program.  Please run it from your desktop."));
 		}
 		exit (0);
@@ -139,7 +137,6 @@
 	gdk_set_program_class (PACKAGE);
 
 	/* Set up program path. */
-
 	if (xpad_argc > 0)
 		program_path = g_find_program_in_path (xpad_argv[0]);
 	else
@@ -153,30 +150,43 @@
 	/* Race condition here, between calls */
 	xpad_app_open_proc_file ();
 	
-	register_stock_icons (); // Leaves 1039 referenced objects behind. No idea how to unref, except 1. Total up to here 1173.
+	register_stock_icons ();
 	gtk_window_set_default_icon_name (PACKAGE);
 	
-	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 (); // Creates 34 referenced objects; but only 14 get unrefferenced. Total 1193.
+	/* Read the Xpad configuration file from disk (if exists) */
+	xpad_global_settings = xpad_settings_new ();
+	
+	/* Delay program startup, if user configured it, to wait for example for the loading of the systray. */
+	if (xpad_settings_get_autostart_delay (xpad_global_settings))
+		sleep(xpad_settings_get_autostart_delay (xpad_global_settings));
+
+	pad_group = xpad_pad_group_new();
+	process_remote_args (&xpad_argc, &xpad_argv, TRUE, xpad_global_settings);
+	
+	xpad_tray_open ();
 	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 (); // each pad creates 333 references and leaves about 100 references behind. Total 1268.
+	pads_loaded_on_start = xpad_app_load_pads ();
 	if (pads_loaded_on_start == 0 && !option_new) {
 		if (!option_nonew) {
 			GtkWidget *pad = xpad_pad_new (pad_group);
 			gtk_widget_show (pad);
 		}
 	}
+
+	/* Since all pads have been loaded, reprocess the show/hide/toggle option for all pads */
+	if (have_gtk && (option_show))
+		xpad_pad_group_show_all (pad_group);
+	if (have_gtk && (option_hide))
+		xpad_pad_group_close_all (pad_group);
+	if (have_gtk && option_toggle)
+		xpad_pad_group_toggle_hide (pad_group);
 	
 	g_idle_add ((GSourceFunc)xpad_app_first_idle_check, pad_group);
 	
@@ -209,22 +219,22 @@
 	
 	g_printerr ("%s\n", primary);
 	
-	dialog = xpad_app_alert_new (parent, GTK_STOCK_DIALOG_ERROR, primary, secondary);
-	gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_OK, 1, NULL);
+	dialog = xpad_app_alert_dialog (parent, "dialog-error", primary, secondary);	
+	gtk_dialog_add_buttons (GTK_DIALOG (dialog), _("_Ok"), GTK_RESPONSE_OK, NULL);
 	gtk_dialog_run (GTK_DIALOG (dialog));
 	gtk_widget_destroy (dialog);
 	
 	xpad_session_manager_stop_interact (FALSE);
 }
 
-G_CONST_RETURN gchar *
+const gchar *
 xpad_app_get_config_dir (void)
 {
 	return config_dir;
 }
 
 /* Returns absolute path to our own executable. May be NULL. */
-G_CONST_RETURN gchar *
+const gchar *
 xpad_app_get_program_path (void)
 {
 	return program_path;
@@ -239,23 +249,23 @@
 void
 xpad_app_quit (void)
 {
-	// Free the memory used by the pads belonging to this group
+	/* Free the memory used by the pads belonging to this group */
 	xpad_pad_group_destroy_pads (xpad_app_get_pad_group());
 
-	// Free the memory used by group.
+	/* Free the memory used by group. */
 	g_object_unref (xpad_app_get_pad_group());
 
-	// Free the memory used by the settings menu.
+	/* Free the memory used by the settings menu. */
 	g_object_unref (xpad_global_settings);
-	xpad_global_settings = NULL; // This is needed due to the asynchronous finalizing process.
+	xpad_global_settings = NULL; /* This is needed due to the asynchronous finalizing process. */
 
-	// Free the memory used by the tray icon and its menu.
+	/* Free the memory used by the tray icon and its menu. */
 	xpad_tray_close ();
 
-	// Free the theme reference. Unfortunately GTK3 leaves about 1000 objects behind.
+	/* 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.
+	/* Give GTK the signal to clean the rest and quit the application. */
 	gtk_main_quit ();
 }
 
@@ -338,24 +348,23 @@
 	return dir;
 }
 
-
 /**
- * Creates an alert with 'stock' used to create an icon and parent text of 'parent',
+ * Creates an alert with a named-icon used to create an icon and parent text of 'parent',
  * 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_dialog (GtkWindow *parent, const gchar *icon_name, const gchar *primary, const gchar *secondary)
 {
 	GtkWidget *dialog, *hbox, *image, *label;
 	gchar *buf;
 	
-	dialog = gtk_dialog_new();
+	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);
+	image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_DIALOG);	
 	label = gtk_label_new (NULL);
 	
 	if (secondary)
@@ -383,7 +392,6 @@
 	return dialog;
 }
 
-
 static void
 register_stock_icons (void)
 {
@@ -393,7 +401,6 @@
 	gtk_icon_theme_prepend_search_path (theme, THEME_DIR);
 }
 
-
 static gboolean
 xpad_app_quit_if_no_pads (XpadPadGroup *group)
 {
@@ -412,7 +419,6 @@
 	return FALSE;
 }
 
-
 static gboolean
 xpad_app_first_idle_check (XpadPadGroup *group)
 {
@@ -439,7 +445,6 @@
 	return FALSE;
 }
 
-
 static void
 xpad_app_pad_added (XpadPadGroup *group, XpadPad *pad)
 {
@@ -454,7 +459,7 @@
 {
 	gint opened = 0;
 	GDir *dir;
-	G_CONST_RETURN gchar *name;
+	const gchar *name;
 	
 	g_signal_connect (pad_group, "pad-added", G_CALLBACK (xpad_app_pad_added), NULL);
 	
@@ -495,17 +500,6 @@
 	return opened;
 }
 
-
-
-
-
-
-
-
-
-
-
-
 /*
 converts main program arguments into one long string.
 puts allocated string in dest, and returns size
@@ -522,7 +516,7 @@
 	for (i = 0; i < argc; i++) {
 		string_length = strlen (argv[i]) + 1;
 
-		// safe cast
+		/* safe cast */
 		if( string_length <= UINT_MAX ) {
 		       size += (guint) string_length;
 		}
@@ -549,7 +543,6 @@
 	return size;
 }
 
-
 /*
 returns number of strings in newly allocated argv
 */
@@ -576,7 +569,7 @@
 		
 		if (tmp) {
 			long int difference = tmp - string;
-			// safe cast from long int to size_t
+			/* safe cast from long int to size_t */
 			if (difference >= 0)
 				len = (size_t) difference;
 			else {
@@ -645,19 +638,19 @@
 	/* here we redirect singleton->priv->output to the socket */
 	output = fdopen (client_fd, "w");
 	
-	if (!process_remote_args (&argc, &argv, TRUE))
+	if (!process_remote_args (&argc, &argv, TRUE, xpad_global_settings))
 	{
 		/* if there were no non-local arguments, insert --new as argument */
 		gint c = 2;
 		gchar **v = NULL;
 		unsigned long int my_size = 0;
-		// safe cast
+		/* safe cast */
 		my_size = sizeof (gchar *) * (long unsigned) c;
 		v = g_malloc (my_size);
 		v[0] = PACKAGE;
 		v[1] = "--new";
 		
-		process_remote_args (&c, &v, TRUE);
+		process_remote_args (&c, &v, TRUE, xpad_global_settings);
 		
 		g_free (v);
 	}
@@ -676,8 +669,7 @@
 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.
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) source;
 	(void) condition;
 	(void) data;
@@ -784,27 +776,6 @@
 	return connected;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 /**
  * Here are the functions called when arguments are passed to us.
  */
@@ -872,7 +843,7 @@
 }
 
 static gboolean
-process_remote_args (gint *argc, gchar **argv[], gboolean have_gtk)
+process_remote_args (gint *argc, gchar **argv[], gboolean have_gtk, XpadSettings *xpad_settings)
 {
 	GError *error = NULL;
 	GOptionContext *context;
@@ -894,21 +865,17 @@
 		if (have_gtk && option_smid)
 			xpad_session_manager_set_id (option_smid);
 		
-		if (have_gtk && option_new)
+		if (have_gtk && (option_new || xpad_settings_get_autostart_new_pad (xpad_settings)))
 		{
 			GtkWidget *pad = xpad_pad_new (pad_group);
 			gtk_widget_show (pad);
 		}
 
-		if (have_gtk && option_show)
-		  xpad_pad_group_show_all (pad_group);
-		
-		if (have_gtk && option_hide)
-		  xpad_pad_group_close_all (pad_group);
-		
-		if (have_gtk && option_toggle)
-		  xpad_pad_group_toggle_hide (pad_group);
-
+		if (xpad_settings_get_autostart_display_pads (xpad_settings) == 0)
+			option_show = TRUE;
+		if (xpad_settings_get_autostart_display_pads (xpad_settings) == 1)
+			option_hide = TRUE;
+		
 		if (have_gtk && option_files)
 		{
 			int i;
 
=== modified file 'src/xpad-app.h'
--- src/xpad-app.h	2013-10-31 21:17:36 +0000
+++ src/xpad-app.h	2014-06-07 00:27:40 +0000
@@ -26,10 +26,10 @@
 G_BEGIN_DECLS
 
 void       xpad_app_error     (GtkWindow *parent, const gchar *primary, const gchar *secondary);
-GtkWidget *xpad_app_alert_new (GtkWindow *parent, const gchar *stock, const gchar *primary, const gchar *secondary);
+GtkWidget *xpad_app_alert_dialog (GtkWindow *parent, const gchar *icon_name, const gchar *primary, const gchar *secondary);
 
-G_CONST_RETURN gchar *xpad_app_get_config_dir (void);
-G_CONST_RETURN gchar *xpad_app_get_program_path (void);
+const gchar *xpad_app_get_config_dir (void);
+const gchar *xpad_app_get_program_path (void);
 XpadPadGroup         *xpad_app_get_pad_group (void);
 XpadSettings		 *xpad_global_settings;
 gboolean              xpad_app_get_translucent (void);
 
=== modified file 'src/xpad-pad-group.c'
--- src/xpad-pad-group.c	2013-10-31 21:17:36 +0000
+++ src/xpad-pad-group.c	2014-06-07 00:27:40 +0000
@@ -95,7 +95,7 @@
 {
 	XpadPadGroup *group = XPAD_PAD_GROUP (object);
 
-	// Save all pads of this group
+	/* Save all pads of this group */
 	xpad_pad_group_save_unsaved_all(group);
 
 	G_OBJECT_CLASS (xpad_pad_group_parent_class)->dispose (object);
@@ -123,7 +123,6 @@
 xpad_pad_group_add (XpadPadGroup *group, GtkWidget *pad)
 {
 	g_object_ref(pad);
-	// g_object_ref_sink(GTK_OBJECT(pad));
 	
 	group->priv->pads = g_slist_append (group->priv->pads, XPAD_PAD (pad));
 	g_signal_connect_swapped (pad, "destroy", G_CALLBACK (xpad_pad_group_remove), group);
 
=== modified file 'src/xpad-pad-properties.c'
--- src/xpad-pad-properties.c	2013-10-31 21:17:36 +0000
+++ src/xpad-pad-properties.c	2014-06-07 00:27:40 +0000
@@ -273,8 +273,7 @@
 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.
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) button;
 
 	g_object_notify (G_OBJECT (prop), "text-color");
@@ -283,8 +282,7 @@
 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.
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) button;
 
 	g_object_notify (G_OBJECT (prop), "back-color");
@@ -293,8 +291,7 @@
 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.
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) button;
 
 	g_object_notify (G_OBJECT (prop), "fontname");
@@ -333,7 +330,7 @@
 	g_object_notify (G_OBJECT (prop), "back_color");
 }
 
-G_CONST_RETURN GdkRGBA *
+const GdkRGBA *
 xpad_pad_properties_get_back_color (XpadPadProperties *prop)
 {
 	gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (prop->priv->backbutton), &prop->priv->backtmp);
@@ -347,7 +344,7 @@
 	g_object_notify (G_OBJECT (prop), "text_color");
 }
 
-G_CONST_RETURN GdkRGBA *
+const GdkRGBA *
 xpad_pad_properties_get_text_color (XpadPadProperties *prop)
 {
 	gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (prop->priv->textbutton), &prop->priv->texttmp);
@@ -361,7 +358,7 @@
 	g_object_notify (G_OBJECT (prop), "fontname");
 }
 
-G_CONST_RETURN gchar *xpad_pad_properties_get_fontname (XpadPadProperties *prop)
+const gchar *xpad_pad_properties_get_fontname (XpadPadProperties *prop)
 {
 	return gtk_font_button_get_font_name (GTK_FONT_BUTTON (prop->priv->fontbutton));
 }
 
=== modified file 'src/xpad-pad-properties.h'
--- src/xpad-pad-properties.h	2013-10-31 21:17:36 +0000
+++ src/xpad-pad-properties.h	2014-06-07 00:27:40 +0000
@@ -59,13 +59,13 @@
 gboolean xpad_pad_properties_get_follow_color_style (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);
+const GdkRGBA *xpad_pad_properties_get_back_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);
+const 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);
+const gchar *xpad_pad_properties_get_fontname (XpadPadProperties *pad_properties);
 
 G_END_DECLS
 
 
=== modified file 'src/xpad-pad.c'
--- src/xpad-pad.c	2013-11-01 20:16:37 +0000
+++ src/xpad-pad.c	2014-06-07 00:27:40 +0000
@@ -241,7 +241,7 @@
 	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_global_settings);
+	pad->priv->sticky = xpad_settings_get_autostart_sticky (xpad_global_settings);
 	pad->priv->textview = NULL;
 	pad->priv->scrollbar = NULL;
 	pad->priv->toolbar = NULL;
@@ -289,7 +289,7 @@
 
 	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_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);
@@ -318,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);
@@ -381,12 +381,12 @@
 		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.
+	/* 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)) {
 		g_signal_handlers_disconnect_matched (pad->priv->clipboard, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, pad);
 	}
 
-	// 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)) {
 		g_signal_handlers_disconnect_matched (pad->priv->toolbar, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, pad);
 		gtk_widget_destroy(pad->priv->toolbar);
@@ -470,7 +470,9 @@
 		This is good, as some WMs don't like us changing the above parameters mid-run,
 		even if we do a hide/show cycle. */
 	gtk_window_set_default_size (GTK_WINDOW (pad), (gint) pad->priv->width, (gint) pad->priv->height);
-	gtk_window_reshow_with_initial_size (GTK_WINDOW (pad));
+	gtk_widget_hide(GTK_WIDGET (pad));
+	gtk_widget_unrealize(GTK_WIDGET (pad));
+	gtk_widget_show(GTK_WIDGET (pad));
 }
 
 static guint
@@ -488,7 +490,7 @@
 		&textx, &texty);
 	gtk_widget_translate_coordinates(pad->priv->textview, GTK_WIDGET(pad), textx, texty, &x, &y);
 
-	// Safe cast from gint to guint
+	/* Safe cast from gint to guint */
 	if (y >= 0) {
 		return (guint) y + pad->priv->toolbar_height + gtk_container_get_border_width(GTK_CONTAINER(pad->priv->textview));
 	}
@@ -511,7 +513,7 @@
 		if (!pad->priv->toolbar_height)
 		{
 			gtk_widget_get_preferred_size (pad->priv->toolbar, &req, NULL);
-			// safe cast from gint to guint
+			/* safe cast from gint to guint */
 			if (req.height >= 0) {
 				pad->priv->toolbar_height = (guint) req.height;
 			}
@@ -625,7 +627,7 @@
 	g_return_if_fail (pad);
 
 	XpadToolbar *toolbar = NULL;
-	// safe cast to toolbar
+	/* safe cast to toolbar */
 	if (XPAD_IS_TOOLBAR (pad->priv->toolbar)) {
 		toolbar = XPAD_TOOLBAR (pad->priv->toolbar);
 		g_return_if_fail (toolbar);
@@ -758,7 +760,7 @@
 {
 	g_return_if_fail (pad);
 
-	// With the delayed saving functionality, it is necessary to clear the unsaved flags to prevent usage of non-existing object information.
+	/* With the delayed saving functionality, it is necessary to clear the unsaved flags to prevent usage of non-existing object information. */
 	pad->priv->unsaved_info = FALSE;
 	pad->priv->unsaved_content = FALSE;
 
@@ -766,31 +768,29 @@
 	{
 		GtkWidget *dialog;
 		gint response;
-		
-		dialog = xpad_app_alert_new (GTK_WINDOW (pad), GTK_STOCK_DIALOG_WARNING,
-			_("Delete this pad?"),
-			_("All text of this pad will be irrevocably lost."));
+
+		dialog = xpad_app_alert_dialog (GTK_WINDOW (pad), "dialog-warning", _("Delete this pad?"), _("All text of this pad will be irrevocably lost."));
 		
 		if (!dialog)
 			return;
-		
-		gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, 1, GTK_STOCK_DELETE, 2, NULL);
-		
+
+		gtk_dialog_add_buttons (GTK_DIALOG (dialog), _("_Delete"), GTK_RESPONSE_ACCEPT, _("_Cancel"), GTK_RESPONSE_REJECT, NULL);
+
 		response = gtk_dialog_run (GTK_DIALOG (dialog));
 		
 		gtk_widget_destroy (dialog);
 		
-		if (response != 2)
+		if (response != GTK_RESPONSE_ACCEPT)
 			return;
 	}
 	
-	// These two if statements actually erase the pad on the harddisk.
+	/* These two if statements actually erase the pad on the harddisk. */
 	if (pad->priv->infoname)
 		fio_remove_file (pad->priv->infoname);
 	if (pad->priv->contentname)
 		fio_remove_file (pad->priv->contentname);
 	
-	// Remove the pad from the group and destroy it.
+	/* Remove the pad from the group and destroy it. */
 	gtk_widget_destroy (GTK_WIDGET (pad));
 }
 
@@ -847,7 +847,7 @@
 
 	if (xpad_pad_properties_get_follow_color_style (prop))
 	{
-		// Set the colors to the global preferences colors
+		/* 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);
 
@@ -855,13 +855,13 @@
 		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.
+		/* 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
+		/* 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);
 
@@ -869,7 +869,7 @@
 		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.
+		/* 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);
 	}
@@ -955,8 +955,7 @@
 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.
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) buffer;
 
 	/* set title */
@@ -969,7 +968,7 @@
 static gboolean
 xpad_pad_toolbar_size_allocate (XpadPad *pad, GtkAllocation *event)
 {
-	// safe cast from gint to guint
+	/* safe cast from gint to guint */
 	if (event->height >= 0) {
 		pad->priv->toolbar_height = (guint) event->height;
 	}
@@ -989,7 +988,7 @@
 	int eWidth = event->width;
 	int eHeight = event->height;
 	
-	// safe cast from gint to guint
+	/* safe cast from gint to guint */
 	if (eWidth >= 0 && eHeight >=0 ) {
 		if (pad->priv->width != (guint) eWidth || pad->priv->height != (guint) eHeight)
 			pad->priv->toolbar_pad_resized = TRUE;
@@ -1022,8 +1021,7 @@
 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.
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) event;
 
 	xpad_pad_close (pad);
@@ -1042,8 +1040,7 @@
 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.
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) text_view;
 
 	if (event->type == GDK_BUTTON_PRESS)
@@ -1312,31 +1309,35 @@
 
 	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, 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, 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.
+		/* 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.
+		/* 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),
+	/*
+	 * 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).
 	 */
 	if(GTK_IS_CONTAINER(pad->priv->menu)) {
@@ -1635,8 +1636,10 @@
 static void
 menu_toolbar (XpadPad *pad, GtkCheckMenuItem *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.
+	/*
+	 * 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));
@@ -1645,8 +1648,10 @@
 static void
 menu_scrollbar (XpadPad *pad, GtkCheckMenuItem *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.
+	/*
+	 * 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));
@@ -1655,8 +1660,10 @@
 static void
 menu_autohide (XpadPad *pad, GtkCheckMenuItem *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.
+	/*
+	 * 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));
@@ -1665,8 +1672,10 @@
 static void
 menu_decorated (XpadPad *pad, GtkCheckMenuItem *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.
+	/*
+	 * 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));
@@ -1686,33 +1695,24 @@
 	return rv;
 }
 
+/* FIXME: Accelerators are working but not visible for menu items with an image (icon). */
 #define MENU_ADD(mnemonic, image, key, mask, callback) {\
-	item = gtk_image_menu_item_new_with_mnemonic (mnemonic);\
 	if (image) {\
-		GtkWidget *imgwidget = gtk_image_new_from_stock (image, GTK_ICON_SIZE_MENU);\
-		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), imgwidget);\
-	}\
-	g_signal_connect_swapped (item, "activate", G_CALLBACK (callback), pad);\
-	if (key)\
-		gtk_widget_add_accelerator(item, "activate", accel_group, key, mask, GTK_ACCEL_VISIBLE);\
-	gtk_container_add (GTK_CONTAINER (menu), item);\
-	gtk_widget_show (item);\
-	}
-
-#define MENU_ADD_STOCK(stock, callback) {\
-	item = gtk_image_menu_item_new_from_stock (stock, accel_group);\
-	g_signal_connect_swapped (item, "activate", G_CALLBACK (callback), pad);\
-	gtk_container_add (GTK_CONTAINER (menu), item);\
-	gtk_widget_show (item);\
-	}
-
-#define MENU_ADD_STOCK_WITH_ACCEL(stock, callback, key, mask) {\
-	item = gtk_image_menu_item_new_from_stock (stock, accel_group);\
-	g_signal_connect_swapped (item, "activate", G_CALLBACK (callback), pad);\
-	if (key)\
-		gtk_widget_add_accelerator(item, "activate", accel_group, key, mask, GTK_ACCEL_VISIBLE);\
-	gtk_container_add (GTK_CONTAINER (menu), item);\
-	gtk_widget_show (item);\
+		item = gtk_menu_item_new ();\
+		GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3);\
+		GdkRGBA bg = {0, 0, 0, 0};\
+		gtk_widget_override_background_color (hbox, GTK_STATE_FLAG_NORMAL, &bg);\
+		gtk_container_add (GTK_CONTAINER (hbox), gtk_image_new_from_icon_name (image, GTK_ICON_SIZE_MENU));\
+		gtk_container_add (GTK_CONTAINER (hbox), gtk_label_new_with_mnemonic (mnemonic));\
+		gtk_container_add (GTK_CONTAINER (item), hbox);\
+	}\
+	else {\
+		item = gtk_menu_item_new_with_mnemonic (mnemonic);\
+	}\
+	g_signal_connect_swapped (item, "activate", G_CALLBACK (callback), pad);\
+	if (key)\
+		gtk_widget_add_accelerator (item, "activate", accel_group, key, mask, GTK_ACCEL_VISIBLE);\
+	gtk_container_add (GTK_CONTAINER (menu), item);\
 	}
 
 #define MENU_ADD_CHECK(mnemonic, active, callback) {\
@@ -1720,13 +1720,11 @@
 	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), active);\
 	g_signal_connect_swapped (item, "toggled", G_CALLBACK (callback), pad);\
 	gtk_container_add (GTK_CONTAINER (menu), item);\
-	gtk_widget_show (item);\
 	}
 
 #define MENU_ADD_SEP() {\
 	item = gtk_separator_menu_item_new ();\
 	gtk_container_add (GTK_CONTAINER (menu), item);\
-	gtk_widget_show (item);\
 	}
 
 static GtkWidget *
@@ -1736,82 +1734,65 @@
 	
 	uppermenu = gtk_menu_new ();
 	gtk_menu_set_accel_group (GTK_MENU (uppermenu), accel_group);
-	
+
+	/* Pad submenu */
 	item = gtk_menu_item_new_with_mnemonic (_("_Pad"));
 	gtk_container_add (GTK_CONTAINER (uppermenu), item);
-	gtk_widget_show (item);
-	
 	menu = gtk_menu_new ();
 	gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu);
-	
-	MENU_ADD_STOCK (GTK_STOCK_NEW, xpad_pad_spawn);
+	MENU_ADD (_("_New"), "document-new", 0, 0, xpad_pad_spawn);
 	MENU_ADD_SEP ();
 	MENU_ADD_CHECK (_("Show on _All Workspaces"), pad->priv->sticky, menu_sticky);
 	g_object_set_data (G_OBJECT (uppermenu), "sticky", item);
-	MENU_ADD_STOCK (GTK_STOCK_PROPERTIES, xpad_pad_open_properties);
+	MENU_ADD (_("_Properties"), "document-properties", 0, 0, xpad_pad_open_properties);
 	MENU_ADD_SEP ();
-	MENU_ADD_STOCK (GTK_STOCK_CLOSE, xpad_pad_close);
-	MENU_ADD_STOCK (GTK_STOCK_DELETE, xpad_pad_delete);
-	
+	MENU_ADD (_("_Close"), "window-close", 0, 0, xpad_pad_close);
+	MENU_ADD (_("_Delete"), "edit-delete", 0, 0, xpad_pad_delete);
+
+	/* Edit submenu */
 	item = gtk_menu_item_new_with_mnemonic (_("_Edit"));
 	gtk_container_add (GTK_CONTAINER (uppermenu), item);
-	gtk_widget_show (item);
-	
 	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_KEY_Z, GDK_CONTROL_MASK);
+	MENU_ADD (_("_Undo"), "edit-undo", GDK_KEY_Z, GDK_CONTROL_MASK, menu_undo);
 	g_object_set_data (G_OBJECT (uppermenu), "undo", item);
-	 
-	MENU_ADD_STOCK_WITH_ACCEL (GTK_STOCK_REDO, menu_redo, GDK_KEY_R, GDK_CONTROL_MASK);
+	MENU_ADD (_("_Redo"), "edit-redo", GDK_KEY_R, GDK_CONTROL_MASK, menu_redo);
 	g_object_set_data (G_OBJECT (uppermenu), "redo", item);
-
 	MENU_ADD_SEP();
-	
-	MENU_ADD_STOCK (GTK_STOCK_PASTE, menu_paste);
+	MENU_ADD (_("_Paste"), "edit-paste", 0, 0, menu_paste);
 	g_object_set_data (G_OBJECT (uppermenu), "paste", item);
-
 	MENU_ADD_SEP ();
+	MENU_ADD (_("_Preferences"), "preferences-system", 0, 0, xpad_pad_open_preferences);
 
-	MENU_ADD_STOCK (GTK_STOCK_PREFERENCES, xpad_pad_open_preferences);
-	
-	
+	/* View submenu */
 	item = gtk_menu_item_new_with_mnemonic (_("_View"));
 	gtk_container_add (GTK_CONTAINER (uppermenu), item);
-	gtk_widget_show (item);
-	
 	menu = gtk_menu_new ();
 	gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu);
-	
 	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);
 	
-	
+	/* Notes submenu */
 	item = gtk_menu_item_new_with_mnemonic (_("_Notes"));
 	gtk_container_add (GTK_CONTAINER (uppermenu), item);
-	gtk_widget_show (item);
-	
 	menu = gtk_menu_new ();
 	gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu);
 	g_object_set_data (G_OBJECT (uppermenu), "notes-menu", menu);
-	
 	MENU_ADD (_("_Show All"), NULL, 0, 0, menu_show_all);
 	MENU_ADD (_("_Close All"), NULL, 0, 0, xpad_pad_close_all);
-	
-	/* The rest of the notes menu will get set up in the prep function below */
-	
+
+	/* Help submenu */
 	item = gtk_menu_item_new_with_mnemonic (_("_Help"));
 	gtk_container_add (GTK_CONTAINER (uppermenu), item);
-	gtk_widget_show (item);
-	
 	menu = gtk_menu_new ();
 	gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu);
+	MENU_ADD (_("_Help"), "help-browser", GDK_KEY_F1, 0, show_help);	
+	MENU_ADD (_("_About"), "help-about", 0, 0, menu_about);
 	
-	MENU_ADD (_("_Contents"), GTK_STOCK_HELP, GDK_KEY_F1, 0, show_help);
-	MENU_ADD (_("_About"), GTK_STOCK_ABOUT, 0, 0, menu_about);
+	gtk_widget_show_all (uppermenu);
 	
 	return uppermenu;
 }
@@ -1909,15 +1890,17 @@
 	menu = gtk_menu_new ();
 	gtk_menu_set_accel_group (GTK_MENU (menu), accel_group);
 	
-	MENU_ADD_STOCK (GTK_STOCK_CUT, menu_cut);
-	MENU_ADD_STOCK (GTK_STOCK_COPY, menu_copy);
-	MENU_ADD_STOCK (GTK_STOCK_PASTE, menu_paste);
+	MENU_ADD (_("Cu_t"), "edit-cut", 0, 0, menu_cut);
+	MENU_ADD (_("_Copy"), "edit-copy", 0, 0, menu_copy);	
+	MENU_ADD (_("_Paste"), "edit-paste", 0, 0, 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_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);
+	MENU_ADD (_("_Bold"), "format-text-bold", GDK_KEY_b, GDK_CONTROL_MASK, menu_bold);	
+	MENU_ADD (_("_Italic"), "format-text-italic", GDK_KEY_i, GDK_CONTROL_MASK, menu_italic);	
+	MENU_ADD (_("_Underline"), "format-text-underline", GDK_KEY_u, GDK_CONTROL_MASK, menu_underline);
+	MENU_ADD (_("_Strikethrough"), "format-text-strikethrough", 0, 0, menu_strikethrough);	
+	
+	gtk_widget_show_all (menu);
 	
 	return menu;
 }
@@ -1925,8 +1908,7 @@
 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.
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) pad;
 
 	GtkWidget *item;
@@ -1942,8 +1924,7 @@
 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.
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) menu;
 
 	g_signal_handlers_block_matched (pad, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, (gpointer) xpad_pad_leave_notify_event, NULL);
@@ -1953,8 +1934,7 @@
 static void
 menu_popdown (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.
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) menu;
 
 	cairo_rectangle_int_t rect;
@@ -1963,14 +1943,6 @@
 	 * We must check if we disabled off of pad and start the timeout if so.
 	 */
 
-	// 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;
@@ -1991,8 +1963,7 @@
 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.
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) toolbar;
 
 	menu_popup (GTK_WIDGET (menu), pad);
@@ -2001,8 +1972,7 @@
 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.
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) toolbar;
 
 	menu_popdown (GTK_WIDGET (menu), pad);
 
=== modified file 'src/xpad-periodic.c'
--- src/xpad-periodic.c	2013-10-31 21:17:36 +0000
+++ src/xpad-periodic.c	2014-06-07 00:27:40 +0000
@@ -91,8 +91,7 @@
 ************************/
 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.
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) cdata;
 
     int cnt=0;
@@ -231,8 +230,7 @@
 
 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.
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) fmt;
 
     return 0;
 
=== modified file 'src/xpad-preferences.c'
--- src/xpad-preferences.c	2013-10-31 21:17:36 +0000
+++ src/xpad-preferences.c	2014-06-07 00:27:40 +0000
@@ -24,60 +24,90 @@
 #include "xpad-app.h"
 #include "xpad-preferences.h"
 #include "xpad-settings.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 struct XpadPreferencesPrivate 
 {
 	GtkWidget *fontcheck;
 	GtkWidget *antifontcheck;
+	GtkWidget *fontbutton;
 	GtkWidget *colorcheck;
 	GtkWidget *anticolorcheck;
-	GtkWidget *colorbox;
-	
+	GtkWidget *colorbox;	
+	GtkWidget *textbutton;
+	GtkWidget *backbutton;
+	GtkWidget *autostart_xpad;
+	GtkWidget *autostart_wait_systray;
+	GtkWidget *autostart_delay;	
+	GtkWidget *autostart_new_pad;
+	GtkWidget *autostart_sticky;
+	GtkWidget *autostart_display_pads;
+	GtkWidget *trayconfigbox;
 	GtkWidget *editcheck;
-	GtkWidget *stickycheck;
 	GtkWidget *confirmcheck;
-	GtkWidget *trayconfigbox;
-	
-	GtkWidget *textbutton;
-	GtkWidget *backbutton;
-	GtkWidget *fontbutton;
-	
-	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 fontcheck_handler;	
 	gulong font_handler;
+	gulong colorcheck_handler;
+	gulong text_handler;
 	gulong back_handler;
-	gulong text_handler;
-	gulong colorcheck_handler;
-	gulong fontcheck_handler;
+	gulong autostart_xpad_handler;
+	gulong autostart_wait_systray_handler;
+	gulong autostart_delay_handler;
+	gulong autostart_new_pad_handler;
+	gulong autostart_sticky_handler;
+	gulong autostart_display_pads_handler;	
+	gulong trayclick_handler;
 	gulong editcheck_handler;
-	gulong stickycheck_handler;
 	gulong confirmcheck_handler;
-	gulong trayclick_handler;
+
+	gulong notify_font_handler;
+	gulong notify_text_handler;
+	gulong notify_back_handler;
+	gulong notify_autostart_wait_systray_handler;
+	gulong notify_autostart_delay_handler;
+	gulong notify_autostart_new_pad_handler;
+	gulong notify_autostart_sticky_handler;
+	gulong notify_autostart_display_pads_handler;
+	gulong notify_tray_handler;
+	gulong notify_edit_handler;
+	gulong notify_confirm_handler;
 };
 
 G_DEFINE_TYPE_WITH_PRIVATE(XpadPreferences, xpad_preferences, GTK_TYPE_DIALOG)
 
-static void change_edit_check (GtkToggleButton *button, XpadPreferences *pref);
-static void change_sticky_check (GtkToggleButton *button, XpadPreferences *pref);
-static void change_confirm_check (GtkToggleButton *button, XpadPreferences *pref);
+static void change_font_check (GtkToggleButton *button, XpadPreferences *pref);
+static void change_font_face (GtkFontButton *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 (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);
-static void notify_sticky (XpadPreferences *pref);
-static void notify_confirm (XpadPreferences *pref);
+static void change_autostart_xpad (GtkToggleButton *button, XpadPreferences *pref);
+static void change_autostart_wait_systray (GtkToggleButton *button, XpadPreferences *pref);
+static void change_autostart_delay (GtkComboBox *box, XpadPreferences *pref);
+static void change_autostart_new_pad (GtkToggleButton *button, XpadPreferences *pref);
+static void change_autostart_sticky (GtkToggleButton *button, XpadPreferences *pref);
+static void change_autostart_display_pads (GtkComboBox *box, XpadPreferences *pref);
+static void change_tray_click_configuration (GtkComboBox *box, XpadPreferences *pref);
+static void change_edit_check (GtkToggleButton *button, XpadPreferences *pref);
+static void change_confirm_check (GtkToggleButton *button, XpadPreferences *pref);
+
 static void notify_fontname (XpadPreferences *pref);
 static void notify_text_color (XpadPreferences *pref);
 static void notify_back_color (XpadPreferences *pref);
+
+static void notify_autostart_wait_systray (XpadPreferences *pref);
+static void notify_autostart_delay (XpadPreferences *pref);
+static void notify_autostart_new_pad (XpadPreferences *pref);
+static void notify_autostart_sticky (XpadPreferences *pref);
+static void notify_autostart_display_pads (XpadPreferences *pref);
 static void notify_tray_click (XpadPreferences *pref);
+static void notify_edit (XpadPreferences *pref);
+static void notify_confirm (XpadPreferences *pref);
+
 static void xpad_preferences_dispose (GObject *object);
 static void xpad_preferences_finalize (GObject *object);
 static void xpad_preferences_response (GtkDialog *dialog, gint response);
@@ -87,16 +117,13 @@
 void
 xpad_preferences_open (void)
 {
-	if (_xpad_preferences)
-	{
-		gtk_window_present (GTK_WINDOW (_xpad_preferences));
-	}
-	else
+	if (!_xpad_preferences)
 	{
 		_xpad_preferences = GTK_WIDGET (g_object_new (XPAD_TYPE_PREFERENCES, NULL));
 		g_signal_connect_swapped (_xpad_preferences, "destroy", G_CALLBACK (g_nullify_pointer), &_xpad_preferences);
-		gtk_widget_show (_xpad_preferences);
 	}
+	
+	gtk_window_present (GTK_WINDOW (_xpad_preferences));
 }
 
 static void
@@ -106,7 +133,7 @@
 
 	gobject_class->dispose = xpad_preferences_dispose;
 	gobject_class->finalize = xpad_preferences_finalize;
-}
+}	
 
 static void
 xpad_preferences_init (XpadPreferences *pref)
@@ -115,8 +142,9 @@
 	const GdkRGBA *color;
 	const gchar *fontname;
 	GtkStyleContext *style;
-	GtkWidget *label, *appearance_frame, *alignment, *appearance_vbox;
-	GtkWidget *options_frame, *options_vbox, *global_vbox, *tray_config_vbox;
+	GtkWidget *appearance_frame, *start_frame, *tray_frame, *other_frame;
+	GtkWidget *global_vbox, *appearance_vbox, *autostart_vbox, *tray_vbox, *other_vbox;
+	GtkWidget *label, *alignment;	
 	gchar *text;
 	GtkSizeGroup *size_group_labels = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 	GtkRequisition req;
@@ -125,6 +153,7 @@
 	
 	pref->priv = xpad_preferences_get_instance_private(pref);
 	
+	/* Appearance options */
 	text = g_strconcat ("<b>", _("Appearance"), "</b>", NULL);
 	label = GTK_WIDGET (g_object_new (GTK_TYPE_LABEL,
 		"label", text,
@@ -148,8 +177,8 @@
 		NULL));
 	
 	pref->priv->textbutton = gtk_color_button_new ();
+	pref->priv->fontbutton = gtk_font_button_new ();
 	pref->priv->backbutton = gtk_color_button_new ();
-	pref->priv->fontbutton = gtk_font_button_new ();
 	
 	pref->priv->antifontcheck = gtk_radio_button_new_with_mnemonic (NULL, _("Use font from theme"));
 	pref->priv->fontcheck = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (pref->priv->antifontcheck), _("Use this font:"));
@@ -164,66 +193,26 @@
 	pref->priv->colorbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 
+	label = gtk_label_new_with_mnemonic (_("Text:"));
+	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+	gtk_size_group_add_widget (size_group_labels, label);
+	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (hbox), pref->priv->textbutton, TRUE, TRUE, 0);
+	g_object_set (G_OBJECT (pref->priv->colorbox), "child", hbox, NULL);
+
+	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);
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 	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_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);
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), pref->priv->textbutton, TRUE, TRUE, 0);
-	g_object_set (G_OBJECT (pref->priv->colorbox), "child", hbox, NULL);
-	
-	alignment = gtk_alignment_new (1, 1, 1, 1);
-	gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 12, 0);
-	gtk_container_add (GTK_CONTAINER (alignment), pref->priv->colorbox);
-	
-	pref->priv->editcheck = gtk_check_button_new_with_mnemonic (_("_Edit lock"));
-	pref->priv->stickycheck = gtk_check_button_new_with_mnemonic (_("_Pads start on all workspaces"));
-	pref->priv->confirmcheck = gtk_check_button_new_with_mnemonic (_("_Confirm pad deletion"));
-	
-	gtk_dialog_add_button (GTK_DIALOG (pref), "gtk-close", GTK_RESPONSE_CLOSE);
-	gtk_dialog_set_default_response (GTK_DIALOG (pref), GTK_RESPONSE_CLOSE);
-	g_signal_connect (pref, "response", G_CALLBACK (xpad_preferences_response), NULL);
-	gtk_window_set_title (GTK_WINDOW (pref), _("Xpad Preferences"));
-	
-	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_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_global_settings);
-	if (color)
-	{
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->colorcheck), TRUE);
-		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_chooser_set_rgba (GTK_COLOR_CHOOSER (pref->priv->backbutton), &theme_background_color);
-	}
-	
-	color = xpad_settings_get_text_color (xpad_global_settings);
-	if (color)
-		gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (pref->priv->textbutton), color);
-	else
-		gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (pref->priv->textbutton), &theme_text_color);
-	
+
 	fontname = xpad_settings_get_fontname (xpad_global_settings);
 	if (fontname)
 	{
@@ -241,10 +230,29 @@
 		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_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));
+
+	color = xpad_settings_get_text_color (xpad_global_settings);
+	if (color)
+		gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (pref->priv->textbutton), color);
+	else
+		gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (pref->priv->textbutton), &theme_text_color);
+	
+	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_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_chooser_set_rgba (GTK_COLOR_CHOOSER (pref->priv->backbutton), &theme_background_color);
+	}
+	
+	alignment = gtk_alignment_new (1, 1, 1, 1);
+	gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 12, 0);
+	gtk_container_add (GTK_CONTAINER (alignment), pref->priv->colorbox);
 	
 	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 
@@ -259,7 +267,15 @@
 	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);
+	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"));
+	
+	/* Start options */
+	text = g_strconcat ("<b>", _("Startup"), "</b>", NULL);
 	label = GTK_WIDGET (g_object_new (GTK_TYPE_LABEL,
 		"label", text,
 		"use-markup", TRUE,
@@ -267,72 +283,187 @@
 		NULL));
 	g_free (text);
 
-	options_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-	gtk_box_set_homogeneous (GTK_BOX (options_vbox), FALSE);
+	autostart_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+	gtk_box_set_homogeneous (GTK_BOX (autostart_vbox), FALSE);
 
 	alignment = gtk_alignment_new (1, 1, 1, 1);
 	g_object_set (G_OBJECT (alignment),
 		"left-padding", 12,
 		"top-padding", 12,
-		"child", options_vbox,
+		"child", autostart_vbox,
 		NULL);
-	options_frame = GTK_WIDGET (g_object_new (GTK_TYPE_FRAME,
+	start_frame = GTK_WIDGET (g_object_new (GTK_TYPE_FRAME,
 		"label-widget", label,
 		"shadow-type", GTK_SHADOW_NONE,
 		"child", alignment,
 		NULL));
-
-	// 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));
+		
+	pref->priv->autostart_xpad = gtk_check_button_new_with_mnemonic (_("_Start Xpad automatically after login"));
+	gtk_box_pack_start (GTK_BOX (autostart_vbox), pref->priv->autostart_xpad, FALSE, FALSE, 0);
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->autostart_xpad), xpad_settings_get_autostart_xpad (xpad_global_settings));
+
+	pref->priv->autostart_wait_systray = gtk_check_button_new_with_mnemonic (_("_Wait for systray (if possible)"));
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 20);
+	gtk_box_pack_start (GTK_BOX (hbox), gtk_alignment_new (1, 1, 1, 1), FALSE, FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (hbox), pref->priv->autostart_wait_systray, FALSE, FALSE, 0);	
+
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->autostart_wait_systray), xpad_settings_get_autostart_wait_systray (xpad_global_settings));
+	if (xpad_settings_get_autostart_xpad (xpad_global_settings))
+		gtk_widget_set_sensitive (pref->priv->autostart_wait_systray, TRUE);
+	else
+		gtk_widget_set_sensitive (pref->priv->autostart_wait_systray, FALSE);
+	gtk_box_pack_start (GTK_BOX (autostart_vbox), hbox, FALSE, FALSE, 0);
+
+	pref->priv->autostart_new_pad = gtk_check_button_new_with_mnemonic (_("_Open a new empty pad"));
+	gtk_box_pack_start (GTK_BOX (autostart_vbox), pref->priv->autostart_new_pad, FALSE, FALSE, 0);
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->autostart_new_pad), xpad_settings_get_autostart_new_pad (xpad_global_settings));
+
+	pref->priv->autostart_sticky = gtk_check_button_new_with_mnemonic (_("_Pads start on all workspaces"));
+	gtk_box_pack_start (GTK_BOX (autostart_vbox), pref->priv->autostart_sticky, FALSE, FALSE, 0);	
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->autostart_sticky), xpad_settings_get_autostart_sticky (xpad_global_settings));
+
+	label = gtk_label_new (_("Delay in seconds"));
+	pref->priv->autostart_delay = gtk_combo_box_text_new();	
+	guint i;
+	for (i=0; i<15; i++)
+		gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT( pref->priv->autostart_delay ), g_strdup_printf ("%i", i));
+	gtk_combo_box_set_active (GTK_COMBO_BOX (pref->priv->autostart_delay), (guint) xpad_settings_get_autostart_delay (xpad_global_settings));
+	 hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(hbox), pref->priv->autostart_delay, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(autostart_vbox), hbox, TRUE, TRUE, 0);
+
+	label = gtk_label_new_with_mnemonic(_("Display pads"));
+	pref->priv->autostart_display_pads = gtk_combo_box_text_new();	
+	gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT( pref->priv->autostart_display_pads ), _("Open all pads") );
+	gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT( pref->priv->autostart_display_pads ), _("Hide all pads") );
+	gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT( pref->priv->autostart_display_pads ), _("Restore to previous state") );
+	gtk_combo_box_set_active( GTK_COMBO_BOX( pref->priv->autostart_display_pads ), (guint) xpad_settings_get_autostart_display_pads (xpad_global_settings));
 	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(hbox), pref->priv->autostart_display_pads, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(autostart_vbox), hbox, TRUE, TRUE, 0);
+	
+	/* Tray options */
+	text = g_strconcat ("<b>", _("Tray"), "</b>", NULL);
+	label = GTK_WIDGET (g_object_new (GTK_TYPE_LABEL,
+		"label", text,
+		"use-markup", TRUE,
+		"xalign", 0.0,
+		NULL));
+	g_free (text);
+
+	tray_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+	gtk_box_set_homogeneous (GTK_BOX (tray_vbox), FALSE);
+
+	alignment = gtk_alignment_new (1, 1, 1, 1);
+	g_object_set (G_OBJECT (alignment),
+		"left-padding", 12,
+		"top-padding", 12,
+		"child", tray_vbox,
+		NULL);
+	tray_frame = GTK_WIDGET (g_object_new (GTK_TYPE_FRAME,
+		"label-widget", label,
+		"shadow-type", GTK_SHADOW_NONE,
+		"child", alignment,
+		NULL));
+
 	label = gtk_label_new_with_mnemonic(_("Tray click behaviour"));
+	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), (guint) xpad_settings_get_tray_click_handler (xpad_global_settings));
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 	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 = 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);
-	pref->priv->confirmcheck_handler = g_signal_connect (pref->priv->confirmcheck, "toggled", G_CALLBACK (change_confirm_check), pref);
+	gtk_box_pack_start(GTK_BOX(tray_vbox), hbox, TRUE, TRUE, 0);
+
+	/* Other options */
+	text = g_strconcat ("<b>", _("Other"), "</b>", NULL);
+	label = GTK_WIDGET (g_object_new (GTK_TYPE_LABEL,
+		"label", text,
+		"use-markup", TRUE,
+		"xalign", 0.0,
+		NULL));
+	g_free (text);
+
+	other_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+	gtk_box_set_homogeneous (GTK_BOX (other_vbox), FALSE);
+
+	alignment = gtk_alignment_new (1, 1, 1, 1);
+	g_object_set (G_OBJECT (alignment),
+		"left-padding", 12,
+		"top-padding", 12,
+		"child", other_vbox,
+		NULL);
+	other_frame = GTK_WIDGET (g_object_new (GTK_TYPE_FRAME,
+		"label-widget", label,
+		"shadow-type", GTK_SHADOW_NONE,
+		"child", alignment,
+		NULL));
+
+	pref->priv->editcheck = gtk_check_button_new_with_mnemonic (_("_Make pads read-only"));
+	pref->priv->confirmcheck = gtk_check_button_new_with_mnemonic (_("_Confirm pad deletion"));
+
+	gtk_box_pack_start (GTK_BOX (other_vbox), pref->priv->editcheck, FALSE, FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (other_vbox), pref->priv->confirmcheck, FALSE, FALSE, 0);	
+	
+	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->confirmcheck), xpad_settings_get_confirm_destroy (xpad_global_settings));
+
+	/* Close button and window title */
+	gtk_dialog_add_button (GTK_DIALOG (pref), "gtk-close", GTK_RESPONSE_CLOSE);
+	gtk_dialog_set_default_response (GTK_DIALOG (pref), GTK_RESPONSE_CLOSE);
+	g_signal_connect (pref, "response", G_CALLBACK (xpad_preferences_response), NULL);
+	gtk_window_set_title (GTK_WINDOW (pref), _("Xpad Preferences"));
+
+	/* Activate all handlers */
+	pref->priv->fontcheck_handler = g_signal_connect (pref->priv->fontcheck, "toggled", G_CALLBACK (change_font_check), pref);
+	pref->priv->font_handler = g_signal_connect (pref->priv->fontbutton, "font-set", G_CALLBACK (change_font_face), pref);
 	pref->priv->colorcheck_handler = g_signal_connect (pref->priv->colorcheck, "toggled", G_CALLBACK (change_color_check), pref);
-	pref->priv->fontcheck_handler = g_signal_connect (pref->priv->fontcheck, "toggled", G_CALLBACK (change_font_check), pref);
 	pref->priv->text_handler = g_signal_connect (pref->priv->textbutton, "color-set", G_CALLBACK (change_text_color), pref);
 	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->autostart_xpad_handler = g_signal_connect (pref->priv->autostart_xpad, "toggled", G_CALLBACK (change_autostart_xpad), pref);
+	pref->priv->autostart_wait_systray_handler = g_signal_connect (pref->priv->autostart_wait_systray, "toggled", G_CALLBACK (change_autostart_wait_systray), pref);
+	pref->priv->autostart_delay_handler = g_signal_connect(pref->priv->autostart_delay, "changed", G_CALLBACK(change_autostart_delay), pref);
+	pref->priv->autostart_new_pad_handler = g_signal_connect (pref->priv->autostart_new_pad, "toggled", G_CALLBACK (change_autostart_new_pad), pref);
+	pref->priv->autostart_sticky_handler = g_signal_connect (pref->priv->autostart_sticky, "toggled", G_CALLBACK (change_autostart_sticky), pref);
+	pref->priv->autostart_display_pads_handler = g_signal_connect (pref->priv->autostart_display_pads, "changed", G_CALLBACK (change_autostart_display_pads), pref);
+
 	pref->priv->trayclick_handler = g_signal_connect(pref->priv->trayconfigbox, "changed", G_CALLBACK(change_tray_click_configuration), pref);
+	pref->priv->editcheck_handler = g_signal_connect (pref->priv->editcheck, "toggled", G_CALLBACK (change_edit_check), pref);
+	pref->priv->confirmcheck_handler = g_signal_connect (pref->priv->confirmcheck, "toggled", G_CALLBACK (change_confirm_check), 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_autostart_wait_systray_handler = g_signal_connect_swapped (xpad_global_settings, "notify::autostart_wait_systray", G_CALLBACK (notify_autostart_wait_systray), pref);
+	pref->priv->notify_autostart_delay_handler = g_signal_connect_swapped (xpad_global_settings, "notify::autostart_delay", G_CALLBACK(notify_autostart_delay), pref);
+	pref->priv->notify_autostart_new_pad_handler = g_signal_connect_swapped (xpad_global_settings, "notify::autostart_new_pad", G_CALLBACK (notify_autostart_new_pad), pref);
+	pref->priv->notify_autostart_sticky_handler = g_signal_connect_swapped (xpad_global_settings, "notify::autostart_sticky", G_CALLBACK (notify_autostart_sticky), pref);
+	pref->priv->notify_autostart_display_pads_handler = g_signal_connect_swapped (xpad_global_settings, "notify::autostart_display_pads", G_CALLBACK (notify_autostart_display_pads), 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);
-	
+
+	/* Make the preference dialog visible */
+	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), start_frame, FALSE, FALSE, 0);	
+	gtk_box_pack_start (GTK_BOX (global_vbox), tray_frame, FALSE, FALSE, 0);	
+	gtk_box_pack_start (GTK_BOX (global_vbox), other_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);	
 	gtk_widget_show_all (gtk_dialog_get_content_area (GTK_DIALOG (pref)));
 	
-	/* Make window not so squished */
+	/* Make the preference window not so squished */
 	gtk_widget_get_preferred_size (GTK_WIDGET (pref), &req, NULL);
 	g_object_set (G_OBJECT (pref), "default-width", (gint) (req.height * 0.8), NULL);
 }
@@ -361,6 +492,29 @@
 }
 
 static void
+change_font_check (GtkToggleButton *button, XpadPreferences *pref)
+{
+	g_signal_handler_block (xpad_global_settings, pref->priv->notify_font_handler);
+	
+	if (!gtk_toggle_button_get_active (button))
+		xpad_settings_set_fontname (xpad_global_settings, NULL);
+	else
+		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_global_settings, pref->priv->notify_font_handler);
+}
+
+static void
+change_font_face (GtkFontButton *button, XpadPreferences *pref)
+{
+	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
 change_color_check (GtkToggleButton *button, XpadPreferences *pref)
 {
 	g_signal_handler_block (xpad_global_settings, pref->priv->notify_back_handler);
@@ -387,18 +541,196 @@
 }
 
 static void
-change_font_check (GtkToggleButton *button, XpadPreferences *pref)
-{
-	g_signal_handler_block (xpad_global_settings, pref->priv->notify_font_handler);
-	
-	if (!gtk_toggle_button_get_active (button))
-		xpad_settings_set_fontname (xpad_global_settings, NULL);
-	else
-		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_global_settings, pref->priv->notify_font_handler);
+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_autostart_xpad (GtkToggleButton *button, XpadPreferences *pref)
+{
+	gboolean autostart;
+	
+	autostart = gtk_toggle_button_get_active (button);
+	
+	if (autostart) {
+		/* Copy the xpad.desktop file to the autostart folder and enable/disable the wait for systray preference */
+		gboolean success;
+		char *source_filename;
+		char *destination_directory;
+		GFile *source, *destination;
+		GError *error = NULL;
+		
+		/* Find the base directory where the application is installed /usr or /usr/local, to find the correct xpad.desktop file. */
+		char *szTmp = g_strdup_printf ("/proc/%d/exe", getpid());
+		enum { BUFFERSIZE = 1024 };
+		char buf[BUFFERSIZE];
+		ssize_t len = readlink(szTmp, buf, sizeof(buf)-1);
+		
+		if (len == -1) {
+			gchar *errtext;
+			errtext = g_strdup_printf (_("Could not find the directory where Xpad is installed\n%s"), error->message);
+			xpad_app_error (NULL, _("Error enabling Xpad autostart"), errtext);
+			g_free (errtext);
+			
+			gtk_toggle_button_set_active (button, FALSE);
+		}
+		else {
+			char basedir[len-8];
+			guint i;
+			for (i=0; i<len-8; i++)
+				basedir[i] = buf[i];
+			basedir[len-9] = '\0';
+
+			source_filename = g_strdup_printf ("%s/share/applications/xpad.desktop", basedir);
+			destination_directory = g_strdup_printf ("%s/.config/autostart/xpad.desktop", g_getenv ("HOME"));
+
+			source = g_file_new_for_path (source_filename);
+			destination = g_file_new_for_path (destination_directory);
+			success = g_file_copy (source, destination, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, &error);
+			
+			if (!success) {
+				gchar *errtext;
+				errtext = g_strdup_printf (_("Could not copy %s to %s\n%s"), source_filename, destination_directory, error->message);
+				xpad_app_error (NULL, _("Error enabling Xpad autostart"), errtext);
+				g_free (errtext);
+				
+				gtk_toggle_button_set_active (button, FALSE);
+			}
+			else {
+				g_signal_handler_block (xpad_global_settings, pref->priv->notify_autostart_wait_systray_handler);
+				gtk_widget_set_sensitive (pref->priv->autostart_wait_systray, TRUE);
+				change_autostart_wait_systray (GTK_TOGGLE_BUTTON (pref->priv->autostart_wait_systray), pref);				
+				g_signal_handler_unblock (xpad_global_settings, pref->priv->notify_autostart_wait_systray_handler);
+			}
+		}
+	}
+	else {
+		/* Remove the xpad.desktop file from the autostart folder and enable/disable the wait for systray preference */
+		gboolean success;
+		char *filename;
+		GFile *file;
+		GError *error = NULL;		
+		
+		filename = g_strdup_printf ("%s/.config/autostart/xpad.desktop", g_getenv ("HOME"));
+		file = g_file_new_for_path (filename);
+		success = g_file_delete (file, NULL, &error);
+
+		if (!success) {
+			gchar *errtext;
+			errtext = g_strdup_printf (_("Could not delete %s\n%s"), filename, error->message);
+			xpad_app_error (NULL, _("Error disabling Xpad autostart"), errtext);
+			g_free (errtext);
+			
+			gtk_toggle_button_set_active (button, TRUE);
+		}
+		else {
+			g_signal_handler_block (xpad_global_settings, pref->priv->notify_autostart_wait_systray_handler);
+			gtk_widget_set_sensitive (pref->priv->autostart_wait_systray, FALSE);
+			g_signal_handler_unblock (xpad_global_settings, pref->priv->notify_autostart_wait_systray_handler);
+		}
+	}
+}
+
+static void
+change_autostart_wait_systray (GtkToggleButton *button, XpadPreferences *pref)
+{
+	GKeyFile *keyfile;
+	GKeyFileFlags flags;
+	GError *error = NULL;
+	char *filename;
+	gboolean wait_systray;
+
+	wait_systray = gtk_toggle_button_get_active (button);
+
+	/* Create a new GKeyFile object and a bitwise list of flags. */
+	keyfile = g_key_file_new ();
+	filename = g_strdup_printf ("%s/.config/autostart/xpad.desktop", g_getenv ("HOME"));	
+	flags = G_KEY_FILE_KEEP_COMMENTS | G_KEY_FILE_KEEP_TRANSLATIONS;
+	error = NULL;
+	
+	/* Load the GKeyFile from xpad.desktop or show an error message. */
+	if (!g_key_file_load_from_file (keyfile, filename, flags, &error)) {
+		gchar *errtext;
+		errtext = g_strdup_printf (_("Could not load %s\n%s"), filename, error->message);
+		xpad_app_error (NULL, _("Error changing wait for systray setting"), errtext);
+		g_free (errtext);
+
+		gtk_toggle_button_set_active (button, !wait_systray);
+		return;
+	}
+
+	g_key_file_set_boolean (keyfile, "Desktop Entry", "X-LXQt-Need-Tray", wait_systray);
+
+	if (!g_key_file_save_to_file (keyfile, filename, &error)) {
+		gchar *errtext;
+		errtext = g_strdup_printf (_("Could not save %s\n%s"), filename, error->message);
+		xpad_app_error (NULL, _("Error changing wait for systray setting"), errtext);
+		g_free (errtext);
+		
+		gtk_toggle_button_set_active (button, !wait_systray);
+		return;
+	}
+
+	g_signal_handler_block (xpad_global_settings, pref->priv->notify_autostart_wait_systray_handler);
+	xpad_settings_set_autostart_wait_systray (xpad_global_settings, wait_systray);
+	g_signal_handler_unblock (xpad_global_settings, pref->priv->notify_autostart_wait_systray_handler);
+}
+
+static void
+change_autostart_delay (GtkComboBox *box, XpadPreferences *pref)
+{
+	g_signal_handler_block(xpad_global_settings, pref->priv->notify_autostart_delay_handler);
+	xpad_settings_set_autostart_delay (xpad_global_settings, (guint) gtk_combo_box_get_active(box));
+	g_signal_handler_unblock (xpad_global_settings, pref->priv->notify_autostart_delay_handler);
+}
+
+static void
+change_autostart_new_pad (GtkToggleButton *button, XpadPreferences *pref)
+{
+	g_signal_handler_block (xpad_global_settings, pref->priv->notify_autostart_new_pad_handler);
+	xpad_settings_set_autostart_new_pad (xpad_global_settings, gtk_toggle_button_get_active (button));
+	g_signal_handler_unblock (xpad_global_settings, pref->priv->notify_autostart_new_pad_handler);
+}
+
+static void
+change_autostart_sticky (GtkToggleButton *button, XpadPreferences *pref)
+{
+	g_signal_handler_block (xpad_global_settings, pref->priv->notify_autostart_sticky_handler);
+	xpad_settings_set_autostart_sticky (xpad_global_settings, gtk_toggle_button_get_active (button));
+	g_signal_handler_unblock (xpad_global_settings, pref->priv->notify_autostart_sticky_handler);
+}
+
+static void
+change_autostart_display_pads (GtkComboBox *box, XpadPreferences *pref)
+{
+	g_signal_handler_block (xpad_global_settings, pref->priv->notify_autostart_display_pads_handler);
+	xpad_settings_set_autostart_display_pads (xpad_global_settings, (guint) gtk_combo_box_get_active(box));
+	g_signal_handler_unblock(xpad_global_settings, pref->priv->notify_autostart_display_pads_handler);
+}
+
+static void
+change_tray_click_configuration (GtkComboBox *box, XpadPreferences *pref)
+{
+	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
@@ -410,14 +742,6 @@
 }
 
 static void
-change_sticky_check (GtkToggleButton *button, XpadPreferences *pref)
-{
-	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_global_settings, pref->priv->notify_confirm_handler);
@@ -426,93 +750,6 @@
 }
 
 static void
-change_tray_click_configuration(GtkComboBox *box, XpadPreferences *pref)
-{
-	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_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 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);
-	
-	if (color)
-	{
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->colorcheck), TRUE);
-		gtk_widget_set_sensitive (pref->priv->colorbox, TRUE);
-		gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (pref->priv->backbutton), color);
-	}
-	else
-	{
-		gtk_widget_set_sensitive (pref->priv->colorbox, FALSE);
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->anticolorcheck), TRUE);
-	}
-	
-	g_signal_handler_unblock (pref->priv->colorcheck, pref->priv->colorcheck_handler);
-	g_signal_handler_unblock (pref->priv->backbutton, pref->priv->back_handler);
-}
-
-static void
-notify_text_color (XpadPreferences *pref)
-{
-	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);
-	
-	if (color)
-	{
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->colorcheck), TRUE);
-		gtk_widget_set_sensitive (pref->priv->colorbox, TRUE);
-		gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (pref->priv->textbutton), color);
-
-	}
-	else
-	{
-		gtk_widget_set_sensitive (pref->priv->colorbox, FALSE);
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->anticolorcheck), TRUE);
-	}
-	
-	g_signal_handler_unblock (pref->priv->colorcheck, pref->priv->colorcheck_handler);
-	g_signal_handler_unblock (pref->priv->textbutton, pref->priv->text_handler);
-}
-
-static void
 notify_fontname (XpadPreferences *pref)
 {
 	const gchar *fontname = xpad_settings_get_fontname (xpad_global_settings);
@@ -537,6 +774,103 @@
 }
 
 static void
+notify_text_color (XpadPreferences *pref)
+{
+	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);
+	
+	if (color)
+	{
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->colorcheck), TRUE);
+		gtk_widget_set_sensitive (pref->priv->colorbox, TRUE);
+		gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (pref->priv->textbutton), color);
+
+	}
+	else
+	{
+		gtk_widget_set_sensitive (pref->priv->colorbox, FALSE);
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->anticolorcheck), TRUE);
+	}
+	
+	g_signal_handler_unblock (pref->priv->colorcheck, pref->priv->colorcheck_handler);
+	g_signal_handler_unblock (pref->priv->textbutton, pref->priv->text_handler);
+}
+
+static void
+notify_back_color (XpadPreferences *pref)
+{
+	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);
+	
+	if (color)
+	{
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->colorcheck), TRUE);
+		gtk_widget_set_sensitive (pref->priv->colorbox, TRUE);
+		gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (pref->priv->backbutton), color);
+	}
+	else
+	{
+		gtk_widget_set_sensitive (pref->priv->colorbox, FALSE);
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->anticolorcheck), TRUE);
+	}
+	
+	g_signal_handler_unblock (pref->priv->colorcheck, pref->priv->colorcheck_handler);
+	g_signal_handler_unblock (pref->priv->backbutton, pref->priv->back_handler);
+}
+
+static void
+notify_autostart_wait_systray (XpadPreferences *pref)
+{
+	g_signal_handler_block (pref->priv->autostart_wait_systray, pref->priv->autostart_wait_systray_handler);
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->autostart_wait_systray), xpad_settings_get_autostart_wait_systray (xpad_global_settings));
+	g_signal_handler_unblock (pref->priv->autostart_wait_systray, pref->priv->autostart_wait_systray_handler);
+}
+
+static void 
+notify_autostart_delay (XpadPreferences *pref)
+{
+	g_signal_handler_block (pref->priv->autostart_delay, pref->priv->autostart_delay_handler);
+	gtk_combo_box_set_active (GTK_COMBO_BOX (pref->priv->autostart_delay), (guint) xpad_settings_get_autostart_delay (xpad_global_settings));
+	g_signal_handler_unblock (pref->priv->autostart_delay, pref->priv->autostart_delay_handler);
+}
+
+static void
+notify_autostart_new_pad (XpadPreferences *pref)
+{
+	g_signal_handler_block (pref->priv->autostart_new_pad, pref->priv->autostart_new_pad_handler);
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->autostart_new_pad), xpad_settings_get_autostart_new_pad (xpad_global_settings));
+	g_signal_handler_unblock (pref->priv->autostart_new_pad, pref->priv->autostart_new_pad_handler);
+}
+
+static void
+notify_autostart_sticky (XpadPreferences *pref)
+{
+	g_signal_handler_block (pref->priv->autostart_sticky, pref->priv->autostart_sticky_handler);
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->autostart_sticky), xpad_settings_get_autostart_sticky (xpad_global_settings));
+	g_signal_handler_unblock (pref->priv->autostart_sticky, pref->priv->autostart_sticky_handler);
+}
+
+static void
+notify_autostart_display_pads (XpadPreferences *pref)
+{
+	g_signal_handler_block (pref->priv->autostart_display_pads, pref->priv->autostart_display_pads_handler);
+	gtk_combo_box_set_active (GTK_COMBO_BOX (pref->priv->autostart_display_pads), (guint) xpad_settings_get_autostart_display_pads (xpad_global_settings));
+	g_signal_handler_unblock (pref->priv->autostart_wait_systray, pref->priv->autostart_wait_systray_handler);
+}
+
+static void 
+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), (guint) xpad_settings_get_tray_click_handler(xpad_global_settings));
+	g_signal_handler_unblock (pref->priv->trayconfigbox, pref->priv->trayclick_handler);
+}
+
+static void
 notify_edit (XpadPreferences *pref)
 {
 	g_signal_handler_block (pref->priv->editcheck, pref->priv->editcheck_handler);
@@ -545,26 +879,9 @@
 }
 
 static void
-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_global_settings));
-	g_signal_handler_unblock (pref->priv->stickycheck, pref->priv->stickycheck_handler);
-}
-
-static void
 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_global_settings));
 	g_signal_handler_unblock (pref->priv->confirmcheck, pref->priv->confirmcheck_handler);
 }
-
-static void 
-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), (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	2013-10-31 21:17:36 +0000
+++ src/xpad-session-manager.c	2014-06-07 00:27:40 +0000
@@ -59,8 +59,7 @@
 xpad_session_manager_cycle (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.
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) source;
 	(void) condition;
 	(void) data;
@@ -110,8 +109,7 @@
 static void
 xpad_session_manager_start_interact_callback (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.
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) client_data;
 	(void) smc_conn;
 
@@ -176,8 +174,7 @@
 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.
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) client_data;
 	(void) watch_data;
 
@@ -210,7 +207,7 @@
 	};
 	SmProp *props[G_N_ELEMENTS (prop)];
 	struct passwd *pw;
-	uint i;
+	guint i;
 	gchar *pid_str;
 	gchar *command = g_strdup (xpad_app_get_program_path ());
 	size_t string_length = 0;
@@ -227,7 +224,7 @@
 	
 	pw = getpwuid (getuid ());
 
-	// While setting all the properties, safe casts are being used.
+	/* While setting all the properties, safe casts are being used. */
 	vals.user->value = pw ? pw->pw_name : "";
 	string_length = strlen (vals.user->value);
 	if (string_length <= INT_MAX)
@@ -354,8 +351,7 @@
 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.
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) fast;
 
 	/* No need to do anything.  Currently, all xpad pads are always current with
@@ -365,12 +361,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.
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) fast;
 
 	/* should also save cursor positions and open accessory windows */
-	
 	if (set_props)
 	{
 		xpad_session_manager_set_properties ();
@@ -383,8 +377,7 @@
                                     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.
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) client_data;
 
 	RETURN_IF_BAD_CONN (smc_conn);
@@ -417,8 +410,7 @@
 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.
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) client_data;
 
 	RETURN_IF_BAD_CONN (smc_conn);
@@ -436,8 +428,7 @@
 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.
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) client_data;
 
 	RETURN_IF_BAD_CONN (smc_conn);
@@ -454,8 +445,7 @@
 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.
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) client_data;
 
 	RETURN_IF_BAD_CONN (smc_conn);
 
=== modified file 'src/xpad-settings.c'
--- src/xpad-settings.c	2013-10-31 22:11:55 +0000
+++ src/xpad-settings.c	2014-06-07 00:27:40 +0000
@@ -30,7 +30,6 @@
 	gboolean has_decorations;
 	gboolean confirm_destroy;
 	gboolean edit_lock;
-	gboolean sticky;
 	guint tray_click_configuration;
 	gboolean has_toolbar;
 	gboolean autohide_toolbar;
@@ -39,6 +38,11 @@
 	GdkRGBA *text;
 	gchar *fontname;
 	GSList *toolbar_buttons;
+	gboolean autostart_wait_systray;
+	guint autostart_delay;
+	gboolean autostart_new_pad;
+	gboolean autostart_sticky;	
+	guint autostart_display_pads;
 };
 
 G_DEFINE_TYPE_WITH_PRIVATE(XpadSettings, xpad_settings, G_TYPE_OBJECT)
@@ -58,7 +62,6 @@
   PROP_HEIGHT,
   PROP_HAS_DECORATIONS,
   PROP_CONFIRM_DESTROY,
-  PROP_STICKY,
   PROP_EDIT_LOCK,
   PROP_TRAY_CLICK_CONFIGURATION,
   PROP_HAS_TOOLBAR,
@@ -67,6 +70,11 @@
   PROP_BACK_COLOR,
   PROP_TEXT_COLOR,
   PROP_FONTNAME,
+  PROP_AUTOSTART_WAIT_SYSTRAY,
+  PROP_AUTOSTART_DELAY,  
+  PROP_AUTOSTART_NEW_PAD,
+  PROP_AUTOSTART_STICKY,
+  PROP_AUTOSTART_DISPLAY_PADS,
   LAST_PROP
 };
 
@@ -95,8 +103,6 @@
 	gobject_class->set_property = xpad_settings_set_property;
 	gobject_class->get_property = xpad_settings_get_property;
 	
-	/* Properties */
-	
 	g_object_class_install_property (gobject_class,
 	                                 PROP_WIDTH,
 	                                 g_param_spec_uint ("width",
@@ -134,14 +140,6 @@
 	                                                       G_PARAM_READWRITE));
 	
 	g_object_class_install_property (gobject_class,
-	                                 PROP_STICKY,
-	                                 g_param_spec_boolean ("sticky",
-	                                                       "Default Stickiness",
-	                                                       "Whether pads are sticky on creation",
-	                                                       FALSE,
-	                                                       G_PARAM_READWRITE));
-	
-	g_object_class_install_property (gobject_class,
 	                                 PROP_EDIT_LOCK,
 	                                 g_param_spec_boolean ("edit_lock",
 	                                                       "Edit Lock",
@@ -204,9 +202,51 @@
 	                                                     "Default color of pad background",
 	                                                     GDK_TYPE_RGBA,
 	                                                     G_PARAM_READWRITE));
-	
-	/* Signals */
-	
+
+	g_object_class_install_property (gobject_class,
+	                                 PROP_AUTOSTART_WAIT_SYSTRAY,
+	                                 g_param_spec_boolean ("autostart_wait_systray",
+	                                                       "Autostart Xpad wait for systray",
+	                                                       "Whether to wait for the systray before starting xpad automatically after login",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE));
+
+	g_object_class_install_property (gobject_class,
+                                     PROP_AUTOSTART_DISPLAY_PADS,
+                                     g_param_spec_uint ("autostart_delay",
+                                                        "Delay autostart of Xpad",
+                                                        "How many seconds will Xpad wait before continuing startup",
+                                                        0,
+                                                        G_MAXUINT,
+                                                        2,
+                                                        G_PARAM_READWRITE));
+	
+	g_object_class_install_property (gobject_class,
+	                                 PROP_AUTOSTART_NEW_PAD,
+	                                 g_param_spec_boolean ("autostart_new_pad",
+	                                                       "Autostart a new pad",
+	                                                       "Whether to create a new pad on startup",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE));
+	
+	g_object_class_install_property (gobject_class,
+	                                 PROP_AUTOSTART_STICKY,
+	                                 g_param_spec_boolean ("autostart_sticky",
+	                                                       "Default Stickiness",
+	                                                       "Whether pads are sticky on creation",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE));
+	
+	g_object_class_install_property (gobject_class,
+                                     PROP_AUTOSTART_DISPLAY_PADS,
+                                     g_param_spec_uint ("autostart_display_pads",
+                                                        "Autostart display pads",
+                                                        "How to show the different pads when Xpad is started",
+                                                        0,
+                                                        G_MAXUINT,
+                                                        2,
+                                                        G_PARAM_READWRITE));
+
 	signals[CHANGE_BUTTONS] = 
 		g_signal_new ("change_buttons",
 		              G_OBJECT_CLASS_TYPE (gobject_class),
@@ -229,7 +269,7 @@
 	settings->priv->height = 200;
 	settings->priv->has_decorations = TRUE;
 	settings->priv->confirm_destroy = TRUE;
-	settings->priv->sticky = FALSE;
+	settings->priv->autostart_sticky = FALSE;
 	settings->priv->edit_lock = FALSE;
 	settings->priv->tray_click_configuration = 0;
 	settings->priv->fontname = NULL;
@@ -240,8 +280,19 @@
 	settings->priv->toolbar_buttons = NULL;
 	settings->priv->toolbar_buttons = g_slist_append (settings->priv->toolbar_buttons, g_strdup ("New"));
 	settings->priv->toolbar_buttons = g_slist_append (settings->priv->toolbar_buttons, g_strdup ("Delete"));
-	settings->priv->toolbar_buttons = g_slist_append (settings->priv->toolbar_buttons, g_strdup ("Close"));
-	
+	settings->priv->toolbar_buttons = g_slist_append (settings->priv->toolbar_buttons, g_strdup ("Separator"));
+	settings->priv->toolbar_buttons = g_slist_append (settings->priv->toolbar_buttons, g_strdup ("Cut"));
+	settings->priv->toolbar_buttons = g_slist_append (settings->priv->toolbar_buttons, g_strdup ("Copy"));
+	settings->priv->toolbar_buttons = g_slist_append (settings->priv->toolbar_buttons, g_strdup ("Paste"));
+	settings->priv->toolbar_buttons = g_slist_append (settings->priv->toolbar_buttons, g_strdup ("Separator"));	
+	settings->priv->toolbar_buttons = g_slist_append (settings->priv->toolbar_buttons, g_strdup ("Undo"));
+	settings->priv->toolbar_buttons = g_slist_append (settings->priv->toolbar_buttons, g_strdup ("Redo"));	
+
+	settings->priv->autostart_wait_systray = TRUE;
+	settings->priv->autostart_delay = 0;
+	settings->priv->autostart_new_pad = FALSE;
+	settings->priv->autostart_display_pads = 2;
+
 	load_from_file (settings, DEFAULTS_FILENAME);
 }
 
@@ -264,7 +315,7 @@
 		gdk_rgba_free (settings->priv->back);
 
 	g_free (settings->priv->fontname);
-	
+		
 	G_OBJECT_CLASS (xpad_settings_parent_class)->finalize (object);
 }
 
@@ -385,23 +436,6 @@
 	return settings->priv->has_toolbar;
 }
 
-void xpad_settings_set_sticky (XpadSettings *settings, gboolean sticky)
-{
-	if (settings->priv->sticky == sticky)
-		return;
-	
-	settings->priv->sticky = sticky;
-	
-	save_to_file (settings, DEFAULTS_FILENAME);
-	
-	g_object_notify (G_OBJECT (settings), "sticky");
-}
-
-gboolean xpad_settings_get_sticky (XpadSettings *settings)
-{
-	return settings->priv->sticky;
-}
-
 void xpad_settings_set_autohide_toolbar (XpadSettings *settings, gboolean hide)
 {
 	if (settings->priv->autohide_toolbar == hide)
@@ -445,72 +479,12 @@
 	g_signal_emit (settings, signals[CHANGE_BUTTONS], 0);
 }
 
-/* Unused function of previous developer
-gboolean xpad_settings_move_toolbar_button (XpadSettings *settings, gint button, gint new)
-{
-	GSList *element = NULL;
-	gpointer data;
-	
-	if (button == new) {
-		g_slist_free(element);
-		return FALSE;
-	}
-	
-	if (new >= (gint) g_slist_length (settings->priv->toolbar_buttons) || 0 > new ) {
-		g_slist_free(element);
-		return FALSE;
-	}
-	
-	element = g_slist_nth (settings->priv->toolbar_buttons, button);
-	if (!element) {
-		g_slist_free(element);
-		return FALSE;
-	}
-	
-	data = element->data;
-	settings->priv->toolbar_buttons = g_slist_delete_link (settings->priv->toolbar_buttons, element);
-	settings->priv->toolbar_buttons = g_slist_insert (settings->priv->toolbar_buttons, data, new);
-	
-	save_to_file (settings, DEFAULTS_FILENAME);
-	
-	g_signal_emit (settings, signals[CHANGE_BUTTONS], 0);
-	
-	g_slist_free(element);
-
-	return TRUE;
-}
-*/
-
 static void xpad_settings_remove_toolbar_list_element (XpadSettings *settings, GSList *element)
 {
 	g_free (element->data);
 	settings->priv->toolbar_buttons = g_slist_delete_link (settings->priv->toolbar_buttons, element);
 }
 
-/* Unused function of previous developer
-gboolean xpad_settings_remove_toolbar_button (XpadSettings *settings, gint button)
-{
-	GSList *element;
-	
-	element = g_slist_nth (settings->priv->toolbar_buttons, button);
-	
-	if (!element) {
-		g_slist_free(element);
-		return FALSE;
-	}
-	
-	xpad_settings_remove_toolbar_list_element (settings, element);
-	
-	save_to_file (settings, DEFAULTS_FILENAME);
-	
-	g_signal_emit (settings, signals[CHANGE_BUTTONS], 0);
-	
-	g_slist_free(element);
-
-	return TRUE;
-}
-*/
-
 gboolean xpad_settings_remove_all_toolbar_buttons (XpadSettings *settings)
 {
 	if (settings->priv->toolbar_buttons == NULL)
@@ -548,12 +522,10 @@
 	
 	g_signal_emit (settings, signals[CHANGE_BUTTONS], 0);
 	
-	g_slist_free(element);
-
 	return TRUE;
 }
 
-G_CONST_RETURN GSList *xpad_settings_get_toolbar_buttons (XpadSettings *settings)
+const GSList *xpad_settings_get_toolbar_buttons (XpadSettings *settings)
 {
 	return settings->priv->toolbar_buttons;
 }
@@ -573,7 +545,7 @@
 	g_object_notify (G_OBJECT (settings), "back_color");
 }
 
-G_CONST_RETURN GdkRGBA *xpad_settings_get_back_color (XpadSettings *settings)
+const GdkRGBA *xpad_settings_get_back_color (XpadSettings *settings)
 {
 	return settings->priv->back;
 }
@@ -593,7 +565,7 @@
 	g_object_notify (G_OBJECT (settings), "text_color");
 }
 
-G_CONST_RETURN GdkRGBA *xpad_settings_get_text_color (XpadSettings *settings)
+const GdkRGBA *xpad_settings_get_text_color (XpadSettings *settings)
 {
 	return settings->priv->text;
 }
@@ -608,11 +580,93 @@
 	g_object_notify (G_OBJECT (settings), "fontname");
 }
 
-G_CONST_RETURN gchar *xpad_settings_get_fontname (XpadSettings *settings)
+const gchar *xpad_settings_get_fontname (XpadSettings *settings)
 {
 	return settings->priv->fontname;
 }
 
+gboolean xpad_settings_get_autostart_xpad (XpadSettings *settings)
+{
+	/* The existence of the xpad.desktop file in the autostart folder defines if autostarting is enabled or disabled */
+	const gchar *filename = g_strdup_printf ("%s/.config/autostart/xpad.desktop", g_getenv ("HOME"));
+	return g_file_test (filename, G_FILE_TEST_EXISTS);
+}
+
+void xpad_settings_set_autostart_wait_systray (XpadSettings *settings, gboolean conf)
+{
+	if (settings->priv->autostart_wait_systray == conf)
+		return;
+	
+	settings->priv->autostart_wait_systray = conf;
+	save_to_file (settings, DEFAULTS_FILENAME);
+	g_object_notify (G_OBJECT (settings), "autostart_wait_systray");
+}
+
+gboolean xpad_settings_get_autostart_wait_systray (XpadSettings *settings)
+{
+	return settings->priv->autostart_wait_systray;
+}
+
+void xpad_settings_set_autostart_delay (XpadSettings *settings, guint conf)
+{
+	if (settings->priv->autostart_delay == conf)
+		return;
+	
+	settings->priv->autostart_delay = conf;
+	save_to_file(settings, DEFAULTS_FILENAME);
+	g_object_notify (G_OBJECT (settings), "autostart_delay");
+}
+
+guint xpad_settings_get_autostart_delay (XpadSettings *settings)
+{
+	return settings->priv->autostart_delay;
+}
+
+void xpad_settings_set_autostart_new_pad (XpadSettings *settings, gboolean conf)
+{
+	if (settings->priv->autostart_new_pad == conf)
+		return;
+	
+	settings->priv->autostart_new_pad = conf;
+	save_to_file (settings, DEFAULTS_FILENAME);
+	g_object_notify (G_OBJECT (settings), "autostart_new_pad");
+}
+
+gboolean xpad_settings_get_autostart_new_pad (XpadSettings *settings)
+{
+	return settings->priv->autostart_new_pad;
+}
+
+void xpad_settings_set_autostart_sticky (XpadSettings *settings, gboolean sticky)
+{
+	if (settings->priv->autostart_sticky == sticky)
+		return;
+	
+	settings->priv->autostart_sticky = sticky;
+	save_to_file (settings, DEFAULTS_FILENAME);
+	g_object_notify (G_OBJECT (settings), "autostart_sticky");
+}
+
+gboolean xpad_settings_get_autostart_sticky (XpadSettings *settings)
+{
+	return settings->priv->autostart_sticky;
+}
+
+void xpad_settings_set_autostart_display_pads (XpadSettings *settings, guint conf)
+{
+	if (settings->priv->autostart_display_pads == conf)
+		return;
+	
+	settings->priv->autostart_display_pads = conf;
+	save_to_file (settings, DEFAULTS_FILENAME);
+	g_object_notify (G_OBJECT (settings), "autostart_display_pads");
+}
+
+guint xpad_settings_get_autostart_display_pads(XpadSettings *settings)
+{
+	return settings->priv->autostart_display_pads;
+}
+
 static void
 xpad_settings_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
 {
@@ -638,10 +692,6 @@
 		xpad_settings_set_confirm_destroy (settings, g_value_get_boolean (value));
 		break;
 	
-	case PROP_STICKY:
-		xpad_settings_set_sticky (settings, g_value_get_boolean (value));
-		break;
-	
 	case PROP_EDIT_LOCK:
 		xpad_settings_set_edit_lock (settings, g_value_get_boolean (value));
 		break;
@@ -673,7 +723,27 @@
 	case PROP_FONTNAME:
 		xpad_settings_set_fontname (settings, g_value_get_string (value));
 		break;
+
+	case PROP_AUTOSTART_WAIT_SYSTRAY:
+		xpad_settings_set_autostart_wait_systray (settings, g_value_get_boolean (value));
+		break;
+
+	case PROP_AUTOSTART_DELAY:
+		xpad_settings_set_autostart_delay (settings, g_value_get_uint (value));
+		break;
+
+	case PROP_AUTOSTART_NEW_PAD:
+		xpad_settings_set_autostart_new_pad (settings, g_value_get_boolean (value));
+		break;
+
+	case PROP_AUTOSTART_STICKY:
+		xpad_settings_set_autostart_sticky (settings, g_value_get_boolean (value));
+		break;
 	
+	case PROP_AUTOSTART_DISPLAY_PADS:
+		xpad_settings_set_autostart_display_pads (settings, g_value_get_uint (value));
+		break;
+		
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -705,10 +775,6 @@
 		g_value_set_boolean (value, xpad_settings_get_confirm_destroy (settings));
 		break;
 	
-	case PROP_STICKY:
-		g_value_set_boolean (value, xpad_settings_get_sticky (settings));
-		break;
-	
 	case PROP_EDIT_LOCK:
 		g_value_set_boolean (value, xpad_settings_get_edit_lock (settings));
 		break;
@@ -736,6 +802,26 @@
 	case PROP_FONTNAME:
 		g_value_set_string (value, xpad_settings_get_fontname (settings));
 		break;
+
+	case PROP_AUTOSTART_WAIT_SYSTRAY:
+		g_value_set_boolean (value, xpad_settings_get_autostart_wait_systray (settings));
+		break;
+	
+	case PROP_AUTOSTART_DELAY:
+		g_value_set_uint (value, xpad_settings_get_autostart_delay (settings));
+		break;
+	
+	case PROP_AUTOSTART_NEW_PAD:
+		g_value_set_boolean (value, xpad_settings_get_autostart_new_pad (settings));
+		break;
+	
+	case PROP_AUTOSTART_STICKY:
+		g_value_set_boolean (value, xpad_settings_get_autostart_sticky (settings));
+		break;
+	
+	case PROP_AUTOSTART_DISPLAY_PADS:
+		g_value_set_uint (value, xpad_settings_get_autostart_display_pads (settings));
+		break;
 	
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -766,14 +852,14 @@
 	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.
+	/* 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,
 		"u|width", &settings->priv->width,
 		"b|confirm_destroy", &settings->priv->confirm_destroy,
 		"b|edit_lock", &settings->priv->edit_lock,
-		"b|sticky_on_start", &settings->priv->sticky,
+		"b|sticky_on_start", &settings->priv->autostart_sticky,
 		"u|tray_click_configuration", &settings->priv->tray_click_configuration,
 		"s|back", &background_color_string,
 		"b|use_back", &use_back,
@@ -784,6 +870,10 @@
 		"b|auto_hide_toolbar", &settings->priv->autohide_toolbar,
 		"b|scrollbar", &settings->priv->has_scrollbar,
 		"s|buttons", &buttons,
+		"b|autostart_wait_systray", &settings->priv->autostart_wait_systray,
+		"u|autostart_delay", &settings->priv->autostart_delay,		
+		"b|autostart_new_pad", &settings->priv->autostart_new_pad,
+		"u|autostart_display_pads", &settings->priv->autostart_display_pads,
 		NULL))
 		return;
 
@@ -791,13 +881,16 @@
 	{
 		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, 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, 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};
 			}
@@ -808,13 +901,16 @@
 
 	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, 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, 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};
 			}
@@ -850,7 +946,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);
@@ -886,7 +982,7 @@
 		"u|width", settings->priv->width,
 		"b|confirm_destroy", settings->priv->confirm_destroy,
 		"b|edit_lock", settings->priv->edit_lock,
-		"b|sticky_on_start", settings->priv->sticky,
+		"b|sticky_on_start", settings->priv->autostart_sticky,
 		"u|tray_click_configuration", settings->priv->tray_click_configuration,
 		"s|back", settings->priv->back ? gdk_rgba_to_string (settings->priv->back) : "NULL",
 		"b|use_back", settings->priv->back ? TRUE : FALSE,
@@ -897,6 +993,10 @@
 		"b|auto_hide_toolbar", settings->priv->autohide_toolbar,
 		"b|scrollbar", settings->priv->has_scrollbar,
 		"s|buttons", buttons,
+		"b|autostart_wait_systray", settings->priv->autostart_wait_systray,
+		"u|autostart_delay", settings->priv->autostart_delay,		
+		"b|autostart_new_pad", settings->priv->autostart_new_pad,
+		"u|autostart_display_pads", settings->priv->autostart_display_pads,
 		NULL);
 	
 	g_free (buttons);
 
=== modified file 'src/xpad-settings.h'
--- src/xpad-settings.h	2013-10-31 21:17:36 +0000
+++ src/xpad-settings.h	2014-06-07 00:27:40 +0000
@@ -66,9 +66,6 @@
 void xpad_settings_set_confirm_destroy (XpadSettings *settings, gboolean confirm);
 gboolean xpad_settings_get_confirm_destroy (XpadSettings *settings);
 
-void xpad_settings_set_sticky (XpadSettings *settings, gboolean sticky);
-gboolean xpad_settings_get_sticky (XpadSettings *settings);
-
 void xpad_settings_set_edit_lock (XpadSettings *settings, gboolean lock);
 gboolean xpad_settings_get_edit_lock (XpadSettings *settings);
 
@@ -82,23 +79,39 @@
 gboolean xpad_settings_get_has_scrollbar (XpadSettings *settings);
 
 void xpad_settings_add_toolbar_button (XpadSettings *settings, const gchar *button);
-// gboolean xpad_settings_move_toolbar_button (XpadSettings *settings, gint button, gint new);
-// gboolean xpad_settings_remove_toolbar_button (XpadSettings *settings, gint button);
 gboolean xpad_settings_remove_all_toolbar_buttons (XpadSettings *settings);
 gboolean xpad_settings_remove_last_toolbar_button (XpadSettings *settings);
-G_CONST_RETURN GSList *xpad_settings_get_toolbar_buttons (XpadSettings *settings);
+const GSList *xpad_settings_get_toolbar_buttons (XpadSettings *settings);
 
 void xpad_settings_set_back_color (XpadSettings *settings, const GdkRGBA *back);
-G_CONST_RETURN GdkRGBA *xpad_settings_get_back_color (XpadSettings *settings);
+const GdkRGBA *xpad_settings_get_back_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);
+const 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);
+const 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);
+guint xpad_settings_get_tray_click_handler (XpadSettings *settings);
+
+void xpad_settings_set_autostart_xpad (XpadSettings *settings, gboolean conf);
+gboolean xpad_settings_get_autostart_xpad (XpadSettings *settings);
+
+void xpad_settings_set_autostart_wait_systray (XpadSettings *settings, gboolean conf);
+gboolean xpad_settings_get_autostart_wait_systray (XpadSettings *settings);
+
+void xpad_settings_set_autostart_delay (XpadSettings *settings, guint conf);
+guint xpad_settings_get_autostart_delay (XpadSettings *settings);
+
+void xpad_settings_set_autostart_new_pad (XpadSettings *settings, gboolean conf);
+gboolean xpad_settings_get_autostart_new_pad (XpadSettings *settings);
+
+void xpad_settings_set_autostart_sticky (XpadSettings *settings, gboolean conf);
+gboolean xpad_settings_get_autostart_sticky (XpadSettings *settings);
+
+void xpad_settings_set_autostart_display_pads (XpadSettings *settings, guint conf);
+guint xpad_settings_get_autostart_display_pads (XpadSettings *settings);
 
 G_END_DECLS
 
 
=== modified file 'src/xpad-text-view.c'
--- src/xpad-text-view.c	2013-10-31 21:17:36 +0000
+++ src/xpad-text-view.c	2014-06-07 00:27:40 +0000
@@ -153,8 +153,7 @@
 static gboolean
 xpad_text_view_focus_out_event (GtkWidget *widget, GdkEventFocus *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.
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) event;
 
 	if (xpad_settings_get_edit_lock (xpad_global_settings))
@@ -200,13 +199,17 @@
 {
 	GdkCursor *cursor;
 	gboolean editable;
+	GdkWindow *view_window;
 	
 	editable = gtk_text_view_get_editable (GTK_TEXT_VIEW (view));
 	gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), editable);
 	
 	cursor = editable ? gdk_cursor_new (GDK_XTERM) : NULL;
 	
-	gdk_window_set_cursor (gtk_text_view_get_window (GTK_TEXT_VIEW (view), GTK_TEXT_WINDOW_TEXT), cursor);
+	/* Only set for pads which are currently visible */ 
+	view_window = gtk_text_view_get_window (GTK_TEXT_VIEW (view), GTK_TEXT_WINDOW_TEXT);
+	if (view_window != NULL)
+		gdk_window_set_cursor (view_window, cursor);
 	
 	if (cursor)
 		g_object_unref (cursor);
@@ -224,11 +227,11 @@
 		pango_font_description_free (fontdesc);
 }
 
-// Update the colors of the textview
+/* 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.
+	/* 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);
 
@@ -236,7 +239,7 @@
 	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.
+	/* 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);
 }
 
=== modified file 'src/xpad-toolbar.c'
--- src/xpad-toolbar.c	2013-10-31 21:17:36 +0000
+++ src/xpad-toolbar.c	2014-06-07 00:27:40 +0000
@@ -35,8 +35,6 @@
 	guint move_button_release_handler;
 	guint move_key_press_handler;
 	XpadPad *pad;
-	// GtkToolItem *move_button;
-	// GtkToolItem *tool_items;
 };
 
 G_DEFINE_TYPE_WITH_PRIVATE(XpadToolbar, xpad_toolbar, GTK_TYPE_TOOLBAR)
@@ -50,7 +48,7 @@
 typedef struct
 {
 	const gchar *name;
-	const gchar *stock;
+	const gchar *icon_name;
 	guint signal;
 	guint type;
 	const gchar *desc;
@@ -78,23 +76,22 @@
 
 static const XpadToolbarButton buttons[] =
 {
-	{"Clear", GTK_STOCK_CLEAR, ACTIVATE_CLEAR, XPAD_BUTTON_TYPE_BUTTON, N_("Clear Pad Contents"), N_("Add C_lear to Toolbar")},
-	{"Close", GTK_STOCK_CLOSE, ACTIVATE_CLOSE, XPAD_BUTTON_TYPE_BUTTON, N_("Close and Save Pad"), N_("Add _Close to Toolbar")},
-	{"Copy", GTK_STOCK_COPY, ACTIVATE_COPY, XPAD_BUTTON_TYPE_BUTTON, N_("Copy to Clipboard"), N_("Add C_opy to Toolbar")},
-	{"Cut", GTK_STOCK_CUT, ACTIVATE_CUT, XPAD_BUTTON_TYPE_BUTTON, N_("Cut to Clipboard"), N_("Add C_ut to Toolbar")},
-	{"Delete", GTK_STOCK_DELETE, ACTIVATE_DELETE, XPAD_BUTTON_TYPE_BUTTON, N_("Delete Pad"), N_("Add _Delete to Toolbar")},
-	{"New", GTK_STOCK_NEW, ACTIVATE_NEW, XPAD_BUTTON_TYPE_BUTTON, N_("Open New Pad"), N_("Add _New to Toolbar")},
-	{"Paste", GTK_STOCK_PASTE, ACTIVATE_PASTE, XPAD_BUTTON_TYPE_BUTTON, N_("Paste from Clipboard"), N_("Add Pa_ste to Toolbar")},
-	{"Preferences", GTK_STOCK_PREFERENCES, ACTIVATE_PREFERENCES, XPAD_BUTTON_TYPE_BUTTON, N_("Edit Preferences"), N_("Add Pr_eferences to Toolbar")},
-	{"Properties", GTK_STOCK_PROPERTIES, ACTIVATE_PROPERTIES, XPAD_BUTTON_TYPE_BUTTON, N_("Edit Pad Properties"), N_("Add Proper_ties to Toolbar")},
-	{"Redo", GTK_STOCK_REDO, ACTIVATE_REDO, XPAD_BUTTON_TYPE_BUTTON, N_("Redo"), N_("Add _Redo to Toolbar")},
-	{"Quit", GTK_STOCK_QUIT, ACTIVATE_QUIT, XPAD_BUTTON_TYPE_BUTTON, N_("Close All Pads"), N_("Add Close _All to Toolbar")},
-	{"Undo", GTK_STOCK_UNDO, ACTIVATE_UNDO, XPAD_BUTTON_TYPE_BUTTON, N_("Undo"), N_("Add _Undo to Toolbar")},
-	{"sep", NULL, 0, XPAD_BUTTON_TYPE_SEPARATOR, NULL, N_("Add a Se_parator to Toolbar")} /* Separator */
-	/*{"Minimize to Tray", "gtk-goto-bottom", 1, N_("Minimize Pads to System Tray")}*/
+	{"Clear", "edit-clear", ACTIVATE_CLEAR, XPAD_BUTTON_TYPE_BUTTON, N_("Clear Pad Contents"), N_("Add C_lear button")},
+	{"Close", "window-close", ACTIVATE_CLOSE, XPAD_BUTTON_TYPE_BUTTON, N_("Close and Save Pad"), N_("Add _Close button")},
+	{"Copy", "edit-copy", ACTIVATE_COPY, XPAD_BUTTON_TYPE_BUTTON, N_("Copy to Clipboard"), N_("Add C_opy button")},
+	{"Cut", "edit-cut", ACTIVATE_CUT, XPAD_BUTTON_TYPE_BUTTON, N_("Cut to Clipboard"), N_("Add C_ut button")},
+	{"Delete", "edit-delete", ACTIVATE_DELETE, XPAD_BUTTON_TYPE_BUTTON, N_("Delete Pad"), N_("Add _Delete button")},
+	{"New", "document-new", ACTIVATE_NEW, XPAD_BUTTON_TYPE_BUTTON, N_("Open New Pad"), N_("Add _New button")},
+	{"Paste", "edit-paste", ACTIVATE_PASTE, XPAD_BUTTON_TYPE_BUTTON, N_("Paste from Clipboard"), N_("Add Pa_ste button")},
+	{"Preferences", "preferences-system", ACTIVATE_PREFERENCES, XPAD_BUTTON_TYPE_BUTTON, N_("Edit Preferences"), N_("Add Pr_eferences button")},
+	{"Properties", "document-properties", ACTIVATE_PROPERTIES, XPAD_BUTTON_TYPE_BUTTON, N_("Edit Pad Properties"), N_("Add Proper_ties button")},
+	{"Redo", "edit-redo", ACTIVATE_REDO, XPAD_BUTTON_TYPE_BUTTON, N_("Redo"), N_("Add _Redo button")},
+	{"Quit", "application-exit", ACTIVATE_QUIT, XPAD_BUTTON_TYPE_BUTTON, N_("Close All Pads"), N_("Add Close _All button")},
+	{"Undo", "edit-undo", ACTIVATE_UNDO, XPAD_BUTTON_TYPE_BUTTON, N_("Undo"), N_("Add _Undo button")},
+	{"Separator", NULL, 0, XPAD_BUTTON_TYPE_SEPARATOR, NULL, N_("Add Se_parator")}
 };
 
-static G_CONST_RETURN XpadToolbarButton *xpad_toolbar_button_lookup (XpadToolbar *toolbar, const gchar *name);
+static const XpadToolbarButton *xpad_toolbar_button_lookup (XpadToolbar *toolbar, const gchar *name);
 static GtkToolItem *xpad_toolbar_button_to_item (XpadToolbar *toolbar, const XpadToolbarButton *button);
 static void xpad_toolbar_button_activated (GtkToolButton *button);
 static void xpad_toolbar_change_buttons (XpadToolbar *toolbar);
@@ -107,16 +104,6 @@
 static void xpad_toolbar_add_button (const gchar *button_name);
 static gboolean xpad_toolbar_popup_context_menu (GtkToolbar *toolbar, gint x, gint y, gint button);
 
-/* Unfinished new feature of previous developer
-static void xpad_toolbar_remove_button (GtkWidget *button);
-static gboolean xpad_toolbar_button_press_event (GtkWidget *widget, GdkEventButton *event);
-static gboolean xpad_toolbar_popup_button_menu (GtkWidget *button, GdkEventButton *event, XpadToolbar *toolbar);
-static gboolean xpad_toolbar_move_button_start (XpadToolbar *toolbar, GtkWidget *button);
-static gboolean xpad_toolbar_move_button_move (XpadToolbar *toolbar, GdkEventMotion *event);
-static gboolean xpad_toolbar_move_button_move_keyboard (XpadToolbar *toolbar, GdkEventKey *event);
-static gboolean xpad_toolbar_move_button_end (XpadToolbar *toolbar);
-*/
-
 static guint signals[LAST_SIGNAL] = { 0 };
 
 enum
@@ -144,7 +131,6 @@
 	gobject_class->dispose = xpad_toolbar_dispose;
 	gobject_class->finalize = xpad_toolbar_finalize;
 	
-	/* Signals */
 	signals[ACTIVATE_NEW] = 
 		g_signal_new ("activate-new",
 		              G_OBJECT_CLASS_TYPE (gobject_class),
@@ -344,11 +330,10 @@
 	}
 }
 
-static G_CONST_RETURN XpadToolbarButton *
+static const 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.
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) toolbar;
 
 	guint i;
@@ -363,7 +348,6 @@
 xpad_toolbar_button_to_item (XpadToolbar *toolbar, const XpadToolbarButton *button)
 {
 	GtkToolItem *item;
-	// GtkWidget *child;
 
 	item = GTK_TOOL_ITEM (g_object_get_data (G_OBJECT (toolbar), button->name));
 	if (item)
@@ -372,11 +356,13 @@
 	switch (button->type)
 	{
 	case XPAD_BUTTON_TYPE_BUTTON:
-		item = GTK_TOOL_ITEM (gtk_tool_button_new_from_stock (button->stock));
+		item = gtk_tool_button_new (NULL, button->name);
+		gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), button->icon_name);
 		g_signal_connect (item, "clicked", G_CALLBACK (xpad_toolbar_button_activated), NULL);
 		break;
 	case XPAD_BUTTON_TYPE_TOGGLE:
-		item = GTK_TOOL_ITEM (gtk_toggle_tool_button_new_from_stock (button->stock));
+		item = gtk_tool_button_new (NULL, button->name);
+		gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), button->icon_name);
 		g_signal_connect (item, "toggled", G_CALLBACK (xpad_toolbar_button_activated), NULL);
 		break;
 	case XPAD_BUTTON_TYPE_SEPARATOR:
@@ -414,7 +400,7 @@
 {
 	GList *list, *temp;
 	const GSList *slist, *stemp;
-	gint i = 0;
+	guint i = 0;
 	guint j = 0;
 	GtkToolItem *item;
 	
@@ -430,16 +416,20 @@
 		g_object_set_data (G_OBJECT (toolbar), buttons[j].name, NULL);
 	
 	slist = xpad_settings_get_toolbar_buttons (xpad_global_settings);
+	
 	for (stemp = slist; stemp; stemp = stemp->next)
 	{
 		const XpadToolbarButton *button;
-		
+
 		button = xpad_toolbar_button_lookup (toolbar, stemp->data);
-		if (!button)
+				
+		if (button->type == XPAD_BUTTON_TYPE_SEPARATOR)
+			item = gtk_separator_tool_item_new ();
+		else if (button->type == XPAD_BUTTON_TYPE_BUTTON)
+			item = xpad_toolbar_button_to_item (toolbar, button);
+		else
 			continue;
 		
-		item = xpad_toolbar_button_to_item (toolbar, button);
-		
 		if (item)
 		{
 			g_object_set_data (G_OBJECT (item), "xpad-button-num", GINT_TO_POINTER (i));
@@ -462,7 +452,7 @@
 	gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
 	gtk_widget_show_all (GTK_WIDGET (item));
 	i++;
-
+	
 	if (toolbar->priv->pad)
 	{
 		xpad_pad_notify_has_selection (toolbar->priv->pad);
@@ -497,8 +487,7 @@
 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.
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) x;
 	(void) y;
 
@@ -515,60 +504,37 @@
 	for (i = 0; i < G_N_ELEMENTS (buttons); i++)
 	{
 		const GSList *j;
-		GtkWidget *item, *image;
+		GtkWidget *item;
+
+		for (j = current_buttons; j; j = j->next)
+			if (g_ascii_strcasecmp (j->data, "Separator") && !g_ascii_strcasecmp (j->data, buttons[i].name))
+				break;
 		
-		if (strcmp (buttons[i].name, "sep") != 0)
-		{
-			for (j = current_buttons; j; j = j->next)
-				if (!g_ascii_strcasecmp (j->data, buttons[i].name))
-					break;
-			
-			if (j)
-			{
-				is_button = TRUE;
-				continue;
-			}
-		}
-		else
-		{
-			/* Don't let user add separators until we can allow clicks on them. */
+		if (j)
+		{
+			is_button = TRUE;
 			continue;
 		}
 		
-		item = gtk_image_menu_item_new_with_mnemonic (buttons[i].menu_desc);
-		
-		image = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_MENU);
-		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-		
+		item = gtk_menu_item_new_with_mnemonic (buttons[i].menu_desc);
 		g_signal_connect_swapped (item, "activate", G_CALLBACK (xpad_toolbar_add_button), (gpointer) buttons[i].name);
-		
 		gtk_menu_attach (GTK_MENU (menu), item, 0, 1, i, i + 1);
 		gtk_widget_show (item);
 	}
 
 	if (is_button)
 	{
-		GtkWidget *item, *image;
+		GtkWidget *item;
 
-		item = gtk_image_menu_item_new_with_mnemonic (N_("Remove All _Buttons"));
-		
-		image = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_MENU);
-		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-		
-		g_signal_connect_swapped (item, "activate", G_CALLBACK (xpad_toolbar_remove_all_buttons), NULL);
-		
+		item = gtk_menu_item_new_with_mnemonic (N_("Remove All _Buttons"));
+		g_signal_connect_swapped (item, "activate", G_CALLBACK (xpad_toolbar_remove_all_buttons), NULL);		
 		gtk_menu_attach (GTK_MENU (menu), item, 0, 1, i, i + 1);
 		gtk_widget_show (item);
 
 		i++;
 		
-		item = gtk_image_menu_item_new_with_mnemonic (N_("Remo_ve Last Button"));
-		
-		image = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_MENU);
-		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-		
+		item = gtk_menu_item_new_with_mnemonic (N_("Remo_ve Last Button"));
 		g_signal_connect_swapped (item, "activate", G_CALLBACK (xpad_toolbar_remove_last_button), NULL);
-		
 		gtk_menu_attach (GTK_MENU (menu), item, 0, 1, i, i + 1);
 		gtk_widget_show (item);
 	}
@@ -625,216 +591,3 @@
 	const XpadToolbarButton *button = xpad_toolbar_button_lookup (toolbar, "Paste");
 	xpad_toolbar_enable_button (toolbar, button, enable);
 }
-
-/*
- * The code below was code in progress of a previous developer
-static gboolean
-xpad_toolbar_button_press_event (GtkWidget *widget, GdkEventButton *event)
-{
-	// Ignore double-clicks and triple-clicks
-	if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
-	{
-		XpadToolbar *toolbar = XPAD_TOOLBAR (g_object_get_data (G_OBJECT (widget), "xpad-toolbar"));
-		xpad_toolbar_popup_button_menu (widget, event, toolbar);
-		return TRUE;
-	}
-	else if (event->button == 2 && event->type == GDK_BUTTON_PRESS)
-	{
-		XpadToolbar *toolbar = XPAD_TOOLBAR (g_object_get_data (G_OBJECT (widget), "xpad-toolbar"));
-		xpad_toolbar_move_button_start (toolbar, widget);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gboolean
-xpad_toolbar_popup_button_menu (GtkWidget *button, GdkEventButton *event, XpadToolbar *toolbar)
-{
-	GtkWidget *menu;
-	GtkWidget *item, *image;
-
-	menu = gtk_menu_new ();
-
-
-	item = gtk_image_menu_item_new_with_mnemonic (_("_Remove From Toolbar"));
-
-	image = gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU);
-	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-
-	g_signal_connect_swapped (item, "activate", G_CALLBACK (xpad_toolbar_remove_button), button);
-	gtk_menu_attach (GTK_MENU (menu), item, 0, 1, 0, 1);
-	gtk_widget_show (item);
-
-
-	item = gtk_menu_item_new_with_mnemonic (_("_Move"));
-	g_signal_connect_swapped (item, "activate", G_CALLBACK (move_menu_item_activated), button);
-	gtk_menu_attach (GTK_MENU (menu), item, 0, 1, 1, 2);
-	gtk_widget_show (item);
-
-
-	g_signal_connect (menu, "deactivate", G_CALLBACK (menu_deactivated), toolbar);
-
-	gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, event ? event->button : 0, gtk_get_current_event_time ());
-
-	g_signal_emit (toolbar, signals[POPUP], 0, menu);
-
-	return TRUE;
-}
-
-static void
-xpad_toolbar_remove_button (GtkWidget *button)
-{
-	gint button_num;
-
-	button_num = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button), "xpad-button-num"));
-
-	xpad_settings_remove_toolbar_button (xpad_global_settings, button_num);
-}
-
-static void
-move_menu_item_activated (GtkWidget *button)
-{
-	XpadToolbar *toolbar;
-
-	toolbar = XPAD_TOOLBAR (g_object_get_data (G_OBJECT (button), "xpad-toolbar"));
-
-	xpad_toolbar_move_button_start (toolbar, button);
-}
-
-static gboolean
-xpad_toolbar_move_button_start (XpadToolbar *toolbar, GtkWidget *button)
-{
-	GdkGrabStatus  status;
-	GdkCursor     *fleur_cursor;
-	GtkWidget *widget;
-
-	widget = GTK_WIDGET (toolbar);
-	gtk_grab_add (widget);
-
-	fleur_cursor = gdk_cursor_new (GDK_FLEUR);
-
-	// g_object_ref (button);
-	toolbar->priv->move_removed = FALSE;
-	toolbar->priv->move_button = GTK_TOOL_ITEM (button);
-	toolbar->priv->move_index = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button), "xpad-button-num"));
-
-	toolbar->priv->move_button_release_handler = g_signal_connect (toolbar, "button-release-event", G_CALLBACK (xpad_toolbar_move_button_end), NULL);
-	toolbar->priv->move_key_press_handler = g_signal_connect (toolbar, "key-press-event", G_CALLBACK (xpad_toolbar_move_button_move_keyboard), NULL);
-	toolbar->priv->move_motion_handler = g_signal_connect (toolbar, "motion-notify-event", G_CALLBACK (xpad_toolbar_move_button_move), NULL);
-
-	status = gdk_pointer_grab (widget->window, FALSE,
-				   GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK, NULL,
-				   fleur_cursor, gtk_get_current_event_time ());
-
-	gdk_cursor_unref (fleur_cursor);
-	gdk_flush ();
-
-	if (status != GDK_GRAB_SUCCESS)
-	{
-		xpad_toolbar_move_button_end (toolbar);
-	}
-
-	return TRUE;
-}
-
-static gboolean
-xpad_toolbar_move_button_move_keyboard (XpadToolbar *toolbar, GdkEventKey *event)
-{
-	if (event->keyval == GDK_KEY_Left || event->keyval == GDK_KEY_KP_Left)
-	{
-		if (!toolbar->priv->move_removed)
-		{
-			toolbar->priv->move_removed = TRUE;
-			gtk_container_remove (GTK_CONTAINER (toolbar), GTK_WIDGET (toolbar->priv->move_button));
-		}
-
-		if (toolbar->priv->move_index > 0)
-			toolbar->priv->move_index--;
-
-		gtk_toolbar_set_drop_highlight_item (GTK_TOOLBAR (toolbar), toolbar->priv->move_button, toolbar->priv->move_index);
-	}
-	else if (event->keyval == GDK_KEY_Right || event->keyval == GDK_KEY_KP_Right)
-	{
-		gint max;
-
-		if (!toolbar->priv->move_removed)
-		{
-			toolbar->priv->move_removed = TRUE;
-			gtk_container_remove (GTK_CONTAINER (toolbar), GTK_WIDGET (toolbar->priv->move_button));
-		}
-
-		max = gtk_toolbar_get_n_items (GTK_TOOLBAR (toolbar)) - 2;
-
-		if (toolbar->priv->move_index < max)
-			toolbar->priv->move_index++;
-
-		gtk_toolbar_set_drop_highlight_item (GTK_TOOLBAR (toolbar), toolbar->priv->move_button, toolbar->priv->move_index);
-	}
-	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;
-	}
-
-	return TRUE;
-}
-
-static gboolean
-xpad_toolbar_move_button_move (XpadToolbar *toolbar, GdkEventMotion *event)
-{
-	gint max;
-
-	if (!toolbar->priv->move_removed)
-	{
-		toolbar->priv->move_removed = TRUE;
-		gtk_container_remove (GTK_CONTAINER (toolbar), GTK_WIDGET (toolbar->priv->move_button));
-	}
-
-	toolbar->priv->move_index = gtk_toolbar_get_drop_index (GTK_TOOLBAR (toolbar), event->x, event->y);
-
-	// Must not move past separator or grip
-	max = gtk_toolbar_get_n_items (GTK_TOOLBAR (toolbar)) - 2;
-	toolbar->priv->move_index = MIN (toolbar->priv->move_index, max);
-
-	gtk_toolbar_set_drop_highlight_item (GTK_TOOLBAR (toolbar), toolbar->priv->move_button, toolbar->priv->move_index);
-
-	return TRUE;
-}
-
-static gboolean
-xpad_toolbar_move_button_end (XpadToolbar *toolbar)
-{
-	gint old_spot;
-	gint max;
-
-	g_signal_handler_disconnect (toolbar, toolbar->priv->move_button_release_handler);
-	g_signal_handler_disconnect (toolbar, toolbar->priv->move_key_press_handler);
-	g_signal_handler_disconnect (toolbar, toolbar->priv->move_motion_handler);
-	toolbar->priv->move_button_release_handler = 0;
-	toolbar->priv->move_key_press_handler = 0;
-	toolbar->priv->move_motion_handler = 0;
-
-	gtk_toolbar_set_drop_highlight_item (GTK_TOOLBAR (toolbar), NULL, 0);
-
-	old_spot = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (toolbar->priv->move_button), "xpad-button-num"));
-
-	// Must not move past separator or grip
-	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_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);
-	}
-
-	// g_object_unref (toolbar->priv->move_button);
-	toolbar->priv->move_button = NULL;
-
-	gtk_grab_remove (GTK_WIDGET (toolbar));
-	gdk_pointer_ungrab (gtk_get_current_event_time ());
-	return TRUE;
-}
-
-*/
 
=== modified file 'src/xpad-tray.c'
--- src/xpad-tray.c	2013-10-31 21:17:36 +0000
+++ src/xpad-tray.c	2014-06-07 00:27:40 +0000
@@ -38,15 +38,15 @@
 	LIST_OF_PADS,
 	NEW_PAD
 };
-// tray icon left click handler
+/* tray icon left click handler */
 static void xpad_tray_activate_cb (GtkStatusIcon *icon);
-// tray icon right click handler
+/* tray icon right click handler */
 static void xpad_tray_popup_menu_cb (GtkStatusIcon *icon, guint button, guint time);
-// "toggle show all" menu item handler
+/* "toggle show all" menu item handler */
 static void xpad_tray_show_hide_all (void);
-// "show pads" menu item handler
+/* "show pads" menu item handler */
 static void xpad_tray_show_windows_list (GtkStatusIcon *icon);
-// helper function to append pad window title as item to menu
+/* helper function to append pad window title as item to menu */
 static void xpad_tray_append_pad_window_titles_to_menu (GtkWidget *menu);
 
 static GtkStatusIcon  *docklet = NULL;
@@ -126,7 +126,7 @@
 xpad_tray_show_hide_all (void)
 {
 	GSList *pads = xpad_pad_group_get_pads (xpad_app_get_pad_group ());
-	// find if any pad is visible
+	/* find if any pad is visible */
 	gboolean open = FALSE;
 	GSList *i;
 	for(i = pads; i != NULL; i = i->next)
@@ -161,7 +161,7 @@
 		no_any_pad = TRUE;
 	g_slist_free (pads);
 	
-	item = gtk_image_menu_item_new_from_stock (GTK_STOCK_NEW, NULL);
+	item = gtk_menu_item_new_with_mnemonic (_("_New"));
 	g_signal_connect_swapped (item, "activate", G_CALLBACK (menu_spawn), xpad_app_get_pad_group ());
 	gtk_container_add (GTK_CONTAINER (menu), item);
 	gtk_widget_show (item);
@@ -177,7 +177,7 @@
 	if (no_any_pad)
 		gtk_widget_set_sensitive (item, FALSE);
 	
-	item = gtk_image_menu_item_new_with_mnemonic (_("_Close All"));
+	item = gtk_menu_item_new_with_mnemonic (_("_Close All"));
 	g_signal_connect_swapped (item, "activate", G_CALLBACK (xpad_pad_group_close_all), xpad_app_get_pad_group ());
 	gtk_container_add (GTK_CONTAINER (menu), item);
 	gtk_widget_show (item);
@@ -188,15 +188,19 @@
 	gtk_container_add (GTK_CONTAINER (menu), item);
 	gtk_widget_show (item);
 	
-	// append window titles
+	/* append window titles */
 	xpad_tray_append_pad_window_titles_to_menu (menu);
+
+	item = gtk_separator_menu_item_new ();
+	gtk_container_add (GTK_CONTAINER (menu), item);
+	gtk_widget_show (item);
 	
-	item = gtk_image_menu_item_new_from_stock (GTK_STOCK_PREFERENCES, NULL);
+	item = gtk_menu_item_new_with_mnemonic (_("_Preferences"));	
 	g_signal_connect (item, "activate", G_CALLBACK (xpad_preferences_open), NULL);
 	gtk_container_add (GTK_CONTAINER (menu), item);
 	gtk_widget_show (item);
 	
-	item = gtk_image_menu_item_new_from_stock (GTK_STOCK_QUIT, NULL);
+	item = gtk_menu_item_new_with_mnemonic (_("_Quit"));	
 	g_signal_connect (item, "activate", G_CALLBACK (xpad_app_quit), NULL);
 	gtk_container_add (GTK_CONTAINER (menu), item);
 	gtk_widget_show (item);
@@ -237,9 +241,9 @@
 	gint n;
 
 	pads = xpad_pad_group_get_pads (xpad_app_get_pad_group ());
-	// Order pads according to title.
+	/* Order pads according to title. */
 	pads = g_slist_sort (pads, (GCompareFunc) menu_title_compare);
-	// Populate list of windows.
+	/* Populate list of windows. */
 	for (l = pads, n = 1; l; l = l->next, n++)
 	{
 		gchar *title;
 
=== modified file 'src/xpad-undo.c'
--- src/xpad-undo.c	2013-10-23 02:51:47 +0000
+++ src/xpad-undo.c	2014-06-07 00:27:40 +0000
@@ -223,8 +223,7 @@
 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.
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) buffer;
 
 	undo->priv->user_action++;
@@ -233,8 +232,7 @@
 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.
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) buffer;
 
 	if (undo->priv->user_action > 0)
@@ -263,8 +261,10 @@
 	return curr;
 }
 
-/* Redo is impossible after text insertion/deletion, only right after Undo (another Redo),
-	so we have to remove every history entry after the current one if there is any */
+/*
+ * Redo is impossible after text insertion/deletion, only right after Undo (another Redo),
+ * so we have to remove every history entry after the current one if there is any
+ */
 static void
 xpad_undo_clear_redo_history (XpadUndo *undo)
 {
@@ -283,8 +283,7 @@
 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.
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) buffer;
 
 	if (undo->priv->frozen)
@@ -299,15 +298,17 @@
 
 		gint pos = gtk_text_iter_get_offset (location);
 
-		// safe cast
+		/* 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 */
+		/*
+		 * 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
+		 */
 		if (undo->priv->history_curr->data)
 		{
 			UserAction *prev_action = undo->priv->history_curr->data;
@@ -315,9 +316,9 @@
 			if (prev_action->action_type == USER_ACTION_INSERT_TEXT)
 			{
 				/* series of 1-letter insertions */
-				if (n_utf8_chars == 1 // this is a 1-letter insertion
-					&& pos == prev_action->end // placed right after the previous text
-					&& (prev_action->n_utf8_chars == 1 || prev_action->merged)) // with which we should merge
+				if (n_utf8_chars == 1 /* this is a 1-letter insertion */
+					&& pos == prev_action->end /* placed right after the previous text */
+					&& (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 ((gunichar) prev_action->text[0]) && !g_ascii_isspace ((gunichar) text[0])) ||
@@ -345,13 +346,14 @@
 		action->n_utf8_chars = n_utf8_chars;
 		action->merged = FALSE;
 
-		/* since each operation clears redo we know that there
-			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 */
+		/*
+		 * Since each operation clears redo we know that there 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);
-		// 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.
+		
+		/* A dirty way to silence the compiler for these unused variables. */
 		(void) dummy_start;
 
 		undo->priv->history_curr = g_list_next (undo->priv->history_curr);
@@ -363,8 +365,7 @@
 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.
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) buffer;
 
 	if (undo->priv->frozen)
@@ -382,7 +383,7 @@
 		gint end_offset = gtk_text_iter_get_offset (end);
 		gint len = abs (end_offset - start_offset);
 
-		// safe cast
+		/* safe cast */
 		string_length = g_utf8_strlen (text, len);
 		if (string_length <= UINT_MAX)
 			n_utf8_chars = (gint) string_length;
@@ -399,8 +400,8 @@
 		action->merged = FALSE;
 
 		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.
+		
+		/* A dirty way to silence the compiler for these unused variables. */
 		(void) dummy_start;
 
 		undo->priv->history_curr = g_list_next (undo->priv->history_curr);
@@ -428,8 +429,8 @@
 	action->merged = FALSE;
 
 	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.
+
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) dummy_start;
 
 	undo->priv->history_curr = g_list_next (undo->priv->history_curr);
@@ -456,8 +457,8 @@
 	action->merged = FALSE;
 
 	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.
+
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) dummy_start;
 
 	undo->priv->history_curr = g_list_next (undo->priv->history_curr);
 
=== modified file 'xpad.desktop.in'
--- xpad.desktop.in	2008-09-20 21:31:43 +0000
+++ xpad.desktop.in	2014-06-07 00:27:40 +0000
@@ -15,4 +15,4 @@
 
 Type=Application
 Categories=GTK;Utility;
-
+X-LXQt-Need-Tray=true